From 7a813cdda32c73ab06d8cf919344c3de8145dd17 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Tue, 13 Jun 2023 21:12:36 +0200 Subject: [PATCH] use common ObjectMapper instance in model unit tests --- .../jvault/connector/model/AbstractModelTest.java | 3 +++ .../jvault/connector/model/AppRoleSecretTest.java | 13 +++++-------- .../jvault/connector/model/AppRoleTest.java | 5 ++--- .../jvault/connector/model/TokenRoleTest.java | 7 +++---- .../stklcode/jvault/connector/model/TokenTest.java | 5 ++--- .../model/response/AppRoleResponseTest.java | 5 ++--- .../model/response/AuthMethodsResponseTest.java | 5 ++--- .../connector/model/response/AuthResponseTest.java | 5 ++--- .../model/response/CredentialsResponseTest.java | 5 ++--- .../connector/model/response/ErrorResponseTest.java | 12 +++++------- .../model/response/HealthResponseTest.java | 5 ++--- .../connector/model/response/HelpResponseTest.java | 8 +++----- .../model/response/MetaSecretResponseTest.java | 7 +++---- .../model/response/MetadataResponseTest.java | 5 ++--- .../model/response/PlainSecretResponseTest.java | 5 ++--- .../connector/model/response/SealResponseTest.java | 7 +++---- .../model/response/SecretListResponseTest.java | 5 ++--- .../model/response/SecretVersionResponseTest.java | 5 ++--- .../connector/model/response/TokenResponseTest.java | 5 ++--- 19 files changed, 49 insertions(+), 68 deletions(-) diff --git a/src/test/java/de/stklcode/jvault/connector/model/AbstractModelTest.java b/src/test/java/de/stklcode/jvault/connector/model/AbstractModelTest.java index efec0e4..0ea2bed 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/AbstractModelTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/AbstractModelTest.java @@ -1,5 +1,6 @@ package de.stklcode.jvault.connector.model; +import com.fasterxml.jackson.databind.ObjectMapper; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; @@ -16,6 +17,7 @@ import static org.junit.jupiter.api.Assertions.fail; */ public abstract class AbstractModelTest { protected final Class modelClass; + protected final ObjectMapper objectMapper; /** * Test case constructor. @@ -24,6 +26,7 @@ public abstract class AbstractModelTest { */ protected AbstractModelTest(Class modelClass) { this.modelClass = modelClass; + this.objectMapper = new ObjectMapper(); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/AppRoleSecretTest.java b/src/test/java/de/stklcode/jvault/connector/model/AppRoleSecretTest.java index d440183..0554210 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/AppRoleSecretTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/AppRoleSecretTest.java @@ -16,7 +16,6 @@ package de.stklcode.jvault.connector.model; -import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import java.lang.reflect.Field; @@ -116,16 +115,14 @@ class AppRoleSecretTest extends AbstractModelTest { */ @Test void jsonTest() throws NoSuchFieldException, IllegalAccessException { - ObjectMapper mapper = new ObjectMapper(); - // A simple roundtrip first. All set fields should be present afterwards.. AppRoleSecret secret = new AppRoleSecret(TEST_ID, TEST_META, TEST_CIDR); - String secretJson = assertDoesNotThrow(() -> mapper.writeValueAsString(secret), "Serialization failed"); + String secretJson = assertDoesNotThrow(() -> objectMapper.writeValueAsString(secret), "Serialization failed"); // CIDR list is comma-separated when used as input, but List otherwise, hence convert string to list. String secretJson2 = commaSeparatedToList(secretJson); AppRoleSecret secret2 = assertDoesNotThrow( - () -> mapper.readValue(secretJson2, AppRoleSecret.class), + () -> objectMapper.readValue(secretJson2, AppRoleSecret.class), "Deserialization failed" ); assertEquals(secret2.getId(), secret.getId()); @@ -145,9 +142,9 @@ class AppRoleSecretTest extends AbstractModelTest { assumeTrue(secret.getNumUses() == 678); setPrivateField(secret, "ttl", 12345); assumeTrue(secret.getTtl() == 12345); - String secretJson3 = assertDoesNotThrow(() -> mapper.writeValueAsString(secret), "Serialization failed"); + String secretJson3 = assertDoesNotThrow(() -> objectMapper.writeValueAsString(secret), "Serialization failed"); secret2 = assertDoesNotThrow( - () -> mapper.readValue(commaSeparatedToList(secretJson3), AppRoleSecret.class), + () -> objectMapper.readValue(commaSeparatedToList(secretJson3), AppRoleSecret.class), "Deserialization failed" ); assertEquals(secret2.getId(), secret.getId()); @@ -165,7 +162,7 @@ class AppRoleSecretTest extends AbstractModelTest { "\"cidr_list\":[\"203.0.113.0/24\",\"198.51.100.0/24\"],\"secret_id_accessor\":\"TEST_ACCESSOR\"," + "\"creation_time\":\"TEST_CREATION\",\"expiration_time\":\"TEST_EXPIRATION\"," + "\"last_updated_time\":\"TEST_LASTUPDATE\",\"secret_id_num_uses\":678,\"secret_id_ttl\":12345}"; - secret2 = assertDoesNotThrow(() -> mapper.readValue(secretJson4, AppRoleSecret.class), "Deserialization failed"); + secret2 = assertDoesNotThrow(() -> objectMapper.readValue(secretJson4, AppRoleSecret.class), "Deserialization failed"); assertEquals("TEST_ACCESSOR", secret2.getAccessor()); assertEquals("TEST_CREATION", secret2.getCreationTime()); assertEquals("TEST_EXPIRATION", secret2.getExpirationTime()); diff --git a/src/test/java/de/stklcode/jvault/connector/model/AppRoleTest.java b/src/test/java/de/stklcode/jvault/connector/model/AppRoleTest.java index b675daf..e55bd7e 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/AppRoleTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/AppRoleTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -110,7 +109,7 @@ class AppRoleTest extends AbstractModelTest { assertNull(role.getTokenType()); // Optional fields should be ignored, so JSON string should only contain role_name. - assertEquals(JSON_MIN, new ObjectMapper().writeValueAsString(role)); + assertEquals(JSON_MIN, objectMapper.writeValueAsString(role)); } /** @@ -137,7 +136,7 @@ class AppRoleTest extends AbstractModelTest { assertEquals(TOKEN_TYPE.value(), role.getTokenType()); // Verify that all parameters are included in JSON string. - assertEquals(JSON_FULL, new ObjectMapper().writeValueAsString(role)); + assertEquals(JSON_FULL, objectMapper.writeValueAsString(role)); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/TokenRoleTest.java b/src/test/java/de/stklcode/jvault/connector/model/TokenRoleTest.java index 884e55f..7e96531 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/TokenRoleTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/TokenRoleTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -133,7 +132,7 @@ class TokenRoleTest extends AbstractModelTest { assertNull(role.getTokenType()); // Optional fields should be ignored, so JSON string should be empty. - assertEquals("{}", new ObjectMapper().writeValueAsString(role)); + assertEquals("{}", objectMapper.writeValueAsString(role)); } /** @@ -177,7 +176,7 @@ class TokenRoleTest extends AbstractModelTest { assertEquals(role, new TokenRole()); // Optional fields should be ignored, so JSON string should be empty. - assertEquals("{}", new ObjectMapper().writeValueAsString(role)); + assertEquals("{}", objectMapper.writeValueAsString(role)); } /** @@ -208,6 +207,6 @@ class TokenRoleTest extends AbstractModelTest { assertEquals(TOKEN_TYPE.value(), role.getTokenType()); // Verify that all parameters are included in JSON string. - assertEquals(JSON_FULL, new ObjectMapper().writeValueAsString(role)); + assertEquals(JSON_FULL, objectMapper.writeValueAsString(role)); } } diff --git a/src/test/java/de/stklcode/jvault/connector/model/TokenTest.java b/src/test/java/de/stklcode/jvault/connector/model/TokenTest.java index 6997b94..82026e2 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/TokenTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/TokenTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -103,7 +102,7 @@ class TokenTest extends AbstractModelTest { assertNull(token.getEntityAlias()); // Optional fields should be ignored, so JSON string should be empty. - assertEquals("{}", new ObjectMapper().writeValueAsString(token)); + assertEquals("{}", objectMapper.writeValueAsString(token)); // Empty builder should be equal to no-arg construction. assertEquals(token, new Token()); @@ -129,7 +128,7 @@ class TokenTest extends AbstractModelTest { assertEquals(PERIOD, token.getPeriod()); // Verify that all parameters are included in JSON string. - assertEquals(JSON_FULL, new ObjectMapper().writeValueAsString(token)); + assertEquals(JSON_FULL, objectMapper.writeValueAsString(token)); } /** diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/AppRoleResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/AppRoleResponseTest.java index 9dcba30..6d78fb9 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/AppRoleResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/AppRoleResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import de.stklcode.jvault.connector.model.AppRole; import org.junit.jupiter.api.Test; @@ -69,7 +68,7 @@ class AppRoleResponseTest extends AbstractModelTest { @Override protected AppRoleResponse createFull() { try { - return new ObjectMapper().readValue(RES_JSON, AppRoleResponse.class); + return objectMapper.readValue(RES_JSON, AppRoleResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -92,7 +91,7 @@ class AppRoleResponseTest extends AbstractModelTest { @Test void jsonRoundtrip() { AppRoleResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(RES_JSON, AppRoleResponse.class), + () -> objectMapper.readValue(RES_JSON, AppRoleResponse.class), "AuthResponse deserialization failed" ); assertNotNull(res, "Parsed response is NULL"); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponseTest.java index c656612..acdd829 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/AuthMethodsResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import de.stklcode.jvault.connector.model.AuthBackend; import de.stklcode.jvault.connector.model.response.embedded.AuthMethod; @@ -83,7 +82,7 @@ class AuthMethodsResponseTest extends AbstractModelTest { @Override protected AuthMethodsResponse createFull() { try { - return new ObjectMapper().readValue(RES_JSON, AuthMethodsResponse.class); + return objectMapper.readValue(RES_JSON, AuthMethodsResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -106,7 +105,7 @@ class AuthMethodsResponseTest extends AbstractModelTest { @Test void jsonRoundtrip() { AuthMethodsResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(RES_JSON, AuthMethodsResponse.class), + () -> objectMapper.readValue(RES_JSON, AuthMethodsResponse.class), "AuthResponse deserialization failed" ); assertNotNull(res, "Parsed response is NULL"); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/AuthResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/AuthResponseTest.java index cf3a893..d5d2e4c 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/AuthResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/AuthResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import de.stklcode.jvault.connector.model.response.embedded.AuthData; import org.junit.jupiter.api.Test; @@ -76,7 +75,7 @@ class AuthResponseTest extends AbstractModelTest { @Override protected AuthResponse createFull() { try { - return new ObjectMapper().readValue(RES_JSON, AuthResponse.class); + return objectMapper.readValue(RES_JSON, AuthResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -89,7 +88,7 @@ class AuthResponseTest extends AbstractModelTest { @Test void jsonRoundtrip() { AuthResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(RES_JSON, AuthResponse.class), + () -> objectMapper.readValue(RES_JSON, AuthResponse.class), "AuthResponse deserialization failed" ); assertNotNull(res, "Parsed response is NULL"); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/CredentialsResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/CredentialsResponseTest.java index 6abbeb2..c7d7735 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/CredentialsResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/CredentialsResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.exception.InvalidResponseException; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -52,7 +51,7 @@ class CredentialsResponseTest extends AbstractModelTest { @Override protected CredentialsResponse createFull() { try { - return new ObjectMapper().readValue(JSON, CredentialsResponse.class); + return objectMapper.readValue(JSON, CredentialsResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -72,7 +71,7 @@ class CredentialsResponseTest extends AbstractModelTest { assertNull(res.getPassword(), "Password not present in data map should not return anything"); res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(JSON, CredentialsResponse.class), + () -> objectMapper.readValue(JSON, CredentialsResponse.class), "Deserialization of CredentialsResponse failed" ); assertEquals(VAL_USER, res.getUsername(), "Incorrect username"); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/ErrorResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/ErrorResponseTest.java index 429e5a2..750d200 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/ErrorResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/ErrorResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -44,7 +43,7 @@ class ErrorResponseTest extends AbstractModelTest { @Override protected ErrorResponse createFull() { try { - return new ObjectMapper().readValue(JSON, ErrorResponse.class); + return objectMapper.readValue(JSON, ErrorResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -56,16 +55,15 @@ class ErrorResponseTest extends AbstractModelTest { */ @Test void jsonRoundtrip() { - ObjectMapper om = new ObjectMapper(); ErrorResponse res = assertDoesNotThrow( - () -> om.readValue(JSON, ErrorResponse.class), + () -> objectMapper.readValue(JSON, ErrorResponse.class), "ErrorResponse deserialization failed" ); assertNotNull(res, "Parsed response is NULL"); assertEquals(List.of(ERROR_1, ERROR_2), res.getErrors(), "Unexpected error messages"); assertEquals( JSON, - assertDoesNotThrow(() -> om.writeValueAsString(res), "ErrorResponse serialization failed"), + assertDoesNotThrow(() -> objectMapper.writeValueAsString(res), "ErrorResponse serialization failed"), "Unexpected JSON string after serialization" ); } @@ -74,13 +72,13 @@ class ErrorResponseTest extends AbstractModelTest { @Test void testToString() { ErrorResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(JSON, ErrorResponse.class), + () -> objectMapper.readValue(JSON, ErrorResponse.class), "ErrorResponse deserialization failed" ); assertEquals(ERROR_1, res.toString()); res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(JSON_EMPTY, ErrorResponse.class), + () -> objectMapper.readValue(JSON_EMPTY, ErrorResponse.class), "ErrorResponse deserialization failed with empty list" ); assertEquals("error response", res.toString()); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java index fa9ba84..bdf55e2 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/HealthResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -61,7 +60,7 @@ class HealthResponseTest extends AbstractModelTest { @Override protected HealthResponse createFull() { try { - return new ObjectMapper().readValue(RES_JSON, HealthResponse.class); + return objectMapper.readValue(RES_JSON, HealthResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -74,7 +73,7 @@ class HealthResponseTest extends AbstractModelTest { @Test void jsonRoundtrip() { HealthResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(RES_JSON, HealthResponse.class), + () -> objectMapper.readValue(RES_JSON, HealthResponse.class), "Health deserialization failed" ); assertNotNull(res, "Parsed response is NULL"); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/HelpResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/HelpResponseTest.java index 0510733..fe84f0c 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/HelpResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/HelpResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -40,7 +39,7 @@ class HelpResponseTest extends AbstractModelTest { @Override protected HelpResponse createFull() { try { - return new ObjectMapper().readValue(JSON, HelpResponse.class); + return objectMapper.readValue(JSON, HelpResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -52,16 +51,15 @@ class HelpResponseTest extends AbstractModelTest { */ @Test void jsonRoundtrip() { - ObjectMapper om = new ObjectMapper(); HelpResponse res = assertDoesNotThrow( - () -> om.readValue(JSON, HelpResponse.class), + () -> objectMapper.readValue(JSON, HelpResponse.class), "HelpResponse deserialization failed" ); assertNotNull(res, "Parsed response is NULL"); assertEquals(HELP, res.getHelp(), "Unexpected help text"); assertEquals( JSON, - assertDoesNotThrow(() -> om.writeValueAsString(res), "HelpResponse serialization failed"), + assertDoesNotThrow(() -> objectMapper.writeValueAsString(res), "HelpResponse serialization failed"), "Unexpected JSON string after serialization" ); } diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/MetaSecretResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/MetaSecretResponseTest.java index dc66807..bdc360e 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/MetaSecretResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/MetaSecretResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -89,7 +88,7 @@ class MetaSecretResponseTest extends AbstractModelTest { @Override protected MetaSecretResponse createFull() { try { - return new ObjectMapper().readValue(SECRET_JSON_V2, MetaSecretResponse.class); + return objectMapper.readValue(SECRET_JSON_V2, MetaSecretResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -103,7 +102,7 @@ class MetaSecretResponseTest extends AbstractModelTest { void jsonRoundtrip() { // KV v2 secret. MetaSecretResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(SECRET_JSON_V2, MetaSecretResponse.class), + () -> objectMapper.readValue(SECRET_JSON_V2, MetaSecretResponse.class), "SecretResponse deserialization failed" ); assertSecretData(res); @@ -117,7 +116,7 @@ class MetaSecretResponseTest extends AbstractModelTest { // Deleted KV v2 secret. res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(SECRET_JSON_V2_2, MetaSecretResponse.class), + () -> objectMapper.readValue(SECRET_JSON_V2_2, MetaSecretResponse.class), "SecretResponse deserialization failed" ); assertSecretData(res); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/MetadataResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/MetadataResponseTest.java index 0db94cb..4a09bab 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/MetadataResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/MetadataResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -71,7 +70,7 @@ class MetadataResponseTest extends AbstractModelTest { @Override protected MetadataResponse createFull() { try { - return new ObjectMapper().readValue(META_JSON, MetadataResponse.class); + return objectMapper.readValue(META_JSON, MetadataResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -84,7 +83,7 @@ class MetadataResponseTest extends AbstractModelTest { @Test void jsonRoundtrip() { MetadataResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(META_JSON, MetadataResponse.class), + () -> objectMapper.readValue(META_JSON, MetadataResponse.class), "MetadataResponse deserialization failed" ); assertNotNull(res, "Parsed response is NULL"); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/PlainSecretResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/PlainSecretResponseTest.java index 860b01f..7372699 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/PlainSecretResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/PlainSecretResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -60,7 +59,7 @@ class PlainSecretResponseTest extends AbstractModelTest { @Override protected PlainSecretResponse createFull() { try { - return new ObjectMapper().readValue(SECRET_JSON, PlainSecretResponse.class); + return objectMapper.readValue(SECRET_JSON, PlainSecretResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -73,7 +72,7 @@ class PlainSecretResponseTest extends AbstractModelTest { @Test void jsonRoundtrip() { SecretResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(SECRET_JSON, PlainSecretResponse.class), + () -> objectMapper.readValue(SECRET_JSON, PlainSecretResponse.class), "SecretResponse deserialization failed" ); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/SealResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/SealResponseTest.java index dfd5ae8..46e53c2 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/SealResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/SealResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -80,7 +79,7 @@ class SealResponseTest extends AbstractModelTest { @Override protected SealResponse createFull() { try { - return new ObjectMapper().readValue(RES_UNSEALED, SealResponse.class); + return objectMapper.readValue(RES_UNSEALED, SealResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -94,7 +93,7 @@ class SealResponseTest extends AbstractModelTest { void jsonRoundtripSealed() { // First test sealed Vault's response. SealResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(RES_SEALED, SealResponse.class), + () -> objectMapper.readValue(RES_SEALED, SealResponse.class), "SealResponse deserialization failed" ); assertNotNull(res, "Parsed response is NULL"); @@ -116,7 +115,7 @@ class SealResponseTest extends AbstractModelTest { // Not test unsealed Vault's response. res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(RES_UNSEALED, SealResponse.class), + () -> objectMapper.readValue(RES_UNSEALED, SealResponse.class), "SealResponse deserialization failed" ); assertNotNull(res, "Parsed response is NULL"); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/SecretListResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/SecretListResponseTest.java index c6ad1a6..597acb5 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/SecretListResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/SecretListResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -54,7 +53,7 @@ class SecretListResponseTest extends AbstractModelTest { @Override protected SecretListResponse createFull() { try { - return new ObjectMapper().readValue(JSON, SecretListResponse.class); + return objectMapper.readValue(JSON, SecretListResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -67,7 +66,7 @@ class SecretListResponseTest extends AbstractModelTest { @Test void getKeysTest() { SecretListResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(JSON, SecretListResponse.class), + () -> objectMapper.readValue(JSON, SecretListResponse.class), "SecretListResponse deserialization failed" ); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/SecretVersionResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/SecretVersionResponseTest.java index e80a4c6..3c5377a 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/SecretVersionResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/SecretVersionResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import org.junit.jupiter.api.Test; @@ -50,7 +49,7 @@ class SecretVersionResponseTest extends AbstractModelTest @Override protected SecretVersionResponse createFull() { try { - return new ObjectMapper().readValue(META_JSON, SecretVersionResponse.class); + return objectMapper.readValue(META_JSON, SecretVersionResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -63,7 +62,7 @@ class SecretVersionResponseTest extends AbstractModelTest @Test void jsonRoundtrip() { SecretVersionResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(META_JSON, SecretVersionResponse.class), + () -> objectMapper.readValue(META_JSON, SecretVersionResponse.class), "SecretVersionResponse deserialization failed" ); assertNotNull(res, "Parsed response is NULL"); diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java index 650e5e9..0535f5a 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java @@ -17,7 +17,6 @@ package de.stklcode.jvault.connector.model.response; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import de.stklcode.jvault.connector.model.AbstractModelTest; import de.stklcode.jvault.connector.model.response.embedded.TokenData; import org.junit.jupiter.api.Test; @@ -96,7 +95,7 @@ class TokenResponseTest extends AbstractModelTest { @Override protected TokenResponse createFull() { try { - return new ObjectMapper().readValue(RES_JSON, TokenResponse.class); + return objectMapper.readValue(RES_JSON, TokenResponse.class); } catch (JsonProcessingException e) { fail("Creation of full model instance failed", e); return null; @@ -119,7 +118,7 @@ class TokenResponseTest extends AbstractModelTest { @Test void jsonRoundtrip() { TokenResponse res = assertDoesNotThrow( - () -> new ObjectMapper().readValue(RES_JSON, TokenResponse.class), + () -> objectMapper.readValue(RES_JSON, TokenResponse.class), "TokenResponse deserialization failed" ); assertNotNull(res, "Parsed response is NULL");