[java][micronaut] minor improvements (#10158)

* mark java micronaut generator as beta

* update doc
This commit is contained in:
William Cheng
2021-08-16 12:04:42 +08:00
committed by GitHub
parent 74671fa242
commit 87554ecb2d
4 changed files with 23 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
generatorName: micronaut-client
generatorName: java-micronaut-client
outputDir: samples/client/petstore/java-micronaut-client/
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
additionalProperties:

View File

@@ -36,6 +36,7 @@ The following generators are available:
* [groovy](generators/groovy.md)
* [haskell-http-client](generators/haskell-http-client.md)
* [java](generators/java.md)
* [java-micronaut-client (beta)](generators/java-micronaut-client.md)
* [javascript](generators/javascript.md)
* [javascript-apollo (beta)](generators/javascript-apollo.md)
* [javascript-closure-angular](generators/javascript-closure-angular.md)
@@ -45,7 +46,6 @@ The following generators are available:
* [k6 (beta)](generators/k6.md)
* [kotlin](generators/kotlin.md)
* [lua (beta)](generators/lua.md)
* [micronaut-client](generators/micronaut-client.md)
* [nim (beta)](generators/nim.md)
* [objc](generators/objc.md)
* [ocaml](generators/ocaml.md)

View File

@@ -1,6 +1,6 @@
---
title: Config Options for micronaut-client
sidebar_label: micronaut-client
title: Config Options for java-micronaut-client
sidebar_label: java-micronaut-client
---
These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

View File

@@ -1,12 +1,20 @@
package org.openapitools.codegen.languages;
import org.openapitools.codegen.*;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenType;
import org.openapitools.codegen.SupportingFile;
import org.openapitools.codegen.languages.features.BeanValidationFeatures;
import org.openapitools.codegen.meta.GeneratorMetadata;
import org.openapitools.codegen.meta.Stability;
import org.openapitools.codegen.meta.features.DocumentationFeature;
import org.openapitools.codegen.meta.features.SecurityFeature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
import static org.openapitools.codegen.CodegenConstants.INVOKER_PACKAGE;
@@ -26,7 +34,7 @@ public class JavaMicronautClientCodegen extends AbstractJavaCodegen implements B
public static final String OPT_TEST_JUNIT = "junit";
public static final String OPT_TEST_SPOCK = "spock";
public static final String NAME = "micronaut-client";
public static final String NAME = "java-micronaut-client";
protected String title;
protected String configPackage;
@@ -61,7 +69,11 @@ public class JavaMicronautClientCodegen extends AbstractJavaCodegen implements B
))
);
outputFolder = "generated-code/javaMicronaut";
generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata)
.stability(Stability.BETA)
.build();
outputFolder = "generated-code/java-micronaut-client";
embeddedTemplateDir = templateDir = "java-micronaut-client";
apiPackage = "org.openapitools.api";
modelPackage = "org.openapitools.model";
@@ -85,7 +97,7 @@ public class JavaMicronautClientCodegen extends AbstractJavaCodegen implements B
cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations", useBeanValidation));
CliOption buildToolOption = new CliOption(OPT_BUILD, "Specify for which build tool to generate files").defaultValue(buildTool);
buildToolOption.setEnum(new HashMap<String, String>(){{
buildToolOption.setEnum(new HashMap<String, String>() {{
put(OPT_BUILD_GRADLE, "Gradle configuration is generated for the project");
put(OPT_BUILD_MAVEN, "Maven configuration is generated for the project");
put(OPT_BUILD_ALL, "Both Gradle and Maven configurations are generated");
@@ -93,7 +105,7 @@ public class JavaMicronautClientCodegen extends AbstractJavaCodegen implements B
cliOptions.add(buildToolOption);
CliOption testToolOption = new CliOption(OPT_TEST, "Specify which test tool to generate files for").defaultValue(testTool);
testToolOption.setEnum(new HashMap<String, String>(){{
testToolOption.setEnum(new HashMap<String, String>() {{
put(OPT_TEST_JUNIT, "Use JUnit as test tool");
put(OPT_TEST_SPOCK, "Use Spock as test tool");
}});
@@ -173,7 +185,7 @@ public class JavaMicronautClientCodegen extends AbstractJavaCodegen implements B
additionalProperties.put(OPT_BUILD, buildTool);
if (additionalProperties.containsKey(OPT_TEST)) {
switch((String) additionalProperties.get(OPT_TEST)) {
switch ((String) additionalProperties.get(OPT_TEST)) {
case OPT_TEST_JUNIT:
case OPT_TEST_SPOCK:
this.testTool = (String) additionalProperties.get(OPT_TEST);