Changeset 1300

Timestamp:

05/13/11 14:21:24 (13 years ago)

Author:

twagoo

Message:

Dao's: abstracted getPublicDescriptions for Profile/Component?.
DbImpl?: implemented getMDProfile(), register() now works for components

testRegisterComponent() now (should) succeed

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/impl/database/AbstractDescriptionDao.java (modified) (5 diffs)
• main/java/clarin/cmdi/componentregistry/impl/database/ComponentDescriptionDao.java (modified) (1 diff)
• main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (6 diffs)
• main/java/clarin/cmdi/componentregistry/impl/database/ProfileDescriptionDao.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/model/AbstractDescription.java (modified) (1 diff)
• test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDatabase.java (modified) (1 diff)
• test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImplTest.java (modified) (1 diff)

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.impl.database;
 
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import java.sql.SQLException;
+import java.sql.ResultSet;
+import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
+import java.util.List;
 import java.util.Collections;
 import java.util.Map;
@@ -6 +12 @@
 import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
 import clarin.cmdi.componentregistry.model.AbstractDescription;
+import org.springframework.jdbc.core.SingleColumnRowMapper;
+import org.springframework.jdbc.core.simple.ParameterizedSingleColumnRowMapper;
 import org.springframework.jdbc.core.simple.SimpleJdbcDaoSupport;
 import static clarin.cmdi.componentregistry.impl.database.ComponentDescriptionDatabase.*;
@@ -14 +22 @@
  */
 public abstract class AbstractDescriptionDao extends SimpleJdbcDaoSupport {
+
+    private final static Logger LOG = LoggerFactory.getLogger(AbstractDescriptionDao.class);
 
     protected abstract String getTableName();
@@ -28 +38 @@
                 + " join " + getTableName() + " on " + TABLE_XML_CONTENT + "." + COLUMN_ID + " = " + getTableName() + ".content_id"
                 + " where " + getTableName() + "." + getCMDIdColumn() + " = :id";
-        return getSimpleJdbcTemplate().queryForObject(select, String.class, cmdId);
+
+
+        List<String> result = getSimpleJdbcTemplate().query(select, new ParameterizedSingleColumnRowMapper<String>(), cmdId);
+        if (result.size() > 0) {
+            return result.get(0);
+        } else {
+            return null;
+        }
     }
 
@@ -45 +62 @@
         params.put("is_public", Boolean.TRUE);
         params.put("is_deleted", Boolean.FALSE);
-        params.put(getCMDIdColumn(), "clarin_" + contentId);
+        params.put(getCMDIdColumn(), description.getId());
         params.put("name", description.getName());
         params.put("description", description.getDescription());
         return insertDescription.executeAndReturnKey(params);
     }
+
+    protected <T extends AbstractDescription> List<T> getPublicDescriptions(final Class<T> _class) {
+        String select = "select name, description, " + getCMDIdColumn()  + " from " + getTableName();
+
+        ParameterizedRowMapper<T> rowMapper = new ParameterizedRowMapper<T>() {
+
+            @Override
+            public T mapRow(ResultSet rs, int rowNumber) throws SQLException {
+                try {
+                    AbstractDescription cd = (AbstractDescription) _class.newInstance();
+                    cd.setName(rs.getString("name"));
+                    cd.setDescription(rs.getString("description"));
+                    cd.setId(rs.getString(getCMDIdColumn()));
+                    return (T) cd;
+                } catch (InstantiationException ex) {
+                    LOG.error("Error in row mapping", ex);
+                } catch (IllegalAccessException ex) {
+                    LOG.error("Error in row mapping", ex);
+                }
+                return null;
+            }
+        };
+
+        return getSimpleJdbcTemplate().query(select, rowMapper);
+    }
 }

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

@@ -25 +25 @@
 
     public List<ComponentDescription> getPublicComponentDescriptions() {
-        String select = "select name, description from " + TABLE_COMPONENT_DESCRIPTION;
-
-        ParameterizedRowMapper<ComponentDescription> rowMapper = new ParameterizedRowMapper<ComponentDescription>() {
-
-            @Override
-            public ComponentDescription mapRow(ResultSet rs, int rowNumber) throws SQLException {
-                ComponentDescription cd = new ComponentDescription();
-                cd.setName(rs.getString("name"));
-                cd.setDescription(rs.getString("description"));
-                return cd;
-            }
-        };
-
-        return getSimpleJdbcTemplate().query(select, rowMapper);
+        return getPublicDescriptions(ComponentDescription.class);
     }
 }

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.DeleteFailedException;
 import clarin.cmdi.componentregistry.MDMarshaller;
@@ -30 +31 @@
 
     private String user;
-    
     @Autowired
     private ProfileDescriptionDao profileDescriptionDao;
@@ -41 +41 @@
      * @see setUser
      */
-    public ComponentRegistryDbImpl(){
-
+    public ComponentRegistryDbImpl() {
     }
 
@@ -83 +82 @@
     @Override
     public CMDComponentSpec getMDProfile(String id) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return getMDComponent(id, profileDescriptionDao);
     }
 
     @Override
     public CMDComponentSpec getMDComponent(String id) {
-        try {
-            String xml = componentDescriptionDao.getContent(id);
-            InputStream is = new ByteArrayInputStream(xml.getBytes());
-            return MDMarshaller.unmarshal(CMDComponentSpec.class, is, MDMarshaller.getCMDComponentSchema());
-        } catch (JAXBException ex) {
-            Logger.getLogger(ComponentRegistryDbImpl.class.getName()).log(Level.SEVERE, null, ex);
+        return getMDComponent(id, componentDescriptionDao);
+    }
+
+    private CMDComponentSpec getMDComponent(String id, AbstractDescriptionDao dao) {
+        String xml = dao.getContent(id);
+        if (xml != null) {
+            try {
+                InputStream is = new ByteArrayInputStream(xml.getBytes());
+                return MDMarshaller.unmarshal(CMDComponentSpec.class, is, MDMarshaller.getCMDComponentSchema());
+            } catch (JAXBException ex) {
+                Logger.getLogger(ComponentRegistryDbImpl.class.getName()).log(Level.SEVERE, null, ex);
+            }
         }
         return null;
@@ -99 +104 @@
 
     @Override
-    public int register(AbstractDescription desc, CMDComponentSpec spec) {
+    public int register(AbstractDescription description, CMDComponentSpec spec) {
+        ComponentRegistryUtils.enrichSpecHeader(spec, description);
         try {
             OutputStream os = new ByteArrayOutputStream();
             MDMarshaller.marshal(spec, os);
             String xml = os.toString();
-            if (!desc.isProfile()) {
-                componentDescriptionDao.insertComponent(desc, xml);
+            if (!description.isProfile()) {
+                componentDescriptionDao.insertComponent(description, xml);
             }
             return 0;
@@ -171 +177 @@
     }
 
-    public void setPublic(){
+    public void setPublic() {
         this.user = null;
     }

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

@@ -3 +3 @@
 import clarin.cmdi.componentregistry.model.ProfileDescription;
 import java.util.List;
-import org.springframework.jdbc.core.simple.ParameterizedBeanPropertyRowMapper;
-import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import static clarin.cmdi.componentregistry.impl.database.ComponentDescriptionDatabase.*;
 
@@ -23 +21 @@
     }
 
-    List<ProfileDescription> getPublicProfileDescriptions() {
-        String select = "select name, description from profile_description";
-
-        ParameterizedRowMapper<ProfileDescription> rowMapper = new ParameterizedBeanPropertyRowMapper<ProfileDescription>();
-
-        return getSimpleJdbcTemplate().query(select, rowMapper);
+    public List<ProfileDescription> getPublicProfileDescriptions() {
+        return getPublicDescriptions(ProfileDescription.class);
     }
 }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/AbstractDescription.java

@@ -95 +95 @@
         return href;
     }
-    
+
     public void setGroupName(String groupName) {
         this.groupName = groupName;

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

@@ -38 +38 @@
                 + "  is_public boolean NOT NULL,"
                 + "  is_deleted boolean DEFAULT false NOT NULL,"
-                + "  component_id character varying NOT NULL,"
+                + "  profile_id character varying NOT NULL,"
                 + "  name character varying NOT NULL,"
                 + "  description character varying NOT NULL,"

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

@@ -13 +13 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertNotNull;
-import org.junit.Ignore;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;