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

Timestamp:

06/18/12 15:24:30 (12 years ago)

Author:

twagoo

Message:

ComponentRegistryFactory? now using ComponentStatus? and Owner instead of userId and userspace parameter.

Refs #142 and #143

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java (modified) (4 diffs)

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.impl.database;
-
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataAccessException;
 
 import clarin.cmdi.componentregistry.ComponentRegistry;
@@ -14 +5 @@
 import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.Configuration;
+import clarin.cmdi.componentregistry.Owner;
 import clarin.cmdi.componentregistry.OwnerUser;
 import clarin.cmdi.componentregistry.UserCredentials;
+import clarin.cmdi.componentregistry.UserUnauthorizedException;
 import clarin.cmdi.componentregistry.model.RegistryUser;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 
 /**
@@ -53 +53 @@
 
     @Override
-    public ComponentRegistry getComponentRegistry(boolean userspace, UserCredentials credentials) {
-        ComponentRegistry result = null;
-        if (userspace) {
+    public ComponentRegistry getComponentRegistry(ComponentStatus status, Owner owner, UserCredentials credentials) throws UserUnauthorizedException {
+        switch (status) {
+            case DEVELOPMENT:
+                return getDevelopmentRegistry(owner, credentials);
+            case PUBLIC:
+                return getPublicRegistry();
+            default:
+                // TODO: Add support for other status types
+                throw new UnsupportedOperationException("Unsupported component status" + status);
+        }
+    }
+
+    private ComponentRegistry getDevelopmentRegistry(Owner owner, UserCredentials credentials) throws IllegalArgumentException, DataAccessException, UserUnauthorizedException {
+        if (owner == null || owner instanceof OwnerUser) {
             RegistryUser user = getOrCreateUser(credentials);
             if (user != null) {
+                if (owner != null && !user.getId().equals(owner.getId())) {
+                    throw new UserUnauthorizedException("User cannot access other user's development registry");
+                }
+
                 try {
-                    result = getNewComponentRegistryForUser(user.getId());
+                    return getNewComponentRegistryForUser(user.getId());
                 } catch (DataAccessException ex) {
                     LOG.error("Could not retrieve or create user", ex);
@@ -68 +83 @@
             }
         } else {
-            result = getPublicRegistry();
+            // TODO: Support group owners
+            throw new UnsupportedOperationException("Group owners not supported");
         }
-        return result;
     }
 
     @Override
-    public ComponentRegistry getOtherUserComponentRegistry(Principal adminPrincipal, String userId) {
+    public ComponentRegistry getOtherUserComponentRegistry(Principal adminPrincipal, ComponentStatus status, Owner owner) {
         try {
-            RegistryUser user = userDao.getById(Integer.parseInt(userId));
+            RegistryUser user;
+            if (owner instanceof OwnerUser) {
+                user = userDao.getById(owner.getId());
+            } else {
+                // TODO: Implement for groups
+                throw new UnsupportedOperationException("Groups not implemented yet");
+            }
             ComponentRegistry result = null;
             if (user != null) {