Changeset 5549 for ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/AdminRegistry.java

Timestamp:

08/11/14 16:07:55 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Added group service. Tested via the tomcat on loclahots (test URI and postman), old unit tests are adjusted and work well. Todo: retest on localhost tomcat, look at run-time exceptions, add new unit tests, adjust front-end

File:

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

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

@@ -14 +14 @@
 import clarin.cmdi.componentregistry.ComponentRegistryException;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
-import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.DeleteFailedException;
+import clarin.cmdi.componentregistry.ItemNotFoundException;
 import clarin.cmdi.componentregistry.MDMarshaller;
-import clarin.cmdi.componentregistry.OwnerUser;
+import clarin.cmdi.componentregistry.UserCredentials;
 import clarin.cmdi.componentregistry.UserUnauthorizedException;
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
@@ -54 +54 @@
 
     public void submitFile(CMDItemInfo info, Principal userPrincipal)
-            throws SubmitFailedException {
+            throws SubmitFailedException, UserUnauthorizedException {
+        if (userPrincipal == null) {
+            LOG.info("Null user principal, nothings is submitted.");
+            return;
+        }
+        
         try {
             BaseDescription originalDescription = info.getDataNode()
@@ -72 +77 @@
                     IOUtils.toInputStream(info.getContent(), "UTF-8"), null);
             checkId(originalDescription.getId(), description.getId());
-
-            int result = getRegistry(userPrincipal, originalDescription, info)
-                    .update(description, spec, userPrincipal,
-                            info.isForceUpdate());
+            ComponentRegistry cr = this.getRegistry(new UserCredentials(userPrincipal));
+            int result = cr.update(description, spec, info.isForceUpdate());
             if (result < 0) {
                 throw new SubmitFailedException(
@@ -83 +86 @@
             throw new SubmitFailedException(e);
         } catch (IOException e) {
+            throw new SubmitFailedException(e);
+        } catch (ItemNotFoundException e) {
             throw new SubmitFailedException(e);
         }
@@ -109 +114 @@
         BaseDescription desc = info.getDataNode().getDescription();
         try {
-            deleteFromRegistry(userPrincipal, desc, info);
+            this.deleteFromRegistry(userPrincipal, desc, info);
             LOG.info("Deleted item: " + id);
         } catch (IOException e) {
@@ -119 +124 @@
         } catch (ComponentRegistryException e) {
             throw new SubmitFailedException(e);
+        } catch (ItemNotFoundException e) {
+            throw new SubmitFailedException(e);
         }
 
@@ -125 +132 @@
     private void deleteFromRegistry(Principal userPrincipal,
             BaseDescription desc, CMDItemInfo info) throws IOException,
-            UserUnauthorizedException, ComponentRegistryException {
-        ComponentRegistry registry = getRegistry(userPrincipal, desc, info);
+            UserUnauthorizedException, ComponentRegistryException, ItemNotFoundException {
+        
+        if (userPrincipal == null) {
+           LOG.info("Bnull user principal, nothing is deleted"); 
+           return;
+        }
+        
+        ComponentRegistry registry = this.getRegistry(new UserCredentials(userPrincipal));
         LOG.info("Deleting item: " + desc);
         if (desc.isProfile()) {
-            registry.deleteMDProfile(desc.getId(), userPrincipal);
+            registry.deleteMDProfile(desc.getId());
         } else {
-            registry.deleteMDComponent(desc.getId(), userPrincipal,
-                    info.isForceUpdate());
+            registry.deleteMDComponent(desc.getId(), info.isForceUpdate());
         }
     }
 
-    private ComponentRegistry getRegistry(Principal userPrincipal,
-            BaseDescription desc, CMDItemInfo info) {
-        ComponentRegistry registry = componentRegistryFactory
-                .getPublicRegistry();
-        // TODO: More generic check
-        if (info.getStatus() == ComponentStatus.PRIVATE /*
-                                                         * || info.getStatus()
-                                                         * == ComponentStatus.
-                                                         * DEVELOPMENT
-                                                         */) {
-            registry = componentRegistryFactory.getOtherUserComponentRegistry(
-                    userPrincipal, info.getStatus(),
-                    new OwnerUser(Integer.parseInt(desc.getUserId())));
-        }
-        return registry;
-    }
+    private ComponentRegistry getRegistry(UserCredentials credentials) throws UserUnauthorizedException{
+        return componentRegistryFactory.getBaseRegistry(credentials);
+        }
+    
 }