Merge branch 'develop' of github.com:polyapi/polyapi-java into develop

Author: gastonortiz

README.md

@@ -1,6 +1,5 @@
 # Java Client Library (beta)
 
-### Latest snapshot version v0.8.0-SNAPSHOT
 ### Latest released version v0.7.0
 
 ## Introduction
@@ -315,8 +314,9 @@ Comparing to its Typescript counterpart, the Java library is still missing the f
 These features will be added in the future releases.
 
 ## Changelog
-### v0.8.0
-- Added automatic update of API and Server functions option.
+### v0.7.1
+- Fixed bug about having duplicate schema types with the same name.
+- Improved minor code issues.
 ### v0.7.0
 - Added ability to handle headers and params on webhook triggers.
 ### v0.6.0

commons/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.polyapi</groupId>
         <artifactId>parent-pom</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath>../parent-pom</relativePath>
     </parent>
 

library/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.polyapi</groupId>
         <artifactId>parent-pom</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath>../parent-pom</relativePath>
     </parent>
     <artifactId>library</artifactId>

parent-pom/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.polyapi</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Poly API Java parent POM</name>
     <url>https://polyapi.io</url>

polyapi-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.polyapi</groupId>
         <artifactId>parent-pom</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath>../parent-pom</relativePath>
     </parent>
     <artifactId>polyapi-maven-plugin</artifactId>

polyapi-maven-plugin/src/main/java/io/polyapi/plugin/utils/StringUtils.java

@@ -1,21 +1,22 @@
 package io.polyapi.plugin.utils;
 
+import java.util.Optional;
+
 import static java.util.function.Predicate.not;
 import static org.apache.commons.text.WordUtils.capitalize;
 import static org.apache.commons.text.WordUtils.uncapitalize;
 
-import java.util.Optional;
-
 public class StringUtils {
     private static final char[] DELIMITERS = new char[]{' ', '_', '-', '.'};
     private StringUtils() {
         // Do nothing.
     }
 
     public static String toPascalCase(String input) {
+
         return Optional.ofNullable(input)
                 .filter(not(String::isBlank))
-                .map(value -> capitalize(input, DELIMITERS).replaceAll("[_\\-\\.\s]", ""))
+                .map(value -> capitalize(input, DELIMITERS).replaceAll("[\\-\\.\s]", ""))
                 .orElse(input);
     }
 

polyapi-maven-plugin/src/test/java/io/polyapi/plugin/service/JsonSchemaParserTest.java

@@ -38,8 +38,10 @@ public static Stream<Arguments> generateSource() {
                 createArguments(11, "Schema that uses allof."),
                 createArguments(12, "Schema with enum with '-' in one of the options.", "Identifier", "TestResponse"),
                 createArguments(13, "Schema with different types that have the same enum.", "Identifier", DEFAULT_RESPONSE_NAME, "Data"),
-                createArguments(14, "Schema that is an Integer."));
+                createArguments(14, "Schema that is an Integer."),
+                createArguments(15, "Schema with multiple enums with the same name and properties.", DEFAULT_RESPONSE_NAME, "DashMinusstyle", "DashMinusstyle_", "Other"));
     }
+
     public static Stream<Arguments> getTypeSource() {
         return Stream.of(Arguments.of(1, "Simple recursive schema with no base type.", createClassName(DEFAULT_RESPONSE_NAME)),
                 Arguments.of(2, "Recursive schema with base type.", createClassName(DEFAULT_RESPONSE_NAME)),
@@ -80,6 +82,7 @@ public void generateTest(Integer caseNumber, String description, List<String> ex
         assertThat(customTypes.size(), equalTo(expectedNames.size()));
         var customTypeNames = customTypes.stream().map(CustomType::getName).toList();
         expectedNames.forEach(expectedName -> assertTrue(customTypeNames.contains(expectedName), format("Result should contain object with name %s. Result contains %s.", expectedName, customTypeNames)));
+        customTypes.forEach(customType -> assertTrue(customType.getCode().contains(format("public class %s {", customType.getName())) || customType.getCode().contains(format("public enum %s {", customType.getName()))));
     }
 
     @ParameterizedTest(name = "Case {0}: {1}")

polyapi-maven-plugin/src/test/resources/io/polyapi/plugin/service/schema/cases/Case 15.schema.json

@@ -0,0 +1,28 @@
+{
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "dash-style": {
+      "type": "string",
+      "enum": [
+        "SOLID"
+      ]
+    },
+    "other": {
+      "type": "object",
+      "properties": {
+        "dash-style": {
+          "type": "string",
+          "enum": [
+            "SOLID"
+          ]
+        }
+      }
+    }
+  },
+  "required": [
+    "dashStyle"
+  ],
+  "title": "Response Type"
+}

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.polyapi</groupId>
     <artifactId>polyapi-java</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>parent-pom</module>