diff --git a/src/main/java/com/adyen/model/acswebhooks/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/acswebhooks/AbstractOpenApiSchema.java index 216baf595..bbee8bb88 100644 --- a/src/main/java/com/adyen/model/acswebhooks/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/acswebhooks/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/acswebhooks/JSON.java b/src/main/java/com/adyen/model/acswebhooks/JSON.java index bc4237b36..5b711524c 100644 --- a/src/main/java/com/adyen/model/acswebhooks/JSON.java +++ b/src/main/java/com/adyen/model/acswebhooks/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/balancecontrol/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/balancecontrol/AbstractOpenApiSchema.java index 6d0d6e817..16047f516 100644 --- a/src/main/java/com/adyen/model/balancecontrol/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/balancecontrol/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/balancecontrol/JSON.java b/src/main/java/com/adyen/model/balancecontrol/JSON.java index 5afd9e9bf..a93acd72f 100644 --- a/src/main/java/com/adyen/model/balancecontrol/JSON.java +++ b/src/main/java/com/adyen/model/balancecontrol/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/balanceplatform/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/balanceplatform/AbstractOpenApiSchema.java index 7d2c2f6fe..6300f20de 100644 --- a/src/main/java/com/adyen/model/balanceplatform/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/balanceplatform/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/balanceplatform/JSON.java b/src/main/java/com/adyen/model/balanceplatform/JSON.java index 62f34fd75..ee05bfaec 100644 --- a/src/main/java/com/adyen/model/balanceplatform/JSON.java +++ b/src/main/java/com/adyen/model/balanceplatform/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/balancewebhooks/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/balancewebhooks/AbstractOpenApiSchema.java index b9ff6f79b..3845894e9 100644 --- a/src/main/java/com/adyen/model/balancewebhooks/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/balancewebhooks/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/balancewebhooks/JSON.java b/src/main/java/com/adyen/model/balancewebhooks/JSON.java index 3d576e32c..ae0cc024b 100644 --- a/src/main/java/com/adyen/model/balancewebhooks/JSON.java +++ b/src/main/java/com/adyen/model/balancewebhooks/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/binlookup/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/binlookup/AbstractOpenApiSchema.java index 39ada081f..7f2ed8b2d 100644 --- a/src/main/java/com/adyen/model/binlookup/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/binlookup/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/binlookup/JSON.java b/src/main/java/com/adyen/model/binlookup/JSON.java index 0ca2562f2..275acb249 100644 --- a/src/main/java/com/adyen/model/binlookup/JSON.java +++ b/src/main/java/com/adyen/model/binlookup/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/checkout/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/checkout/AbstractOpenApiSchema.java index c6701e96a..0c1cc93b3 100644 --- a/src/main/java/com/adyen/model/checkout/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/checkout/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/checkout/JSON.java b/src/main/java/com/adyen/model/checkout/JSON.java index e963c6e7f..80cec4f24 100644 --- a/src/main/java/com/adyen/model/checkout/JSON.java +++ b/src/main/java/com/adyen/model/checkout/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/configurationwebhooks/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/configurationwebhooks/AbstractOpenApiSchema.java index 264f124fd..3cfc72ea4 100644 --- a/src/main/java/com/adyen/model/configurationwebhooks/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/configurationwebhooks/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/configurationwebhooks/JSON.java b/src/main/java/com/adyen/model/configurationwebhooks/JSON.java index 8f4f9e315..a7359241d 100644 --- a/src/main/java/com/adyen/model/configurationwebhooks/JSON.java +++ b/src/main/java/com/adyen/model/configurationwebhooks/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/dataprotection/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/dataprotection/AbstractOpenApiSchema.java index 8a0f706e6..70bbc98a6 100644 --- a/src/main/java/com/adyen/model/dataprotection/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/dataprotection/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/dataprotection/JSON.java b/src/main/java/com/adyen/model/dataprotection/JSON.java index 863861ac1..225bdcf07 100644 --- a/src/main/java/com/adyen/model/dataprotection/JSON.java +++ b/src/main/java/com/adyen/model/dataprotection/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/disputes/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/disputes/AbstractOpenApiSchema.java index 87069e9f3..0b0e75813 100644 --- a/src/main/java/com/adyen/model/disputes/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/disputes/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/disputes/JSON.java b/src/main/java/com/adyen/model/disputes/JSON.java index 663f3b128..7b749e401 100644 --- a/src/main/java/com/adyen/model/disputes/JSON.java +++ b/src/main/java/com/adyen/model/disputes/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/disputewebhooks/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/disputewebhooks/AbstractOpenApiSchema.java index 3f70fd62c..5187ef4af 100644 --- a/src/main/java/com/adyen/model/disputewebhooks/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/disputewebhooks/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/disputewebhooks/JSON.java b/src/main/java/com/adyen/model/disputewebhooks/JSON.java index d74df41d7..b144e9daa 100644 --- a/src/main/java/com/adyen/model/disputewebhooks/JSON.java +++ b/src/main/java/com/adyen/model/disputewebhooks/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/legalentitymanagement/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/legalentitymanagement/AbstractOpenApiSchema.java index 39c2d4556..a0cf16462 100644 --- a/src/main/java/com/adyen/model/legalentitymanagement/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/legalentitymanagement/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/legalentitymanagement/JSON.java b/src/main/java/com/adyen/model/legalentitymanagement/JSON.java index cfbe7eaae..8d3432cd1 100644 --- a/src/main/java/com/adyen/model/legalentitymanagement/JSON.java +++ b/src/main/java/com/adyen/model/legalentitymanagement/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/management/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/management/AbstractOpenApiSchema.java index 90640c130..dec7eddcb 100644 --- a/src/main/java/com/adyen/model/management/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/management/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/management/JSON.java b/src/main/java/com/adyen/model/management/JSON.java index 7ed0c88bd..e7636df03 100644 --- a/src/main/java/com/adyen/model/management/JSON.java +++ b/src/main/java/com/adyen/model/management/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/managementwebhooks/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/managementwebhooks/AbstractOpenApiSchema.java index b6ee54d9d..afb8c9764 100644 --- a/src/main/java/com/adyen/model/managementwebhooks/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/managementwebhooks/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/managementwebhooks/JSON.java b/src/main/java/com/adyen/model/managementwebhooks/JSON.java index 6615ef758..29d9aac38 100644 --- a/src/main/java/com/adyen/model/managementwebhooks/JSON.java +++ b/src/main/java/com/adyen/model/managementwebhooks/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/negativebalancewarningwebhooks/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/negativebalancewarningwebhooks/AbstractOpenApiSchema.java index d57975bbb..d248a2531 100644 --- a/src/main/java/com/adyen/model/negativebalancewarningwebhooks/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/negativebalancewarningwebhooks/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/negativebalancewarningwebhooks/JSON.java b/src/main/java/com/adyen/model/negativebalancewarningwebhooks/JSON.java index 14adee19d..2673db028 100644 --- a/src/main/java/com/adyen/model/negativebalancewarningwebhooks/JSON.java +++ b/src/main/java/com/adyen/model/negativebalancewarningwebhooks/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/payment/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/payment/AbstractOpenApiSchema.java index de1f3ce7a..1d8492f33 100644 --- a/src/main/java/com/adyen/model/payment/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/payment/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/payment/JSON.java b/src/main/java/com/adyen/model/payment/JSON.java index be9f25638..da7759d75 100644 --- a/src/main/java/com/adyen/model/payment/JSON.java +++ b/src/main/java/com/adyen/model/payment/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/paymentsapp/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/paymentsapp/AbstractOpenApiSchema.java index 553318c80..4a6afb0af 100644 --- a/src/main/java/com/adyen/model/paymentsapp/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/paymentsapp/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/paymentsapp/JSON.java b/src/main/java/com/adyen/model/paymentsapp/JSON.java index 7f93b9085..29447d5db 100644 --- a/src/main/java/com/adyen/model/paymentsapp/JSON.java +++ b/src/main/java/com/adyen/model/paymentsapp/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/payout/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/payout/AbstractOpenApiSchema.java index 03fb315a1..79608e81e 100644 --- a/src/main/java/com/adyen/model/payout/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/payout/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/payout/JSON.java b/src/main/java/com/adyen/model/payout/JSON.java index cd5bf5a1e..054bf03a7 100644 --- a/src/main/java/com/adyen/model/payout/JSON.java +++ b/src/main/java/com/adyen/model/payout/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/posmobile/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/posmobile/AbstractOpenApiSchema.java index 77f3d15b3..f0e161e97 100644 --- a/src/main/java/com/adyen/model/posmobile/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/posmobile/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/posmobile/JSON.java b/src/main/java/com/adyen/model/posmobile/JSON.java index 09677fa0b..e3f32866b 100644 --- a/src/main/java/com/adyen/model/posmobile/JSON.java +++ b/src/main/java/com/adyen/model/posmobile/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/recurring/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/recurring/AbstractOpenApiSchema.java index 26c50010c..6adb83f62 100644 --- a/src/main/java/com/adyen/model/recurring/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/recurring/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/recurring/JSON.java b/src/main/java/com/adyen/model/recurring/JSON.java index a83eda2bc..212414577 100644 --- a/src/main/java/com/adyen/model/recurring/JSON.java +++ b/src/main/java/com/adyen/model/recurring/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/reportwebhooks/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/reportwebhooks/AbstractOpenApiSchema.java index 94dd2ba56..839373b6a 100644 --- a/src/main/java/com/adyen/model/reportwebhooks/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/reportwebhooks/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/reportwebhooks/JSON.java b/src/main/java/com/adyen/model/reportwebhooks/JSON.java index dedd7def9..5b5159e6c 100644 --- a/src/main/java/com/adyen/model/reportwebhooks/JSON.java +++ b/src/main/java/com/adyen/model/reportwebhooks/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/sessionauthentication/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/sessionauthentication/AbstractOpenApiSchema.java index bad6fb79f..f6d638482 100644 --- a/src/main/java/com/adyen/model/sessionauthentication/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/sessionauthentication/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/sessionauthentication/JSON.java b/src/main/java/com/adyen/model/sessionauthentication/JSON.java index d01918213..c3aafeaa0 100644 --- a/src/main/java/com/adyen/model/sessionauthentication/JSON.java +++ b/src/main/java/com/adyen/model/sessionauthentication/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/storedvalue/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/storedvalue/AbstractOpenApiSchema.java index 1d1f030b2..dd06ee5f2 100644 --- a/src/main/java/com/adyen/model/storedvalue/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/storedvalue/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/storedvalue/JSON.java b/src/main/java/com/adyen/model/storedvalue/JSON.java index 635032d79..37a4e8b50 100644 --- a/src/main/java/com/adyen/model/storedvalue/JSON.java +++ b/src/main/java/com/adyen/model/storedvalue/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/tokenizationwebhooks/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/tokenizationwebhooks/AbstractOpenApiSchema.java index 647569e23..f7361bb8c 100644 --- a/src/main/java/com/adyen/model/tokenizationwebhooks/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/tokenizationwebhooks/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/tokenizationwebhooks/JSON.java b/src/main/java/com/adyen/model/tokenizationwebhooks/JSON.java index 7bd4136eb..56f45af8e 100644 --- a/src/main/java/com/adyen/model/tokenizationwebhooks/JSON.java +++ b/src/main/java/com/adyen/model/tokenizationwebhooks/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/transactionwebhooks/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/transactionwebhooks/AbstractOpenApiSchema.java index a70ba555e..e707b4965 100644 --- a/src/main/java/com/adyen/model/transactionwebhooks/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/transactionwebhooks/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/transactionwebhooks/JSON.java b/src/main/java/com/adyen/model/transactionwebhooks/JSON.java index b8bfac46f..2dd25328b 100644 --- a/src/main/java/com/adyen/model/transactionwebhooks/JSON.java +++ b/src/main/java/com/adyen/model/transactionwebhooks/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/transfers/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/transfers/AbstractOpenApiSchema.java index 5758e860c..05a25e27a 100644 --- a/src/main/java/com/adyen/model/transfers/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/transfers/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/transfers/JSON.java b/src/main/java/com/adyen/model/transfers/JSON.java index 59cf0c976..a2553c3ed 100644 --- a/src/main/java/com/adyen/model/transfers/JSON.java +++ b/src/main/java/com/adyen/model/transfers/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator. diff --git a/src/main/java/com/adyen/model/transferwebhooks/AbstractOpenApiSchema.java b/src/main/java/com/adyen/model/transferwebhooks/AbstractOpenApiSchema.java index e6df1d3d4..5fdd90656 100644 --- a/src/main/java/com/adyen/model/transferwebhooks/AbstractOpenApiSchema.java +++ b/src/main/java/com/adyen/model/transferwebhooks/AbstractOpenApiSchema.java @@ -137,10 +137,6 @@ public int hashCode() { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } } diff --git a/src/main/java/com/adyen/model/transferwebhooks/JSON.java b/src/main/java/com/adyen/model/transferwebhooks/JSON.java index 05bb6bfa4..96b83a20b 100644 --- a/src/main/java/com/adyen/model/transferwebhooks/JSON.java +++ b/src/main/java/com/adyen/model/transferwebhooks/JSON.java @@ -4,7 +4,6 @@ import com.adyen.serializer.ByteArraySerializer; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.ws.rs.core.GenericType; @@ -18,10 +17,10 @@ public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -69,7 +68,7 @@ public static ObjectMapper getMapper() { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -195,12 +194,11 @@ public static boolean isInstanceOf( } /** A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = - new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator.