loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.3.x' into 4.0.x

Browse Source
This commit is contained in:
William Cheng 2018-10-16 23:42:29 +08:00
commit 83c55ec016
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/generators/kotlin-server.md
View File

@ -5,7 +5,7 @@ CONFIG OPTIONS for kotlin-server
source folder for generated code (Default: src/main/kotlin) source folder for generated code (Default: src/main/kotlin)
packageName packageName
Generated artifact package name (e.g. io.swagger). Generated artifact package name. (Default: org.openapitools)
groupId groupId
Generated artifact package's organization (i.e. maven groupId). (Default: org.openapitools) Generated artifact package's organization (i.e. maven groupId). (Default: org.openapitools)

2
docs/generators/kotlin-spring.md
View File

@ -5,7 +5,7 @@ CONFIG OPTIONS for kotlin-spring
source folder for generated code (Default: src/main/kotlin) source folder for generated code (Default: src/main/kotlin)
packageName packageName
Generated artifact package name (e.g. io.swagger). Generated artifact package name. (Default: org.openapitools)
groupId groupId
Generated artifact package's organization (i.e. maven groupId). (Default: org.openapitools) Generated artifact package's organization (i.e. maven groupId). (Default: org.openapitools)

2
docs/generators/kotlin.md
View File

@ -5,7 +5,7 @@ CONFIG OPTIONS for kotlin
source folder for generated code (Default: src/main/kotlin) source folder for generated code (Default: src/main/kotlin)
packageName packageName
Generated artifact package name (e.g. io.swagger). Generated artifact package name. (Default: org.openapitools)
groupId groupId
Generated artifact package's organization (i.e. maven groupId). (Default: org.openapitools) Generated artifact package's organization (i.e. maven groupId). (Default: org.openapitools)

2
docs/generators/lua.md
View File

@ -2,7 +2,7 @@
CONFIG OPTIONS for lua CONFIG OPTIONS for lua
packageName packageName
Lua package name (convention: lowercase). (Default: swagger-client) Lua package name (convention: lowercase). (Default: openapir-client)
packageVersion packageVersion
Lua package version. (Default: 1.0.0-1) Lua package version. (Default: 1.0.0-1)

2
docs/generators/rust-server.md
View File

@ -2,7 +2,7 @@
CONFIG OPTIONS for rust-server CONFIG OPTIONS for rust-server
packageName packageName
Rust crate name (convention: snake_case). (Default: swagger_client) Rust crate name (convention: snake_case). (Default: openapi_client)
packageVersion packageVersion
Rust crate version. (Default: 1.0.0) Rust crate version. (Default: 1.0.0)

2
modules/openapi-generator-gradle-plugin/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
View File

@ -38,7 +38,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
protected String artifactId; protected String artifactId;
protected String artifactVersion = "1.0.0"; protected String artifactVersion = "1.0.0";
protected String groupId = "org.openapitools"; protected String groupId = "org.openapitools";
protected String packageName; protected String packageName = "org.openapitools";
protected String sourceFolder = "src/main/kotlin"; protected String sourceFolder = "src/main/kotlin";
@ -191,7 +191,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
cliOptions.clear(); cliOptions.clear();
addOption(CodegenConstants.SOURCE_FOLDER, CodegenConstants.SOURCE_FOLDER_DESC, sourceFolder); 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.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_ID, "Generated artifact id (name of jar).", artifactId);
addOption(CodegenConstants.ARTIFACT_VERSION, "Generated artifact's package version.", artifactVersion); addOption(CodegenConstants.ARTIFACT_VERSION, "Generated artifact's package version.", artifactVersion);

8
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java
View File

@ -48,11 +48,11 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(LuaClientCodegen.class); private static final Logger LOGGER = LoggerFactory.getLogger(LuaClientCodegen.class);
protected String specFolder = "spec"; protected String specFolder = "spec";
protected String packageName = "openapi-client"; protected String packageName = "openapiclient";
protected String packageVersion = "1.0.0-1"; protected String packageVersion = "1.0.0-1";
protected String apiDocPath = "docs/"; protected String apiDocPath = "docs/";
protected String modelDocPath = "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() { public CodegenType getTag() {
return CodegenType.CLIENT; return CodegenType.CLIENT;
@ -138,8 +138,8 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig {
importMapping.put("os", "io/ioutil"); importMapping.put("os", "io/ioutil");
cliOptions.clear(); cliOptions.clear();
cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Lua package name (convention: lowercase).") cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Lua package name (convention: single word).")
.defaultValue("swagger-client")); .defaultValue("openapiclient"));
cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "Lua package version.") cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "Lua package version.")
.defaultValue("1.0.0-1")); .defaultValue("1.0.0-1"));
cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC) cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC)

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
View File

@ -175,7 +175,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
cliOptions.clear(); cliOptions.clear();
cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME,
"Rust crate name (convention: snake_case).") "Rust crate name (convention: snake_case).")
.defaultValue("swagger_client")); .defaultValue("openapi_client"));
cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION,
"Rust crate version.") "Rust crate version.")
.defaultValue("1.0.0")); .defaultValue("1.0.0"));
@ -219,7 +219,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) { if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) {
setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME)); setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME));
} else { } else {
setPackageName("swagger_client"); setPackageName("openapi_client");
} }
if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) { if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) {