Changeset 1324

Timestamp:

05/17/11 08:39:02 (13 years ago)

Author:

twagoo

Message:

Implemented getComponentRegistry method for FactoryDbImpl?

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java (modified) (3 diffs)
• test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImplTest.java (modified) (3 diffs)
• test/java/clarin/cmdi/componentregistry/impl/database/UserDaoTest.java (modified) (2 diffs)
• test/java/clarin/cmdi/componentregistry/rest/DummyPrincipal.java (modified) (1 diff)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java

@@ -17 +17 @@
  */
 public class ComponentRegistryFactoryDbImpl implements ComponentRegistryFactory {
+
     @Autowired
     private ComponentRegistryBeanFactory componentRegistryBeanFactory;
@@ -38 +39 @@
     @Override
     public ComponentRegistry getComponentRegistry(boolean userspace, UserCredentials credentials) {
-        return getComponentRegistryForUser(null);
+        ComponentRegistry result = null;
+        if (userspace) {
+            if (credentials != null && !ANONYMOUS_USER.equals(credentials.
+                    getPrincipalName())) {
+                String principalName = credentials.getPrincipalName();
+                User user = getOrCreateUser(principalName, credentials.
+                        getDisplayName());
+                result = getComponentRegistryForUser(user.getId());
+            } else {
+                throw new IllegalArgumentException("No user credentials available cannot load userspace.");
+            }
+        } else {
+            result = getPublicRegistry();
+        }
+        return result;
     }
 
@@ -57 +72 @@
         return componentRegistry;
     }
+
+    private User getOrCreateUser(String principalName, String displayName) {
+        // Try getting it from db
+        User user = userDao.getByPrincipalName(principalName);
+        if (user == null) {
+            // Create the new user
+            user = new User();
+            user.setPrincipalName(principalName);
+            user.setName(displayName);
+            userDao.insertUser(user);
+            // Retrieve from db
+            user = userDao.getByPrincipalName(principalName);
+        }
+        return user;
+    }
 }

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImplTest.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.impl.database;
 
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.junit.Before;
+import clarin.cmdi.componentregistry.model.UserMapping.User;
 import clarin.cmdi.componentregistry.ComponentRegistry;
+import clarin.cmdi.componentregistry.UserCredentials;
+import clarin.cmdi.componentregistry.rest.DummyPrincipal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.junit.Test;
@@ -9 +14 @@
 
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
 
 /**
@@ -19 +26 @@
 
     @Autowired
-    ComponentRegistryFactoryDbImpl componentRegistryFactory;
+    private ComponentRegistryFactoryDbImpl componentRegistryFactory;
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Before
+    public void init() {
+        ComponentRegistryDatabase.resetDatabase(jdbcTemplate);
+        ComponentRegistryDatabase.createTableRegistryUser(jdbcTemplate);
+    }
 
     @Test
     public void testInjection() {
-        assertNotNull(componentRegistryFactory);
+        assertNotNull(componentRegistryFactory);
     }
 
     @Test
     public void testGetPublicRegistry() {
-        ComponentRegistry registry = componentRegistryFactory.getPublicRegistry();
-        assertNotNull(registry);
+        ComponentRegistry registry = componentRegistryFactory.getPublicRegistry();
+        assertNotNull(registry);
+    }
+
+    @Test
+    public void getComponentRegistry() {
+        // Get public
+        assertNotNull(componentRegistryFactory.getComponentRegistry(false, null));
+        
+        // Get for non-existing user
+        final User testUser = UserDaoTest.createTestUser();
+        UserCredentials credentials = new DummyPrincipal(testUser.
+                getPrincipalName()).getCredentials();
+
+        ComponentRegistryDbImpl cr1 = (ComponentRegistryDbImpl) componentRegistryFactory.
+                getComponentRegistry(true, credentials);
+        assertNotNull(cr1);
+        // Get for existing user
+        ComponentRegistryDbImpl cr2 = (ComponentRegistryDbImpl) componentRegistryFactory.
+                getComponentRegistry(true, credentials);
+        assertNotNull(cr2);
+        assertEquals(cr1.getUserId(), cr2.getUserId());
+
+        // Get for another new user
+        UserCredentials credentials2 = new DummyPrincipal(testUser.
+                getPrincipalName() + "2").getCredentials();
+        ComponentRegistryDbImpl cr3 = (ComponentRegistryDbImpl) componentRegistryFactory.
+                getComponentRegistry(true, credentials2);
+        assertNotNull(cr3);
+        assertNotSame(cr1.getUserId(), cr3.getUserId());
     }
 }

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/UserDaoTest.java

@@ -69 +69 @@
     }
 
-    private User createTestUser(){
+    public static User createTestUser(){
         User testUser = new User();
         testUser.setName(TEST_USER_NAME);
@@ -76 +76 @@
     }
 
-    private final static String TEST_USER_NAME = "Aap";
-    private final static String TEST_USER_PRINCIPAL_NAME = "aap@clarin.eu";
+    public final static String TEST_USER_NAME = "Aap";
+    public final static String TEST_USER_PRINCIPAL_NAME = "aap@clarin.eu";
 }

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/DummyPrincipal.java

@@ -6 +6 @@
 
 public final class DummyPrincipal implements Principal {
+
     public static final DummyPrincipal DUMMY_PRINCIPAL = new DummyPrincipal("JUnit@test.com");
     public static final UserCredentials DUMMY_CREDENTIALS = new UserCredentials(DUMMY_PRINCIPAL) {
-        @Override
-        public String getDisplayName() {
-            return "J.Unit";
-        }
+
+        @Override
+        public String getDisplayName() {
+            return "J.Unit";
+        }
     };
-
     private final String username;
 
     public DummyPrincipal(String username) {
-        this.username = username;
+        this.username = username;
     }
 
+    @Override
     public String getName() {
-        return username;
+        return username;
+    }
+
+    public UserCredentials getCredentials() {
+        return new UserCredentials(this);
     }
 }