Changeset 5549 for ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/ComponentRegistryImplBase.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/ComponentRegistryImplBase.java (modified) (6 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/ComponentRegistryImplBase.java

@@ -14 +14 @@
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryException;
-import clarin.cmdi.componentregistry.DeleteFailedException;
+import clarin.cmdi.componentregistry.ItemNotFoundException;
 import clarin.cmdi.componentregistry.MDMarshaller;
+import clarin.cmdi.componentregistry.UserUnauthorizedException;
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
-import clarin.cmdi.componentregistry.components.CMDComponentType;
 import clarin.cmdi.componentregistry.components.CMDComponentSpec.Header;
 import clarin.cmdi.componentregistry.model.BaseDescription;
-import clarin.cmdi.componentregistry.model.ComponentDescription;
 import clarin.cmdi.componentregistry.model.ProfileDescription;
 
@@ -33 +32 @@
     protected abstract MDMarshaller getMarshaller();
 
-    @Override
-    public List<ComponentDescription> getUsageInComponents(String componentId) throws ComponentRegistryException {
-        LOG.debug("Checking usage of component {} in components", componentId);
-        List<ComponentDescription> result = new ArrayList<ComponentDescription>();
-        List<String> ids = getAllNonDeletedComponentIds();
-        for (String id : ids) {
-            CMDComponentSpec spec = getMDComponent(id);
-            if (spec != null && hasComponentId(componentId, spec.getCMDComponent())) {
-                LOG.debug("Component {} used in component {}", componentId, spec.getHeader().getID());
-                result.add(getComponentDescription(id));
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public List<ProfileDescription> getUsageInProfiles(String componentId) throws ComponentRegistryException {
-        LOG.debug("Checking usage of component {} in profiles", componentId);
-        List<ProfileDescription> result = new ArrayList<ProfileDescription>();
-        for (String id : getAllNonDeletedProfileIds()) {
-            CMDComponentSpec profile = getMDProfile(id);
-            if (profile != null && hasComponentId(componentId, profile.getCMDComponent())) {
-                LOG.debug("Component {} used in profile {}", componentId, profile.getHeader().getID());
-                result.add(getProfileDescription(id));
-            }
-        }
-        return result;
-    }
+    
 
     /**
@@ -70 +42 @@
     @Override
     public List<ProfileDescription> getProfileDescriptionsForMetadaEditor() throws ComponentRegistryException {
-        // TODO: Below can also be done by accepting and passing a parameter in the ProfileDescriptionDaoImpl, should have better performance
+        // TODO: Below can also be done by accepting and passing a parameter in the ProfileDescriptionDaoImpl, should have better performance
 
         // Get all profile descriptions
@@ -77 +49 @@
         ArrayList<ProfileDescription> descriptions = new ArrayList<ProfileDescription>();
         for (String id : descriptionsCollectionIds) {
-            ProfileDescription profile = getProfileDescription(id);
-            if (profile.isShowInEditor()) {
-                descriptions.add(profile);
+            try {
+                ProfileDescription profile = getProfileDescriptionAccessControlled(id);
+                if (profile.isShowInEditor()) {
+                    descriptions.add(profile);
+                }
+            } catch (UserUnauthorizedException e) {
+            } catch (ItemNotFoundException e) {
             }
+
         }
         // Return filtered list
@@ -102 +79 @@
     }
 
-    protected static boolean findComponentId(String componentId, List<CMDComponentType> componentReferences) {
-        for (CMDComponentType cmdComponent : componentReferences) {
-            if (hasComponentId(componentId, cmdComponent)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static boolean hasComponentId(String componentId, CMDComponentType cmdComponent) {
-        if (componentId.equals(cmdComponent.getComponentId())) {
-            return true;
-        } else if (findComponentId(componentId, cmdComponent.getCMDComponent())) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+    
+   
+    
 
     protected void writeXsd(CMDComponentSpec expandedSpec, OutputStream outputStream) {
@@ -135 +97 @@
     }
 
-    protected void checkStillUsed(String componentId) throws DeleteFailedException, ComponentRegistryException {
-        for (String id : getAllNonDeletedProfileIds()) {
-            CMDComponentSpec spec = getMDProfile(id);
-            if (spec != null && hasComponentId(componentId, spec.getCMDComponent())) {
-                LOG.warn("Cannot delete component {}, still used in profile {} and possibly other profiles and/or components", componentId, spec.getHeader().getID());
-                // Profile match - throw
-                throw new DeleteFailedException("Component is still in use by other components or profiles. Request component usage for details.");
-            }
-        }
-
-        LOG.debug("Component {} is not used in any profiles", componentId);
-
-        for (String id : getAllNonDeletedComponentIds()) {
-            CMDComponentSpec spec = getMDComponent(id);
-            if (spec != null && hasComponentId(componentId, spec.getCMDComponent())) {
-                LOG.warn("Cannot delete component {}, still used in component {} and possibly other components", componentId, spec.getHeader().getID());
-                // Component match -> throw
-                throw new DeleteFailedException("Component is still in use by one or more other components. Request component usage for details.");
-            }
-        }
-    }
 }