Skip to content

Commit 75ed1a3

Browse files
AdyenAutomationBotAdyenAutomationBot
AdyenAutomationBot
and
AdyenAutomationBot
authored
Code generation: update services and models (#1537)
* false[adyen-sdk-automation] automated change * style(fmt): code formatted --------- Co-authored-by: AdyenAutomationBot <AdyenAutomationBot [email protected]>
1 parent 9caf56f commit 75ed1a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+182
-338
lines changed

‎src/main/java/com/adyen/model/acswebhooks/AbstractOpenApiSchema.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,6 @@ public int hashCode() {
137137
* @return true if it's nullable
138138
*/
139139
public Boolean isNullable() {
140-
if (Boolean.TRUE.equals(isNullable)) {
141-
return Boolean.TRUE;
142-
} else {
143-
return Boolean.FALSE;
144-
}
140+
return Boolean.TRUE.equals(isNullable);
145141
}
146142
}

‎src/main/java/com/adyen/model/acswebhooks/JSON.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.adyen.serializer.ByteArraySerializer;
55
import com.fasterxml.jackson.annotation.*;
66
import com.fasterxml.jackson.databind.*;
7-
import com.fasterxml.jackson.databind.json.JsonMapper;
87
import com.fasterxml.jackson.databind.module.SimpleModule;
98
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
109
import jakarta.ws.rs.core.GenericType;
@@ -18,10 +17,10 @@
1817
public class JSON implements ContextResolver<ObjectMapper> {
1918
private static ObjectMapper mapper;
2019

21-
public JSON() {
20+
private JSON() {
2221
mapper = new ObjectMapper();
2322
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
24-
JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false);
23+
mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true);
2524
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
2625
mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true);
2726
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
@@ -69,7 +68,7 @@ public static ObjectMapper getMapper() {
6968
public static Class<?> getClassForElement(JsonNode node, Class<?> modelClass) {
7069
ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass);
7170
if (cdm != null) {
72-
return cdm.getClassForElement(node, new HashSet<Class<?>>());
71+
return cdm.getClassForElement(node, new HashSet<>());
7372
}
7473
return null;
7574
}
@@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping {
8786
ClassDiscriminatorMapping(Class<?> cls, String propertyName, Map<String, Class<?>> mappings) {
8887
modelClass = cls;
8988
discriminatorName = propertyName;
90-
discriminatorMappings = new HashMap<String, Class<?>>();
89+
discriminatorMappings = new HashMap<>();
9190
if (mappings != null) {
9291
discriminatorMappings.putAll(mappings);
9392
}
@@ -195,12 +194,11 @@ public static boolean isInstanceOf(
195194
}
196195

197196
/** A map of discriminators for all model classes. */
198-
private static Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators =
197+
private static final Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators =
199198
new HashMap<Class<?>, ClassDiscriminatorMapping>();
200199

201200
/** A map of oneOf/anyOf descendants for each model class. */
202-
private static Map<Class<?>, Map<String, GenericType>> modelDescendants =
203-
new HashMap<Class<?>, Map<String, GenericType>>();
201+
private static final Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
204202

205203
/**
206204
* Register a model class discriminator.

‎src/main/java/com/adyen/model/balancecontrol/AbstractOpenApiSchema.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,6 @@ public int hashCode() {
137137
* @return true if it's nullable
138138
*/
139139
public Boolean isNullable() {
140-
if (Boolean.TRUE.equals(isNullable)) {
141-
return Boolean.TRUE;
142-
} else {
143-
return Boolean.FALSE;
144-
}
140+
return Boolean.TRUE.equals(isNullable);
145141
}
146142
}

‎src/main/java/com/adyen/model/balancecontrol/JSON.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.adyen.serializer.ByteArraySerializer;
55
import com.fasterxml.jackson.annotation.*;
66
import com.fasterxml.jackson.databind.*;
7-
import com.fasterxml.jackson.databind.json.JsonMapper;
87
import com.fasterxml.jackson.databind.module.SimpleModule;
98
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
109
import jakarta.ws.rs.core.GenericType;
@@ -18,10 +17,10 @@
1817
public class JSON implements ContextResolver<ObjectMapper> {
1918
private static ObjectMapper mapper;
2019

21-
public JSON() {
20+
private JSON() {
2221
mapper = new ObjectMapper();
2322
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
24-
JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false);
23+
mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true);
2524
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
2625
mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true);
2726
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
@@ -69,7 +68,7 @@ public static ObjectMapper getMapper() {
6968
public static Class<?> getClassForElement(JsonNode node, Class<?> modelClass) {
7069
ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass);
7170
if (cdm != null) {
72-
return cdm.getClassForElement(node, new HashSet<Class<?>>());
71+
return cdm.getClassForElement(node, new HashSet<>());
7372
}
7473
return null;
7574
}
@@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping {
8786
ClassDiscriminatorMapping(Class<?> cls, String propertyName, Map<String, Class<?>> mappings) {
8887
modelClass = cls;
8988
discriminatorName = propertyName;
90-
discriminatorMappings = new HashMap<String, Class<?>>();
89+
discriminatorMappings = new HashMap<>();
9190
if (mappings != null) {
9291
discriminatorMappings.putAll(mappings);
9392
}
@@ -195,12 +194,11 @@ public static boolean isInstanceOf(
195194
}
196195

197196
/** A map of discriminators for all model classes. */
198-
private static Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators =
197+
private static final Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators =
199198
new HashMap<Class<?>, ClassDiscriminatorMapping>();
200199

201200
/** A map of oneOf/anyOf descendants for each model class. */
202-
private static Map<Class<?>, Map<String, GenericType>> modelDescendants =
203-
new HashMap<Class<?>, Map<String, GenericType>>();
201+
private static final Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
204202

205203
/**
206204
* Register a model class discriminator.

‎src/main/java/com/adyen/model/balanceplatform/AbstractOpenApiSchema.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,6 @@ public int hashCode() {
137137
* @return true if it's nullable
138138
*/
139139
public Boolean isNullable() {
140-
if (Boolean.TRUE.equals(isNullable)) {
141-
return Boolean.TRUE;
142-
} else {
143-
return Boolean.FALSE;
144-
}
140+
return Boolean.TRUE.equals(isNullable);
145141
}
146142
}

‎src/main/java/com/adyen/model/balanceplatform/JSON.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.adyen.serializer.ByteArraySerializer;
55
import com.fasterxml.jackson.annotation.*;
66
import com.fasterxml.jackson.databind.*;
7-
import com.fasterxml.jackson.databind.json.JsonMapper;
87
import com.fasterxml.jackson.databind.module.SimpleModule;
98
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
109
import jakarta.ws.rs.core.GenericType;
@@ -18,10 +17,10 @@
1817
public class JSON implements ContextResolver<ObjectMapper> {
1918
private static ObjectMapper mapper;
2019

21-
public JSON() {
20+
private JSON() {
2221
mapper = new ObjectMapper();
2322
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
24-
JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false);
23+
mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true);
2524
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
2625
mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true);
2726
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
@@ -69,7 +68,7 @@ public static ObjectMapper getMapper() {
6968
public static Class<?> getClassForElement(JsonNode node, Class<?> modelClass) {
7069
ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass);
7170
if (cdm != null) {
72-
return cdm.getClassForElement(node, new HashSet<Class<?>>());
71+
return cdm.getClassForElement(node, new HashSet<>());
7372
}
7473
return null;
7574
}
@@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping {
8786
ClassDiscriminatorMapping(Class<?> cls, String propertyName, Map<String, Class<?>> mappings) {
8887
modelClass = cls;
8988
discriminatorName = propertyName;
90-
discriminatorMappings = new HashMap<String, Class<?>>();
89+
discriminatorMappings = new HashMap<>();
9190
if (mappings != null) {
9291
discriminatorMappings.putAll(mappings);
9392
}
@@ -195,12 +194,11 @@ public static boolean isInstanceOf(
195194
}
196195

197196
/** A map of discriminators for all model classes. */
198-
private static Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators =
197+
private static final Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators =
199198
new HashMap<Class<?>, ClassDiscriminatorMapping>();
200199

201200
/** A map of oneOf/anyOf descendants for each model class. */
202-
private static Map<Class<?>, Map<String, GenericType>> modelDescendants =
203-
new HashMap<Class<?>, Map<String, GenericType>>();
201+
private static final Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
204202

205203
/**
206204
* Register a model class discriminator.

‎src/main/java/com/adyen/model/balancewebhooks/AbstractOpenApiSchema.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,6 @@ public int hashCode() {
137137
* @return true if it's nullable
138138
*/
139139
public Boolean isNullable() {
140-
if (Boolean.TRUE.equals(isNullable)) {
141-
return Boolean.TRUE;
142-
} else {
143-
return Boolean.FALSE;
144-
}
140+
return Boolean.TRUE.equals(isNullable);
145141
}
146142
}

‎src/main/java/com/adyen/model/balancewebhooks/JSON.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.adyen.serializer.ByteArraySerializer;
55
import com.fasterxml.jackson.annotation.*;
66
import com.fasterxml.jackson.databind.*;
7-
import com.fasterxml.jackson.databind.json.JsonMapper;
87
import com.fasterxml.jackson.databind.module.SimpleModule;
98
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
109
import jakarta.ws.rs.core.GenericType;
@@ -18,10 +17,10 @@
1817
public class JSON implements ContextResolver<ObjectMapper> {
1918
private static ObjectMapper mapper;
2019

21-
public JSON() {
20+
private JSON() {
2221
mapper = new ObjectMapper();
2322
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
24-
JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false);
23+
mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true);
2524
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
2625
mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true);
2726
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
@@ -69,7 +68,7 @@ public static ObjectMapper getMapper() {
6968
public static Class<?> getClassForElement(JsonNode node, Class<?> modelClass) {
7069
ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass);
7170
if (cdm != null) {
72-
return cdm.getClassForElement(node, new HashSet<Class<?>>());
71+
return cdm.getClassForElement(node, new HashSet<>());
7372
}
7473
return null;
7574
}
@@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping {
8786
ClassDiscriminatorMapping(Class<?> cls, String propertyName, Map<String, Class<?>> mappings) {
8887
modelClass = cls;
8988
discriminatorName = propertyName;
90-
discriminatorMappings = new HashMap<String, Class<?>>();
89+
discriminatorMappings = new HashMap<>();
9190
if (mappings != null) {
9291
discriminatorMappings.putAll(mappings);
9392
}
@@ -195,12 +194,11 @@ public static boolean isInstanceOf(
195194
}
196195

197196
/** A map of discriminators for all model classes. */
198-
private static Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators =
197+
private static final Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators =
199198
new HashMap<Class<?>, ClassDiscriminatorMapping>();
200199

201200
/** A map of oneOf/anyOf descendants for each model class. */
202-
private static Map<Class<?>, Map<String, GenericType>> modelDescendants =
203-
new HashMap<Class<?>, Map<String, GenericType>>();
201+
private static final Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
204202

205203
/**
206204
* Register a model class discriminator.

‎src/main/java/com/adyen/model/binlookup/AbstractOpenApiSchema.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,6 @@ public int hashCode() {
137137
* @return true if it's nullable
138138
*/
139139
public Boolean isNullable() {
140-
if (Boolean.TRUE.equals(isNullable)) {
141-
return Boolean.TRUE;
142-
} else {
143-
return Boolean.FALSE;
144-
}
140+
return Boolean.TRUE.equals(isNullable);
145141
}
146142
}

‎src/main/java/com/adyen/model/binlookup/JSON.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.adyen.serializer.ByteArraySerializer;
55
import com.fasterxml.jackson.annotation.*;
66
import com.fasterxml.jackson.databind.*;
7-
import com.fasterxml.jackson.databind.json.JsonMapper;
87
import com.fasterxml.jackson.databind.module.SimpleModule;
98
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
109
import jakarta.ws.rs.core.GenericType;
@@ -18,10 +17,10 @@
1817
public class JSON implements ContextResolver<ObjectMapper> {
1918
private static ObjectMapper mapper;
2019

21-
public JSON() {
20+
private JSON() {
2221
mapper = new ObjectMapper();
2322
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
24-
JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false);
23+
mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true);
2524
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
2625
mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true);
2726
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
@@ -69,7 +68,7 @@ public static ObjectMapper getMapper() {
6968
public static Class<?> getClassForElement(JsonNode node, Class<?> modelClass) {
7069
ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass);
7170
if (cdm != null) {
72-
return cdm.getClassForElement(node, new HashSet<Class<?>>());
71+
return cdm.getClassForElement(node, new HashSet<>());
7372
}
7473
return null;
7574
}
@@ -87,7 +86,7 @@ private static class ClassDiscriminatorMapping {
8786
ClassDiscriminatorMapping(Class<?> cls, String propertyName, Map<String, Class<?>> mappings) {
8887
modelClass = cls;
8988
discriminatorName = propertyName;
90-
discriminatorMappings = new HashMap<String, Class<?>>();
89+
discriminatorMappings = new HashMap<>();
9190
if (mappings != null) {
9291
discriminatorMappings.putAll(mappings);
9392
}
@@ -195,12 +194,11 @@ public static boolean isInstanceOf(
195194
}
196195

197196
/** A map of discriminators for all model classes. */
198-
private static Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators =
197+
private static final Map<Class<?>, ClassDiscriminatorMapping> modelDiscriminators =
199198
new HashMap<Class<?>, ClassDiscriminatorMapping>();
200199

201200
/** A map of oneOf/anyOf descendants for each model class. */
202-
private static Map<Class<?>, Map<String, GenericType>> modelDescendants =
203-
new HashMap<Class<?>, Map<String, GenericType>>();
201+
private static final Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
204202

205203
/**
206204
* Register a model class discriminator.

0 commit comments

Comments
 (0)