From e4823cf4e63ff21a8eb0665da1f48aaf2d59d1ed Mon Sep 17 00:00:00 2001 From: Jim Schubert Date: Sat, 22 Feb 2020 20:06:38 -0500 Subject: [PATCH] [go][java] Document new parameterized server support (#5380) * [go][java] Document new parameterized server support * [java] Regenerate samples --- docs/generators/go-experimental.md | 2 +- docs/generators/go.md | 2 +- docs/generators/java.md | 2 +- .../org/openapitools/codegen/languages/GoClientCodegen.java | 3 +++ .../org/openapitools/codegen/languages/JavaClientCodegen.java | 4 ++++ .../org/openapitools/codegen/java/JavaClientCodegenTest.java | 4 ++++ 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/generators/go-experimental.md b/docs/generators/go-experimental.md index 66ceccb18a1..2f2fed44c40 100644 --- a/docs/generators/go-experimental.md +++ b/docs/generators/go-experimental.md @@ -162,7 +162,7 @@ sidebar_label: go-experimental |Examples|✓|OAS2,OAS3 |XMLStructureDefinitions|✗|OAS2,OAS3 |MultiServer|✗|OAS3 -|ParameterizedServer|✗|OAS3 +|ParameterizedServer|✓|OAS3 |ParameterStyling|✗|OAS3 |Callbacks|✗|OAS3 |LinkObjects|✗|OAS3 diff --git a/docs/generators/go.md b/docs/generators/go.md index 6abcb82c7c4..830a42503de 100644 --- a/docs/generators/go.md +++ b/docs/generators/go.md @@ -162,7 +162,7 @@ sidebar_label: go |Examples|✓|OAS2,OAS3 |XMLStructureDefinitions|✗|OAS2,OAS3 |MultiServer|✗|OAS3 -|ParameterizedServer|✗|OAS3 +|ParameterizedServer|✓|OAS3 |ParameterStyling|✗|OAS3 |Callbacks|✗|OAS3 |LinkObjects|✗|OAS3 diff --git a/docs/generators/java.md b/docs/generators/java.md index 2e3c153c08e..c97d5e24d4e 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -241,7 +241,7 @@ sidebar_label: java |Examples|✓|OAS2,OAS3 |XMLStructureDefinitions|✗|OAS2,OAS3 |MultiServer|✗|OAS3 -|ParameterizedServer|✗|OAS3 +|ParameterizedServer|✓|OAS3 |ParameterStyling|✗|OAS3 |Callbacks|✗|OAS3 |LinkObjects|✗|OAS3 diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java index e3d4637c4f8..97f8099f975 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java @@ -52,6 +52,9 @@ public class GoClientCodegen extends AbstractGoCodegen { SecurityFeature.ApiKey, SecurityFeature.OAuth2_Implicit )) + .includeGlobalFeatures( + GlobalFeature.ParameterizedServer + ) .excludeGlobalFeatures( GlobalFeature.XMLStructureDefinitions, GlobalFeature.Callbacks, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 7b8fcf0f89f..acc4dcc3739 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -26,6 +26,7 @@ import org.openapitools.codegen.languages.features.BeanValidationFeatures; import org.openapitools.codegen.languages.features.GzipFeatures; import org.openapitools.codegen.languages.features.PerformBeanValidationFeatures; import org.openapitools.codegen.meta.features.DocumentationFeature; +import org.openapitools.codegen.meta.features.GlobalFeature; import org.openapitools.codegen.templating.mustache.CaseFormatLambda; import org.openapitools.codegen.utils.ProcessUtils; import org.slf4j.Logger; @@ -106,8 +107,10 @@ public class JavaClientCodegen extends AbstractJavaCodegen public JavaClientCodegen() { super(); + // TODO: Move GlobalFeature.ParameterizedServer to library: jersey after moving featureSet to generatorMetadata featureSet = getFeatureSet().modify() .includeDocumentationFeatures(DocumentationFeature.Readme) + .includeGlobalFeatures(GlobalFeature.ParameterizedServer) .build(); outputFolder = "generated-code" + File.separator + "java"; @@ -290,6 +293,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java")); supportingFiles.add(new SupportingFile("ServerConfiguration.mustache", invokerFolder, "ServerConfiguration.java")); supportingFiles.add(new SupportingFile("ServerVariable.mustache", invokerFolder, "ServerVariable.java")); + if (!(RESTTEMPLATE.equals(getLibrary()) || REST_ASSURED.equals(getLibrary()) || NATIVE.equals(getLibrary()) || MICROPROFILE.equals(getLibrary()))) { supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java")); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index c6da1cb17ef..cff4cbc696e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -290,6 +290,8 @@ public class JavaClientCodegenTest { TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/xyz/abcdef/ApiClient.java"); TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/xyz/abcdef/ApiException.java"); TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/xyz/abcdef/ApiResponse.java"); + TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/xyz/abcdef/ServerConfiguration.java"); + TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/xyz/abcdef/ServerVariable.java"); TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/xyz/abcdef/auth/ApiKeyAuth.java"); TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/xyz/abcdef/auth/Authentication.java"); TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/xyz/abcdef/auth/HttpBasicAuth.java"); @@ -364,6 +366,8 @@ public class JavaClientCodegenTest { TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/zz/yyyy/invoker/xxxx/ApiClient.java"); TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/zz/yyyy/invoker/xxxx/ApiException.java"); TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/zz/yyyy/invoker/xxxx/ApiResponse.java"); + TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/zz/yyyy/invoker/xxxx/ServerConfiguration.java"); + TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/zz/yyyy/invoker/xxxx/ServerVariable.java"); TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/zz/yyyy/invoker/xxxx/auth/ApiKeyAuth.java"); TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/zz/yyyy/invoker/xxxx/auth/Authentication.java"); TestUtils.ensureContainsFile(generatedFiles, output, "src/main/java/zz/yyyy/invoker/xxxx/auth/HttpBasicAuth.java");