From 65356aa30133cbca034081e84608cd17cac3852e Mon Sep 17 00:00:00 2001 From: Bruno Didot Date: Wed, 11 Nov 2020 21:56:04 +0100 Subject: [PATCH 1/2] Bump jackson from 1.x to 2.x - Bump jackson from 1.x to 2.x: [notes](http://www.cowtowncoder.com/blog/archives/2012/04/entry_469.html), [changelog](https://github.com/FasterXML/jackson-core/blob/master/release-notes/VERSION-2.x) - Bump target JDK from 1.6 to 1.8 --- CHANGELOG.md | 4 ++++ pom.xml | 10 +++++----- .../command/impl/core/AbstractCommand.java | 14 ++++++------- .../KeystoneAuthenticationV3CommandImpl.java | 4 ++-- .../shared/account/ContainerListElement.java | 2 +- .../container/StoredObjectListElement.java | 2 +- .../identity/access/AccessNoTenant.java | 4 ++-- .../shared/identity/access/AccessTenant.java | 6 +++--- .../shared/identity/access/EndPoint.java | 2 +- .../identity/access/KeystoneV3Access.java | 2 +- .../shared/identity/access/Metadata.java | 4 ++-- .../command/shared/identity/access/Role.java | 2 +- .../identity/access/ServiceCatalog.java | 4 ++-- .../shared/identity/access/Tenant.java | 2 +- .../command/shared/identity/access/Token.java | 2 +- .../command/shared/identity/access/User.java | 4 ++-- .../authentication/Authentication.java | 9 ++++----- .../KeystoneV3Authentication.java | 2 +- .../KeystoneV3PasswordIdentity.java | 2 +- .../shared/identity/tenant/Tenant.java | 2 +- .../shared/identity/tenant/Tenants.java | 4 ++-- .../impl/account/ContainerListingTest.java | 2 +- .../shared/identity/access/AccessTest.java | 6 +++--- .../identity/access/KeystoneV3AccessTest.java | 4 ++-- .../authentication/AuthenticationTest.java | 6 +++--- .../KeystoneV3AuthenticationTest.java | 20 +++++++++---------- .../shared/identity/tenant/TenantsTest.java | 2 +- 27 files changed, 65 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84758e06..c183de96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [Unreleased] +### Changed +- [#183](https://github.com/javaswift/joss/pull/183): Bump jackson from 1.x to 2.x, target JDK from 1.6 to 1.8 [@didot](https://github.com/didot) [#175](https://github.com/javaswift/joss/issues/175() + ## [0.10.3](https://github.com/javaswift/joss/releases/tag/v0.10.3) - 2019-05-20 ### Changed - [#156](https://github.com/javaswift/joss/pull/156): Adds support for KeystoneV3 scoping during auth [@tfelix](https://github.com/tfelix) [#155](https://github.com/javaswift/joss/issues/155) diff --git a/pom.xml b/pom.xml index fcbe9b1c..ab371cf9 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 2.6 2.3 4.5.3 - 1.9.7 + 2.11.3 4.10 1.6 1.7.2 @@ -62,8 +62,8 @@ - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind ${jackson.version} @@ -147,8 +147,8 @@ maven-compiler-plugin ${maven.compiler.plugin.version} - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/src/main/java/org/javaswift/joss/command/impl/core/AbstractCommand.java b/src/main/java/org/javaswift/joss/command/impl/core/AbstractCommand.java index cc8ffeef..ad927cc0 100644 --- a/src/main/java/org/javaswift/joss/command/impl/core/AbstractCommand.java +++ b/src/main/java/org/javaswift/joss/command/impl/core/AbstractCommand.java @@ -8,14 +8,14 @@ import java.util.List; import java.util.concurrent.Callable; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.util.EntityUtils; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize; import org.javaswift.joss.command.impl.core.httpstatus.HttpStatusChecker; import org.javaswift.joss.exception.CommandException; import org.javaswift.joss.headers.Header; @@ -136,9 +136,9 @@ protected void modifyURI(QueryParameters queryParameters) { protected ObjectMapper createObjectMapper(boolean dealWithRootValue) { ObjectMapper objectMapper = new ObjectMapper(); if (dealWithRootValue) { - objectMapper.configure(SerializationConfig.Feature.WRAP_ROOT_VALUE, true); - objectMapper.configure(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE, true); - objectMapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); + objectMapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); + objectMapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true); + objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); } return objectMapper; } diff --git a/src/main/java/org/javaswift/joss/command/impl/identity/KeystoneAuthenticationV3CommandImpl.java b/src/main/java/org/javaswift/joss/command/impl/identity/KeystoneAuthenticationV3CommandImpl.java index f3a4213e..41100f24 100644 --- a/src/main/java/org/javaswift/joss/command/impl/identity/KeystoneAuthenticationV3CommandImpl.java +++ b/src/main/java/org/javaswift/joss/command/impl/identity/KeystoneAuthenticationV3CommandImpl.java @@ -2,13 +2,13 @@ import java.io.IOException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; import org.javaswift.joss.client.factory.AccountConfig; import org.javaswift.joss.command.impl.core.AbstractCommand; import org.javaswift.joss.command.impl.core.httpstatus.HttpStatusChecker; diff --git a/src/main/java/org/javaswift/joss/command/shared/account/ContainerListElement.java b/src/main/java/org/javaswift/joss/command/shared/account/ContainerListElement.java index 0fc935ef..879c7a4e 100644 --- a/src/main/java/org/javaswift/joss/command/shared/account/ContainerListElement.java +++ b/src/main/java/org/javaswift/joss/command/shared/account/ContainerListElement.java @@ -1,6 +1,6 @@ package org.javaswift.joss.command.shared.account; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class ContainerListElement { diff --git a/src/main/java/org/javaswift/joss/command/shared/container/StoredObjectListElement.java b/src/main/java/org/javaswift/joss/command/shared/container/StoredObjectListElement.java index 75cc9d06..aaef3f09 100644 --- a/src/main/java/org/javaswift/joss/command/shared/container/StoredObjectListElement.java +++ b/src/main/java/org/javaswift/joss/command/shared/container/StoredObjectListElement.java @@ -1,6 +1,6 @@ package org.javaswift.joss.command.shared.container; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; public class StoredObjectListElement { diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/access/AccessNoTenant.java b/src/main/java/org/javaswift/joss/command/shared/identity/access/AccessNoTenant.java index 0fe20d04..ad421132 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/access/AccessNoTenant.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/access/AccessNoTenant.java @@ -1,7 +1,7 @@ package org.javaswift.joss.command.shared.identity.access; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonRootName; import org.javaswift.joss.client.factory.TempUrlHashPrefixSource; @JsonRootName(value="access") diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/access/AccessTenant.java b/src/main/java/org/javaswift/joss/command/shared/identity/access/AccessTenant.java index a37b234a..7caed2ba 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/access/AccessTenant.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/access/AccessTenant.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonRootName; import org.apache.http.HttpStatus; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.map.annotate.JsonRootName; import org.javaswift.joss.client.factory.TempUrlHashPrefixSource; import org.javaswift.joss.exception.CommandExceptionError; import org.javaswift.joss.exception.HttpStatusExceptionUtil; diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/access/EndPoint.java b/src/main/java/org/javaswift/joss/command/shared/identity/access/EndPoint.java index 401e7b8f..3acb2a2d 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/access/EndPoint.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/access/EndPoint.java @@ -1,6 +1,6 @@ package org.javaswift.joss.command.shared.identity.access; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class EndPoint { diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/access/KeystoneV3Access.java b/src/main/java/org/javaswift/joss/command/shared/identity/access/KeystoneV3Access.java index 2169d397..c14f6613 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/access/KeystoneV3Access.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/access/KeystoneV3Access.java @@ -4,7 +4,7 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.codehaus.jackson.JsonNode; +import com.fasterxml.jackson.databind.JsonNode; import org.javaswift.joss.client.factory.TempUrlHashPrefixSource; import org.javaswift.joss.model.Access; diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/access/Metadata.java b/src/main/java/org/javaswift/joss/command/shared/identity/access/Metadata.java index e932bf71..c782a30b 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/access/Metadata.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/access/Metadata.java @@ -1,8 +1,8 @@ package org.javaswift.joss.command.shared.identity.access; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) public class Metadata { diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/access/Role.java b/src/main/java/org/javaswift/joss/command/shared/identity/access/Role.java index 5fd348b0..174f56e5 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/access/Role.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/access/Role.java @@ -1,6 +1,6 @@ package org.javaswift.joss.command.shared.identity.access; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Role { diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/access/ServiceCatalog.java b/src/main/java/org/javaswift/joss/command/shared/identity/access/ServiceCatalog.java index 13ec35a6..41e35d54 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/access/ServiceCatalog.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/access/ServiceCatalog.java @@ -1,10 +1,10 @@ package org.javaswift.joss.command.shared.identity.access; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; import java.util.List; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - @JsonIgnoreProperties(ignoreUnknown = true) public class ServiceCatalog { diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/access/Tenant.java b/src/main/java/org/javaswift/joss/command/shared/identity/access/Tenant.java index 8f7e4207..0ca3ddeb 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/access/Tenant.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/access/Tenant.java @@ -1,6 +1,6 @@ package org.javaswift.joss.command.shared.identity.access; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Tenant { diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/access/Token.java b/src/main/java/org/javaswift/joss/command/shared/identity/access/Token.java index 9ec24e35..4b209dee 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/access/Token.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/access/Token.java @@ -1,6 +1,6 @@ package org.javaswift.joss.command.shared.identity.access; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Token { diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/access/User.java b/src/main/java/org/javaswift/joss/command/shared/identity/access/User.java index 2ec15361..941dc2e4 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/access/User.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/access/User.java @@ -1,10 +1,10 @@ package org.javaswift.joss.command.shared.identity.access; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; import java.util.List; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - @JsonIgnoreProperties(ignoreUnknown = true) public class User { diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/authentication/Authentication.java b/src/main/java/org/javaswift/joss/command/shared/identity/authentication/Authentication.java index 0bf18505..be36ad00 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/authentication/Authentication.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/authentication/Authentication.java @@ -1,8 +1,7 @@ package org.javaswift.joss.command.shared.identity.authentication; -import org.codehaus.jackson.map.annotate.JsonRootName; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName(value="auth") public class Authentication { @@ -16,12 +15,12 @@ public Authentication(final String tenantName, String tenantId, final String use this.tenantId = tenantId; } - @JsonSerialize(include=Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) public String getTenantId() { return this.tenantId; } - @JsonSerialize(include=Inclusion.NON_NULL) + @JsonInclude(JsonInclude.Include.NON_NULL) public String getTenantName() { return this.tenantName; } diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3Authentication.java b/src/main/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3Authentication.java index 215332ec..767d9ddb 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3Authentication.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3Authentication.java @@ -1,6 +1,6 @@ package org.javaswift.joss.command.shared.identity.authentication; -import org.codehaus.jackson.map.annotate.JsonRootName; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName(value="auth") public class KeystoneV3Authentication { diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3PasswordIdentity.java b/src/main/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3PasswordIdentity.java index b38b27d1..753f12ec 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3PasswordIdentity.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3PasswordIdentity.java @@ -1,6 +1,6 @@ package org.javaswift.joss.command.shared.identity.authentication; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; public class KeystoneV3PasswordIdentity { diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/tenant/Tenant.java b/src/main/java/org/javaswift/joss/command/shared/identity/tenant/Tenant.java index aa94a438..99f9f059 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/tenant/Tenant.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/tenant/Tenant.java @@ -1,6 +1,6 @@ package org.javaswift.joss.command.shared.identity.tenant; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Tenant { diff --git a/src/main/java/org/javaswift/joss/command/shared/identity/tenant/Tenants.java b/src/main/java/org/javaswift/joss/command/shared/identity/tenant/Tenants.java index 7e400948..9ee1d70d 100644 --- a/src/main/java/org/javaswift/joss/command/shared/identity/tenant/Tenants.java +++ b/src/main/java/org/javaswift/joss/command/shared/identity/tenant/Tenants.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.javaswift.joss.exception.CommandException; @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/src/test/java/org/javaswift/joss/command/impl/account/ContainerListingTest.java b/src/test/java/org/javaswift/joss/command/impl/account/ContainerListingTest.java index 3fd9b1e6..4a2cbb2d 100644 --- a/src/test/java/org/javaswift/joss/command/impl/account/ContainerListingTest.java +++ b/src/test/java/org/javaswift/joss/command/impl/account/ContainerListingTest.java @@ -4,7 +4,7 @@ import java.io.IOException; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.javaswift.joss.command.shared.account.ContainerListElement; import org.javaswift.joss.util.ClasspathTemplateResource; import org.junit.Test; diff --git a/src/test/java/org/javaswift/joss/command/shared/identity/access/AccessTest.java b/src/test/java/org/javaswift/joss/command/shared/identity/access/AccessTest.java index ad00ec5e..a09378a9 100644 --- a/src/test/java/org/javaswift/joss/command/shared/identity/access/AccessTest.java +++ b/src/test/java/org/javaswift/joss/command/shared/identity/access/AccessTest.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.List; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; import org.javaswift.joss.client.factory.TempUrlHashPrefixSource; import org.javaswift.joss.exception.CommandExceptionError; import org.javaswift.joss.exception.NotFoundException; @@ -23,7 +23,7 @@ public class AccessTest { public void testUnmarshalling() throws IOException { String jsonString = new ClasspathTemplateResource("/sample-access.json").loadTemplate(); ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE, true); + mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true); Access access = mapper.readValue(jsonString, AccessTenant.class); assertEquals("a376b74fbdb64a4986cd3234647ff6f8", access.getToken()); assertEquals("https://og.cloudvps.com:443/v1/AUTH_bfo000024", access.getInternalURL()); diff --git a/src/test/java/org/javaswift/joss/command/shared/identity/access/KeystoneV3AccessTest.java b/src/test/java/org/javaswift/joss/command/shared/identity/access/KeystoneV3AccessTest.java index 1e55afd4..877b58ad 100644 --- a/src/test/java/org/javaswift/joss/command/shared/identity/access/KeystoneV3AccessTest.java +++ b/src/test/java/org/javaswift/joss/command/shared/identity/access/KeystoneV3AccessTest.java @@ -2,8 +2,8 @@ import static org.junit.Assert.assertEquals; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/javaswift/joss/command/shared/identity/authentication/AuthenticationTest.java b/src/test/java/org/javaswift/joss/command/shared/identity/authentication/AuthenticationTest.java index 75cae9a8..f4bc086f 100644 --- a/src/test/java/org/javaswift/joss/command/shared/identity/authentication/AuthenticationTest.java +++ b/src/test/java/org/javaswift/joss/command/shared/identity/authentication/AuthenticationTest.java @@ -4,8 +4,8 @@ import java.io.IOException; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import org.junit.Test; public class AuthenticationTest { @@ -13,7 +13,7 @@ public class AuthenticationTest { @Test public void testMarshalling() throws IOException { ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationConfig.Feature.WRAP_ROOT_VALUE, true); + mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); Authentication auth = new Authentication("testtenant", "testtenantid", "testuser", "testpassword"); assertEquals("{\"auth\":{\"passwordCredentials\":{\"username\":\"testuser\",\"password\":\"testpassword\"},\"tenantName\":\"testtenant\",\"tenantId\":\"testtenantid\"}}", mapper.writeValueAsString(auth)); } diff --git a/src/test/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3AuthenticationTest.java b/src/test/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3AuthenticationTest.java index a88185d8..76ef9244 100644 --- a/src/test/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3AuthenticationTest.java +++ b/src/test/java/org/javaswift/joss/command/shared/identity/authentication/KeystoneV3AuthenticationTest.java @@ -4,10 +4,10 @@ import java.io.IOException; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import org.junit.Test; public class KeystoneV3AuthenticationTest { @@ -15,8 +15,8 @@ public class KeystoneV3AuthenticationTest { @Test public void testMarshallingDefaultScope() throws IOException { ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationConfig.Feature.WRAP_ROOT_VALUE, true); - mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); + mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); KeystoneV3Authentication authentication = new KeystoneV3Authentication(); authentication.setIdentity(new KeystoneV3Identity("username", "password", "domainName")); @@ -33,8 +33,8 @@ public void testMarshallingDefaultScope() throws IOException { @Test public void testMarshallingDomainScope() throws IOException { ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationConfig.Feature.WRAP_ROOT_VALUE, true); - mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); + mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); KeystoneV3Authentication authentication = new KeystoneV3Authentication(); authentication.setIdentity(new KeystoneV3Identity("username", "password", "domainName")); @@ -52,8 +52,8 @@ public void testMarshallingDomainScope() throws IOException { @Test public void testMarshallingProjectScope() throws IOException { ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationConfig.Feature.WRAP_ROOT_VALUE, true); - mapper.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL); + mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); KeystoneV3Authentication authentication = new KeystoneV3Authentication(); authentication.setIdentity(new KeystoneV3Identity("username", "password", "domainName")); diff --git a/src/test/java/org/javaswift/joss/command/shared/identity/tenant/TenantsTest.java b/src/test/java/org/javaswift/joss/command/shared/identity/tenant/TenantsTest.java index 854cb181..fd28b874 100644 --- a/src/test/java/org/javaswift/joss/command/shared/identity/tenant/TenantsTest.java +++ b/src/test/java/org/javaswift/joss/command/shared/identity/tenant/TenantsTest.java @@ -6,7 +6,7 @@ import java.io.IOException; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.javaswift.joss.exception.CommandException; import org.junit.Test; From 4ba31455caf89af55c2f0129685dc5c289e9ebfd Mon Sep 17 00:00:00 2001 From: Bruno Didot Date: Wed, 11 Nov 2020 22:04:26 +0100 Subject: [PATCH 2/2] Fix link to PR in CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c183de96..368ed5de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] ### Changed -- [#183](https://github.com/javaswift/joss/pull/183): Bump jackson from 1.x to 2.x, target JDK from 1.6 to 1.8 [@didot](https://github.com/didot) [#175](https://github.com/javaswift/joss/issues/175() +- [#185](https://github.com/javaswift/joss/pull/185): Bump jackson from 1.x to 2.x, target JDK from 1.6 to 1.8 [@didot](https://github.com/didot) [#175](https://github.com/javaswift/joss/issues/175) ## [0.10.3](https://github.com/javaswift/joss/releases/tag/v0.10.3) - 2019-05-20 ### Changed