Merge pull request #93 from ZenWave360/mainteinance/v2.2.1

fix: processing of javaType in jsonschema3pojo plugin

Author: ivangsa

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

@@ -14,18 +14,17 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.zenwave360.sdk.utils.AsyncAPIUtils;
+import io.zenwave360.sdk.utils.Maps;
 import io.zenwave360.sdk.zdl.GeneratedProjectFiles;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.RegExUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.jsonschema2pojo.*;
 import org.jsonschema2pojo.exception.ClassAlreadyExistsException;
 import org.jsonschema2pojo.rules.RuleFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
@@ -151,33 +150,42 @@ public void generateFromNativeFormat(JsonSchema2PojoConfiguration config, Map<St
         codeModel.build(sourcesWriter, resourcesWriter);
     }
 
-    private final ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
     private final ObjectMapper jsonMapper = new ObjectMapper();
 
     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);
-
-        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 + "\"");
+        populateJavaTypeFromRefsRecursively(payload, packageName);
+        return this.jsonMapper.writeValueAsString(payload);
+    }
+
+    private void populateJavaTypeFromRefsRecursively(Object obj, String packageName) {
+        if (obj instanceof Map) {
+            Map<String, Object> map = (Map<String, Object>) obj;
+
+            // Replace $ref and original ref with javaType (if not already present)
+            if (!map.containsKey("javaType")) {
+                String refValue = JSONPath.getFirst(map, "$['" + originalRefProperty + "']", "$['$ref']");
+
+                if (refValue != null && refValue.contains("#/components/schemas/")) {
+                    String schemaName = refValue.substring(refValue.lastIndexOf("/") + 1);
+                    String className = NamingUtils.asJavaTypeName(schemaName);
+                    map.put("javaType", packageName + "." + className);
+                }
+            }
+            map.remove("x--original-$ref");
+            map.remove("$ref");
+
+
+            // Recursively process all values in the map
+            for (Object value : map.values()) {
+                populateJavaTypeFromRefsRecursively(value, packageName);
             }
-            yml = matcher.appendTail(result).toString();
-        }
 
-        Object jsonObject = this.yamlMapper.readTree(yml);
-        return this.jsonMapper.writeValueAsString(jsonObject);
+        } else if (obj instanceof List) {
+            List<Object> list = (List<Object>) obj;
+            for (Object item : list) {
+                populateJavaTypeFromRefsRecursively(item, packageName);
+            }
+        }
     }
 
     private Annotator instantiate(Class<? extends Annotator> annotatorClass, GenerationConfig config) {

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

@@ -30,6 +30,8 @@ public void test_generator_for_asyncapi_v3() throws Exception {
         new MainGenerator().generate(plugin);
 
         Assertions.assertTrue(new File("target/zenwave630/src/main/java/io/example/v3/domain/events/CustomerInput.java").exists());
+        Assertions.assertTrue(new File("target/zenwave630/src/main/java/mypackage/CustomerCreated.java").exists());
+        Assertions.assertFalse(new File("target/zenwave630/src/main/java/io/example/v3/domain/events/CustomerCreated.java").exists());
     }
 
     @Test

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

@@ -137,6 +137,7 @@ components:
     CustomerCreated:
       type: "object"
       x-business-entity: "CustomerCreated"
+      javaType: "mypackage.CustomerCreated"
       properties:
         id:
           type: "string"