Skip to content

Commit 68a4e08

Browse files
committed
Merge branch '3.0.0' into kotlin
2 parents 9aa7e0b + a547cbb commit 68a4e08

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public static void main(String[] args) {
9191
String language = CLIHelper.detectlanguage(args);
9292
if (StringUtils.isNotBlank(language)) {
9393
CodegenConfig config = CodegenConfigLoader.forName(language);
94-
codegenArguments = config.getLanguageArguments();
94+
codegenArguments = config.readLanguageArguments();
9595
if (codegenArguments != null && !codegenArguments.isEmpty()) {
9696
for (CodegenArgument codegenArgument : codegenArguments) {
9797
String[] arguments = CLIHelper.getArguments(codegenArgument);

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,9 @@ public interface CodegenConfig {
220220

221221
void addHandlebarHelpers(Handlebars handlebars);
222222

223+
List<CodegenArgument> readLanguageArguments();
224+
223225
List<CodegenArgument> getLanguageArguments();
224226

225-
void processArgumentsValues(List<CodegenArgument> codegenArguments);
227+
void setLanguageArguments(List<CodegenArgument> codegenArguments);
226228
}

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3164,13 +3164,18 @@ public void addHandlebarHelpers(Handlebars handlebars) {
31643164
handlebars.registerHelper(HasNotHelper.NAME, new HasNotHelper());
31653165
}
31663166

3167+
@Override
3168+
public List<CodegenArgument> readLanguageArguments() {
3169+
return null;
3170+
}
3171+
31673172
@Override
31683173
public List<CodegenArgument> getLanguageArguments() {
31693174
return null;
31703175
}
31713176

31723177
@Override
3173-
public void processArgumentsValues(List<CodegenArgument> codegenArguments){
3178+
public void setLanguageArguments(List<CodegenArgument> codegenArguments){
31743179
}
31753180

31763181
/**

modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ public ClientOptInput toClientOptInput() {
416416
config.languageSpecificPrimitives().addAll(languageSpecificPrimitives);
417417
config.reservedWordsMappings().putAll(reservedWordMappings);
418418

419-
config.processArgumentsValues(codegenArguments);
419+
config.setLanguageArguments(codegenArguments);
420420

421421
checkAndSetAdditionalProperty(apiPackage, CodegenConstants.API_PACKAGE);
422422
checkAndSetAdditionalProperty(modelPackage, CodegenConstants.MODEL_PACKAGE);
@@ -478,7 +478,7 @@ public ClientOptInput toClientOptInput(String content) {
478478
config.languageSpecificPrimitives().addAll(languageSpecificPrimitives);
479479
config.reservedWordsMappings().putAll(reservedWordMappings);
480480

481-
config.processArgumentsValues(codegenArguments);
481+
config.setLanguageArguments(codegenArguments);
482482

483483
checkAndSetAdditionalProperty(apiPackage, CodegenConstants.API_PACKAGE);
484484
checkAndSetAdditionalProperty(modelPackage, CodegenConstants.MODEL_PACKAGE);

0 commit comments

Comments
 (0)