Fixes

Author: andriy-dmytruk

openapi-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java

@@ -664,8 +664,10 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
             for (var param : op.allParams) {
                 processGenericAnnotations(param);
             }
-            processGenericAnnotations(op.returnProperty);
-            op.returnType = op.returnProperty.vendorExtensions.get("typeWithEnumWithGenericAnnotations").toString();
+            if (op.returnProperty != null) {
+                processGenericAnnotations(op.returnProperty);
+                op.returnType = op.returnProperty.vendorExtensions.get("typeWithEnumWithGenericAnnotations").toString();
+            }
         }
 
         return objs;
@@ -690,7 +692,8 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
 
         if (op.isResponseFile) {
             op.returnType = typeMapping.get("responseFile");
-            op.returnProperty.dataType = op.returnProperty.datatypeWithEnum = op.returnType;
+            op.returnProperty.dataType = op.returnType;
+            op.returnProperty.datatypeWithEnum = op.returnType;
             op.imports.add(op.returnType);
         }
 
@@ -814,7 +817,8 @@ private void wrapOperationReturnType(CodegenOperation op, String wrapperType, bo
             newReturnType.dataType = typeName + '<' + originalReturnType + '>';
             newReturnType.items = op.returnProperty;
         }
-        newReturnType.containerTypeMapped = newReturnType.containerType = typeName;
+        newReturnType.containerTypeMapped = typeName;
+        newReturnType.containerType = typeName;
         op.vendorExtensions.put("originalReturnType", originalReturnType);
 
         op.returnType = newReturnType.dataType;
@@ -934,8 +938,6 @@ private void processGenericAnnotations(String dataType, String dataTypeWithEnum,
                 typeWithGenericAnnotations = "Map<String, " + genericAnnotations + itemsProp.vendorExtensions.get("typeWithGenericAnnotations") + ">";
                 typeWithEnumWithGenericAnnotations = "Map<String, " + genericAnnotations + itemsProp.vendorExtensions.get("typeWithEnumWithGenericAnnotations") + ">";
             } else if (containerType != null) {
-                System.out.println("Container: " + containerType);
-                System.out.println("Items: " + itemsProp);
                 var genericAnnotations = genericAnnotations(itemsProp);
                 processGenericAnnotations(itemsProp);
                 typeWithGenericAnnotations = containerType + "<" + genericAnnotations + itemsProp.vendorExtensions.get("typeWithGenericAnnotations") + ">";

openapi-generator/src/test/java/io/micronaut/openapi/generator/MicronautServerCodegenTest.java

@@ -207,7 +207,7 @@ void doGenerateMonoWrapHttpResponse() {
         String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS);
 
         String apiPath = outputPath + "src/main/java/org/openapitools/api/";
-        assertFileContains(apiPath + "PetApi.java", "Mono<HttpResponse<Pet>>");
+        assertFileContains(apiPath + "PetApi.java", "Mono<HttpResponse<@Valid Pet>>");
     }
 
     @Test
@@ -219,8 +219,8 @@ void doGenerateMono() {
         String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS);
 
         String apiPath = outputPath + "src/main/java/org/openapitools/api/";
-        assertFileContains(apiPath + "PetApi.java", "Mono<Pet>");
-        assertFileNotContains(apiPath + "PetApi.java", "Flux<Pet>");
+        assertFileContains(apiPath + "PetApi.java", "Mono<@Valid Pet>");
+        assertFileNotContains(apiPath + "PetApi.java", "Flux<@Valid Pet>");
         assertFileNotContains(apiPath + "PetApi.java", "HttpResponse");
     }
 
@@ -233,8 +233,8 @@ void doGenerateMonoAndFlux() {
         String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS);
 
         String apiPath = outputPath + "src/main/java/org/openapitools/api/";
-        assertFileContains(apiPath + "PetApi.java", "Mono<Pet>");
-        assertFileContains(apiPath + "PetApi.java", "Flux<Pet>");
+        assertFileContains(apiPath + "PetApi.java", "Mono<@Valid Pet>");
+        assertFileContains(apiPath + "PetApi.java", "Flux<@Valid Pet>");
         assertFileNotContains(apiPath + "PetApi.java", "HttpResponse");
     }
 
@@ -246,7 +246,7 @@ void doGenerateWrapHttpResponse() {
         String outputPath = generateFiles(codegen, PETSTORE_PATH, CodegenConstants.MODELS, CodegenConstants.APIS);
 
         String apiPath = outputPath + "src/main/java/org/openapitools/api/";
-        assertFileContains(apiPath + "PetApi.java", "HttpResponse<Pet>");
+        assertFileContains(apiPath + "PetApi.java", "HttpResponse<@Valid Pet>");
         assertFileNotContains(apiPath + "PetApi.java", "Mono");
     }