Changeset 1303

Timestamp:

05/16/11 07:32:54 (13 years ago)

Author:

twagoo

Message:

Made AbstractDescriptionDao? generic, RowMapper? inner class

Added some more tests

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/impl/database/AbstractDescriptionDao.java (modified) (3 diffs)
• main/java/clarin/cmdi/componentregistry/impl/database/ComponentDescriptionDao.java (modified) (3 diffs)
• main/java/clarin/cmdi/componentregistry/impl/database/ProfileDescriptionDao.java (modified) (2 diffs)
• test/java/clarin/cmdi/componentregistry/impl/database/AbstractDescriptionDaoTest.java (modified) (2 diffs)
• test/java/clarin/cmdi/componentregistry/impl/database/ComponentDescriptionDaoTest.java (modified) (1 diff)
• test/java/clarin/cmdi/componentregistry/impl/database/ProfileDescriptionDaoTest.java (added)

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

@@ -12 +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;
@@ -21 +20 @@
  * @author Twan Goosen <twan.goosen@mpi.nl>
  */
-public abstract class AbstractDescriptionDao extends SimpleJdbcDaoSupport {
+public abstract class AbstractDescriptionDao<T extends AbstractDescription> extends SimpleJdbcDaoSupport {
 
     private final static Logger LOG = LoggerFactory.getLogger(AbstractDescriptionDao.class);
 
     protected abstract String getTableName();
-
     protected abstract String getCMDIdColumn();
 
+    /**
+     * Class object required to instantiate new description domain objects
+     */
+    private Class<T> _class;
+
+    protected AbstractDescriptionDao(Class<T> _class) {
+        this._class = _class;
+    }
     /**
      * 
@@ -68 +74 @@
     }
 
-    protected <T extends AbstractDescription> List<T> getPublicDescriptions(final Class<T> _class) {
-        String select = "select name, description, " + getCMDIdColumn()  + " from " + getTableName();
+    /**
+     *
+     * @return All descriptions in the public space
+     */
+    protected List<T> getPublicDescriptions() {
+        String select = "select name, description, " + getCMDIdColumn() + " from " + getTableName() + " where is_public = TRUE";
+        return getSimpleJdbcTemplate().query(select, new AbstractDescriptionRowMapper());
+    }
 
-        ParameterizedRowMapper<T> rowMapper = new ParameterizedRowMapper<T>() {
+    private class AbstractDescriptionRowMapper<T> implements 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;
+        @Override
+        public T mapRow(ResultSet rs, int rowNumber) throws SQLException {
+            try {
+                AbstractDescription newDescription = (AbstractDescription) _class.newInstance();
+                newDescription.setName(rs.getString("name"));
+                newDescription.setDescription(rs.getString("description"));
+                newDescription.setId(rs.getString(getCMDIdColumn()));
+                return (T) newDescription;
+            } catch (InstantiationException ex) {
+                LOG.error("Error in row mapping", ex);
+            } catch (IllegalAccessException ex) {
+                LOG.error("Error in row mapping", ex);
             }
-        };
-
-        return getSimpleJdbcTemplate().query(select, rowMapper);
-    }
+            return null;
+        }
+    };
 }

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

@@ -2 +2 @@
 
 import clarin.cmdi.componentregistry.model.ComponentDescription;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.List;
-import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import static clarin.cmdi.componentregistry.impl.database.ComponentDescriptionDatabase.*;
 
@@ -12 +9 @@
  * @author Twan Goosen <twan.goosen@mpi.nl>
  */
-public class ComponentDescriptionDao extends AbstractDescriptionDao {
+public class ComponentDescriptionDao extends AbstractDescriptionDao<ComponentDescription> {
+
+    public ComponentDescriptionDao() {
+        super(ComponentDescription.class);
+    }
 
     @Override
@@ -25 +26 @@
 
     public List<ComponentDescription> getPublicComponentDescriptions() {
-        return getPublicDescriptions(ComponentDescription.class);
+        return getPublicDescriptions();
     }
 }

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

@@ -9 +9 @@
  * @author Twan Goosen <twan.goosen@mpi.nl>
  */
-public class ProfileDescriptionDao extends AbstractDescriptionDao {
+public class ProfileDescriptionDao extends AbstractDescriptionDao<ProfileDescription> {
+
+    public ProfileDescriptionDao() {
+        super(ProfileDescription.class);
+    }
 
     @Override
@@ -22 +26 @@
 
     public List<ProfileDescription> getPublicProfileDescriptions() {
-        return getPublicDescriptions(ProfileDescription.class);
+        return getPublicDescriptions();
     }
 }

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.impl.database;
 
-import clarin.cmdi.componentregistry.components.CMDComponentSpec;
+import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.model.ComponentDescription;
 import clarin.cmdi.componentregistry.rest.RegistryTestHelper;
+import java.util.List;
 import org.junit.runner.RunWith;
 import org.junit.Test;
@@ -41 +42 @@
         getDao().insertComponent(description, testComponent);
     }
+
+    @Test
+    public void testGetPublicComponents() throws Exception {
+        List<AbstractDescription> descriptions =  getDao().getPublicDescriptions();
+        assertNotNull(descriptions);
+    }
 }

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

@@ -19 +19 @@
         resetDatabase(jdbcTemplate);
         createTableComponentDescription(jdbcTemplate);
-        createTableProfileDescription(jdbcTemplate);
         createTableXmlContent(jdbcTemplate);
     }