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

Timestamp:

02/13/14 10:50:48 (10 years ago)

Author:

olhsha

Message:

NotebookDao? Unit test is finished. Passes.

File:

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

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

@@ -86 +86 @@
     final static protected String targetStar = targetTableName + ".*";
     final static protected String principalStar = principalTableName + ".*";
-    
     ////////////////////////////////
-    
-   
     ///////////////////////////////////////////////////
     protected String internalIdName = null;
@@ -168 +165 @@
         @Override
         public XMLGregorianCalendar mapRow(ResultSet rs, int rowNumber) throws SQLException {
-            return timeStampToXMLGregorianCalendar(rs);
+            return timeStampToXMLGregorianCalendar(rs.getString(last_modified));
         }
     };
@@ -216 +213 @@
         }
     };
-    
     protected final RowMapper<Number> ownerIDRowMapper = new RowMapper<Number>() {
         @Override
@@ -223 +219 @@
         }
     };
-    
-
 
     @Override
@@ -266 +260 @@
 
     /////////////////////////
-    protected XMLGregorianCalendar timeStampToXMLGregorianCalendar(ResultSet rs) {
+    protected XMLGregorianCalendar timeStampToXMLGregorianCalendar(String ts) {
+        String tsAdjusted = ts.replace(' ', 'T') + "Z";
         try {
-            String ts = rs.getString(last_modified).replace(' ', 'T') + "Z";
-            try {
-                return DatatypeFactory.newInstance().newXMLGregorianCalendar(ts);
-            } catch (DatatypeConfigurationException dtce) {
-                _logger.error(" ", dtce);
-                return null;
-            }
-        } catch (SQLException sqle) {
-            _logger.error(" ", sqle);
-            return null;
-        }
+            return DatatypeFactory.newInstance().newXMLGregorianCalendar(tsAdjusted);
+        } catch (DatatypeConfigurationException dtce) {
+            _logger.error(" ", dtce);
+            return null;
+        }
+
     }
 }