Changeset 3209

Timestamp:

07/30/13 12:24:35 (11 years ago)

Author:

peterwithers

Message:

Added the constructor defined in the spring configuration file, that provides the mandatory dataSource used by the queries.

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcUserDao.java (modified) (3 diffs)

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

@@ -23 +23 @@
 import java.sql.SQLException;
 import java.util.List;
+import javax.sql.DataSource;
 import org.springframework.jdbc.core.RowMapper;
 
@@ -29 +30 @@
  * @author olhsha
  */
-public class JdbcUserDao extends JdbcResourceDao implements UserDao{
-    
+public class JdbcUserDao extends JdbcResourceDao implements UserDao {
+
+    public JdbcUserDao(DataSource dataSource) {
+        setDataSource(dataSource);
+    }
+
     @Override
     public Number getInternalID(UserIdentifier userIdentifier) {
@@ -36 +41 @@
             return null;
         }
-       String sql = "SELECT "+principal_id+" FROM "+principalTableName+" WHERE "+external_id  +"= ?";
-       List<Number> result= getSimpleJdbcTemplate().query(sql, userIDRowMapper, userIdentifier.toString());
-       
-       if (result==null){
-           return null;
-       }
-       
-       if (result.isEmpty()) {
-           return null;
-       }
-       
-       return result.get(0);
+        String sql = "SELECT " + principal_id + " FROM " + principalTableName + " WHERE " + external_id + "= ?";
+        List<Number> result = getSimpleJdbcTemplate().query(sql, userIDRowMapper, userIdentifier.toString());
+
+        if (result == null) {
+            return null;
+        }
+
+        if (result.isEmpty()) {
+            return null;
+        }
+
+        return result.get(0);
     }
-    
-     private final RowMapper<Number> userIDRowMapper = new RowMapper<Number>() {        
+    private final RowMapper<Number> userIDRowMapper = new RowMapper<Number>() {
         @Override
         public Number mapRow(ResultSet rs, int rowNumber) throws SQLException {
-           Number result = rs.getInt(principal_id);
-           return result;
+            Number result = rs.getInt(principal_id);
+            return result;
         }
-     };
+    };
 }