Cubic suggestions

Author: jpfinne

modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java

@@ -1773,7 +1773,10 @@ protected void ensureInheritanceForDiscriminatorMappings(Schema parent, Schema c
             Map<String, Schema> childProperties = child.getProperties();
             if (childProperties != null) {
                 // move the properties inside the new allOf.
-                Schema newChildProperties = new Schema<>().properties(childProperties);
+                Schema newChildProperties = new Schema<>()
+                        .properties(childProperties)
+                        .additionalProperties(child.getAdditionalProperties());
+                ModelUtils.copyMetadata(child, newChildProperties);
                 allOf.add(newChildProperties);
                 child.setProperties(null);
                 child.setType(null);

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/JavaFileAssert.java

@@ -2,6 +2,8 @@
 
 import com.github.javaparser.StaticJavaParser;
 import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.nodeTypes.NodeWithName;
 import com.github.javaparser.ast.nodeTypes.modifiers.NodeWithAbstractModifier;
@@ -59,33 +61,40 @@ public JavaFileAssert isNormalClass() {
         return this;
     }
 
-    public JavaFileAssert extendsClass(String... parentClass) {
-        Set<String> expectedClasses = Stream.of(parentClass)
-                .collect(Collectors.toSet());
-
-        Set<String> actualParents = actual.getType(0)
+    public JavaFileAssert extendsClass(String parentClass) {
+        String actualParent = actual.getType(0)
                 .asClassOrInterfaceDeclaration().getExtendedTypes()
                 .stream()
+                .filter(JavaFileAssert::isClass)
                 .map(ClassOrInterfaceType::getNameWithScope)
-                .collect(Collectors.toSet());
+                .findFirst()
+                .orElse(null);
 
-        Assertions.assertThat(actualParents)
+        Assertions.assertThat(actualParent)
                 .withFailMessage("Expected type %s to extends %s, but found %s",
-                        actual.getType(0).getName().asString(), expectedClasses, actualParents)
-                .isEqualTo(expectedClasses);
+                        actual.getType(0).getName().asString(), parentClass, actualParent)
+                .isEqualTo(parentClass);
         return this;
     }
 
+    private static boolean isClass(ClassOrInterfaceType cit) {
+        return cit.asClassOrInterfaceType().getParentNode()
+                .map(node -> node instanceof ClassOrInterfaceDeclaration && !((ClassOrInterfaceDeclaration)node).isInterface())
+                .orElse(false);
+    }
+
     public JavaFileAssert doesNotExtendsClasses() {
-        Set<String> actualParents = actual.getType(0)
+        String actualParent = actual.getType(0)
                 .asClassOrInterfaceDeclaration().getExtendedTypes()
                 .stream()
+                .filter(JavaFileAssert::isClass)
                 .map(ClassOrInterfaceType::getNameWithScope)
-                .collect(Collectors.toSet());
-        Assertions.assertThat(actualParents)
+                .findFirst()
+                .orElse(null);
+        Assertions.assertThat(actualParent)
                 .withFailMessage("Expected type %s to extends a class, but found %s",
-                        actual.getType(0).getName().asString(), actualParents)
-                .isEmpty();
+                        actual.getType(0).getName().asString(), actualParent)
+                .isNull();
         return this;
     }
 

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java

@@ -6770,5 +6770,15 @@ void oneOf_issue_14769() throws IOException {
                 Map.of(MODEL_NAME_SUFFIX, "Dto",
                         GENERATE_MODEL_DOCS, false, GENERATE_APIS, false, INTERFACE_ONLY, true),
                 codegen -> codegen.addOpenapiNormalizer("REPLACE_ONE_OF_BY_DISCRIMINATOR_MAPPING", "true"));
+
+        JavaFileAssert.assertThat(files.get("VehicleDto.java"))
+                .isNormalClass()
+                .assertTypeAnnotations().containsWithName("JsonSubTypes")
+                .recursivelyContainsWithNameAndAttributes("JsonSubTypes.Type", Map.of("value", "CarDto.class", "name", "\"car\""))
+                .recursivelyContainsWithNameAndAttributes("JsonSubTypes.Type", Map.of("value", "PlaneDto.class", "name", "\"plane\""));
+
+        JavaFileAssert.assertThat(files.get("CarDto.java"))
+                .isNormalClass()
+                .extendsClass("VehicleDto");
     }
 }