You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2019/11/24 01:02:57 UTC
[qpid-broker-j] 01/02: QPID-8379: [Broker-J] Upgrade jackson
dependecies to version 2.10.1
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit faad55dfe0ff72fbc93774090b062b707ed1ec6e
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Nov 18 16:08:42 2019 +0000
QPID-8379: [Broker-J] Upgrade jackson dependecies to version 2.10.1
This closes #40
(cherry picked from commit 45d10564ad5ac1c6a5aca2f90e59215ba39bb0da)
---
pom.xml | 4 ++--
.../java/org/apache/qpid/tests/http/HttpTestHelper.java | 15 +++++++--------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index a655c9f..69d9279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,8 +105,8 @@
<derby-version>10.13.1.1</derby-version>
<logback-version>1.2.3</logback-version>
<guava-version>27.0-jre</guava-version>
- <fasterxml-jackson-version>2.9.10</fasterxml-jackson-version>
- <fasterxml-jackson-databind-version>2.9.10</fasterxml-jackson-databind-version>
+ <fasterxml-jackson-version>2.10.1</fasterxml-jackson-version>
+ <fasterxml-jackson-databind-version>2.10.1</fasterxml-jackson-databind-version>
<slf4j-version>1.7.26</slf4j-version>
<jetty-version>9.4.19.v20190610</jetty-version>
diff --git a/systests/qpid-systests-http-management/src/main/java/org/apache/qpid/tests/http/HttpTestHelper.java b/systests/qpid-systests-http-management/src/main/java/org/apache/qpid/tests/http/HttpTestHelper.java
index 5efc3aa..a2b94ad 100644
--- a/systests/qpid-systests-http-management/src/main/java/org/apache/qpid/tests/http/HttpTestHelper.java
+++ b/systests/qpid-systests-http-management/src/main/java/org/apache/qpid/tests/http/HttpTestHelper.java
@@ -38,7 +38,6 @@ import java.security.UnrecoverableKeyException;
import java.security.cert.X509Certificate;
import java.util.Base64;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -64,11 +63,11 @@ public class HttpTestHelper
{
private static final Logger LOGGER = LoggerFactory.getLogger(HttpTestHelper.class);
- private static final TypeReference<List<LinkedHashMap<String, Object>>> TYPE_LIST_OF_LINKED_HASH_MAPS = new TypeReference<List<LinkedHashMap<String, Object>>>()
+ private static final TypeReference<List<Map<String, Object>>> TYPE_LIST_OF_MAPS = new TypeReference<List<Map<String, Object>>>()
{
};
- private static final TypeReference<LinkedHashMap<String, Object>> TYPE_LINKED_HASH_MAPS = new TypeReference<LinkedHashMap<String, Object>>()
+ private static final TypeReference<Map<String, Object>> TYPE_MAP = new TypeReference<Map<String, Object>>()
{
};
@@ -191,7 +190,7 @@ public class HttpTestHelper
byte[] data = readConnectionInputStream(connection);
ObjectMapper mapper = new ObjectMapper();
- Map<String, Object> providedObject = mapper.readValue(new ByteArrayInputStream(data), TYPE_LINKED_HASH_MAPS);
+ Map<String, Object> providedObject = mapper.readValue(new ByteArrayInputStream(data), TYPE_MAP);
return providedObject;
}
@@ -225,15 +224,15 @@ public class HttpTestHelper
public List<Map<String, Object>> getJsonAsList(String path) throws IOException
{
- return getJson(path, TYPE_LIST_OF_LINKED_HASH_MAPS, HttpServletResponse.SC_OK);
+ return getJson(path, TYPE_LIST_OF_MAPS, HttpServletResponse.SC_OK);
}
public Map<String, Object> getJsonAsMap(String path) throws IOException
{
- return getJson(path, TYPE_LINKED_HASH_MAPS, HttpServletResponse.SC_OK);
+ return getJson(path, TYPE_MAP, HttpServletResponse.SC_OK);
}
- public <T> T getJson(String path, final TypeReference valueTypeRef, int expectedResponseCode) throws IOException
+ public <T> T getJson(String path, final TypeReference<T> valueTypeRef, int expectedResponseCode) throws IOException
{
int responseCode = -1;
HttpURLConnection connection = openManagementConnection(path, "GET");
@@ -255,7 +254,7 @@ public class HttpTestHelper
}
}
- public <T> T postJson(String path, final Object data, final TypeReference valueTypeRef, int expectedResponseCode) throws IOException
+ public <T> T postJson(String path, final Object data, final TypeReference<T> valueTypeRef, int expectedResponseCode) throws IOException
{
int responseCode = -1;
HttpURLConnection connection = openManagementConnection(path, "POST");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org