From ebc2700a9210beb7ca3b5e26e218240bd386e410 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 16 Oct 2018 23:04:50 +0800 Subject: [PATCH 1/2] update gradle download link (#1254) --- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties index 7e3739c46a5..612f9e88eda 100644 --- a/modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-2-bin.zip +distributionUrl=https\://downloads.gradle.org/distributions/gradle-4.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From d8957af76b453a0087da4bbfb7b9deca429e5dbb Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 16 Oct 2018 23:05:14 +0800 Subject: [PATCH 2/2] Update generator option (#1236) * update generator option * update kotlin option usage * update lua option * update wording for lua option --- docs/generators/kotlin-server.md | 2 +- docs/generators/kotlin-spring.md | 2 +- docs/generators/kotlin.md | 2 +- docs/generators/lua.md | 2 +- docs/generators/rust-server.md | 2 +- .../codegen/languages/AbstractKotlinCodegen.java | 4 ++-- .../openapitools/codegen/languages/LuaClientCodegen.java | 8 ++++---- .../openapitools/codegen/languages/RustServerCodegen.java | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/generators/kotlin-server.md b/docs/generators/kotlin-server.md index 08b3996237f..1d69a88b7fb 100644 --- a/docs/generators/kotlin-server.md +++ b/docs/generators/kotlin-server.md @@ -5,7 +5,7 @@ CONFIG OPTIONS for kotlin-server source folder for generated code (Default: src/main/kotlin) packageName - Generated artifact package name (e.g. io.swagger). + Generated artifact package name. (Default: org.openapitools) groupId Generated artifact package's organization (i.e. maven groupId). (Default: org.openapitools) diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md index dace2b33af9..16c84f74b86 100644 --- a/docs/generators/kotlin-spring.md +++ b/docs/generators/kotlin-spring.md @@ -5,7 +5,7 @@ CONFIG OPTIONS for kotlin-spring source folder for generated code (Default: src/main/kotlin) packageName - Generated artifact package name (e.g. io.swagger). + Generated artifact package name. (Default: org.openapitools) groupId Generated artifact package's organization (i.e. maven groupId). (Default: org.openapitools) diff --git a/docs/generators/kotlin.md b/docs/generators/kotlin.md index e2184b546bf..75529e49286 100644 --- a/docs/generators/kotlin.md +++ b/docs/generators/kotlin.md @@ -5,7 +5,7 @@ CONFIG OPTIONS for kotlin source folder for generated code (Default: src/main/kotlin) packageName - Generated artifact package name (e.g. io.swagger). + Generated artifact package name. (Default: org.openapitools) groupId Generated artifact package's organization (i.e. maven groupId). (Default: org.openapitools) diff --git a/docs/generators/lua.md b/docs/generators/lua.md index 721da77eddf..d35fb4f2cd3 100644 --- a/docs/generators/lua.md +++ b/docs/generators/lua.md @@ -2,7 +2,7 @@ CONFIG OPTIONS for lua packageName - Lua package name (convention: lowercase). (Default: swagger-client) + Lua package name (convention: lowercase). (Default: openapir-client) packageVersion Lua package version. (Default: 1.0.0-1) diff --git a/docs/generators/rust-server.md b/docs/generators/rust-server.md index 7e7b340a990..f0bac844c16 100644 --- a/docs/generators/rust-server.md +++ b/docs/generators/rust-server.md @@ -2,7 +2,7 @@ CONFIG OPTIONS for rust-server packageName - Rust crate name (convention: snake_case). (Default: swagger_client) + Rust crate name (convention: snake_case). (Default: openapi_client) packageVersion Rust crate version. (Default: 1.0.0) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index 37c5124c9f0..e59d72cd589 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -38,7 +38,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co protected String artifactId; protected String artifactVersion = "1.0.0"; protected String groupId = "org.openapitools"; - protected String packageName; + protected String packageName = "org.openapitools"; protected String sourceFolder = "src/main/kotlin"; @@ -191,7 +191,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co cliOptions.clear(); addOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC, sourceFolder); - addOption(CodegenConstants.PACKAGE_NAME, "Generated artifact package name (e.g. io.swagger).", packageName); + addOption(CodegenConstants.PACKAGE_NAME, "Generated artifact package name.", packageName); addOption(CodegenConstants.GROUP_ID, "Generated artifact package's organization (i.e. maven groupId).", groupId); addOption(CodegenConstants.ARTIFACT_ID, "Generated artifact id (name of jar).", artifactId); addOption(CodegenConstants.ARTIFACT_VERSION, "Generated artifact's package version.", artifactVersion); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java index 9a345379021..de11614209f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java @@ -48,11 +48,11 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig { private static final Logger LOGGER = LoggerFactory.getLogger(LuaClientCodegen.class); protected String specFolder = "spec"; - protected String packageName = "openapi-client"; + protected String packageName = "openapiclient"; protected String packageVersion = "1.0.0-1"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; - protected String luaRocksFilename = "openapi-client-1.0.0-1.rockspec"; + protected String luaRocksFilename = "openapiclient-1.0.0-1.rockspec"; public CodegenType getTag() { return CodegenType.CLIENT; @@ -138,8 +138,8 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig { importMapping.put("os", "io/ioutil"); cliOptions.clear(); - cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Lua package name (convention: lowercase).") - .defaultValue("swagger-client")); + cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Lua package name (convention: single word).") + .defaultValue("openapiclient")); cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "Lua package version.") .defaultValue("1.0.0-1")); cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java index d45ce26f0ea..a1980ebb871 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java @@ -175,7 +175,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig { cliOptions.clear(); cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Rust crate name (convention: snake_case).") - .defaultValue("swagger_client")); + .defaultValue("openapi_client")); cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "Rust crate version.") .defaultValue("1.0.0")); @@ -219,7 +219,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig { if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) { setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME)); } else { - setPackageName("swagger_client"); + setPackageName("openapi_client"); } if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) {