Bump version of essential-json to get the byte arrays accessors; acce…

…pt the 'T' as date/time separator
arkanovicz · Sep 27, 2022 · 091cc58 · 091cc58
1 parent 52c6c60
commit 091cc58
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 11 deletions.
diff --git a/modality-api-client/pom.xml b/modality-api-client/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>com.republicate.modality</groupId>
         <artifactId>modality</artifactId>
-        <version>2.1.4</version>
+        <version>2.2</version>
     </parent>
 
     <artifactId>modality-api-client</artifactId>
@@ -50,7 +50,7 @@ under the License.
         <dependency>
             <groupId>com.republicate</groupId>
             <artifactId>essential-json</artifactId>
-            <version>2.6.4</version>
+            <version>2.7</version>
         </dependency>
         <!-- force version of commons-codec
              to avoid a security issue in v1.11

diff --git a/modality-core/pom.xml b/modality-core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.republicate.modality</groupId>
         <artifactId>modality</artifactId>
-        <version>2.1.4</version>
+        <version>2.2</version>
     </parent>
 
     <artifactId>modality-core</artifactId>
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>com.republicate</groupId>
             <artifactId>essential-json</artifactId>
-            <version>2.6.4</version>
+            <version>2.7</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/modality-core/src/main/java/com/republicate/modality/sql/SqlUtils.java b/modality-core/src/main/java/com/republicate/modality/sql/SqlUtils.java
@@ -112,6 +112,7 @@ public static List<String> getColumnNames(ResultSet resultSet) throws SQLExcepti
         sqlTypeToClass.put(Types.TIMESTAMP, java.sql.Timestamp.class);
         sqlTypeToClass.put(Types.TINYINT, Byte.class);
         sqlTypeToClass.put(Types.VARCHAR, String.class);
+        sqlTypeToClass.put(Types.BINARY, byte[].class);
     }
 
     public static Class getSqlTypeClass(int type)

diff --git a/modality-core/src/main/java/com/republicate/modality/util/ConversionHandlerImpl.java b/modality-core/src/main/java/com/republicate/modality/util/ConversionHandlerImpl.java
@@ -80,6 +80,7 @@ public class ConversionHandlerImpl implements ConversionHandler
 
     static DateFormat isoDateFormat = new SimpleDateFormat("yyyy-MM-dd");
     static DateFormat isoTimestampFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    static DateFormat isoSepTimestampFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
 
     /**
      * a converters cache map, initialized with the standard narrowing and string parsing conversions.
@@ -677,7 +678,9 @@ public java.sql.Timestamp convert(Serializable o)
             {
                 try
                 {
-                    return new java.sql.Timestamp(isoTimestampFormat.parse(String.valueOf(o)).getTime());
+                    String strTime = String.valueOf(o);
+                    DateFormat format = strTime.contains("T") ? isoSepTimestampFormat : isoTimestampFormat;
+                    return new java.sql.Timestamp(format.parse(strTime).getTime());
                 }
                 catch (ParseException pe)
                 {

diff --git a/modality-examples/modality-example-bookshelf/pom.xml b/modality-examples/modality-example-bookshelf/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>com.republicate.modality</groupId>
         <artifactId>modality-examples</artifactId>
-        <version>2.1.4</version>
+        <version>2.2</version>
     </parent>
 
     <artifactId>modality-example-bookshelf</artifactId>

diff --git a/modality-examples/pom.xml b/modality-examples/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>com.republicate.modality</groupId>
         <artifactId>modality</artifactId>
-        <version>2.1.4</version>
+        <version>2.2</version>
     </parent>
 
     <artifactId>modality-examples</artifactId>

diff --git a/modality-webapp-auth/pom.xml b/modality-webapp-auth/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>com.republicate.modality</groupId>
         <artifactId>modality</artifactId>
-        <version>2.1.4</version>
+        <version>2.2</version>
     </parent>
 
     <artifactId>modality-webapp-auth</artifactId>

diff --git a/modality-webapp/pom.xml b/modality-webapp/pom.xml
@@ -22,7 +22,7 @@ under the License.
     <parent>
         <groupId>com.republicate.modality</groupId>
         <artifactId>modality</artifactId>
-        <version>2.1.4</version>
+        <version>2.2</version>
     </parent>
 
     <artifactId>modality-webapp</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@ under the License.
 
     <groupId>com.republicate.modality</groupId>
     <artifactId>modality</artifactId>
-    <version>2.1.4</version>
+    <version>2.2</version>
 
     <packaging>pom</packaging>
     <name>${project.groupId}:${project.artifactId}</name>

diff --git a/velocity-tools-model/pom.xml b/velocity-tools-model/pom.xml
@@ -23,7 +23,7 @@ under the License.
         <groupId>com.republicate.modality</groupId>
         <artifactId>modality</artifactId>
 
-        <version>2.1.4</version>
+        <version>2.2</version>
     </parent>
 
     <artifactId>velocity-tools-model</artifactId>