From c3b4180efb45170df699ec244281475ceb68c74a Mon Sep 17 00:00:00 2001
From: Piotr Gawron <p.gawron@atcomp.pl>
Date: Thu, 18 Jan 2024 14:57:08 +0100
Subject: [PATCH] jackson version aligned
---
.../mapviewer/converter/zip/OverviewLinkDeserializer.java | 2 +-
.../main/java/lcsb/mapviewer/model/map/OverviewLink.java | 6 +++---
pom.xml | 2 +-
.../mapviewer/web/ChemicalControllerIntegrationTest.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/converter/src/main/java/lcsb/mapviewer/converter/zip/OverviewLinkDeserializer.java b/converter/src/main/java/lcsb/mapviewer/converter/zip/OverviewLinkDeserializer.java
index d87f1f26b8..5631b22a61 100644
--- a/converter/src/main/java/lcsb/mapviewer/converter/zip/OverviewLinkDeserializer.java
+++ b/converter/src/main/java/lcsb/mapviewer/converter/zip/OverviewLinkDeserializer.java
@@ -59,7 +59,7 @@ public class OverviewLinkDeserializer extends StdDeserializer<OverviewLink> {
} else {
throw new DeserializationException("Cannot deserialize OverviewLink.");
}
- List<Point2D> polygon = mapper.readValue(mapper.treeAsTokens(rootNode.get("polygon")), new TypeReference<List<Point2D.Double>>() {
+ List<Point2D.Double> polygon = mapper.readValue(mapper.treeAsTokens(rootNode.get("polygon")), new TypeReference<List<Point2D.Double>>() {
});
result.setPolygon(polygon);
diff --git a/model/src/main/java/lcsb/mapviewer/model/map/OverviewLink.java b/model/src/main/java/lcsb/mapviewer/model/map/OverviewLink.java
index 9af16bd658..fa01c8e9c0 100644
--- a/model/src/main/java/lcsb/mapviewer/model/map/OverviewLink.java
+++ b/model/src/main/java/lcsb/mapviewer/model/map/OverviewLink.java
@@ -58,8 +58,8 @@ public abstract class OverviewLink implements Serializable {
/**
* String representing polygon area on the image that should be clickable and
- * that corresponds to this link. This string should be space separated list
- * of coordinates. Example "10,10 20,20 100,0".
+ * that corresponds to this link. This string should be space separated list of
+ * coordinates. Example "10,10 20,20 100,0".
*/
private String polygon;
@@ -99,7 +99,7 @@ public abstract class OverviewLink implements Serializable {
this.polygon = polygon;
}
- public void setPolygon(final List<Point2D> coordinates) {
+ public void setPolygon(final List<? extends Point2D> coordinates) {
StringBuilder polygon = new StringBuilder("");
for (Point2D point2d : coordinates) {
polygon.append(point2d.getX() + "," + point2d.getY() + " ");
diff --git a/pom.xml b/pom.xml
index 9e2eb0b0bf..a217b0647d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
<jersey.version>1.19.4</jersey.version>
- <jackson.version>2.9.9</jackson.version>
+ <jackson.version>2.13.5</jackson.version>
<servlet-api.version>4.0.1</servlet-api.version>
diff --git a/web/src/test/java/lcsb/mapviewer/web/ChemicalControllerIntegrationTest.java b/web/src/test/java/lcsb/mapviewer/web/ChemicalControllerIntegrationTest.java
index 22da9583e1..6610133f4d 100644
--- a/web/src/test/java/lcsb/mapviewer/web/ChemicalControllerIntegrationTest.java
+++ b/web/src/test/java/lcsb/mapviewer/web/ChemicalControllerIntegrationTest.java
@@ -243,7 +243,7 @@ public class ChemicalControllerIntegrationTest extends ControllerIntegrationTest
String content = mockMvc.perform(request)
.andExpect(status().is2xxSuccessful())
.andReturn().getResponse().getContentAsString();
- List<Object> list = objectMapper.readValue(content, new TypeReference<Object>() {
+ List<Object> list = objectMapper.readValue(content, new TypeReference<List<Object>>() {
});
assertEquals(0, list.size());
}
--
GitLab