Merge pull request #251 from mohrezaei/master

Update dependencies
goldmansachs · Feb 7, 2022 · 1db65d9 · 1db65d9
2 parents 5e18933 + 4303e33
commit 1db65d9
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 49 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@
             - It's a lot more strict regarding identifiers. This may cause issues with table names in unit tests.
             - Numerical computations can result in slightly different outcomes (e.g. rounding down vs up).
     - For unit tests, `MODE=LEGACY` is auto set for the in memory instance. The main use of this is the `IDENTITY()` function.
+- Update main dependencies: Eclipse Collections 11.0.0, Joda Time 2.10.13, slf4j 1.7.35.
+- Update serialization dependencies: gson 2.8.9, jackson-core 2.13.1.
+
 ### Bug Fixes:
 - Fix parsing large long values in test data files
 

diff --git a/build/build.xml b/build/build.xml
@@ -67,19 +67,18 @@
         <include name="**/*.jar"/>
     </fileset>
 
+    <fileset dir="${root}/lib/graphql" id="fileset.lib.graphql">
+        <include name="**/*.jar"/>
+    </fileset>
+
     <path id="reladomo.compile.classpath">
         <fileset refid="fileset.lib.compile"/>
         <pathelement location="${root}/reladomo/target/reladomo-asm-4.2.jar"/>
     </path>
 
     <path id="reladomographql.compile.classpath">
         <pathelement location="${root}/reladomo/target/classes"/>
-        <pathelement location="${root}/build/lib/graphql/graphql-java-13.0.jar"/>
-        <pathelement location="${root}/build/lib/graphql/graphql-java-servlet-8.0.0.jar"/>
-        <pathelement location="${root}/lib/serial/jackson-databind-2.8.6.jar"/>
-        <pathelement location="${root}/lib/serial/jackson-core-2.8.6.jar"/>
-        <pathelement location="${root}/build/lib/graphql/javax.servlet-api-3.0.1.jar"/>
-        <pathelement location="${root}/build/lib/graphql/graphql-java-extended-scalars-1.0.jar"/>
+        <fileset refid="fileset.lib.graphql"/>
     </path>
 
     <path id="reladomo.test.compile.classpath">
@@ -1976,6 +1975,10 @@
         <include name="**/*.jar"/>
     </fileset>
 
+    <fileset dir="${root}/lib/serialtest" id="fileset.lib.serialtest">
+        <include name="**/*.jar"/>
+    </fileset>
+
     <path id="reladomo.serial.compile.classpath">
         <fileset refid="fileset.lib.serial"/>
         <path refid="reladomo.compile.classpath"/>
@@ -1985,6 +1988,7 @@
     <path id="reladomo.serial.test.compile.classpath">
         <path refid="reladomo.serial.compile.classpath"/>
         <path refid="reladomo.run.test.classpath"/>
+        <fileset refid="fileset.lib.serialtest"/>
         <pathelement location="${root}/reladomoserial/target/classes"/>
         <pathelement location="${root}/reladomo/target/test-classes-onheap"/>
         <pathelement location="${root}/reladomo/target/test-util-classes"/>

diff --git a/build/pom-templates/pom-reladomo-graphql.xml b/build/pom-templates/pom-reladomo-graphql.xml
@@ -61,6 +61,20 @@ under the License.
             <version>13.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.13.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.13.1</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.graphql-java-kickstart</groupId>
             <artifactId>graphql-java-servlet</artifactId>

diff --git a/build/pom-templates/pom-reladomo-serial.xml b/build/pom-templates/pom-reladomo-serial.xml
@@ -60,14 +60,21 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.0</version>
+            <version>2.8.9</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.8.6</version>
+            <version>2.13.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.13.1</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/build/pom-templates/pom-reladomo.xml b/build/pom-templates/pom-reladomo.xml
@@ -55,13 +55,13 @@
         <dependency>
             <groupId>org.eclipse.collections</groupId>
             <artifactId>eclipse-collections-api</artifactId>
-            <version>7.1.1</version>
+            <version>11.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.collections</groupId>
             <artifactId>eclipse-collections</artifactId>
-            <version>7.1.1</version>
+            <version>11.0.0</version>
         </dependency>
 
         <dependency>
@@ -73,13 +73,13 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.9.4</version>
+            <version>2.10.13</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.21</version>
+            <version>1.7.35</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/build/reladomolib.spec b/build/reladomolib.spec
@@ -1,10 +1,10 @@
 # <repo>, <groupId>, <artifactId>, <version>, <extension>, <destDir>, <checksum>
 # central,org.apache.ant,ant,1.9.6,jar,build/lib,80E2063B01BAB3C79C2D84E4ED5E73868394C85A
-central,org.eclipse.collections,eclipse-collections-api,7.1.1,jar,lib/compile,806C2B3BEF5364D1A1668F25CE70100FA2C6B919
-central,org.eclipse.collections,eclipse-collections,7.1.1,jar,lib/compile,83ECA9F03F1F2D055DF453D72036C5CE2E82896B
-central,joda-time,joda-time,2.9.4,jar,lib/compile,1C295B462F16702EBE720BBB08F62E1BA80DA41B
+central,org.eclipse.collections,eclipse-collections-api,11.0.0,jar,lib/compile,1FA4325CDAD80CFEC8ADE827B8F8D00A54936E35
+central,org.eclipse.collections,eclipse-collections,11.0.0,jar,lib/compile,FDEAF9CBD78FA80AB3F96B9DB9567538B20B1A6E
+central,joda-time,joda-time,2.10.13,jar,lib/compile,86F338C18CEA2A89005556642E81707FF920DD38
 central,org.apache.geronimo.specs,geronimo-jta_1.1_spec,1.1.1,jar,lib/compile,AABAB3165B8EA936B9360ABBF448459C0D04A5A4
-central,org.slf4j,slf4j-api,1.7.21,jar,lib/compile,139535A69A4239DB087DE9BAB0BEE568BF8E0B70
+central,org.slf4j,slf4j-api,1.7.35,jar,lib/compile,517F3A0687490B72D0E56D815E05608A541AF802
 
 #drivers
 central,org.postgresql,postgresql,9.3-1101-jdbc4,jar,lib/drivers,9DA59F12BADEA19B3B2884161F624BCF6750F985
@@ -36,48 +36,52 @@ central,org.jacoco,org.jacoco.ant,0.7.9,jar,lib/coverage,7CB39A4B38A32FFC8D0B505
 central,org.ow2.asm,asm-debug-all,5.2,jar,lib/coverage,3354E11E2B34215F06DAB629AB88E06ACA477C19
 
 #serial libs:
-central,com.google.code.gson,gson,2.8.0,jar,lib/serial,C4BA5371A29AC9B2AD6129B1D39EA38750043EFF
-
-central,com.fasterxml.jackson.core,jackson-core,2.8.6,jar,lib/serial,2EF7B1CC34DE149600F5E75BC2D5BF40DE894E60
-central,com.fasterxml.jackson.core,jackson-annotations,2.8.6,jar,lib/serial,9577018F9CE3636A2E1CB0A0C7FE915E5098DED5
-central,com.fasterxml.jackson.core,jackson-databind,2.8.6,jar,lib/serial,C43DE61F74ECC61322EF8F402837BA65B0AA2BF4
-
-central,com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.8.8,jar,lib/serial,E70BE1CD2AD47615A527F7475F63ACADBF3BE730
-central,com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.8.8,jar,lib/serial,345A87F3C145912163964DED45803EBF0A9C775E
-
-central,org.glassfish.jersey.core,jersey-common,2.25,jar,lib/serial,B38E1A1AF6AD75DD9037A767764B0D41801F1C9F
-central,org.glassfish.jersey.core,jersey-server,2.25,jar,lib/serial,0874CA16134872781B8C6A2ADFE3BB2AF80BC378
-central,org.glassfish.jersey.core,jersey-client,2.25,jar,lib/serial,416A00562F25D7EFDBA015E5C21876D19163EDD0
-central,org.glassfish.jersey.ext,jersey-entity-filtering,2.25,jar,lib/serial,52B5A204A79D22041F4B30C2670E95C2456CBCBD
-central,org.glassfish.jersey.media,jersey-media-json-jackson,2.25,jar,lib/serial,2C99D40047A50FC43C5886545F7F2148C7E4A384
-central,org.glassfish.jersey.media,jersey-media-jaxb,2.25,jar,lib/serial,09AA3EEBA90DCE24F04BF27CD1A4E0D378EC697F
-central,org.glassfish.jersey.bundles.repackaged,jersey-guava,2.25,jar,lib/serial,4439BDDB870B210E40CA2E953813930BE424DC0C
-
-central,org.glassfish.hk2,hk2-api,2.5.0-b30,jar,lib/serial,5C6688A6BAFCD2098BEF4CA45226D5355B816647
-central,org.glassfish.hk2,hk2-utils,2.5.0-b30,jar,lib/serial,B17FC7D8082AC00E59CD96FDA9CFF21F24CC367C
-central,org.glassfish.hk2,hk2-locator,2.5.0-b30,jar,lib/serial,82056CBBD258647BBC6B80DEBE4E6B7121C61BE9
-central,org.glassfish.hk2.external,javax.inject,2.5.0-b30,jar,lib/serial,054B36144FD2FB684F9CEE73D96060BB82E4D363
-central,org.glassfish.jersey.containers,jersey-container-grizzly2-http,2.25,jar,lib/serial,ACA5D2802C7D81E4350829696C96AEE2F01FE6A9
-central,org.glassfish.grizzly,grizzly-http-server,2.3.28,jar,lib/serial,13BC9A63DAE3A0A623B52FE71753D5413D134540
-central,org.glassfish.grizzly,grizzly-http,2.3.28,jar,lib/serial,BB34B4E7FBB66B53AC6D428DCC99F5925C9FF7BD
-central,org.glassfish.grizzly,grizzly-framework,2.3.28,jar,lib/serial,23A90F6316B3776699B173CCF9394C69D15B7E9C
+central,com.google.code.gson,gson,2.8.9,jar,lib/serial,8A432C1D6825781E21A02DB2E2C33C5FDE2833B9
+
+central,com.fasterxml.jackson.core,jackson-core,2.13.1,jar,lib/serial,51AE921A2ED1E06CA8876F12F32F265E83C0B2B8
+central,com.fasterxml.jackson.core,jackson-databind,2.13.1,jar,lib/serial,698B2D2B15D9A1B7AAE025F1D9F576842285E7F6
 
 central,javax.ws.rs,javax.ws.rs-api,2.0,jar,lib/serial,61F0983EB190954CCDEDE31E786A9E0BD9767C4A
-central,javax.validation,validation-api,1.1.0.Final,jar,lib/serial,8613AE82954779D518631E05DAA73A6A954817D5
-central,javax.annotation,javax.annotation-api,1.2,jar,lib/serial,479C1E06DB31C432330183F5CAE684163F186146
 
-central,org.javassist,javassist,3.20.0-GA,jar,lib/serial,A9CBCDFB7E9F86FBC74D3AFAE65F2248BFBF82A0
+central,com.fasterxml.jackson.core,jackson-annotations,2.13.1,jar,lib/serialtest,1CBCBE4623113E6AF92CCAA89884A345270F1A87
+
+central,com.fasterxml.jackson.jaxrs,jackson-jaxrs-json-provider,2.13.1,jar,lib/serialtest,F305A0891E9C917FDD526F3708896B99CF89AF5C
+central,com.fasterxml.jackson.jaxrs,jackson-jaxrs-base,2.13.1,jar,lib/serialtest,2C8AA6362A140F5DE4CD6292F9D92AE09DC03F34
+
+central,org.glassfish.jersey.core,jersey-common,2.25,jar,lib/serialtest,B38E1A1AF6AD75DD9037A767764B0D41801F1C9F
+central,org.glassfish.jersey.core,jersey-server,2.25,jar,lib/serialtest,0874CA16134872781B8C6A2ADFE3BB2AF80BC378
+central,org.glassfish.jersey.core,jersey-client,2.25,jar,lib/serialtest,416A00562F25D7EFDBA015E5C21876D19163EDD0
+central,org.glassfish.jersey.ext,jersey-entity-filtering,2.25,jar,lib/serialtest,52B5A204A79D22041F4B30C2670E95C2456CBCBD
+central,org.glassfish.jersey.media,jersey-media-json-jackson,2.25,jar,lib/serialtest,2C99D40047A50FC43C5886545F7F2148C7E4A384
+central,org.glassfish.jersey.media,jersey-media-jaxb,2.25,jar,lib/serialtest,09AA3EEBA90DCE24F04BF27CD1A4E0D378EC697F
+central,org.glassfish.jersey.bundles.repackaged,jersey-guava,2.25,jar,lib/serialtest,4439BDDB870B210E40CA2E953813930BE424DC0C
+
+central,org.glassfish.hk2,hk2-api,2.5.0-b30,jar,lib/serialtest,5C6688A6BAFCD2098BEF4CA45226D5355B816647
+central,org.glassfish.hk2,hk2-utils,2.5.0-b30,jar,lib/serialtest,B17FC7D8082AC00E59CD96FDA9CFF21F24CC367C
+central,org.glassfish.hk2,hk2-locator,2.5.0-b30,jar,lib/serialtest,82056CBBD258647BBC6B80DEBE4E6B7121C61BE9
+central,org.glassfish.hk2.external,javax.inject,2.5.0-b30,jar,lib/serialtest,054B36144FD2FB684F9CEE73D96060BB82E4D363
+central,org.glassfish.jersey.containers,jersey-container-grizzly2-http,2.25,jar,lib/serialtest,ACA5D2802C7D81E4350829696C96AEE2F01FE6A9
+central,org.glassfish.grizzly,grizzly-http-server,2.3.28,jar,lib/serialtest,13BC9A63DAE3A0A623B52FE71753D5413D134540
+central,org.glassfish.grizzly,grizzly-http,2.3.28,jar,lib/serialtest,BB34B4E7FBB66B53AC6D428DCC99F5925C9FF7BD
+central,org.glassfish.grizzly,grizzly-framework,2.3.28,jar,lib/serialtest,23A90F6316B3776699B173CCF9394C69D15B7E9C
+
+central,javax.validation,validation-api,1.1.0.Final,jar,lib/serialtest,8613AE82954779D518631E05DAA73A6A954817D5
+central,javax.annotation,javax.annotation-api,1.2,jar,lib/serialtest,479C1E06DB31C432330183F5CAE684163F186146
+
+central,org.javassist,javassist,3.20.0-GA,jar,lib/serialtest,A9CBCDFB7E9F86FBC74D3AFAE65F2248BFBF82A0
 
 #xa libs:
 central,org.apache.geronimo.specs,geronimo-jms_1.1_spec,1.1.1,jar,lib/xa,C872B46C601D8DC03633288B81269F9E42762CEA
 
 #graphql
-central,javax.servlet,javax.servlet-api,3.0.1,jar,build/lib/graphql,6BF0EBB7EFD993E222FC1112377B5E92A13B38DD
-central,com.graphql-java,graphql-java,13.0,jar,build/lib/graphql,F3D5C387CF09A13922F719FC984E7B6CBF2A3CCF
-central,com.graphql-java-kickstart,graphql-java-servlet,8.0.0,jar,build/lib/graphql,F0FEE2A1DD3715EE93473A54FA93F7CFDFC24E46
-central,com.graphql-java,graphql-java-extended-scalars,1.0,jar,build/lib/graphql,D798F4D543331B26E5E0B359D84D775F66B0E3E0
+central,javax.servlet,javax.servlet-api,3.0.1,jar,lib/graphql,6BF0EBB7EFD993E222FC1112377B5E92A13B38DD
+central,com.graphql-java,graphql-java,13.0,jar,lib/graphql,F3D5C387CF09A13922F719FC984E7B6CBF2A3CCF
+central,com.graphql-java-kickstart,graphql-java-servlet,8.0.0,jar,lib/graphql,F0FEE2A1DD3715EE93473A54FA93F7CFDFC24E46
+central,com.graphql-java,graphql-java-extended-scalars,1.0,jar,lib/graphql,D798F4D543331B26E5E0B359D84D775F66B0E3E0
 central,org.skyscreamer,jsonassert,1.5.0,jar,lib/test,6C9D5FE2F59DA598D9AEFC1CFC6528FF3CF32DF3
 central,com.vaadin.external.google,android-json,0.0.20131108.vaadin1,jar,lib/test,FA26D351FE62A6A17F5CDA1287C1C6110DEC413F
+central,com.fasterxml.jackson.core,jackson-core,2.13.1,jar,lib/graphql,51AE921A2ED1E06CA8876F12F32F265E83C0B2B8
+central,com.fasterxml.jackson.core,jackson-databind,2.13.1,jar,lib/graphql,698B2D2B15D9A1B7AAE025F1D9F576842285E7F6
 
 
 # Copyright 2016 Goldman Sachs.

diff --git a/reladomo/src/main/java/com/gs/fw/common/mithra/util/ConstantIntSet.java b/reladomo/src/main/java/com/gs/fw/common/mithra/util/ConstantIntSet.java
@@ -19,6 +19,7 @@
 
 import org.eclipse.collections.api.IntIterable;
 import org.eclipse.collections.api.LazyIntIterable;
+import org.eclipse.collections.api.LazyIterable;
 import org.eclipse.collections.api.bag.primitive.MutableIntBag;
 import org.eclipse.collections.api.block.function.primitive.IntToObjectFunction;
 import org.eclipse.collections.api.block.function.primitive.ObjectIntToObjectFunction;
@@ -30,6 +31,7 @@
 import org.eclipse.collections.api.set.primitive.ImmutableIntSet;
 import org.eclipse.collections.api.set.primitive.IntSet;
 import org.eclipse.collections.api.set.primitive.MutableIntSet;
+import org.eclipse.collections.api.tuple.primitive.IntIntPair;
 import org.eclipse.collections.impl.set.mutable.primitive.IntHashSet;
 import java.io.Serializable;
 
@@ -307,5 +309,33 @@ public void appendString(Appendable appendable, String start, String separator,
         delegate.appendString(appendable, start, separator, end);
     }
 
+    @Override
+    public IntSet union(IntSet set)
+    {
+        return delegate.union(set);
+    }
+
+    @Override
+    public IntSet intersect(IntSet set)
+    {
+        return delegate.intersect(set);
+    }
+
+    @Override
+    public IntSet difference(IntSet set)
+    {
+        return delegate.difference(set);
+    }
 
+    @Override
+    public IntSet symmetricDifference(IntSet set)
+    {
+        return delegate.symmetricDifference(set);
+    }
+
+    @Override
+    public LazyIterable<IntIntPair> cartesianProduct(IntSet set)
+    {
+        return delegate.cartesianProduct(set);
+    }
 }
diff --git a/reladomo/src/main/java/com/gs/fw/common/mithra/util/ConstantShortSet.java b/reladomo/src/main/java/com/gs/fw/common/mithra/util/ConstantShortSet.java
@@ -17,6 +17,7 @@
 
 package com.gs.fw.common.mithra.util;
 
+import org.eclipse.collections.api.LazyIterable;
 import org.eclipse.collections.api.LazyShortIterable;
 import org.eclipse.collections.api.ShortIterable;
 import org.eclipse.collections.api.bag.primitive.MutableShortBag;
@@ -30,6 +31,7 @@
 import org.eclipse.collections.api.set.primitive.ImmutableShortSet;
 import org.eclipse.collections.api.set.primitive.MutableShortSet;
 import org.eclipse.collections.api.set.primitive.ShortSet;
+import org.eclipse.collections.api.tuple.primitive.ShortShortPair;
 import org.eclipse.collections.impl.set.mutable.primitive.ShortHashSet;
 import java.io.Serializable;
 
@@ -305,5 +307,33 @@ public void appendString(Appendable appendable, String start, String separator,
         delegate.appendString(appendable, start, separator, end);
     }
 
+    @Override
+    public ShortSet union(ShortSet set)
+    {
+        return delegate.union(set);
+    }
+
+    @Override
+    public ShortSet intersect(ShortSet set)
+    {
+        return delegate.intersect(set);
+    }
+
+    @Override
+    public ShortSet difference(ShortSet set)
+    {
+        return delegate.difference(set);
+    }
 
+    @Override
+    public ShortSet symmetricDifference(ShortSet set)
+    {
+        return delegate.symmetricDifference(set);
+    }
+
+    @Override
+    public LazyIterable<ShortShortPair> cartesianProduct(ShortSet set)
+    {
+        return delegate.cartesianProduct(set);
+    }
 }
diff --git a/reladomoserial/src/main/java/com/gs/reladomo/serial/json/JsonDeserializerState.java b/reladomoserial/src/main/java/com/gs/reladomo/serial/json/JsonDeserializerState.java
@@ -17,6 +17,7 @@
 package com.gs.reladomo.serial.json;
 
 import com.gs.fw.common.mithra.attribute.AsOfAttribute;
+import com.gs.fw.common.mithra.attribute.DateAttribute;
 import com.gs.fw.common.mithra.attribute.TimestampAttribute;
 import com.gs.fw.common.mithra.util.serializer.ReladomoDeserializer;
 import com.gs.fw.common.mithra.util.serializer.ReladomoSerializationContext;
@@ -171,11 +172,17 @@ public JsonDeserializerState valueTimestamp(Timestamp value, ReladomoDeserialize
         @Override
         public JsonDeserializerState valueNumberInt(String value, ReladomoDeserializer deserializer, IntDateParser intDateParser) throws IOException
         {
-            if (deserializer.getCurrentAttribute() instanceof TimestampAttribute || deserializer.getCurrentAttribute() instanceof AsOfAttribute)
+            if (deserializer.getCurrentAttribute() instanceof TimestampAttribute ||
+                    deserializer.getCurrentAttribute() instanceof AsOfAttribute)
             {
                 Date date = intDateParser.parseIntAsDate(value);
                 deserializer.setTimestampField(new Timestamp(date.getTime()));
             }
+            else if (deserializer.getCurrentAttribute() instanceof DateAttribute)
+            {
+                Date date = intDateParser.parseIntAsDate(value);
+                deserializer.setDateField(new java.sql.Date(date.getTime()));
+            }
             else
             {
                 deserializer.parseFieldFromString(value);