diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java index 3cf8cb7133ef..b77239a5b4db 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java @@ -15,24 +15,9 @@ import org.slf4j.LoggerFactory; public class GoClientCodegen extends DefaultCodegen implements CodegenConfig { static Logger LOGGER = LoggerFactory.getLogger(GoClientCodegen.class); - - public static final String VARIABLE_NAMING_CONVENTION = "variableNamingConvention"; - public static final String PACKAGE_PATH = "packagePath"; - public static final String SRC_BASE_PATH = "srcBasePath"; - public static final String COMPOSER_VENDOR_NAME = "composerVendorName"; - public static final String COMPOSER_PROJECT_NAME = "composerProjectName"; protected String packageName = "swagger"; protected String packageVersion = "1.0.0"; - protected String invokerPackage = "Swagger\\Client"; - protected String composerVendorName = "swagger"; - protected String composerProjectName = "swagger-client"; - protected String packagePath = "SwaggerClient-php"; - protected String artifactVersion = "1.0.0"; - protected String srcBasePath = "lib"; - protected String variableNamingConvention= "snake_case"; - protected String apiDocPath = "docs/"; - protected String modelDocPath = "docs/"; public CodegenType getTag() { return CodegenType.CLIENT; @@ -118,70 +103,11 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig { .defaultValue("swagger")); cliOptions.add(new CliOption(CodegenConstants.PACKAGE_VERSION, "Go package version.") .defaultValue("1.0.0")); - cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); - cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); - cliOptions.add(new CliOption(VARIABLE_NAMING_CONVENTION, "naming convention of variable name, e.g. camelCase.") - .defaultValue("snake_case")); - cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, "The main namespace to use for all classes. e.g. Yay\\Pets")); - cliOptions.add(new CliOption(PACKAGE_PATH, "The main package name for classes. e.g. GeneratedPetstore")); - cliOptions.add(new CliOption(SRC_BASE_PATH, "The directory under packagePath to serve as source root.")); - cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets. IMPORTANT NOTE (2016/03): composerVendorName will be deprecated and replaced by gitUserId in the next swagger-codegen release")); - cliOptions.add(new CliOption(COMPOSER_PROJECT_NAME, "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client. IMPORTANT NOTE (2016/03): composerProjectName will be deprecated and replaced by gitRepoId in the next swagger-codegen release")); - cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, "The version to use in the composer package version field. e.g. 1.2.3")); - } @Override public void processOpts() { - super.processOpts(); - - if (additionalProperties.containsKey(PACKAGE_PATH)) { - this.setPackagePath((String) additionalProperties.get(PACKAGE_PATH)); - } else { - additionalProperties.put(PACKAGE_PATH, packagePath); - } - - if (additionalProperties.containsKey(SRC_BASE_PATH)) { - this.setSrcBasePath((String) additionalProperties.get(SRC_BASE_PATH)); - } else { - additionalProperties.put(SRC_BASE_PATH, srcBasePath); - } - - if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) { - this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE)); - } else { - additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage); - } - - if (!additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) { - additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage); - } - - if (!additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) { - additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage); - } - - if (additionalProperties.containsKey(COMPOSER_PROJECT_NAME)) { - this.setComposerProjectName((String) additionalProperties.get(COMPOSER_PROJECT_NAME)); - } else { - additionalProperties.put(COMPOSER_PROJECT_NAME, composerProjectName); - } - - if (additionalProperties.containsKey(COMPOSER_VENDOR_NAME)) { - this.setComposerVendorName((String) additionalProperties.get(COMPOSER_VENDOR_NAME)); - } else { - additionalProperties.put(COMPOSER_VENDOR_NAME, composerVendorName); - } - - if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION)) { - this.setArtifactVersion((String) additionalProperties.get(CodegenConstants.ARTIFACT_VERSION)); - } else { - additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, artifactVersion); - } - - if (additionalProperties.containsKey(VARIABLE_NAMING_CONVENTION)) { - this.setParameterNamingConvention((String) additionalProperties.get(VARIABLE_NAMING_CONVENTION)); - } + //super.processOpts(); if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) { setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME)); @@ -408,32 +334,4 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig { public void setPackageVersion(String packageVersion) { this.packageVersion = packageVersion; } - - public void setInvokerPackage(String invokerPackage) { - this.invokerPackage = invokerPackage; - } - - public void setArtifactVersion(String artifactVersion) { - this.artifactVersion = artifactVersion; - } - - public void setPackagePath(String packagePath) { - this.packagePath = packagePath; - } - - public void setSrcBasePath(String srcBasePath) { - this.srcBasePath = srcBasePath; - } - - public void setParameterNamingConvention(String variableNamingConvention) { - this.variableNamingConvention = variableNamingConvention; - } - - public void setComposerVendorName(String composerVendorName) { - this.composerVendorName = composerVendorName; - } - - public void setComposerProjectName(String composerProjectName) { - this.composerProjectName = composerProjectName; - } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoClientOptionsTest.java index e307ac3ca5c4..528666c58e52 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/go/GoClientOptionsTest.java @@ -26,26 +26,6 @@ public class GoClientOptionsTest extends AbstractOptionsTest { @Override protected void setExpectations() { new Expectations(clientCodegen) {{ - clientCodegen.setModelPackage(GoClientOptionsProvider.MODEL_PACKAGE_VALUE); - times = 1; - clientCodegen.setApiPackage(GoClientOptionsProvider.API_PACKAGE_VALUE); - times = 1; - //clientCodegen.setSortParamsByRequiredFlag(Boolean.valueOf(GoClientOptionsProvider.SORT_PARAMS_VALUE)); - //times = 1; - clientCodegen.setParameterNamingConvention(GoClientOptionsProvider.VARIABLE_NAMING_CONVENTION_VALUE); - times = 1; - clientCodegen.setInvokerPackage(GoClientOptionsProvider.INVOKER_PACKAGE_VALUE); - times = 1; - clientCodegen.setPackagePath(GoClientOptionsProvider.PACKAGE_PATH_VALUE); - times = 1; - clientCodegen.setSrcBasePath(GoClientOptionsProvider.SRC_BASE_PATH_VALUE); - times = 1; - clientCodegen.setComposerVendorName(GoClientOptionsProvider.COMPOSER_VENDOR_NAME_VALUE); - times = 1; - clientCodegen.setComposerProjectName(GoClientOptionsProvider.COMPOSER_PROJECT_NAME_VALUE); - times = 1; - clientCodegen.setArtifactVersion(GoClientOptionsProvider.ARTIFACT_VERSION_VALUE); - times = 1; clientCodegen.setPackageVersion(GoClientOptionsProvider.PACKAGE_VERSION_VALUE); times = 1; clientCodegen.setPackageName(GoClientOptionsProvider.PACKAGE_NAME_VALUE); diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/GoClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/GoClientOptionsProvider.java index 7383043bc645..304d8acf4574 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/GoClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/GoClientOptionsProvider.java @@ -8,20 +8,9 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; public class GoClientOptionsProvider implements OptionsProvider { - public static final String MODEL_PACKAGE_VALUE = "package"; - public static final String API_PACKAGE_VALUE = "apiPackage"; - public static final String SORT_PARAMS_VALUE = "false"; - public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; - public static final String VARIABLE_NAMING_CONVENTION_VALUE = "snake_case"; - public static final String INVOKER_PACKAGE_VALUE = "Swagger\\Client\\Go"; - public static final String PACKAGE_PATH_VALUE = "SwaggerClient-go"; - public static final String SRC_BASE_PATH_VALUE = "libGo"; - public static final String COMPOSER_VENDOR_NAME_VALUE = "swaggerGo"; - public static final String COMPOSER_PROJECT_NAME_VALUE = "swagger-client-go"; - public static final String ARTIFACT_VERSION_VALUE = "1.0.0-SNAPSHOT"; - public static final String PACKAGE_VERSION_VALUE = "1.0.0-TEST"; - public static final String PACKAGE_NAME_VALUE = "TEST"; + public static final String PACKAGE_VERSION_VALUE = "1.0.0"; + public static final String PACKAGE_NAME_VALUE = "Go"; @Override public String getLanguage() { @@ -31,17 +20,7 @@ public class GoClientOptionsProvider implements OptionsProvider { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(CodegenConstants.MODEL_PACKAGE, MODEL_PACKAGE_VALUE) - .put(CodegenConstants.API_PACKAGE, API_PACKAGE_VALUE) - //.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) - //.put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE) - .put(GoClientCodegen.VARIABLE_NAMING_CONVENTION, VARIABLE_NAMING_CONVENTION_VALUE) - .put(CodegenConstants.INVOKER_PACKAGE, INVOKER_PACKAGE_VALUE) - .put(GoClientCodegen.PACKAGE_PATH, PACKAGE_PATH_VALUE) - .put(GoClientCodegen.SRC_BASE_PATH, SRC_BASE_PATH_VALUE) - .put(GoClientCodegen.COMPOSER_VENDOR_NAME, COMPOSER_VENDOR_NAME_VALUE) - .put(GoClientCodegen.COMPOSER_PROJECT_NAME, COMPOSER_PROJECT_NAME_VALUE) - .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE) + return builder .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) .put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) .build();