Skip to content

Commit 38a4b35

Browse files
authored
Bumped Jackson 2.21.2 and refactored deprecated methods (#12615)
Signed-off-by: Paolo Patierno <ppatierno@live.com>
1 parent 5b74ce8 commit 38a4b35

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@
7676
<fabric8.openshift-client.version>7.6.1</fabric8.openshift-client.version>
7777
<fabric8.kubernetes-model.version>7.6.1</fabric8.kubernetes-model.version>
7878
<fabric8.zjsonpatch.version>7.6.1</fabric8.zjsonpatch.version>
79-
<fasterxml.jackson-core.version>2.18.6</fasterxml.jackson-core.version>
80-
<fasterxml.jackson-databind.version>2.18.6</fasterxml.jackson-databind.version>
81-
<fasterxml.jackson-dataformat.version>2.18.6</fasterxml.jackson-dataformat.version>
82-
<fasterxml.jackson-annotations.version>2.18.6</fasterxml.jackson-annotations.version>
83-
<fasterxml.jackson-datatype.version>2.18.6</fasterxml.jackson-datatype.version>
84-
<fasterxml.jackson-jaxrs.version>2.18.6</fasterxml.jackson-jaxrs.version>
79+
<fasterxml.jackson-core.version>2.21.2</fasterxml.jackson-core.version>
80+
<fasterxml.jackson-databind.version>2.21.2</fasterxml.jackson-databind.version>
81+
<fasterxml.jackson-dataformat.version>2.21.2</fasterxml.jackson-dataformat.version>
82+
<fasterxml.jackson-annotations.version>2.21</fasterxml.jackson-annotations.version>
83+
<fasterxml.jackson-datatype.version>2.21.2</fasterxml.jackson-datatype.version>
84+
<fasterxml.jackson-jaxrs.version>2.21.2</fasterxml.jackson-jaxrs.version>
8585
<vertx.version>5.0.10</vertx.version>
8686
<vertx-junit5.version>5.0.10</vertx-junit5.version>
8787
<kafka.version>4.2.0</kafka.version>

test/src/main/java/io/strimzi/test/ReadWriteUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public static <T> T readObjectFromYamlFileInResources(String resource, Class<T>
146146
}
147147
ObjectMapper mapper = new YAMLMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, !ignoreUnknownProperties);
148148
try {
149-
return mapper.readValue(url, c);
149+
return mapper.readValue(url.openStream(), c);
150150
} catch (InvalidFormatException e) {
151151
throw new IllegalArgumentException(e);
152152
} catch (IOException e) {
@@ -223,7 +223,7 @@ public static <T> String writeObjectToYamlString(T instance) {
223223
try {
224224
ObjectMapper mapper = new YAMLMapper()
225225
.disable(YAMLGenerator.Feature.USE_NATIVE_TYPE_ID)
226-
.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
226+
.setDefaultPropertyInclusion(JsonInclude.Include.NON_EMPTY);
227227
return mapper.writeValueAsString(instance);
228228
} catch (JsonProcessingException e) {
229229
throw new RuntimeException(e);
@@ -241,7 +241,7 @@ public static <T> String writeObjectToYamlString(T instance) {
241241
*/
242242
public static <T> String writeObjectToJsonString(T instance) {
243243
try {
244-
ObjectMapper mapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
244+
ObjectMapper mapper = new ObjectMapper().setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL);
245245
return mapper.writeValueAsString(instance);
246246
} catch (JsonProcessingException e) {
247247
throw new RuntimeException(e);

0 commit comments

Comments
 (0)