Added fixes for duplicate enums and dashes in enum constants.

Author: gastonortiz

README.md

@@ -1,5 +1,7 @@
 # Java Client Library (beta)
-### v0.4.2
+
+### Latest snapshot version v0.4.3-SNAPSHOT
+### Latest released version v0.4.2
 
 ## Introduction
 Welcome my friends! This is the Poly API Java client GitHub page. If you are here, then it means you're familiar with what we do at Poly. If you aren't, you can always check [here](https://github.com/polyapi/poly-alpha).
@@ -369,7 +371,8 @@ These features will be added in the future releases.
 
 ## Changelog
 ### v0.4.2
-- TBD
+- Fixed code generation bug where enum constants had dashes in them '-'.
+- Fixed code generation bug where multiple classes within a package had the same enum declaration.
 ### v0.4.1
 - Added Function ID in the javadocs of functions.
 ### v0.4.0

library/src/main/java/io/polyapi/client/internal/service/VariableInjectionServiceImpl.java

@@ -30,7 +30,7 @@ public Object replace(String propertyName, Object original) {
     }
 
     public synchronized <T> T inject(String key, String type) {
-        logger.error("Injecting variable with key '{}' and type '{}'.", key, type);
+        logger.debug("Injecting variable with key '{}' and type '{}'.", key, type);
         if (!injectionMap.containsKey(key)) {
             logger.debug("Injection map doesn't contain the key, generating a new one.");
             injectionMap.put(key, switch (type.toLowerCase()) {

polyapi-maven-plugin/src/main/java/io/polyapi/plugin/service/schema/PublicEnumRule.java

@@ -1,7 +1,9 @@
 package io.polyapi.plugin.service.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.sun.codemodel.*;
+import org.json.JSONObject;
 import org.jsonschema2pojo.GenerationConfig;
 import org.jsonschema2pojo.Jackson2Annotator;
 import org.jsonschema2pojo.Schema;
@@ -12,17 +14,37 @@
 import org.jsonschema2pojo.rules.EnumRule;
 import org.jsonschema2pojo.rules.RuleFactory;
 import org.jsonschema2pojo.util.NameHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.util.Optional;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import static java.util.Spliterator.ORDERED;
+import static java.util.Spliterators.spliteratorUnknownSize;
+import static java.util.stream.StreamSupport.stream;
 import static org.jsonschema2pojo.rules.PrimitiveTypes.isPrimitive;
 
 public class PublicEnumRule extends EnumRule {
+    private static final Logger logger = LoggerFactory.getLogger(PublicEnumRule.class);
 
     protected PublicEnumRule(RuleFactory ruleFactory) {
         super(ruleFactory);
     }
 
     @Override
     public JType apply(String nodeName, JsonNode node, JsonNode parent, JClassContainer container, Schema schema) {
-        return super.apply(nodeName, node, parent, container.getPackage(), schema);
+        return stream(Spliterators.<JType>spliteratorUnknownSize(container.getPackage().classes(), ORDERED), false)
+                .filter(definedClass -> definedClass.name().equalsIgnoreCase(nodeName))
+                .findFirst()
+                .orElseGet(() -> super.apply(nodeName, node, parent, container.getPackage(), schema));
+    }
+
+    @Override
+    protected String getConstantName(String nodeName, String customName) {
+        return super.getConstantName(nodeName.replace("-", "_"), customName);
     }
 }

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

@@ -17,6 +17,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
@@ -34,28 +35,34 @@ public class JsonSchemaParserTest {
     private final ObjectMapper objectMapper = new ObjectMapper();
 
     public static Stream<Arguments> generateSource() {
-        return Stream.of(Arguments.of("Simple recursive schema with no base type.", "Case 1", 2, List.of("Data", DEFAULT_RESPONSE_NAME)),
-                Arguments.of("Recursive schema with base type.", "Case 2", 8, List.of("Coupon", "Discount", "Address", "CouponMetadata", "ResponseTypeMetadata", DEFAULT_RESPONSE_NAME, "InvoiceSettings", "Shipping")),
-                Arguments.of("Schema that has a text value evaluated to null.", "Case 3", 8, List.of("Message", DEFAULT_RESPONSE_NAME, "Edited", "Metadata", "Block", "Attachment", "Text", "EventPayload")),
-                Arguments.of("Schema with base type and no definitions.", "Case 4", 1, List.of(DEFAULT_RESPONSE_NAME)),
-                Arguments.of("Schema for array of numbers.", "Case 5", 1, List.of(DEFAULT_RESPONSE_NAME)),
-                Arguments.of("Schema for array of integers.", "Case 6", 1, List.of(DEFAULT_RESPONSE_NAME)),
-                Arguments.of("Simple schema with attribute.", "Case 7", 1, List.of(DEFAULT_RESPONSE_NAME)),
-                Arguments.of("Schema with duplicate fields.", "Case 8", 1, List.of("ResponseTypeElement")),
-                Arguments.of("Schema with enum.", "Case 9", 2, List.of("TestResponse", "DashStyle")),
-                Arguments.of("Schema that is a String.", "Case 10", 0, List.of()),
-                Arguments.of("Schema that uses allof.", "Case 11", 0, List.of()));
+        return Stream.of(createArguments(1, "Simple recursive schema with no base type.", "Data", DEFAULT_RESPONSE_NAME),
+                createArguments(2, "Recursive schema with base type.", "Coupon", "Discount", "Address", "CouponMetadata", "ResponseTypeMetadata", DEFAULT_RESPONSE_NAME, "InvoiceSettings", "Shipping"),
+                createArguments(3, "Schema that has a text value evaluated to null.", "Message", DEFAULT_RESPONSE_NAME, "Edited", "Metadata", "Block", "Attachment", "Text", "EventPayload"),
+                createArguments(4, "Schema with base type and no definitions.", DEFAULT_RESPONSE_NAME),
+                createArguments(5, "Schema for array of numbers.", DEFAULT_RESPONSE_NAME),
+                createArguments(6, "Schema for array of integers.", DEFAULT_RESPONSE_NAME),
+                createArguments(7, "Simple schema with attribute.", DEFAULT_RESPONSE_NAME),
+                createArguments(8, "Schema with duplicate fields.", "ResponseTypeElement"),
+                createArguments(9, "Schema with enum.", "TestResponse", "DashStyle"),
+                createArguments(10, "Schema that is a String."),
+                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", "TestResponse", "Data"));
+    }
+
+    private static Arguments createArguments(Integer caseNumber, String caseDescription, String... expectedNames) {
+        return Arguments.of(caseDescription, format("Case %s", caseNumber), Arrays.stream(expectedNames).toList());
     }
 
     @ParameterizedTest(name = "{1}: {0}")
     @MethodSource("generateSource")
-    public void generateTest(String description, String schemaFileName, Integer expectedSize, List<String> expectedNames) throws IOException {
+    public void generateTest(String description, String schemaFileName, List<String> expectedNames) throws IOException {
         var specification = new ApiFunctionSpecification();
         specification.setName("test");
         specification.setContext("polyapi.testing");
         var customTypes = jsonSchemaParser.parse("TestResponse", specification.getPackageName(), IOUtils.toString(JsonSchemaParser.class.getResourceAsStream(format("/%s/cases/%s.schema.json", JsonSchemaParser.class.getPackageName().replace(".", "/"), schemaFileName)), defaultCharset()));
         assertThat(customTypes, notNullValue());
-        assertThat(customTypes.size(), equalTo(expectedSize));
+        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)));
     }

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

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://json-schema.org/draft-06/schema#",
+  "type": "object",
+  "properties": {
+    "identifier": {
+      "type": "string",
+      "description": "Record identifier",
+      "default": "current",
+      "enum": [
+        "current",
+        "co-applicant"
+      ]
+    }
+  },
+  "additionalProperties": false
+}

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

@@ -0,0 +1,47 @@
+{
+  "$schema": "http://json-schema.org/draft-06/schema#",
+  "definitions": {
+    "Data": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "hello": {
+          "type": "string"
+        },
+        "identifier": {
+          "type": "string",
+          "description": "Record identifier",
+          "default": "current",
+          "enum": [
+            "current",
+            "co-applicant"
+          ]
+        }
+      },
+      "required": [
+        "hello"
+      ],
+      "title": "Data"
+    }
+  },
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "data": {
+      "$ref": "#/definitions/Data"
+    },
+    "identifier": {
+      "type": "string",
+      "description": "Record identifier",
+      "default": "current",
+      "enum": [
+        "current",
+        "co-applicant"
+      ]
+    }
+  },
+  "required": [
+    "data"
+  ],
+  "title": "ResponseType"
+}