Merge pull request #352 from bcgov/feature/redis-update

Update generated source move away from glassfish
bcgov · Sep 25, 2023 · ad271e0 · ad271e0
2 parents 95d67cf + 4ec87d6
commit ad271e0
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/src/backend/libs/ai-bom/pom.xml b/src/backend/libs/ai-bom/pom.xml
@@ -27,7 +27,7 @@
         <org.apache.cxf.version>4.0.1</org.apache.cxf.version>
         <org.apache.tika.version>1.24.1</org.apache.tika.version>
         <org.codehaus.janino>3.1.3</org.codehaus.janino>
-        <org.glassfish.jersey.inject.version>2.32</org.glassfish.jersey.inject.version>
+        <org.glassfish.jersey.inject.version>3.1.3</org.glassfish.jersey.inject.version>
         <org.junit.jupiter.version>5.7.1</org.junit.jupiter.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <org.mockito.mockito-all.version>1.10.19</org.mockito.mockito-all.version>

diff --git a/src/backend/libs/ai-diligen-client/pom.xml b/src/backend/libs/ai-diligen-client/pom.xml
@@ -126,6 +126,31 @@
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.10.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okio</groupId>
+            <artifactId>okio</artifactId>
+            <version>3.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>4.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.gsonfire</groupId>
+            <artifactId>gson-fire</artifactId>
+            <version>1.8.5</version>
+        </dependency>
 
     </dependencies>
 
@@ -195,7 +220,6 @@
                             <generatorName>java</generatorName>
                             <configOptions>
                                 <disallowAdditionalPropertiesIfNotPresent>false</disallowAdditionalPropertiesIfNotPresent>
-                                <dateLibrary>joda</dateLibrary>
                                 <validateSpec>false</validateSpec>
 
                                 <!-- javax.* to jakarta.* -->
@@ -204,7 +228,7 @@
 
                                 <additionalModelTypeAnnotations>@com.fasterxml.jackson.annotation.JsonIgnoreProperties(ignoreUnknown = true)</additionalModelTypeAnnotations>
                             </configOptions>
-                            <library>jersey2</library>
+
                             <apiPackage>${default-package}.api</apiPackage>
                             <modelPackage>${default-package}.api.model</modelPackage>
                             <invokerPackage>${default-package}.api.handler</invokerPackage>

diff --git a/...rc/test/java/ca/bc/gov/open/jag/aidiligenclient/diligen/processor/FieldProcessorTest.java b/...rc/test/java/ca/bc/gov/open/jag/aidiligenclient/diligen/processor/FieldProcessorTest.java
@@ -4,6 +4,7 @@
 import ca.bc.gov.open.jag.aidiligenclient.api.model.Field;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -39,8 +40,10 @@ public void testProduct() throws IOException, JSONException {
 
         ObjectMapper mapper = new ObjectMapper();
 
-        DocumentConfig formData = mapper.readValue(new String(Files.readAllBytes(path)), DocumentConfig.class);
 
+        DocumentConfig formData = mapper.readValue(new String(Files.readAllBytes(path)), DocumentConfig.class);
+        //Different structure require a different naming strategy
+        mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
         List<Field> response = mapper.readValue(new String(
                 Files.readAllBytes(path2)), new TypeReference<List<Field>>(){});