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

Move Ruby module/gem to codegen constant (#2621)

Browse Source 
* move module/gem to codegen constant

* remove extra line
This commit is contained in:
William Cheng 2019-04-10 21:36:53 +08:00 committed by GitHub
parent 9455fe7bec
commit 173d16d114
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
View File

@ -54,6 +54,12 @@ public class CodegenConstants {
public static final String PERL_MODULE_NAME = "perlModuleName";
public static final String PERL_MODULE_NAME_DESC = "root module name for generated perl code";
public static final String MODULE_NAME = "moduleName";
public static final String MODULE_NAME_DESC = "top module name (convention: CamelCase, usually corresponding to gem name).";
public static final String GEM_NAME = "gemName";
public static final String GEM_NAME_DESC = "gem name (convention: underscore_case).";
public static final String PYTHON_PACKAGE_NAME = "pythonPackageName";
public static final String PYTHON_PACKAGE_NAME_DESC = "package name for generated python code";

22
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
View File

@ -38,8 +38,6 @@ import static org.openapitools.codegen.utils.StringUtils.underscore;
public class RubyClientCodegen extends AbstractRubyCodegen {
private static final Logger LOGGER = LoggerFactory.getLogger(RubyClientCodegen.class);
private static final String NUMERIC_ENUM_PREFIX = "N";
public static final String GEM_NAME = "gemName";
public static final String MODULE_NAME = "moduleName";
public static final String GEM_VERSION = "gemVersion";
public static final String GEM_LICENSE = "gemLicense";
public static final String GEM_REQUIRED_RUBY_VERSION = "gemRequiredRubyVersion";
@ -113,10 +111,12 @@ public class RubyClientCodegen extends AbstractRubyCodegen {
}
}
cliOptions.add(new CliOption(GEM_NAME, "gem name (convention: underscore_case).").
cliOptions.add(new CliOption(CodegenConstants.GEM_NAME, CodegenConstants.GEM_NAME_DESC).
defaultValue("openapi_client"));
cliOptions.add(new CliOption(MODULE_NAME, "top module name (convention: CamelCase, usually corresponding" +
" to gem name).").defaultValue("OpenAPIClient"));
cliOptions.add(new CliOption(CodegenConstants.MODULE_NAME, CodegenConstants.MODULE_NAME_DESC).
defaultValue("OpenAPIClient"));
cliOptions.add(new CliOption(GEM_VERSION, "gem version.").defaultValue("1.0.0"));
cliOptions.add(new CliOption(GEM_LICENSE, "gem license. ").
@ -147,11 +147,11 @@ public class RubyClientCodegen extends AbstractRubyCodegen {
public void processOpts() {
super.processOpts();
if (additionalProperties.containsKey(GEM_NAME)) {
setGemName((String) additionalProperties.get(GEM_NAME));
if (additionalProperties.containsKey(CodegenConstants.GEM_NAME)) {
setGemName((String) additionalProperties.get(CodegenConstants.GEM_NAME));
}
if (additionalProperties.containsKey(MODULE_NAME)) {
setModuleName((String) additionalProperties.get(MODULE_NAME));
if (additionalProperties.containsKey(CodegenConstants.MODULE_NAME)) {
setModuleName((String) additionalProperties.get(CodegenConstants.MODULE_NAME));
}
if (gemName == null && moduleName == null) {
@ -163,8 +163,8 @@ public class RubyClientCodegen extends AbstractRubyCodegen {
setModuleName(generateModuleName(gemName));
}
additionalProperties.put(GEM_NAME, gemName);
additionalProperties.put(MODULE_NAME, moduleName);
additionalProperties.put(CodegenConstants.GEM_NAME, gemName);
additionalProperties.put(CodegenConstants.MODULE_NAME, moduleName);
if (additionalProperties.containsKey(GEM_VERSION)) {
setGemVersion((String) additionalProperties.get(GEM_VERSION));

4
modules/openapi-generator/src/test/java/org/openapitools/codegen/options/RubyClientOptionsProvider.java
View File

@ -47,8 +47,8 @@ public class RubyClientOptionsProvider implements OptionsProvider {
@Override
public Map<String, String> createOptions() {
ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
return builder.put(RubyClientCodegen.GEM_NAME, GEM_NAME_VALUE)
.put(RubyClientCodegen.MODULE_NAME, MODULE_NAME_VALUE)
return builder.put(CodegenConstants.GEM_NAME, GEM_NAME_VALUE)
.put(CodegenConstants.MODULE_NAME, MODULE_NAME_VALUE)
.put(RubyClientCodegen.GEM_VERSION, GEM_VERSION_VALUE)
.put(RubyClientCodegen.GEM_LICENSE, GEM_LICENSE_VALUE)
.put(RubyClientCodegen.GEM_REQUIRED_RUBY_VERSION, GEM_REQUIRED_RUBY_VERSION_VALUE)