v2 includes module name in ref class

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

@@ -185,7 +185,7 @@ public interface CodegenConfig {
 
     String toModelDocFilename(String name);
 
-    String toModelImport(String name);
+    String toModelImport(String refClass);
 
     Map<String, String> toModelImportMap(String name);
 
@@ -330,4 +330,6 @@ public interface CodegenConfig {
     boolean getUseInlineModelResolver();
 
     boolean getAddSuffixToDuplicateOperationNicknames();
+
+    String toRefClass(String ref, String sourceJsonPath);
 }

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenModel.java

@@ -1214,7 +1214,8 @@ public void addDiscriminatorMappedModelsImports() {
         }
         for (CodegenDiscriminator.MappedModel mm : discriminator.getMappedModels()) {
             if (!"".equals(mm.getModelName())) {
-                imports.add(mm.getModelName());
+                String complexType = mm.getModelName();
+                imports.add(complexType);
             }
         }
     }

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

@@ -1283,26 +1283,29 @@ private ModelsMap processModels(CodegenConfig config, Map<String, Schema> defini
         List<ModelMap> modelMaps = new ArrayList<>();
         Set<String> allImports = new LinkedHashSet<>();
         for (Map.Entry<String, Schema> definitionsEntry : definitions.entrySet()) {
-            String key = definitionsEntry.getKey();
+            String schemaName = definitionsEntry.getKey();
             Schema schema = definitionsEntry.getValue();
             if (schema == null)
                 throw new RuntimeException("schema cannot be null in processModels");
-            CodegenModel cm = config.fromModel(key, schema);
+            CodegenModel cm = config.fromModel(schemaName, schema);
             ModelMap mo = new ModelMap();
             mo.setModel(cm);
-            mo.put("importPath", config.toModelImport(cm.classname));
+            mo.put("importPath", config.toModelImport(config.toRefClass("#/components/schemas/"+schemaName, "")));
             modelMaps.add(mo);
 
             cm.removeSelfReferenceImport();
 
+            if (cm.imports == null || cm.imports.size() == 0) {
+                continue;
+            }
             allImports.addAll(cm.imports);
         }
         objs.setModels(modelMaps);
         Set<String> importSet = new ConcurrentSkipListSet<>();
         for (String nextImport : allImports) {
             String mapping = config.importMapping().get(nextImport);
             if (mapping == null) {
-                mapping = config.toModelImport(nextImport);
+                mapping = nextImport;
             }
             if (mapping != null && !config.defaultIncludes().contains(mapping)) {
                 importSet.add(mapping);

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java

@@ -349,7 +349,8 @@ default Set<String> getImports(boolean importContainerType, boolean importBaseTy
                 DefaultCodegenTest.mapParamImportInnerObject
                 */
                 String refClass = this.getRefClass();
-                if (refClass != null) {
+                if (refClass != null && refClass.contains(".")) {
+                    // self reference classes do not contain periods
                     imports.add(refClass);
                 }
                 /*
@@ -364,7 +365,8 @@ default Set<String> getImports(boolean importContainerType, boolean importBaseTy
         } else {
             // referenced or inline schemas
             String refClass = this.getRefClass();
-            if (refClass != null) {
+            if (refClass != null && refClass.contains(".")) {
+                // self reference classes do not contain periods
                 imports.add(refClass);
             }
             String baseType = this.getBaseType();

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java

@@ -1081,15 +1081,15 @@ public GeneratorLanguage generatorLanguage() {
     }
 
     @Override
-    protected void updateModelForObject(CodegenModel m, Schema schema) {
+    protected void updateModelForObject(CodegenModel m, Schema schema, String sourceJsonPath) {
         /**
          * we have a custom version of this function so we only set isMap to true if
          * ModelUtils.isMapSchema
          * In other generators, isMap is true for all type object schemas
          */
         if (schema.getProperties() != null || schema.getRequired() != null && !(schema instanceof ComposedSchema)) {
             // passing null to allProperties and allRequired as there's no parent
-            addVars(m, unaliasPropertySchema(schema.getProperties()), schema.getRequired(), null, null);
+            addVars(m, unaliasPropertySchema(schema.getProperties()), schema.getRequired(), null, null, sourceJsonPath);
         }
         if (ModelUtils.isMapSchema(schema)) {
             // an object or anyType composed schema that has additionalProperties set
@@ -1103,6 +1103,6 @@ protected void updateModelForObject(CodegenModel m, Schema schema) {
             }
         }
         // process 'additionalProperties'
-        setAddProps(schema, m);
+        setAddProps(schema, m, sourceJsonPath);
     }
 }