From df8d4fd8b8ff02296040d463bb9860be1a918448 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 14 Mar 2016 21:43:53 +0800 Subject: [PATCH] remove releaseVersion (duplicated with packageVersion) --- .../java/io/swagger/codegen/cmd/Generate.java | 7 ------- .../io/swagger/codegen/CodegenConfig.java | 4 ---- .../io/swagger/codegen/CodegenConstants.java | 3 --- .../io/swagger/codegen/DefaultCodegen.java | 20 +------------------ .../codegen/config/CodegenConfigurator.java | 11 ---------- pom.xml | 2 +- 6 files changed, 2 insertions(+), 45 deletions(-) diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java index 064e4b9520f..c44088473e6 100644 --- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java +++ b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java @@ -115,9 +115,6 @@ public class Generate implements Runnable { @Option(name = {"--release-note"}, title = "release note", description = CodegenConstants.RELEASE_NOTE_DESC) private String releaseNote; - @Option(name = {"--release-version"}, title = "release version", description = CodegenConstants.RELEASE_VERSION_DESC) - private String releaseVersion; - @Option(name = {"--http-user-agent"}, title = "http user agent", description = CodegenConstants.HTTP_USER_AGENT) private String httpUserAgent; @@ -210,10 +207,6 @@ public class Generate implements Runnable { configurator.setReleaseNote(releaseNote); } - if (isNotEmpty(releaseVersion)) { - configurator.setReleaseVersion(releaseVersion); - } - if (isNotEmpty(httpUserAgent)) { configurator.setHttpUserAgent(httpUserAgent); } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java index 4d829232b07..3dc90472247 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java @@ -180,10 +180,6 @@ public interface CodegenConfig { String getReleaseNote(); - void setReleaseVersion(String releaseVersion); - - String getReleaseVersion(); - void setHttpUserAgent(String httpUserAgent); String getHttpUserAgent(); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java index 0cf31d081f9..a43c8f8c986 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConstants.java @@ -100,9 +100,6 @@ public class CodegenConstants { public static final String RELEASE_NOTE = "releaseNote"; public static final String RELEASE_NOTE_DESC = "Release note, default to 'Minor update'."; - public static final String RELEASE_VERSION = "releaseVersion"; - public static final String RELEASE_VERSION_DESC= "Release version, e.g. 1.2.5, default to 0.1.0."; - public static final String HTTP_USER_AGENT = "httpUserAgent"; public static final String HTTP_USER_AGENT_DESC = "HTTP user agent, e.g. codegen_csharp_api_client, default to 'Swagger-Codegen/{releaseVersion}}/{language}'"; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 649212735d3..65ed6a456ef 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -83,7 +83,7 @@ public class DefaultCodegen { protected String library; protected Boolean sortParamsByRequiredFlag = true; protected Boolean ensureUniqueParams = true; - protected String gitUserId, gitRepoId, releaseNote, releaseVersion; + protected String gitUserId, gitRepoId, releaseNote; protected String httpUserAgent; public List cliOptions() { @@ -2414,24 +2414,6 @@ public class DefaultCodegen { return releaseNote; } - /** - * Set release version. - * - * @param releaseVersion Release version - */ - public void setReleaseVersion(String releaseVersion) { - this.releaseVersion = releaseVersion; - } - - /** - * Release version - * - * @return Release version - */ - public String getReleaseVersion() { - return releaseVersion; - } - /** * Set HTTP user agent. * diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java index b94ca5f2e18..98c57ab341a 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java @@ -63,7 +63,6 @@ public class CodegenConfigurator { private String gitUserId="YOUR_GIT_USR_ID"; private String gitRepoId="YOUR_GIT_REPO_ID"; private String releaseNote="Minor update"; - private String releaseVersion="0.1.0"; private String httpUserAgent; private final Map dynamicProperties = new HashMap(); //the map that holds the JsonAnySetter/JsonAnyGetter values @@ -327,15 +326,6 @@ public class CodegenConfigurator { return this; } - public String getReleaseVersion() { - return releaseVersion; - } - - public CodegenConfigurator setReleaseVersion(String releaseVersion) { - this.releaseVersion = releaseVersion; - return this; - } - public String getHttpUserAgent() { return httpUserAgent; } @@ -374,7 +364,6 @@ public class CodegenConfigurator { checkAndSetAdditionalProperty(modelNameSuffix, CodegenConstants.MODEL_NAME_SUFFIX); checkAndSetAdditionalProperty(gitUserId, CodegenConstants.GIT_USER_ID); checkAndSetAdditionalProperty(gitRepoId, CodegenConstants.GIT_REPO_ID); - checkAndSetAdditionalProperty(releaseVersion, CodegenConstants.RELEASE_VERSION); checkAndSetAdditionalProperty(releaseNote, CodegenConstants.RELEASE_NOTE); checkAndSetAdditionalProperty(httpUserAgent, CodegenConstants.HTTP_USER_AGENT); diff --git a/pom.xml b/pom.xml index 3519ce9f0cb..bc0b67c0e1d 100644 --- a/pom.xml +++ b/pom.xml @@ -549,7 +549,7 @@ 1.0.18-SNAPSHOT 2.11.1 2.3.4 - 1.5.7 + 1.5.8 2.4 1.2 4.8.1