Changeset 3272


Ignore:
Timestamp:
08/06/13 14:27:45 (11 years ago)
Author:
olhsha
Message:

refactored Version and CachedRepresentation? dao -2 (getting external Id refactoring)

Location:
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/CachedRepresentationDao.java

    r3264 r3272  
    3333     * @return extrnalID identifier of the resource with internalID
    3434     */
    35     public CachedRepresentationIdentifier getExternalId(Number internalID);
     35    public CachedRepresentationIdentifier getExternalID(Number internalID);
    3636 
    3737    /**

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/ResourceDao.java

    r3264 r3272  
    3434   
    3535   
    36    
    37    
    38    
    3936     /**   
    4037     * @param notebookID

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/VersionDao.java

    r3264 r3272  
    3434     */
    3535   
    36     public VersionIdentifier getExternalId(Number internalID);   
     36    public VersionIdentifier getExternalID(Number internalID);   
    3737   
    3838   
    … …  
    4040     *
    4141     * @param internalID
    42      * @return the insance of Version.class  where the veriosn internal Id is "internalID"
     42     * @return the instance of Version.class  where the version internal Id is "internalID"
    4343     *
    4444     */

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java

    r3236 r3272  
    6666   
    6767    public JdbcAnnotationDao(DataSource dataSource) {
    68         setDataSource(dataSource);
     68        setDataSource(dataSource);       
     69        internalIdName = annotation_id;
     70        resourceTableName = annotationTableName;
    6971    }
    7072   

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDao.java

    r3264 r3272  
    4343    //////////////////////////////////////////////////////////////////////////////////////////////////////
    4444    @Override
    45     public CachedRepresentationIdentifier getExternalId(Number internalID) {
    46         if (internalID == null) {
    47             return null;
    48         }
    49         String sql = "SELECT " + external_id + " FROM " + cachedRepresentationTableName + " WHERE " + cached_representation_id + "= ?";
    50         List<String> sqlResult = getSimpleJdbcTemplate().query(sql, externalIDRowMapper, internalID);
    51 
    52         if (sqlResult == null) {
    53             return null;
    54         }
    55         if (sqlResult.isEmpty()) {
    56             return null;
    57         }
    58 
    59         CachedRepresentationIdentifier result = new CachedRepresentationIdentifier(sqlResult.get(0));
    60         return result;
     45    public CachedRepresentationIdentifier getExternalID(Number internalID) {
     46      return new CachedRepresentationIdentifier(super.getExternalIdentifier(internalID));
    6147    }
    62     private final RowMapper<String> externalIDRowMapper = new RowMapper<String>() {
    63         @Override
    64         public String mapRow(ResultSet rs, int rowNumber) throws SQLException {
    65             return (rs.getString(external_id));
    66         }
    67     };
    68 
    6948   
    7049    @Override

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java

    r3264 r3272  
    9999    protected String resourceTableName=null;
    100100   
    101    
     101    //////////////////////////////////////////////////////////////////////////////////
    102102    @Override
    103103    public <T extends DasishIdentifier> Number getInternalID(T externalId){
    … …  
    127127        }
    128128     };
     129     
     130     
     131     /////////////////////////////////////////////
     132     
     133   
     134    protected String getExternalIdentifier(Number internalId){
     135      if (internalId == null) {
     136            return null;
     137        }
     138        String sql = "SELECT " + external_id + " FROM " + resourceTableName + " WHERE " + internalIdName + "= ?";
     139        List<String> sqlResult = getSimpleJdbcTemplate().query(sql, externalIDRowMapper, internalId);
     140
     141        if (sqlResult == null) {
     142            return null;
     143        }
     144        if (sqlResult.isEmpty()) {
     145            return null;
     146        }
     147
     148        return (sqlResult.get(0));
     149    }
     150   
     151    protected final RowMapper<String> externalIDRowMapper = new RowMapper<String>() {
     152        @Override
     153        public String mapRow(ResultSet rs, int rowNumber) throws SQLException {
     154            return (rs.getString(external_id));
     155        }
     156    };
     157   
     158   
    129159   
    130160    //////////////////////////////////////////

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDao.java

    r3264 r3272  
    4343       //////////////////////////////////////////////////////////////////////////////////////////////////////   
    4444      @Override
    45       public VersionIdentifier getExternalId(Number internalID){
    46        if (internalID == null) {
    47             return null;
    48         }
    49        String sql = "SELECT "+external_id+" FROM "+versionTableName+" WHERE "+version_id  +"= ?";
    50        List<String> sqlResult= getSimpleJdbcTemplate().query(sql, externalIDRowMapper, internalID);
    51        
    52        if (sqlResult == null) {
    53            return null;
    54        }
    55        if (sqlResult.isEmpty()) {
    56            return null;
    57        }
    58        
    59         VersionIdentifier result  = new VersionIdentifier(sqlResult.get(0));
    60         return result;
    61     } 
    62      
    63      private final RowMapper<String> externalIDRowMapper = new RowMapper<String>() {       
    64         @Override
    65         public String mapRow(ResultSet rs, int rowNumber) throws SQLException {
    66             return(rs.getString(external_id));
    67         }
    68      };
    69    
     45      public VersionIdentifier getExternalID(Number internalID){
     46          return new VersionIdentifier(super.getExternalIdentifier(internalID));
     47      }
    7048      ///////////////////////////////////////////////////////////////
    7149     @Override

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDaoTest.java

    r3264 r3272  
    6161        Number internalID = 1;
    6262        CachedRepresentationIdentifier expResult = new CachedRepresentationIdentifier(TestBackendConstants._TEST_CACHED_REPRESENTATION_1_EXT_ID_);
    63         CachedRepresentationIdentifier result = jdbcCachedRepresentationDao.getExternalId(internalID);
     63        CachedRepresentationIdentifier result = jdbcCachedRepresentationDao.getExternalID(internalID);
    6464        assertEquals(expResult, result);
    6565    }

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDaoTest.java

    r3264 r3272  
    5151        System.out.println("getExternalId");
    5252        Number internalID = 1;
    53         VersionIdentifier result = jdbcVersionDao.getExternalId(internalID);
     53        VersionIdentifier result = jdbcVersionDao.getExternalID(internalID);
    5454        assertEquals(TestBackendConstants._TEST_VERSION_1_EXT_ID, result.toString());
    5555    }
Note: See TracChangeset for help on using the changeset viewer.