Merge pull request #91 from Bahmni/BAH-3883

BAH-3883 | Removed jackson-mapper-asl dependency
Bahmni · Jun 10, 2024 · 018eec5 · 018eec5
2 parents f3dbef4 + e3a869c
commit 018eec5
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <properties>
         <spring.version>5.3.27</spring.version>
         <dynamicreports.version>4.0.0</dynamicreports.version>
-        <jackson.version>2.13.0</jackson.version>
+        <jackson.version>2.17.0</jackson.version>
         <skipDump>true</skipDump>
         <skipConfig>true</skipConfig>
         <openMRSVersion>2.5.7</openMRSVersion>
@@ -177,7 +177,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.4.1</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -214,11 +214,6 @@
             <artifactId>commons-fileupload</artifactId>
             <version>1.5</version>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.8</version>
-        </dependency>
         <dependency>
             <groupId>org.openmrs.api</groupId>
             <artifactId>openmrs-api</artifactId>

diff --git a/src/main/java/org/bahmni/reports/template/DrugOrderTemplate.java b/src/main/java/org/bahmni/reports/template/DrugOrderTemplate.java
@@ -11,7 +11,7 @@
 import org.bahmni.reports.model.UsingDatasource;
 import org.bahmni.reports.report.BahmniReportBuilder;
 import org.bahmni.reports.util.CommonComponents;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.stringtemplate.v4.ST;
 
 import java.io.IOException;

diff --git a/src/main/java/org/bahmni/reports/template/ObsTemplate.java b/src/main/java/org/bahmni/reports/template/ObsTemplate.java
@@ -14,8 +14,8 @@
 import org.bahmni.reports.util.CommonComponents;
 import org.bahmni.reports.util.SqlUtil;
 import org.bahmni.webclients.HttpClient;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.stringtemplate.v4.ST;
 
 import java.net.URI;

diff --git a/src/main/java/org/bahmni/reports/template/ProgramDrugOrderTemplate.java b/src/main/java/org/bahmni/reports/template/ProgramDrugOrderTemplate.java
@@ -13,7 +13,7 @@
 import org.bahmni.reports.report.BahmniReportBuilder;
 import org.bahmni.reports.util.CommonComponents;
 import org.bahmni.reports.util.SqlUtil;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.stringtemplate.v4.ST;
 
 import java.io.IOException;

diff --git a/src/main/java/org/bahmni/reports/template/ProgramObsTemplate.java b/src/main/java/org/bahmni/reports/template/ProgramObsTemplate.java
@@ -15,8 +15,8 @@
 import org.bahmni.reports.util.CommonComponents;
 import org.bahmni.reports.util.SqlUtil;
 import org.bahmni.webclients.HttpClient;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.stringtemplate.v4.ST;
 
 import java.net.URI;

diff --git a/src/main/java/org/bahmni/reports/util/ConceptUtil.java b/src/main/java/org/bahmni/reports/util/ConceptUtil.java
@@ -4,8 +4,8 @@
 import org.apache.logging.log4j.Logger;
 import org.bahmni.webclients.HttpClient;
 import org.bahmni.webclients.WebClientsException;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -28,7 +28,7 @@ public static ConceptDataTypes getConceptDataType(String concept, HttpClient htt
             JsonNode rootNode = objectMapper.readTree(response);
 
             JsonNode nameNode = rootNode.path("datatype");
-            String type = nameNode.path("display").getTextValue();
+            String type = nameNode.path("display").asText();
             try {
                 return ConceptDataTypes.valueOf(type);
             } catch (IllegalArgumentException e) {

diff --git a/src/main/java/org/bahmni/reports/util/GenericLabOrderReportTemplateHelper.java b/src/main/java/org/bahmni/reports/util/GenericLabOrderReportTemplateHelper.java
@@ -9,8 +9,8 @@
 import org.bahmni.reports.model.GenericLabOrderReportConfig;
 import org.bahmni.reports.model.Report;
 import org.bahmni.webclients.HttpClient;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

diff --git a/src/main/java/org/bahmni/reports/util/GenericObservationFormReportTemplateHelper.java b/src/main/java/org/bahmni/reports/util/GenericObservationFormReportTemplateHelper.java
@@ -12,8 +12,8 @@
 import org.bahmni.reports.model.Report;
 import org.bahmni.webclients.HttpClient;
 import org.bahmni.webclients.WebClientsException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import java.net.URI;
 import java.util.ArrayList;

diff --git a/src/main/java/org/bahmni/reports/util/GenericObservationReportTemplateHelper.java b/src/main/java/org/bahmni/reports/util/GenericObservationReportTemplateHelper.java
@@ -11,8 +11,8 @@
 import org.bahmni.reports.model.Report;
 import org.bahmni.webclients.HttpClient;
 import org.bahmni.webclients.WebClientsException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.core.type.TypeReference;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

diff --git a/src/test/java/org/bahmni/reports/report/GenericObservationFormReportTest.java b/src/test/java/org/bahmni/reports/report/GenericObservationFormReportTest.java
@@ -3,7 +3,7 @@
 import org.bahmni.reports.model.ConceptName;
 import org.bahmni.reports.report.integrationtests.BaseIntegrationTest;
 import org.bahmni.reports.wrapper.CsvReport;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/src/test/java/org/bahmni/reports/report/GenericObservationReportTest.java b/src/test/java/org/bahmni/reports/report/GenericObservationReportTest.java
@@ -3,7 +3,7 @@
 import org.bahmni.reports.model.ConceptName;
 import org.bahmni.reports.report.integrationtests.BaseIntegrationTest;
 import org.bahmni.reports.wrapper.CsvReport;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/src/test/java/org/bahmni/reports/report/ObservationFormReportTest.java b/src/test/java/org/bahmni/reports/report/ObservationFormReportTest.java
@@ -4,7 +4,7 @@
 import org.bahmni.reports.model.ConceptName;
 import org.bahmni.reports.report.integrationtests.BaseIntegrationTest;
 import org.bahmni.reports.wrapper.CsvReport;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;
 import org.junit.Test;