Changeset 3309


Ignore:
Timestamp:
08/08/13 09:07:45 (11 years ago)
Author:
olhsha
Message:

updating getInternalID and getExternalID for dao-users

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

Legend:

Unmodified
Added
Removed

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

    r3303 r3309  
    3636public interface AnnotationDao extends ResourceDao{
    3737   
    38     // Returns the list of annotation info-s  for the notebook id.
    39     List<AnnotationInfo> getAnnotationInfos(List<Number> annotationIDs);   
    40      
    41    
    42      // Returns the list of annotations Id-s  for the notebook id.
    43     List<ResourceREF> getAnnotationREFs(List<Number> annotationIDs);   
     38     /**
     39     *
     40     * @param internalId
     41     * @return the external identifier for the annotation with internalId
     42     */
     43    public AnnotationIdentifier getExternalID(Number internalId);
     44   
    4445   
    4546    /**
    … …  
    6970    public Annotation addAnnotation(Annotation annotation, Number ownerID) throws SQLException;
    7071 
    71     /**
    72      *
    73      * @param internalId
    74      * @return the external identifier for the annotation with internalId
    75      */
    76     public AnnotationIdentifier getExternalID(Number internalId);
     72   
     73   
     74   
     75    List<AnnotationInfo> getAnnotationInfos(List<Number> annotationIDs);   
     76     
     77   
     78   
     79    List<ResourceREF> getAnnotationREFs(List<Number> annotationIDs);   
     80   
    7781}

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

    r3300 r3309  
    6666     */
    6767    public Source addSource(Source freshSource);
    68    
    69    
    7068   
    7169    //////////////////////////////////////////////

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

    r3216 r3309  
    2626public interface UserDao extends ResourceDao{
    2727   
    28     /**
    29      *
    30      * @param userIDentifier
    31      * @return the internal identifier of "userIDentifier"
    32      */
    33     Number getInternalID(UserIdentifier userIDentifier);
    34    
     28 
    3529    /**
    3630     *
    … …  
    3832     * @return the external UserIdentifier of internalId;
    3933     */
    40     UserIdentifier getExternalID(Number internalId);
     34    UserIdentifier getExternalID(Number internalID);
    4135}
    4236

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

    r3216 r3309  
    3434    public JdbcUserDao(DataSource dataSource) {
    3535        setDataSource(dataSource);
     36        internalIdName = principal_id;
     37        resourceTableName = principalTableName;
    3638    }
    3739
    38     @Override
    39     public Number getInternalID(UserIdentifier userIdentifier) {
    40         if (userIdentifier == null) {
    41             return null;
    42         }
    43         String sql = "SELECT " + principal_id + " FROM " + principalTableName + " WHERE " + external_id + "= ?";
    44         List<Number> result = getSimpleJdbcTemplate().query(sql, userIDRowMapper, userIdentifier.toString());
    45 
    46         if (result == null) {
    47             return null;
    48         }
    49 
    50         if (result.isEmpty()) {
    51             return null;
    52         }
    53 
    54         return result.get(0);
    55     }
    56     private final RowMapper<Number> userIDRowMapper = new RowMapper<Number>() {
    57         @Override
    58         public Number mapRow(ResultSet rs, int rowNumber) throws SQLException {
    59             Number result = rs.getInt(principal_id);
    60             return result;
    61         }
    62     };
    63    
    6440    ///////////////////////////////////////////////////////////////////
    6541    @Override
    66     public UserIdentifier getExternalID(Number internalId) {
    67         if (internalId == null) {
    68             return null;
    69         }
    70         String sql = "SELECT " + external_id + " FROM " + principalTableName + " WHERE " + principal_id + "= ?";
    71         List<UserIdentifier> result = getSimpleJdbcTemplate().query(sql, internalIDRowMapper, internalId.toString());
    72 
    73         if (result == null) {
    74             return null;
    75         }
    76 
    77         if (result.isEmpty()) {
    78             return null;
    79         }
    80 
    81         return result.get(0);
     42    public UserIdentifier getExternalID(Number internalID) {
     43        return new UserIdentifier(super.getExternalIdentifier(internalID));
    8244    }
    83     private final RowMapper<UserIdentifier> internalIDRowMapper = new RowMapper<UserIdentifier>() {
    84         @Override
    85         public UserIdentifier mapRow(ResultSet rs, int rowNumber) throws SQLException {
    86             UserIdentifier result = new UserIdentifier(rs.getString(external_id));
    87             return result;
    88         }
    89     };
    9045}

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

    r3218 r3309  
    6767       
    6868        UserIdentifier testTwo = jdbcUserDao.getExternalID(null);
    69         assertEquals(null, testTwo);
     69        assertEquals(null, testTwo.getUUID());
    7070    }
    7171   
Note: See TracChangeset for help on using the changeset viewer.