fix(toString): improve output for additional properties using Map.ToS…

…tring (#119) - Refactor the ToString override to utilize Map.ToString Closes #118
apimatic · Dec 19, 2024 · 03d2cdb · 03d2cdb
1 parent 0b85743
commit 03d2cdb
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/src/main/java/io/apimatic/core/types/AdditionalProperties.java b/src/main/java/io/apimatic/core/types/AdditionalProperties.java
@@ -5,7 +5,6 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 
@@ -93,12 +92,7 @@ public void setAdditionalProperty(String key, T value, boolean skipNullValue) {
 
     @Override
     public String toString() {
-        if (properties.isEmpty()) {
-            return "";
-        }
-
-        return properties.entrySet().stream().map(entry -> entry.getKey() + "=" + entry.getValue())
-                .collect(Collectors.joining(", ", ", ", ""));
+        return properties.toString();
     }
 
     /**

diff --git a/src/test/java/apimatic/core/type/AdditionalPropertiesTest.java b/src/test/java/apimatic/core/type/AdditionalPropertiesTest.java
@@ -346,4 +346,29 @@ public Void mString(String actualValue) {
             }
         });
     }
+
+    @Test
+    public void testModelWithAdditionalPropertiesToString() throws IOException {
+        ModelWithPrimitiveAdditionalProperties simpleModel =
+                new ModelWithPrimitiveAdditionalProperties.Builder(
+                        "APIMatic").additionalProperty("name", "value").build();
+
+        final String actualSimpleModelToString =
+                "ModelWithPrimitiveAdditionalProperties [company=APIMatic{name=value}]";
+
+        assertEquals(simpleModel.toString(), actualSimpleModelToString);
+
+        ModelWithDateTimeAdditionalProperties dateTimeModel =
+                new ModelWithDateTimeAdditionalProperties.Builder("APIMatic")
+                        .additionalProperty("name",
+                                LocalDateTime.of(DateTimeConstants.YEAR2000, DateTimeConstants.JULY,
+                                        DateTimeConstants.DAY13, DateTimeConstants.HOUR6,
+                                        DateTimeConstants.MINUTES10))
+                        .build();
+
+        final String actualDateTimeModelToString =
+                "ModelWithDateTimeAdditionalProperties [company=APIMatic{name=2000-07-13T06:10}]";
+
+        assertEquals(dateTimeModel.toString(), actualDateTimeModelToString);
+    }
 }