Merge pull request #57 from dvmikheev/fix/javaType-value

fix: use formatted POJO name in converted json for javaType value

Author: ivangsa

plugins/asyncapi-jsonschema2pojo/src/main/java/io/zenwave360/sdk/plugins/AsyncApiJsonSchema2PojoGenerator.java

@@ -11,6 +11,8 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import io.zenwave360.sdk.utils.AsyncAPIUtils;
 import io.zenwave360.sdk.zdl.GeneratedProjectFiles;
@@ -175,8 +177,25 @@ public void generateFromNativeFormat(JsonSchema2PojoConfiguration config, Map<St
     protected String convertToJson(final Map<String, Object> payload, final String packageName) throws JsonProcessingException {
         this.yamlMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
         String yml = this.yamlMapper.writerWithDefaultPrettyPrinter().writeValueAsString(payload);
-        yml = RegExUtils.replaceAll(yml, originalRefProperty + ": \".*#/components/schemas/", "javaType: \"" + packageName + ".");
-        yml = RegExUtils.replaceAll(yml, "ref: \".*#/components/schemas/", "javaType: \"" + packageName + ".");
+
+        List<String> regexPatterns = List.of(
+                originalRefProperty + ": \".*#/components/schemas/([^\"]+)\"",
+                "ref: \".*#/components/schemas/([^\"]+)\""
+        );
+
+        for (String regex : regexPatterns) {
+            Pattern pattern = Pattern.compile(regex);
+            Matcher matcher = pattern.matcher(yml);
+            StringBuilder result = new StringBuilder();
+
+            while (matcher.find()) {
+                String matchedGroup = matcher.group(1);
+                String className = NamingUtils.asJavaTypeName(matchedGroup);
+                matcher.appendReplacement(result, "javaType: \"" + packageName + "." + className + "\"");
+            }
+            yml = matcher.appendTail(result).toString();
+        }
+
         Object jsonObject = this.yamlMapper.readTree(yml);
         return this.jsonMapper.writeValueAsString(jsonObject);
     }

plugins/asyncapi-jsonschema2pojo/src/test/java/io/zenwave360/sdk/plugins/AsyncApiJsonSchema2PojoGeneratorTest.java

@@ -32,6 +32,18 @@ public void test_generator_for_asyncapi_v3() throws Exception {
         Assertions.assertTrue(new File("target/zenwave630/src/main/java/io/example/v3/domain/events/CustomerInput.java").exists());
     }
 
+    @Test
+    public void test_generator_for_asyncapi_schemas_with_delimiters() throws Exception {
+        Plugin plugin = new AsyncApiJsonSchema2PojoPlugin()
+                .withApiFile("classpath:asyncapi.yml")
+                .withTargetFolder("target/zenwave630")
+                .withOption("modelPackage", "io.example.integration.test.with_schemas.model");
+
+        new MainGenerator().generate(plugin);
+
+        Assertions.assertTrue(new File("target/zenwave630/src/main/java/io/example/integration/test/with_schemas/model/DepartmentV1.java").exists());
+    }
+
     @Test
     public void test_generator_for_asyncapi_v3_filter_messages() throws Exception {
         Plugin plugin = new AsyncApiJsonSchema2PojoPlugin()

plugins/asyncapi-jsonschema2pojo/src/test/resources/asyncapi.yml

@@ -24,9 +24,19 @@ components:
           backupEmail:
             description: something else
             $ref: "#/components/schemas/Email"
+          department:
+            description: department where user works
+            $ref: "#/components/schemas/Department-v1"
   schemas:
     Email:
       type: string
       enum:
         - Google
         - Yahoo
+    Department-v1:
+      type: object
+      properties:
+        identifier:
+          type: string
+        name:
+          type: string