From 98e6d73c54f54bb0489b330652934cf6417e6783 Mon Sep 17 00:00:00 2001 From: Muhammad Sufyan Date: Thu, 14 Nov 2024 16:15:55 +0500 Subject: [PATCH] fixed linting issues --- .../core/types/AdditionalProperties.java | 21 ++-- .../core/utilities/ConversionHelper.java | 31 +++-- .../apimatic/core/utilities/CoreHelper.java | 7 +- .../core/constants/DateTimeConstants.java | 2 +- ...rayOfNonPrimitiveAdditionalProperties.java | 10 +- ...dArrayOfPrimitiveAdditionalProperties.java | 9 +- ...MapOfNonPrimitiveAdditionalProperties.java | 6 +- ...yOfMapOfPrimitiveAdditionalProperties.java | 5 +- ...rayOfNonPrimitiveAdditionalProperties.java | 5 +- ...hArrayOfPrimitiveAdditionalProperties.java | 6 +- ...ModelWithDateTimeAdditionalProperties.java | 8 +- ...rayOfNonPrimitiveAdditionalProperties.java | 6 +- ...fArrayOfPrimitiveAdditionalProperties.java | 6 +- ...MapOfNonPrimitiveAdditionalProperties.java | 6 +- ...ithMapOfPrimitiveAdditionalProperties.java | 6 +- ...lWithNonPrimitiveAdditionalProperties.java | 6 +- ...odelWithPrimitiveAdditionalProperties.java | 6 +- ...ithTypeCombinatorAdditionalProperties.java | 6 +- .../core/type/AdditionalPropertiesTest.java | 8 +- .../core/utilities/ConversionHelperTest.java | 40 +++--- .../core/utilities/CoreHelperTest.java | 114 ++++++++++-------- 21 files changed, 183 insertions(+), 131 deletions(-) diff --git a/src/main/java/io/apimatic/core/types/AdditionalProperties.java b/src/main/java/io/apimatic/core/types/AdditionalProperties.java index 7c64788..72cdd34 100644 --- a/src/main/java/io/apimatic/core/types/AdditionalProperties.java +++ b/src/main/java/io/apimatic/core/types/AdditionalProperties.java @@ -19,7 +19,7 @@ public class AdditionalProperties { /** * Map to store additional properties. */ - private final Map additionalProperties = new LinkedHashMap<>(); + private final Map properties = new LinkedHashMap<>(); /** * Set to store model properties. @@ -35,10 +35,9 @@ public AdditionalProperties() { /** * Parameterized constructor. - * * @param classInstance The instance of the class with additional properties. */ - public AdditionalProperties(Class classInstance) { + public AdditionalProperties(final Class classInstance) { Method[] methods = classInstance.getMethods(); for (Method method : methods) { JsonGetter jsonGetter = method.getAnnotation(JsonGetter.class); @@ -50,16 +49,14 @@ public AdditionalProperties(Class classInstance) { /** * Gets the additional properties. - * * @return the map of additional properties. */ public Map getAdditionalProperties() { - return additionalProperties; + return properties; } /** * Sets an additional property. - * * @param key The key for the additional property. * @param value The value of the additional property. * @throws IllegalArgumentException if there is a conflict between the key and @@ -74,12 +71,11 @@ public void setAdditionalProperty(String key, T value) { throw new IllegalArgumentException( "Key '" + key + "' conflicts with a model property."); } - additionalProperties.put(key, value); + properties.put(key, value); } /** * Sets an additional property with an option to skip null values. - * * @param key The key for the additional property. * @param value The value of the additional property. * @param skipNullValue If true, null values will be skipped. @@ -95,21 +91,20 @@ public void setAdditionalProperty(String key, T value, boolean skipNullValue) { @Override public String toString() { - if (additionalProperties.isEmpty()) { + if (properties.isEmpty()) { return ""; } - return additionalProperties.entrySet().stream().map(entry -> entry.getKey() + "=" + entry.getValue()) + return properties.entrySet().stream().map(entry -> entry.getKey() + "=" + entry.getValue()) .collect(Collectors.joining(", ", ", ", "")); } /** * Gets an additional property by key. - * * @param key The key of the additional property to retrieve. * @return the value of the additional property associated with the given key, * or null if not found. */ public T getAdditionalProperty(String key) { - return additionalProperties.get(key); + return properties.get(key); } -} \ No newline at end of file +} diff --git a/src/main/java/io/apimatic/core/utilities/ConversionHelper.java b/src/main/java/io/apimatic/core/utilities/ConversionHelper.java index a3fa3ab..80cfa94 100644 --- a/src/main/java/io/apimatic/core/utilities/ConversionHelper.java +++ b/src/main/java/io/apimatic/core/utilities/ConversionHelper.java @@ -10,7 +10,7 @@ * A helper class for converting types of various structures supported in the * SDK. */ -public class ConversionHelper { +public final class ConversionHelper { /** * Private constructor to prevent instantiation of this utility class. @@ -45,7 +45,8 @@ public static S convertToSimpleType(Object value, Function conver * fails. */ @SuppressWarnings("unchecked") - public static Map convertToMap(Object value, Function conversionFunction) { + public static Map convertToMap(Object value, + Function conversionFunction) { if (value == null) { return null; } @@ -72,7 +73,8 @@ public static Map convertToMap(Object value, Function * conversion fails. */ @SuppressWarnings("unchecked") - public static List convertToArray(Object value, Function conversionFunction) { + public static List convertToArray(Object value, + Function conversionFunction) { try { List valueList = (List) value; return valueList.stream().map(item -> convertToSimpleType(item, conversionFunction)) @@ -94,7 +96,8 @@ public static List convertToArray(Object value, Function conve * conversion fails. */ @SuppressWarnings("unchecked") - public static List> convertToArrayOfMap(Object value, Function conversionFunction) { + public static List> convertToArrayOfMap(Object value, + Function conversionFunction) { try { List valueList = (List) value; return valueList.stream().map(item -> convertToMap(item, conversionFunction)) @@ -116,7 +119,8 @@ public static List> convertToArrayOfMap(Object value, Functio * fails. */ @SuppressWarnings("unchecked") - public static Map> convertToMapOfArray(Object value, Function conversionFunction) { + public static Map> convertToMapOfArray(Object value, + Function conversionFunction) { try { Map valueMap = (Map) value; return valueMap.entrySet().stream() @@ -143,10 +147,12 @@ public static Map> convertToMapOfArray(Object value, Functio * conversion fails. */ @SuppressWarnings("unchecked") - public static T convertToNDimensionalArray(Object value, Function conversionFunction, + public static T convertToNDimensionalArray(Object value, + Function conversionFunction, int dimensionCount) { try { - return (T) convertToNDimensionalArrayInternal(value, conversionFunction, dimensionCount); + return (T) convertToNDimensionalArrayInternal(value, + conversionFunction, dimensionCount); } catch (Exception e) { return null; } @@ -164,7 +170,8 @@ public static T convertToNDimensionalArray(Object value, Function List convertToNDimensionalArrayInternal(Object value, Function conversionFunction, + private static List convertToNDimensionalArrayInternal(Object value, + Function conversionFunction, int dimensionCount) { try { if (dimensionCount == 1) { @@ -172,12 +179,14 @@ private static List convertToNDimensionalArrayInternal(Object value, Func } else if (dimensionCount > 1) { List valueList = (List) value; return valueList.stream() - .map(item -> convertToNDimensionalArray(item, conversionFunction, dimensionCount - 1)) - .filter(item -> item != null && !((List) item).isEmpty()).collect(Collectors.toList()); + .map(item -> convertToNDimensionalArray(item, + conversionFunction, dimensionCount - 1)) + .filter(item -> item != null && !((List) item).isEmpty()) + .collect(Collectors.toList()); } } catch (Exception e) { // Ignoring exception to handle silently. } return null; } -} \ No newline at end of file +} diff --git a/src/main/java/io/apimatic/core/utilities/CoreHelper.java b/src/main/java/io/apimatic/core/utilities/CoreHelper.java index ecd199c..90e0698 100644 --- a/src/main/java/io/apimatic/core/utilities/CoreHelper.java +++ b/src/main/java/io/apimatic/core/utilities/CoreHelper.java @@ -1298,10 +1298,11 @@ private static void objectToList(String objName, Object obj, processed, arraySerializationFormat); } } else { - JsonSerializer serializer = getCollectionSerializer(serializerAnnotation); + JsonSerializer serializer = getCollectionSerializer( + serializerAnnotation); String serializedValue = serialize(value, serializer); - value = serializedValue != null ? - deserializeAsObject(serializedValue.toString()) : value; + value = serializedValue != null + ? deserializeAsObject(serializedValue.toString()) : value; objectToList(objName, (Map) value, objectList, processed, arraySerializationFormat); } diff --git a/src/test/java/apimatic/core/constants/DateTimeConstants.java b/src/test/java/apimatic/core/constants/DateTimeConstants.java index 3acdf4e..6442572 100644 --- a/src/test/java/apimatic/core/constants/DateTimeConstants.java +++ b/src/test/java/apimatic/core/constants/DateTimeConstants.java @@ -44,4 +44,4 @@ private DateTimeConstants() { /** Year value for 1997. */ public static final int YEAR1997 = 1997; -} \ No newline at end of file +} diff --git a/src/test/java/apimatic/core/models/ModelWith3dArrayOfNonPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWith3dArrayOfNonPrimitiveAdditionalProperties.java index 8e920f4..8945019 100644 --- a/src/test/java/apimatic/core/models/ModelWith3dArrayOfNonPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWith3dArrayOfNonPrimitiveAdditionalProperties.java @@ -14,8 +14,9 @@ public class ModelWith3dArrayOfNonPrimitiveAdditionalProperties { + private final static int ArrayDimension = 3; private String company; - protected AdditionalProperties>>> additionalProperties = + private AdditionalProperties>>> additionalProperties = new AdditionalProperties>>>(this.getClass()); /** @@ -68,10 +69,10 @@ private Map>>> getAdditionalProperties() { @JsonAnySetter private void setAdditionalProperties(String name, Object value) { additionalProperties.setAdditionalProperty(name, - ConversionHelper.convertToNDimensionalArray(value, + ConversionHelper.convertToNDimensionalArray(value, x -> CoreHelper.tryDeserialize( CoreHelper.trySerialize(x), Vehicle.class), - 3), + ArrayDimension), true); } @@ -90,7 +91,8 @@ public List>> getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWith3dArrayOfNonPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWith3dArrayOfNonPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWith3dArrayOfPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWith3dArrayOfPrimitiveAdditionalProperties.java index 0ef1bc5..9bdd981 100644 --- a/src/test/java/apimatic/core/models/ModelWith3dArrayOfPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWith3dArrayOfPrimitiveAdditionalProperties.java @@ -13,8 +13,9 @@ public class ModelWith3dArrayOfPrimitiveAdditionalProperties { + private final static int ArrayDimension = 3; private String company; - protected AdditionalProperties>>> additionalProperties = + private AdditionalProperties>>> additionalProperties = new AdditionalProperties>>>(this.getClass()); /** @@ -68,7 +69,8 @@ private Map>>> getAdditionalProperties() { private void setAdditionalProperties(String name, Object value) { additionalProperties.setAdditionalProperty(name, ConversionHelper.convertToNDimensionalArray(value, - x -> ((String) x), 3), + x -> ((String) x), + ArrayDimension), true); } @@ -87,7 +89,8 @@ public List>> getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWith3dArrayOfPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWith3dArrayOfPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties.java index fce0fd3..a6a88fb 100644 --- a/src/test/java/apimatic/core/models/ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties.java @@ -13,8 +13,9 @@ import io.apimatic.core.utilities.CoreHelper; public class ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties { + private String company; - protected AdditionalProperties>> additionalProperties = + private AdditionalProperties>> additionalProperties = new AdditionalProperties>>(this.getClass()); /** @@ -89,7 +90,8 @@ public List> getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithArrayOfMapOfPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithArrayOfMapOfPrimitiveAdditionalProperties.java index 0f698ba..cb08cbb 100644 --- a/src/test/java/apimatic/core/models/ModelWithArrayOfMapOfPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithArrayOfMapOfPrimitiveAdditionalProperties.java @@ -14,7 +14,7 @@ public class ModelWithArrayOfMapOfPrimitiveAdditionalProperties { private String company; - protected AdditionalProperties>> additionalProperties = + private AdditionalProperties>> additionalProperties = new AdditionalProperties>>(this.getClass()); /** @@ -86,7 +86,8 @@ public List> getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithArrayOfMapOfPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithArrayOfMapOfPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithArrayOfNonPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithArrayOfNonPrimitiveAdditionalProperties.java index 735cb64..49623ce 100644 --- a/src/test/java/apimatic/core/models/ModelWithArrayOfNonPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithArrayOfNonPrimitiveAdditionalProperties.java @@ -15,7 +15,7 @@ public class ModelWithArrayOfNonPrimitiveAdditionalProperties { private String company; - protected AdditionalProperties> additionalProperties = + private AdditionalProperties> additionalProperties = new AdditionalProperties>(this.getClass()); /** @@ -88,7 +88,8 @@ public List getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithArrayOfNonPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithArrayOfNonPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithArrayOfPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithArrayOfPrimitiveAdditionalProperties.java index 019e8fb..9a63352 100644 --- a/src/test/java/apimatic/core/models/ModelWithArrayOfPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithArrayOfPrimitiveAdditionalProperties.java @@ -12,8 +12,9 @@ import io.apimatic.core.utilities.ConversionHelper; public class ModelWithArrayOfPrimitiveAdditionalProperties { + private String company; - protected AdditionalProperties> additionalProperties = + private AdditionalProperties> additionalProperties = new AdditionalProperties>(this.getClass()); /** @@ -85,7 +86,8 @@ public List getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithArrayOfPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithArrayOfPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithDateTimeAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithDateTimeAdditionalProperties.java index 121b575..198967e 100644 --- a/src/test/java/apimatic/core/models/ModelWithDateTimeAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithDateTimeAdditionalProperties.java @@ -14,8 +14,9 @@ import io.apimatic.core.utilities.LocalDateTimeHelper; public class ModelWithDateTimeAdditionalProperties { + private String company; - protected AdditionalProperties additionalProperties = + private AdditionalProperties additionalProperties = new AdditionalProperties(this.getClass()); /** @@ -68,7 +69,7 @@ private Map getAdditionalProperties() { @JsonAnySetter private void setAdditionalProperties(String name, Object value) { additionalProperties.setAdditionalProperty(name, - ConversionHelper.convertToSimpleType(value, + ConversionHelper.convertToSimpleType(value, x -> LocalDateTimeHelper.fromRfc1123DateTime(String.valueOf(x))), true); } @@ -88,7 +89,8 @@ public LocalDateTime getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithDateTimeAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithDateTimeAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties.java index 26f55da..df1fcee 100644 --- a/src/test/java/apimatic/core/models/ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties.java @@ -13,8 +13,9 @@ import io.apimatic.core.utilities.CoreHelper; public class ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties { + private String company; - protected AdditionalProperties>> additionalProperties = + private AdditionalProperties>> additionalProperties = new AdditionalProperties>>(this.getClass()); /** @@ -87,7 +88,8 @@ public Map> getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithMapOfArrayOfPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithMapOfArrayOfPrimitiveAdditionalProperties.java index 8d1d270..938a6b4 100644 --- a/src/test/java/apimatic/core/models/ModelWithMapOfArrayOfPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithMapOfArrayOfPrimitiveAdditionalProperties.java @@ -12,8 +12,9 @@ import io.apimatic.core.utilities.ConversionHelper; public class ModelWithMapOfArrayOfPrimitiveAdditionalProperties { + private String company; - protected AdditionalProperties>> additionalProperties = + private AdditionalProperties>> additionalProperties = new AdditionalProperties>>(this.getClass()); /** @@ -85,7 +86,8 @@ public Map> getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithMapOfArrayOfPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithMapOfArrayOfPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithMapOfNonPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithMapOfNonPrimitiveAdditionalProperties.java index 727b627..a9eccbe 100644 --- a/src/test/java/apimatic/core/models/ModelWithMapOfNonPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithMapOfNonPrimitiveAdditionalProperties.java @@ -12,8 +12,9 @@ import io.apimatic.core.utilities.CoreHelper; public class ModelWithMapOfNonPrimitiveAdditionalProperties { + private String company; - protected AdditionalProperties> additionalProperties = + private AdditionalProperties> additionalProperties = new AdditionalProperties>(this.getClass()); /** @@ -86,7 +87,8 @@ public Map getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithMapOfNonPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithMapOfNonPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithMapOfPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithMapOfPrimitiveAdditionalProperties.java index ab80a3e..610b992 100644 --- a/src/test/java/apimatic/core/models/ModelWithMapOfPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithMapOfPrimitiveAdditionalProperties.java @@ -11,8 +11,9 @@ import io.apimatic.core.utilities.ConversionHelper; public class ModelWithMapOfPrimitiveAdditionalProperties { + private String company; - protected AdditionalProperties> additionalProperties = + private AdditionalProperties> additionalProperties = new AdditionalProperties>(this.getClass()); /** @@ -84,7 +85,8 @@ public Map getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithMapOfPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithMapOfPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithNonPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithNonPrimitiveAdditionalProperties.java index 617d2b1..4e6af50 100644 --- a/src/test/java/apimatic/core/models/ModelWithNonPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithNonPrimitiveAdditionalProperties.java @@ -12,8 +12,9 @@ import io.apimatic.core.utilities.CoreHelper; public class ModelWithNonPrimitiveAdditionalProperties { + private String company; - protected AdditionalProperties additionalProperties = + private AdditionalProperties additionalProperties = new AdditionalProperties(this.getClass()); /** @@ -86,7 +87,8 @@ public Vehicle getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithNonPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithNonPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithPrimitiveAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithPrimitiveAdditionalProperties.java index 1be15b0..c620a33 100644 --- a/src/test/java/apimatic/core/models/ModelWithPrimitiveAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithPrimitiveAdditionalProperties.java @@ -11,8 +11,9 @@ import io.apimatic.core.utilities.ConversionHelper; public class ModelWithPrimitiveAdditionalProperties { + private String company; - protected AdditionalProperties additionalProperties = + private AdditionalProperties additionalProperties = new AdditionalProperties(this.getClass()); /** @@ -84,7 +85,8 @@ public String getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithPrimitiveAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/models/ModelWithTypeCombinatorAdditionalProperties.java b/src/test/java/apimatic/core/models/ModelWithTypeCombinatorAdditionalProperties.java index 50864a7..6180bc6 100644 --- a/src/test/java/apimatic/core/models/ModelWithTypeCombinatorAdditionalProperties.java +++ b/src/test/java/apimatic/core/models/ModelWithTypeCombinatorAdditionalProperties.java @@ -13,8 +13,9 @@ import io.apimatic.core.utilities.CoreHelper; public class ModelWithTypeCombinatorAdditionalProperties { + private String company; - protected AdditionalProperties additionalProperties = + private AdditionalProperties additionalProperties = new AdditionalProperties(this.getClass()); /** @@ -87,7 +88,8 @@ public SendScalarParamBody getAdditionalProperty(String key) { */ @Override public String toString() { - return "ModelWithTypeCombinatorAdditionalProperties [" + "company=" + company + additionalProperties + "]"; + return "ModelWithTypeCombinatorAdditionalProperties [" + + "company=" + company + additionalProperties + "]"; } /** diff --git a/src/test/java/apimatic/core/type/AdditionalPropertiesTest.java b/src/test/java/apimatic/core/type/AdditionalPropertiesTest.java index 657b2a4..091411c 100644 --- a/src/test/java/apimatic/core/type/AdditionalPropertiesTest.java +++ b/src/test/java/apimatic/core/type/AdditionalPropertiesTest.java @@ -297,18 +297,18 @@ public void test3DArrayAdditionalProperties() throws IOException { @Test public void testTypeCombinatorAdditionalProperties() throws IOException { - final Double Item1 = 100.11; - final Double Item2 = 133.00; + final Double item1 = 100.11; + final Double item2 = 133.00; // Case A ModelWithTypeCombinatorAdditionalProperties model = new ModelWithTypeCombinatorAdditionalProperties.Builder("APIMatic") .additionalProperty("name", SendScalarParamBody.fromPrecision( - Arrays.asList(Item1, Item2))) + Arrays.asList(item1, item2))) .build(); ModelWithTypeCombinatorAdditionalProperties actualModel = CoreHelper.deserialize( CoreHelper.serialize(model), ModelWithTypeCombinatorAdditionalProperties.class); - List expectedListValue = Arrays.asList(Item1, Item2); + List expectedListValue = Arrays.asList(item1, item2); actualModel.getAdditionalProperty("name").match(new SendScalarParamBody.Cases() { @Override diff --git a/src/test/java/apimatic/core/utilities/ConversionHelperTest.java b/src/test/java/apimatic/core/utilities/ConversionHelperTest.java index 86469bd..c71c839 100644 --- a/src/test/java/apimatic/core/utilities/ConversionHelperTest.java +++ b/src/test/java/apimatic/core/utilities/ConversionHelperTest.java @@ -31,7 +31,7 @@ public class ConversionHelperTest { private static final int DIMENSION_TWO = 2; // Helper function for conversion - private static final Function ToInteger = value -> { + private static final Function To_Integer = value -> { if (value instanceof Number) { return ((Number) value).intValue(); } @@ -40,12 +40,12 @@ public class ConversionHelperTest { @Test public void testConvertToSimpleTypeSuccess() { - assertEquals(TEST_INTEGER_FIVE, ConversionHelper.convertToSimpleType(5, ToInteger)); + assertEquals(TEST_INTEGER_FIVE, ConversionHelper.convertToSimpleType(TEST_INTEGER_FIVE, To_Integer)); } @Test public void testConvertToSimpleTypeNullConversionFunction() { - assertNull(ConversionHelper.convertToSimpleType("test", ToInteger)); + assertNull(ConversionHelper.convertToSimpleType("test", To_Integer)); } @Test @@ -53,7 +53,7 @@ public void testConvertToMapSuccess() { Map input = new HashMap<>(); input.put(KEY_ONE, EXPECTED_INTEGER_ONE); input.put(KEY_TWO, EXPECTED_INTEGER_TWO); - Map result = ConversionHelper.convertToMap(input, ToInteger); + Map result = ConversionHelper.convertToMap(input, To_Integer); assertEquals(EXPECTED_SIZE_TWO, result.size()); assertEquals(EXPECTED_INTEGER_ONE, result.get(KEY_ONE)); assertEquals(EXPECTED_INTEGER_TWO, result.get(KEY_TWO)); @@ -64,7 +64,7 @@ public void testConvertToMapSkipsUnconvertibleValues() { Map input = new HashMap<>(); input.put(KEY_ONE, EXPECTED_INTEGER_ONE); input.put(KEY_TWO, NON_INTEGER_VALUE); - Map result = ConversionHelper.convertToMap(input, ToInteger); + Map result = ConversionHelper.convertToMap(input, To_Integer); assertEquals(EXPECTED_SIZE_ONE, result.size()); assertEquals(EXPECTED_INTEGER_ONE, result.get(KEY_ONE)); assertNull(result.get(KEY_TWO)); @@ -72,14 +72,14 @@ public void testConvertToMapSkipsUnconvertibleValues() { @Test public void testConvertToMapNullInput() { - assertNull(ConversionHelper.convertToMap(null, ToInteger)); + assertNull(ConversionHelper.convertToMap(null, To_Integer)); } @Test public void testConvertToArraySuccess() { List input = Arrays.asList(EXPECTED_INTEGER_ONE, EXPECTED_INTEGER_TWO, EXPECTED_INTEGER_THREE); - List result = ConversionHelper.convertToArray(input, ToInteger); + List result = ConversionHelper.convertToArray(input, To_Integer); assertEquals(Arrays.asList(EXPECTED_INTEGER_ONE, EXPECTED_INTEGER_TWO, EXPECTED_INTEGER_THREE), result); } @@ -88,13 +88,13 @@ public void testConvertToArraySuccess() { public void testConvertToArraySkipsUnconvertibleItems() { List input = Arrays.asList(EXPECTED_INTEGER_ONE, NON_INTEGER_VALUE, EXPECTED_INTEGER_THREE); - List result = ConversionHelper.convertToArray(input, ToInteger); + List result = ConversionHelper.convertToArray(input, To_Integer); assertEquals(Arrays.asList(EXPECTED_INTEGER_ONE, EXPECTED_INTEGER_THREE), result); } @Test public void testConvertToArrayNullInput() { - assertNull(ConversionHelper.convertToArray(null, ToInteger)); + assertNull(ConversionHelper.convertToArray(null, To_Integer)); } @Test @@ -103,7 +103,7 @@ public void testConvertToArrayOfMapSuccess() { Map map1 = new HashMap<>(); map1.put(KEY_ONE, EXPECTED_INTEGER_ONE); input.add(map1); - List> result = ConversionHelper.convertToArrayOfMap(input, ToInteger); + List> result = ConversionHelper.convertToArrayOfMap(input, To_Integer); assertEquals(EXPECTED_SIZE_ONE, result.size()); assertEquals(EXPECTED_INTEGER_ONE, result.get(0).get(KEY_ONE)); } @@ -117,21 +117,21 @@ public void testConvertToArrayOfMapSkipsEmptyAndUnconvertibleMaps() { map2.put(KEY_TWO, NON_INTEGER_VALUE); input.add(map1); input.add(map2); - List> result = ConversionHelper.convertToArrayOfMap(input, ToInteger); + List> result = ConversionHelper.convertToArrayOfMap(input, To_Integer); assertEquals(EXPECTED_SIZE_ONE, result.size()); assertEquals(EXPECTED_INTEGER_ONE, result.get(0).get(KEY_ONE)); } @Test public void testConvertToArrayOfMapNullInput() { - assertNull(ConversionHelper.convertToArrayOfMap(null, ToInteger)); + assertNull(ConversionHelper.convertToArrayOfMap(null, To_Integer)); } @Test public void testConvertToMapOfArraySuccess() { Map input = new HashMap<>(); input.put(KEY_ONE, Arrays.asList(EXPECTED_INTEGER_ONE, EXPECTED_INTEGER_TWO)); - Map> result = ConversionHelper.convertToMapOfArray(input, ToInteger); + Map> result = ConversionHelper.convertToMapOfArray(input, To_Integer); assertEquals(EXPECTED_SIZE_ONE, result.size()); assertEquals(Arrays.asList(EXPECTED_INTEGER_ONE, EXPECTED_INTEGER_TWO), result.get(KEY_ONE)); @@ -143,7 +143,7 @@ public void testConvertToMapOfArraySkipsEmptyAndUnconvertibleArrays() { input.put(KEY_ONE, Arrays.asList(EXPECTED_INTEGER_ONE, NON_INTEGER_VALUE, EXPECTED_INTEGER_THREE)); input.put(KEY_TWO, Arrays.asList(NON_INTEGER_VALUE)); - Map> result = ConversionHelper.convertToMapOfArray(input, ToInteger); + Map> result = ConversionHelper.convertToMapOfArray(input, To_Integer); assertEquals(EXPECTED_SIZE_ONE, result.size()); assertEquals(Arrays.asList(EXPECTED_INTEGER_ONE, EXPECTED_INTEGER_THREE), result.get(KEY_ONE)); @@ -151,7 +151,7 @@ public void testConvertToMapOfArraySkipsEmptyAndUnconvertibleArrays() { @Test public void testConvertToMapOfArrayNullInput() { - assertNull(ConversionHelper.convertToMapOfArray(null, ToInteger)); + assertNull(ConversionHelper.convertToMapOfArray(null, To_Integer)); } @Test @@ -159,7 +159,7 @@ public void testConvertToNDimensionalArray1DArray() { List input = Arrays.asList(EXPECTED_INTEGER_ONE, EXPECTED_INTEGER_TWO, EXPECTED_INTEGER_THREE); List result = ConversionHelper.convertToNDimensionalArray(input, - ToInteger, DIMENSION_ONE); + To_Integer, DIMENSION_ONE); assertEquals(Arrays.asList(EXPECTED_INTEGER_ONE, EXPECTED_INTEGER_TWO, EXPECTED_INTEGER_THREE), result); } @@ -170,7 +170,7 @@ public void testConvertToNDimensionalArray2DArray() { Arrays.asList(EXPECTED_INTEGER_ONE, EXPECTED_INTEGER_TWO), Arrays.asList(EXPECTED_INTEGER_THREE, EXPECTED_INTEGER_FOUR)); List> result = ConversionHelper.convertToNDimensionalArray(input, - ToInteger, DIMENSION_TWO); + To_Integer, DIMENSION_TWO); assertEquals(Arrays.asList(Arrays.asList(EXPECTED_INTEGER_ONE, EXPECTED_INTEGER_TWO), Arrays.asList(EXPECTED_INTEGER_THREE, EXPECTED_INTEGER_FOUR)), result); } @@ -180,13 +180,13 @@ public void testConvertToNDimensionalArraySkipsEmptyAndUnconvertibleItems() { List input = Arrays.asList(Arrays.asList(EXPECTED_INTEGER_ONE, NON_INTEGER_VALUE), Arrays.asList(EXPECTED_INTEGER_THREE, EXPECTED_INTEGER_FOUR)); List> result = ConversionHelper.convertToNDimensionalArray(input, - ToInteger, DIMENSION_TWO); + To_Integer, DIMENSION_TWO); assertEquals(Arrays.asList(Arrays.asList(EXPECTED_INTEGER_ONE), Arrays.asList(EXPECTED_INTEGER_THREE, EXPECTED_INTEGER_FOUR)), result); } @Test public void testConvertToNDimensionalArrayNullInput() { - assertNull(ConversionHelper.convertToNDimensionalArray(null, ToInteger, DIMENSION_TWO)); + assertNull(ConversionHelper.convertToNDimensionalArray(null, To_Integer, DIMENSION_TWO)); } -} \ No newline at end of file +} diff --git a/src/test/java/apimatic/core/utilities/CoreHelperTest.java b/src/test/java/apimatic/core/utilities/CoreHelperTest.java index 1f0647e..92d1d3c 100644 --- a/src/test/java/apimatic/core/utilities/CoreHelperTest.java +++ b/src/test/java/apimatic/core/utilities/CoreHelperTest.java @@ -721,11 +721,12 @@ public void testPrepareFormFieldsModel() { ArraySerializationFormat.INDEXED); assertEquals(actual, expected); } - + @SuppressWarnings("serial") @Test public void testPrepareFormFieldsPrimitiveAdditionalPropertiesModel() { - ModelWithPrimitiveAdditionalProperties simple = new ModelWithPrimitiveAdditionalProperties.Builder("APIMatic") + ModelWithPrimitiveAdditionalProperties simple = + new ModelWithPrimitiveAdditionalProperties.Builder("APIMatic") .additionalProperty("name", "value").build(); Map formParameters = new HashMap<>(); formParameters.put("body", simple); @@ -740,8 +741,9 @@ public void testPrepareFormFieldsPrimitiveAdditionalPropertiesModel() { assertEquals(expected, actual); // Array of primitive types - ModelWithArrayOfPrimitiveAdditionalProperties array = new ModelWithArrayOfPrimitiveAdditionalProperties.Builder( - "APIMatic").additionalProperty("name", Arrays.asList("value1", "value2")).build(); + ModelWithArrayOfPrimitiveAdditionalProperties array = + new ModelWithArrayOfPrimitiveAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", Arrays.asList("value1", "value2")).build(); formParameters = new HashMap<>(); formParameters.put("body", array); @@ -760,8 +762,9 @@ public void testPrepareFormFieldsPrimitiveAdditionalPropertiesModel() { put("key2", "value2"); } }; - ModelWithMapOfPrimitiveAdditionalProperties map = new ModelWithMapOfPrimitiveAdditionalProperties.Builder( - "APIMatic").additionalProperty("name", primitiveAdditionalProperties).build(); + ModelWithMapOfPrimitiveAdditionalProperties map = + new ModelWithMapOfPrimitiveAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", primitiveAdditionalProperties).build(); formParameters = new HashMap<>(); formParameters.put("body", map); @@ -774,8 +777,9 @@ public void testPrepareFormFieldsPrimitiveAdditionalPropertiesModel() { assertEquals(expected, actual); // Array of Map of primitive types - ModelWithArrayOfMapOfPrimitiveAdditionalProperties arrayOfMap = new ModelWithArrayOfMapOfPrimitiveAdditionalProperties.Builder( - "APIMatic").additionalProperty("name", Arrays.asList(primitiveAdditionalProperties)).build(); + ModelWithArrayOfMapOfPrimitiveAdditionalProperties arrayOfMap = + new ModelWithArrayOfMapOfPrimitiveAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", Arrays.asList(primitiveAdditionalProperties)).build(); formParameters = new HashMap<>(); formParameters.put("body", arrayOfMap); @@ -794,8 +798,9 @@ public void testPrepareFormFieldsPrimitiveAdditionalPropertiesModel() { put("key2", Arrays.asList("value1", "value2")); } }; - ModelWithMapOfArrayOfPrimitiveAdditionalProperties mapOfArray = new ModelWithMapOfArrayOfPrimitiveAdditionalProperties.Builder( - "APIMatic").additionalProperty("name", arrayAdditionalProperties).build(); + ModelWithMapOfArrayOfPrimitiveAdditionalProperties mapOfArray = + new ModelWithMapOfArrayOfPrimitiveAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", arrayAdditionalProperties).build(); formParameters = new HashMap<>(); formParameters.put("body", mapOfArray); @@ -810,9 +815,11 @@ public void testPrepareFormFieldsPrimitiveAdditionalPropertiesModel() { assertEquals(expected, actual); // 3D Array of primitive types - ModelWith3dArrayOfPrimitiveAdditionalProperties array3D = new ModelWith3dArrayOfPrimitiveAdditionalProperties.Builder( - "APIMatic").additionalProperty("name", Arrays.asList(Arrays.asList(Arrays.asList("value1", "value2")))) - .build(); + ModelWith3dArrayOfPrimitiveAdditionalProperties array3D = + new ModelWith3dArrayOfPrimitiveAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", Arrays.asList(Arrays.asList( + Arrays.asList("value1", "value2")))) + .build(); formParameters = new HashMap<>(); formParameters.put("body", array3D); @@ -824,18 +831,20 @@ public void testPrepareFormFieldsPrimitiveAdditionalPropertiesModel() { actual.sort(Comparator.comparing(SimpleEntry::getKey)); assertEquals(expected, actual); - ModelWithDateTimeAdditionalProperties dateTimeModel = new ModelWithDateTimeAdditionalProperties.Builder( - "APIMatic") - .additionalProperty("name", - LocalDateTime.of(DateTimeConstants.YEAR2000, DateTimeConstants.JULY, - DateTimeConstants.DAY13, DateTimeConstants.HOUR6, DateTimeConstants.MINUTES10)) - .build(); + ModelWithDateTimeAdditionalProperties dateTimeModel = + new ModelWithDateTimeAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", + LocalDateTime.of(DateTimeConstants.YEAR2000, DateTimeConstants.JULY, + DateTimeConstants.DAY13, DateTimeConstants.HOUR6, + DateTimeConstants.MINUTES10)) + .build(); formParameters = new HashMap<>(); formParameters.put("body", dateTimeModel); expected = new ArrayList>(); expected.add(new SimpleEntry("body[company]", "APIMatic")); - expected.add(new SimpleEntry("body[name]", "Thu, 13 Jul 2000 06:10:00 GMT")); + expected.add(new SimpleEntry("body[name]", + "Thu, 13 Jul 2000 06:10:00 GMT")); actual = CoreHelper.prepareFormFields(formParameters, ArraySerializationFormat.INDEXED); actual.sort(Comparator.comparing(SimpleEntry::getKey)); assertEquals(expected, actual); @@ -844,8 +853,9 @@ public void testPrepareFormFieldsPrimitiveAdditionalPropertiesModel() { @SuppressWarnings("serial") @Test public void testPrepareFormFieldsNonPrimitiveAdditionalPropertiesModel() { - ModelWithNonPrimitiveAdditionalProperties simpleModel = new ModelWithNonPrimitiveAdditionalProperties.Builder( - "APIMatic").additionalProperty("name", new Vehicle.Builder("4").build()).build(); + ModelWithNonPrimitiveAdditionalProperties simpleModel = + new ModelWithNonPrimitiveAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", new Vehicle.Builder("4").build()).build(); Map formParameters = new HashMap<>(); formParameters.put("body", simpleModel); @@ -859,11 +869,11 @@ public void testPrepareFormFieldsNonPrimitiveAdditionalPropertiesModel() { assertEquals(expected, actual); // Array of non primitive types - ModelWithArrayOfNonPrimitiveAdditionalProperties array = new ModelWithArrayOfNonPrimitiveAdditionalProperties.Builder( - "APIMatic") - .additionalProperty("name", - Arrays.asList(new Vehicle.Builder("4").build(), new Vehicle.Builder("5").build())) - .build(); + ModelWithArrayOfNonPrimitiveAdditionalProperties array = + new ModelWithArrayOfNonPrimitiveAdditionalProperties.Builder("APIMatic") + .additionalProperty("name",Arrays.asList( + new Vehicle.Builder("4").build(), new Vehicle.Builder("5").build())) + .build(); formParameters = new HashMap<>(); formParameters.put("body", array); @@ -882,8 +892,9 @@ public void testPrepareFormFieldsNonPrimitiveAdditionalPropertiesModel() { put("key2", new Vehicle.Builder("5").build()); } }; - ModelWithMapOfNonPrimitiveAdditionalProperties map = new ModelWithMapOfNonPrimitiveAdditionalProperties.Builder( - "APIMatic").additionalProperty("name", nonPrimitiveAdditionalProperties).build(); + ModelWithMapOfNonPrimitiveAdditionalProperties map = + new ModelWithMapOfNonPrimitiveAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", nonPrimitiveAdditionalProperties).build(); formParameters = new HashMap<>(); formParameters.put("body", map); @@ -896,8 +907,10 @@ public void testPrepareFormFieldsNonPrimitiveAdditionalPropertiesModel() { assertEquals(expected, actual); // Array of Map of non primitive types - ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties arrayOfMap = new ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties.Builder( - "APIMatic").additionalProperty("name", Arrays.asList(nonPrimitiveAdditionalProperties)).build(); + ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties arrayOfMap = + new ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", Arrays.asList(nonPrimitiveAdditionalProperties)) + .build(); formParameters = new HashMap<>(); formParameters.put("body", arrayOfMap); @@ -910,14 +923,16 @@ public void testPrepareFormFieldsNonPrimitiveAdditionalPropertiesModel() { assertEquals(expected, actual); // Map of Array of non primitive types - Map> arrayNonPrimitiveAdditionalProperties = new HashMap>() { + Map> arrayNonPrimitiveAdditionalProperties = + new HashMap>() { { put("key1", Arrays.asList(new Vehicle.Builder("4").build())); put("key2", Arrays.asList(new Vehicle.Builder("5").build())); } }; - ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties mapOfArray = new ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties.Builder( - "APIMatic").additionalProperty("name", arrayNonPrimitiveAdditionalProperties).build(); + ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties mapOfArray = + new ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", arrayNonPrimitiveAdditionalProperties).build(); formParameters = new HashMap<>(); formParameters.put("body", mapOfArray); @@ -930,12 +945,11 @@ public void testPrepareFormFieldsNonPrimitiveAdditionalPropertiesModel() { assertEquals(expected, actual); // 3D Array of non primitive types - ModelWith3dArrayOfNonPrimitiveAdditionalProperties array3D = new ModelWith3dArrayOfNonPrimitiveAdditionalProperties.Builder( - "APIMatic").additionalProperty( - "name", - Arrays.asList(Arrays.asList( - Arrays.asList(new Vehicle.Builder("4").build(), new Vehicle.Builder("5").build())))) - .build(); + ModelWith3dArrayOfNonPrimitiveAdditionalProperties array3D = + new ModelWith3dArrayOfNonPrimitiveAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", Arrays.asList(Arrays.asList(Arrays.asList( + new Vehicle.Builder("4").build(), new Vehicle.Builder("5").build())))) + .build(); formParameters = new HashMap<>(); formParameters.put("body", array3D); @@ -948,23 +962,29 @@ public void testPrepareFormFieldsNonPrimitiveAdditionalPropertiesModel() { assertEquals(expected, actual); // oneOf/anyOf cases - ModelWithTypeCombinatorAdditionalProperties typeCombinatorAModel = new ModelWithTypeCombinatorAdditionalProperties.Builder( - "APIMatic").additionalProperty("name", SendScalarParamBody.fromPrecision(Arrays.asList(100.11, 133.00))) - .build(); + final Double item1 = 100.11; + final Double item2 = 133.0; + ModelWithTypeCombinatorAdditionalProperties typeCombinatorAModel = + new ModelWithTypeCombinatorAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", SendScalarParamBody.fromPrecision( + Arrays.asList(item1, item2))) + .build(); formParameters = new HashMap<>(); formParameters.put("body", typeCombinatorAModel); expected = new ArrayList>(); expected.add(new SimpleEntry("body[company]", "APIMatic")); - expected.add(new SimpleEntry("body[name][0]", 100.11)); - expected.add(new SimpleEntry("body[name][1]", 133.0)); + expected.add(new SimpleEntry("body[name][0]", item1)); + expected.add(new SimpleEntry("body[name][1]", item2)); actual = CoreHelper.prepareFormFields(formParameters, ArraySerializationFormat.INDEXED); actual.sort(Comparator.comparing(SimpleEntry::getKey)); assertEquals(expected, actual); - ModelWithTypeCombinatorAdditionalProperties typeCombinatorBModel = new ModelWithTypeCombinatorAdditionalProperties.Builder( - "APIMatic").additionalProperty("name", SendScalarParamBody.fromMString("value")).build(); + ModelWithTypeCombinatorAdditionalProperties typeCombinatorBModel = + new ModelWithTypeCombinatorAdditionalProperties.Builder("APIMatic") + .additionalProperty("name", SendScalarParamBody.fromMString("value")) + .build(); formParameters = new HashMap<>(); formParameters.put("body", typeCombinatorBModel);