Improve testing on discriminator annotations

Signed-off-by: Ricardo Zanini <[email protected]>

Author: ricardozanini

client/deployment/src/main/resources/templates/libraries/microprofile/pojo.qute

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 @com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, property = "{m.discriminator.propertyBaseName}", visible = true)
 @com.fasterxml.jackson.annotation.JsonSubTypes({
 {#for child in m.discriminator.mappedModels}
-    @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = {package}.{child.modelName}.class, name = "{#if m.vendorExtensions.x-discriminator-value.or('') == ''}{child.mappingName}{#else}{m.vendorExtensions.x-discriminator-value}{/if}"),
+    @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = {child.modelName}.class, name = "{#if m.vendorExtensions.x-discriminator-value.or('') == ''}{child.mappingName}{#else}{m.vendorExtensions.x-discriminator-value}{/if}"),
 {/for}
 })
 {#else}

client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapperTest.java

@@ -45,13 +45,27 @@
 
 public class OpenApiClientGeneratorWrapperTest {
 
+    private static Optional<MethodDeclaration> getMethodDeclarationByIdentifier(List<MethodDeclaration> methodDeclarations,
+            String methodName) {
+        return methodDeclarations.stream().filter(md -> md.getName().getIdentifier().equals(methodName)).findAny();
+    }
+
     @Test
-    void verifyNOTFOUNDClass() throws java.net.URISyntaxException {
+    void verifyDiscriminatorGeneration() throws java.net.URISyntaxException, FileNotFoundException {
         OpenApiClientGeneratorWrapper generatorWrapper = createGeneratorWrapper("issue-852.json");
         final List<File> generatedFiles = generatorWrapper.generate("org.issue852");
 
         assertNotNull(generatedFiles);
         assertFalse(generatedFiles.isEmpty());
+
+        final Optional<File> classWithDiscriminator = generatedFiles.stream()
+                .filter(f -> f.getName().endsWith("PostRevisionForDocumentRequest.java")).findFirst();
+        assertThat(classWithDiscriminator).isPresent();
+
+        final CompilationUnit compilationUnit = StaticJavaParser.parse(classWithDiscriminator.orElseThrow());
+        assertThat(compilationUnit.findFirst(ClassOrInterfaceDeclaration.class)
+                .flatMap(first -> first.getAnnotationByClass(com.fasterxml.jackson.annotation.JsonSubTypes.class)))
+                .isPresent();
     }
 
     @Test
@@ -774,9 +788,4 @@ private Optional<VariableDeclarator> findVariableByName(List<FieldDeclaration> f
                 .filter((VariableDeclarator variable) -> name.equals(variable.getName().asString()))
                 .findFirst();
     }
-
-    private static Optional<MethodDeclaration> getMethodDeclarationByIdentifier(List<MethodDeclaration> methodDeclarations,
-            String methodName) {
-        return methodDeclarations.stream().filter(md -> md.getName().getIdentifier().equals(methodName)).findAny();
-    }
 }