Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BAH-3883 | Removed jackson-mapper-asl dependency #91

Merged
merged 2 commits into from
Jun 10, 2024
Merged

BAH-3883 | Removed jackson-mapper-asl dependency #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb3b393
BAH-3883 | Removed jackson-mapper-asl dependency
SanoferSameera Jun 5, 2024
e3a869c
BAH-3883 | Update. jackson core version to latest 2.14.0
SanoferSameera Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SanoferSameera Seems like a version jump. Hope you have validated the references to this dependency are working as before

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

<skipDump>true</skipDump>
<skipConfig>true</skipConfig>
<openMRSVersion>2.5.7</openMRSVersion>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/bahmni/reports/template/DrugOrderTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/bahmni/reports/template/ObsTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/bahmni/reports/template/ProgramDrugOrderTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/bahmni/reports/template/ProgramObsTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/bahmni/reports/util/ConceptUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/bahmni/reports/util/GenericLabOrderReportTemplateHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/bahmni/reports/util/GenericObservationFormReportTemplateHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/bahmni/reports/util/GenericObservationReportTemplateHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/bahmni/reports/report/GenericObservationFormReportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/bahmni/reports/report/GenericObservationReportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/bahmni/reports/report/ObservationFormReportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading