Micronaut openapi 6.12.3

micronaut-projects · Oct 22, 2024 · 9d7f22f · 9d7f22f
1 parent 810c09e
commit 9d7f22f
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 0 deletions.
diff --git a/openapi-plugin/src/main/java/io/micronaut/gradle/openapi/DefaultOpenApiExtension.java b/openapi-plugin/src/main/java/io/micronaut/gradle/openapi/DefaultOpenApiExtension.java
@@ -189,6 +189,10 @@ private void configureCommonProperties(String name, AbstractOpenApiGenerator<?,
         task.getApiNameSuffix().convention(openApiSpec.getApiNameSuffix());
         task.getModelNamePrefix().convention(openApiSpec.getModelNamePrefix());
         task.getModelNameSuffix().convention(openApiSpec.getModelNameSuffix());
+
+        task.getGenerateSwaggerAnnotations().convention(openApiSpec.getGenerateSwaggerAnnotations());
+        task.getImplicitHeaders().convention(openApiSpec.getImplicitHeaders());
+        task.getImplicitHeadersRegex().convention(openApiSpec.getImplicitHeadersRegex());
     }
 
     private void withJavaSourceSets(Consumer<? super SourceSetContainer> consumer) {

diff --git a/openapi-plugin/src/main/java/io/micronaut/gradle/openapi/OpenApiSpec.java b/openapi-plugin/src/main/java/io/micronaut/gradle/openapi/OpenApiSpec.java
@@ -82,4 +82,10 @@ public interface OpenApiSpec {
     Property<String> getModelNamePrefix();
 
     Property<String> getModelNameSuffix();
+
+    Property<Boolean> getGenerateSwaggerAnnotations();
+
+    Property<Boolean> getImplicitHeaders();
+
+    Property<String> getImplicitHeadersRegex();
 }
diff --git a/openapi-plugin/src/main/java/io/micronaut/gradle/openapi/tasks/AbstractOpenApiGenerator.java b/openapi-plugin/src/main/java/io/micronaut/gradle/openapi/tasks/AbstractOpenApiGenerator.java
@@ -146,6 +146,18 @@ public abstract class AbstractOpenApiGenerator<W extends AbstractOpenApiWorkActi
     @Input
     public abstract Property<String> getModelNameSuffix();
 
+    @Optional
+    @Input
+    public abstract Property<Boolean> getGenerateSwaggerAnnotations();
+
+    @Optional
+    @Input
+    public abstract Property<Boolean> getImplicitHeaders();
+
+    @Optional
+    @Input
+    public abstract Property<String> getImplicitHeadersRegex();
+
     @OutputDirectory
     public abstract DirectoryProperty getOutputDirectory();
 
@@ -197,6 +209,10 @@ public final void execute() {
                 params.getModelNamePrefix().set(getModelNamePrefix().orElse(""));
                 params.getModelNameSuffix().set(getModelNameSuffix().orElse(""));
 
+                params.getGenerateSwaggerAnnotations().set(getGenerateSwaggerAnnotations());
+                params.getImplicitHeaders().set(getImplicitHeaders());
+                params.getImplicitHeadersRegex().set(getImplicitHeadersRegex().orElse(""));
+
                 configureWorkerParameters(params);
             });
     }

diff --git a/...api-plugin/src/main/java/io/micronaut/gradle/openapi/tasks/AbstractOpenApiWorkAction.java b/...api-plugin/src/main/java/io/micronaut/gradle/openapi/tasks/AbstractOpenApiWorkAction.java
@@ -105,6 +105,12 @@ interface OpenApiParameters extends WorkParameters {
         Property<String> getModelNamePrefix();
 
         Property<String> getModelNameSuffix();
+
+        Property<Boolean> getGenerateSwaggerAnnotations();
+
+        Property<Boolean> getImplicitHeaders();
+
+        Property<String> getImplicitHeadersRegex();
     }
 
     protected abstract void configureBuilder(MicronautCodeGeneratorBuilder builder);
@@ -170,6 +176,9 @@ public void execute() {
                 .withApiNameSuffix(parameters.getApiNameSuffix().orElse("").get())
                 .withModelNamePrefix(parameters.getModelNamePrefix().orElse("").get())
                 .withModelNameSuffix(parameters.getModelNameSuffix().orElse("").get())
+                .withGenerateSwaggerAnnotations(parameters.getGenerateSwaggerAnnotations().get())
+                .withImplicitHeaders(parameters.getImplicitHeaders().get())
+                .withImplicitHeadersRegex(parameters.getImplicitHeadersRegex().orElse("").get())
             );
 
         configureBuilder(builder);

diff --git a/openapi-plugin/src/test/groovy/io/micronaut/openapi/gradle/OpenApiClientGeneratorSpec.groovy b/openapi-plugin/src/test/groovy/io/micronaut/openapi/gradle/OpenApiClientGeneratorSpec.groovy
@@ -68,6 +68,8 @@ class OpenApiClientGeneratorSpec extends AbstractOpenApiGeneratorSpec {
                         fluxForArrays = true
                         nameMapping = [test: "changedTest"]
                         clientId = "my-client"
+                        generateSwaggerAnnotations = true
+                        implicitHeadersRegex = ".*"
                     }
                 }
             }