Changeset 1340

Timestamp:

05/19/11 07:33:10 (13 years ago)

Author:

twagoo

Message:

Moved ComponentRegistryUtils? helper methods to ImplBase? class

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry

Files:

• ComponentRegistryUtils.java (deleted)
• impl/ComponentRegistryImplBase.java (modified) (6 diffs)
• impl/database/ComponentRegistryDbImpl.java (modified) (6 diffs)
• impl/filesystem/ComponentRegistryImpl.java (modified) (8 diffs)

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

@@ -2 +2 @@
 
 import clarin.cmdi.componentregistry.ComponentRegistry;
-import clarin.cmdi.componentregistry.ComponentRegistryUtils;
 import clarin.cmdi.componentregistry.DeleteFailedException;
+import clarin.cmdi.componentregistry.MDMarshaller;
 import clarin.cmdi.componentregistry.UserUnauthorizedException;
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
+import clarin.cmdi.componentregistry.components.CMDComponentSpec.Header;
+import clarin.cmdi.componentregistry.components.CMDComponentType;
 import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.model.ComponentDescription;
@@ -11 +13 @@
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
+import javax.xml.bind.JAXBException;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
@@ -20 +27 @@
  */
 public abstract class ComponentRegistryImplBase implements ComponentRegistry{
+        private final static Logger LOG = LoggerFactory.getLogger(ComponentRegistryImplBase.class);
 
     @Override
@@ -27 +35 @@
         for (ComponentDescription desc : descs) {
             CMDComponentSpec spec = getMDComponent(desc.getId());
-            if (spec != null && ComponentRegistryUtils.findComponentId(componentId, spec.getCMDComponent())) {
+            if (spec != null && findComponentId(componentId, spec.getCMDComponent())) {
                 result.add(desc);
             }
@@ -39 +47 @@
         for (ProfileDescription profileDescription : getProfileDescriptions()) {
             CMDComponentSpec profile = getMDProfile(profileDescription.getId());
-            if (profile != null && ComponentRegistryUtils.findComponentId(componentId, profile.getCMDComponent())) {
+            if (profile != null && findComponentId(componentId, profile.getCMDComponent())) {
                 result.add(profileDescription);
             }
@@ -45 +53 @@
         return result;
     }
+
+    /* HELPER METHODS */
+
+    protected static String stripRegistryId(String id) {
+        return StringUtils.removeStart(id, ComponentRegistry.REGISTRY_ID);
+    }
+
+    protected static void enrichSpecHeader(CMDComponentSpec spec, AbstractDescription description) {
+        Header header = spec.getHeader();
+        header.setID(description.getId());
+        if (StringUtils.isEmpty(header.getName())) {
+            header.setName(description.getName());
+        }
+        if (StringUtils.isEmpty(header.getDescription())) {
+            header.setDescription(description.getDescription());
+        }
+    }
+
+    protected static boolean findComponentId(String componentId, List<CMDComponentType> componentReferences) {
+        for (CMDComponentType cmdComponent : componentReferences) {
+            if (componentId.equals(cmdComponent.getComponentId())) {
+                return true;
+            } else if (findComponentId(componentId, cmdComponent.getCMDComponent())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    protected static void writeXsd(CMDComponentSpec expandedSpec, OutputStream outputStream) {
+        MDMarshaller.generateXsd(expandedSpec, outputStream);
+    }
+
+    protected static void writeXml(CMDComponentSpec spec, OutputStream outputStream) {
+        try {
+            MDMarshaller.marshal(spec, outputStream);
+        } catch (UnsupportedEncodingException e) {
+            LOG.error("Error in encoding: ", e);
+        } catch (JAXBException e) {
+            LOG.error("Cannot marshall spec: " + spec, e);
+        }
+    }
+
+    /* UNIMPLEMENTED INTERFACE METHODS */
 
     @Override

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

@@ -2 +2 @@
 
 import clarin.cmdi.componentregistry.ComponentRegistry;
-import clarin.cmdi.componentregistry.ComponentRegistryUtils;
 import clarin.cmdi.componentregistry.Configuration;
 import clarin.cmdi.componentregistry.DeleteFailedException;
@@ -131 +130 @@
     @Override
     public int register(AbstractDescription description, CMDComponentSpec spec) {
-        ComponentRegistryUtils.enrichSpecHeader(spec, description);
+        enrichSpecHeader(spec, description);
         try {
             String xml = componentSpecToString(spec);
@@ -194 +193 @@
         CMDComponentSpec expandedSpec = CMDComponentSpecExpanderDbImpl.
                 expandProfile(profileId, this);
-        ComponentRegistryUtils.writeXml(expandedSpec, output);
+        writeXml(expandedSpec, output);
     }
 
@@ -201 +200 @@
         CMDComponentSpec expandedSpec = CMDComponentSpecExpanderDbImpl.
                 expandProfile(profileId, this);
-        ComponentRegistryUtils.writeXsd(expandedSpec, outputStream);
+        writeXsd(expandedSpec, outputStream);
     }
 
@@ -208 +207 @@
         CMDComponentSpec expandedSpec = CMDComponentSpecExpanderDbImpl.
                 expandComponent(componentId, this);
-        ComponentRegistryUtils.writeXml(expandedSpec, output);
+        writeXml(expandedSpec, output);
     }
 
@@ -215 +214 @@
         CMDComponentSpec expandedSpec = CMDComponentSpecExpanderDbImpl.
                 expandComponent(componentId, this);
-        ComponentRegistryUtils.writeXsd(expandedSpec, outputStream);
+        writeXsd(expandedSpec, outputStream);
     }
 

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/filesystem/ComponentRegistryImpl.java

@@ -3 +3 @@
 import clarin.cmdi.componentregistry.impl.ComponentRegistryImplBase;
 import clarin.cmdi.componentregistry.ComponentRegistry;
-import clarin.cmdi.componentregistry.ComponentRegistryUtils;
 import clarin.cmdi.componentregistry.Configuration;
 import clarin.cmdi.componentregistry.DeleteFailedException;
@@ -167 +166 @@
     public void getMDProfileAsXml(String profileId, OutputStream output) {
         CMDComponentSpec expandedSpec = CMDComponentSpecExpanderImpl.expandProfile(profileId, this);
-        ComponentRegistryUtils.writeXml(expandedSpec, output);
+        writeXml(expandedSpec, output);
     }
 
@@ -173 +172 @@
     public void getMDProfileAsXsd(String profileId, OutputStream outputStream) {
         CMDComponentSpec expandedSpec = CMDComponentSpecExpanderImpl.expandProfile(profileId, this);
-        ComponentRegistryUtils.writeXsd(expandedSpec, outputStream);
+        writeXsd(expandedSpec, outputStream);
     }
 
     private File getProfileFile(String profileId) {
-        String id = ComponentRegistryUtils.stripRegistryId(profileId);
+        String id = stripRegistryId(profileId);
         File file = new File(getProfileDir(), id + File.separator + id + ".xml");
         return file;
@@ -195 +194 @@
     public void getMDComponentAsXml(String componentId, OutputStream output) {
         CMDComponentSpec expandedSpec = CMDComponentSpecExpanderImpl.expandComponent(componentId, this);
-        ComponentRegistryUtils.writeXml(expandedSpec, output);
+        writeXml(expandedSpec, output);
     }
 
@@ -201 +200 @@
     public void getMDComponentAsXsd(String componentId, OutputStream outputStream) {
         CMDComponentSpec expandedSpec = CMDComponentSpecExpanderImpl.expandComponent(componentId, this);
-        ComponentRegistryUtils.writeXsd(expandedSpec, outputStream);
+        writeXsd(expandedSpec, outputStream);
     }
 
     private File getComponentFile(String componentId) {
-        String id = ComponentRegistryUtils.stripRegistryId(componentId);
+        String id = stripRegistryId(componentId);
         File file = new File(getComponentDir(), id + File.separator + id + ".xml");
         return file;
@@ -265 +264 @@
 
     private int register(File storageDir, AbstractDescription description, CMDComponentSpec spec, Closure onFail) {
-        String strippedId = ComponentRegistryUtils.stripRegistryId(description.getId());
+        String strippedId = stripRegistryId(description.getId());
         File dir = new File(storageDir, strippedId);
         boolean success = false;
@@ -273 +272 @@
                 writeDescription(dir, description);
                 if (spec != null) {
-                    ComponentRegistryUtils.enrichSpecHeader(spec, description);
+                    enrichSpecHeader(spec, description);
                     writeCMDComponentSpec(dir, strippedId + ".xml", spec);
                 }
@@ -403 +402 @@
         File file = null;
         if (description.isProfile()) {
-            file = new File(resourceConfig.getProfileDeletionDir(), ComponentRegistryUtils.stripRegistryId(description.getId()));
+            file = new File(resourceConfig.getProfileDeletionDir(), stripRegistryId(description.getId()));
         } else {
-            file = new File(resourceConfig.getComponentDeletionDir(), ComponentRegistryUtils.stripRegistryId(description.getId()));
+            file = new File(resourceConfig.getComponentDeletionDir(), stripRegistryId(description.getId()));
         }
         if (file.exists()) {