fixed linting issues

apimatic · Nov 14, 2024 · 98e6d73 · 98e6d73
1 parent d02220c
commit 98e6d73
Show file tree

Hide file tree

Showing 21 changed files with 183 additions and 131 deletions.
diff --git 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<T> {
     /**
      * Map to store additional properties.
      */
-    private final Map<String, T> additionalProperties = new LinkedHashMap<>();
+    private final Map<String, T> 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<String, T> 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);
     }
-}
+}
diff --git 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> S convertToSimpleType(Object value, Function<Object, S> conver
      *         fails.
      */
     @SuppressWarnings("unchecked")
-    public static <S> Map<String, S> convertToMap(Object value, Function<Object, S> conversionFunction) {
+    public static <S> Map<String, S> convertToMap(Object value,
+            Function<Object, S> conversionFunction) {
         if (value == null) {
             return null;
         }
@@ -72,7 +73,8 @@ public static <S> Map<String, S> convertToMap(Object value, Function<Object, S>
      *         conversion fails.
      */
     @SuppressWarnings("unchecked")
-    public static <S> List<S> convertToArray(Object value, Function<Object, S> conversionFunction) {
+    public static <S> List<S> convertToArray(Object value,
+            Function<Object, S> conversionFunction) {
         try {
             List<Object> valueList = (List<Object>) value;
             return valueList.stream().map(item -> convertToSimpleType(item, conversionFunction))
@@ -94,7 +96,8 @@ public static <S> List<S> convertToArray(Object value, Function<Object, S> conve
      *         conversion fails.
      */
     @SuppressWarnings("unchecked")
-    public static <S> List<Map<String, S>> convertToArrayOfMap(Object value, Function<Object, S> conversionFunction) {
+    public static <S> List<Map<String, S>> convertToArrayOfMap(Object value,
+            Function<Object, S> conversionFunction) {
         try {
             List<Object> valueList = (List<Object>) value;
             return valueList.stream().map(item -> convertToMap(item, conversionFunction))
@@ -116,7 +119,8 @@ public static <S> List<Map<String, S>> convertToArrayOfMap(Object value, Functio
      *         fails.
      */
     @SuppressWarnings("unchecked")
-    public static <S> Map<String, List<S>> convertToMapOfArray(Object value, Function<Object, S> conversionFunction) {
+    public static <S> Map<String, List<S>> convertToMapOfArray(Object value,
+            Function<Object, S> conversionFunction) {
         try {
             Map<String, Object> valueMap = (Map<String, Object>) value;
             return valueMap.entrySet().stream()
@@ -143,10 +147,12 @@ public static <S> Map<String, List<S>> convertToMapOfArray(Object value, Functio
      *         conversion fails.
      */
     @SuppressWarnings("unchecked")
-    public static <T, S> T convertToNDimensionalArray(Object value, Function<Object, S> conversionFunction,
+    public static <T, S> T convertToNDimensionalArray(Object value,
+            Function<Object, S> conversionFunction,
             int dimensionCount) {
         try {
-            return (T) convertToNDimensionalArrayInternal(value, conversionFunction, dimensionCount);
+            return (T) convertToNDimensionalArrayInternal(value,
+                    conversionFunction, dimensionCount);
         } catch (Exception e) {
             return null;
         }
@@ -164,20 +170,23 @@ public static <T, S> T convertToNDimensionalArray(Object value, Function<Object,
      *         conversion fails.
      */
     @SuppressWarnings("unchecked")
-    private static <S> List<?> convertToNDimensionalArrayInternal(Object value, Function<Object, S> conversionFunction,
+    private static <S> List<?> convertToNDimensionalArrayInternal(Object value,
+            Function<Object, S> conversionFunction,
             int dimensionCount) {
         try {
             if (dimensionCount == 1) {
                 return convertToArray(value, conversionFunction);
             } else if (dimensionCount > 1) {
                 List<Object> valueList = (List<Object>) 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;
     }
-}
+}
diff --git 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
@@ -44,4 +44,4 @@ private DateTimeConstants() {
 
     /** Year value for 1997. */
     public static final int YEAR1997 = 1997;
-}
+}
diff --git 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<List<List<List<Vehicle>>>> additionalProperties =
+    private AdditionalProperties<List<List<List<Vehicle>>>> additionalProperties =
             new AdditionalProperties<List<List<List<Vehicle>>>>(this.getClass());
 
     /**
@@ -68,10 +69,10 @@ private Map<String, List<List<List<Vehicle>>>> 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<List<List<Vehicle>>> 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
@@ -13,8 +13,9 @@
 
 public class ModelWith3dArrayOfPrimitiveAdditionalProperties {
 
+    private final static int ArrayDimension = 3;
     private String company;
-    protected AdditionalProperties<List<List<List<String>>>> additionalProperties =
+    private AdditionalProperties<List<List<List<String>>>> additionalProperties =
             new AdditionalProperties<List<List<List<String>>>>(this.getClass());
 
     /**
@@ -68,7 +69,8 @@ private Map<String, List<List<List<String>>>> 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<List<List<String>>> getAdditionalProperty(String key) {
      */
     @Override
     public String toString() {
-        return "ModelWith3dArrayOfPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]";
+        return "ModelWith3dArrayOfPrimitiveAdditionalProperties ["
+                + "company=" + company + additionalProperties + "]";
     }
 
     /**

diff --git a/...test/java/apimatic/core/models/ModelWithArrayOfMapOfNonPrimitiveAdditionalProperties.java b/...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<List<Map<String, Vehicle>>> additionalProperties =
+    private AdditionalProperties<List<Map<String, Vehicle>>> additionalProperties =
             new AdditionalProperties<List<Map<String, Vehicle>>>(this.getClass());
 
     /**
@@ -89,7 +90,8 @@ public List<Map<String, Vehicle>> 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
@@ -14,7 +14,7 @@
 public class ModelWithArrayOfMapOfPrimitiveAdditionalProperties {
 
     private String company;
-    protected AdditionalProperties<List<Map<String, String>>> additionalProperties =
+    private AdditionalProperties<List<Map<String, String>>> additionalProperties =
             new AdditionalProperties<List<Map<String, String>>>(this.getClass());
 
     /**
@@ -86,7 +86,8 @@ public List<Map<String, String>> 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
@@ -15,7 +15,7 @@
 public class ModelWithArrayOfNonPrimitiveAdditionalProperties {
 
     private String company;
-    protected AdditionalProperties<List<Vehicle>> additionalProperties =
+    private AdditionalProperties<List<Vehicle>> additionalProperties =
             new AdditionalProperties<List<Vehicle>>(this.getClass());
 
     /**
@@ -88,7 +88,8 @@ public List<Vehicle> 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
@@ -12,8 +12,9 @@
 import io.apimatic.core.utilities.ConversionHelper;
 
 public class ModelWithArrayOfPrimitiveAdditionalProperties {
+
     private String company;
-    protected AdditionalProperties<List<String>> additionalProperties =
+    private AdditionalProperties<List<String>> additionalProperties =
             new AdditionalProperties<List<String>>(this.getClass());
 
     /**
@@ -85,7 +86,8 @@ public List<String> 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
@@ -14,8 +14,9 @@
 import io.apimatic.core.utilities.LocalDateTimeHelper;
 
 public class ModelWithDateTimeAdditionalProperties {
+
     private String company;
-    protected AdditionalProperties<LocalDateTime> additionalProperties =
+    private AdditionalProperties<LocalDateTime> additionalProperties =
             new AdditionalProperties<LocalDateTime>(this.getClass());
 
     /**
@@ -68,7 +69,7 @@ private Map<String, LocalDateTime> 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/...test/java/apimatic/core/models/ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties.java b/...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<Map<String, List<Vehicle>>> additionalProperties =
+    private AdditionalProperties<Map<String, List<Vehicle>>> additionalProperties =
             new AdditionalProperties<Map<String, List<Vehicle>>>(this.getClass());
 
     /**
@@ -87,7 +88,8 @@ public Map<String, List<Vehicle>> getAdditionalProperty(String key) {
      */
     @Override
     public String toString() {
-        return "ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties [" + "company=" + company + additionalProperties + "]";
+        return "ModelWithMapOfArrayOfNonPrimitiveAdditionalProperties ["
+                + "company=" + company + additionalProperties + "]";
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,4 +44,4 @@ private DateTimeConstants() { @@
         /** Year value for 1997. */
         public static final int YEAR1997 = 1997;
-    }
+    }