From d82c77da34a29cd9bba71dfde57c9479ae39ad7f Mon Sep 17 00:00:00 2001 From: Mateusz Mackowiak Date: Fri, 27 May 2016 12:46:09 +0200 Subject: [PATCH] - [Objc] Fix test after removing license property - Moved adding License file to DefaultGenerator --- .../io/swagger/codegen/DefaultCodegen.java | 2 ++ .../io/swagger/codegen/DefaultGenerator.java | 9 ++++++--- .../io/swagger/codegen/SupportingFile.java | 19 ++++++++++++++++++- .../codegen/languages/ObjcClientCodegen.java | 1 - .../{objc => _common}/LICENSE.mustache | 0 .../codegen/objc/ObjcClientOptionsTest.java | 2 -- .../options/ObjcClientOptionsProvider.java | 2 -- samples/client/petstore/objc/README.md | 2 +- 8 files changed, 27 insertions(+), 10 deletions(-) rename modules/swagger-codegen/src/main/resources/{objc => _common}/LICENSE.mustache (100%) 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 7623899f2a6..cc850a39e11 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 @@ -792,6 +792,8 @@ public class DefaultCodegen { importMapping.put("LocalDate", "org.joda.time.*"); importMapping.put("LocalTime", "org.joda.time.*"); + supportingFiles.add(new SupportingFile.GlobalSupportingFile("LICENSE.mustache", "LICENSE")); + cliOptions.add(CliOption.newBoolean(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG_DESC).defaultValue(Boolean.TRUE.toString())); cliOptions.add(CliOption.newBoolean(CodegenConstants.ENSURE_UNIQUE_PARAMS, CodegenConstants diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java index 769a6185336..1684bf40705 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -530,9 +530,12 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { LOGGER.info("Skipped overwriting " + outputFilename); continue; } - - String templateFile = getFullTemplateFile(config, support.templateFile); - + String templateFile; + if( support instanceof SupportingFile.GlobalSupportingFile) { + templateFile = config.getCommonTemplateDir() + File.separator + support.templateFile; + } else { + templateFile = getFullTemplateFile(config, support.templateFile); + } boolean shouldGenerate = true; if(supportingFilesToGenerate != null && supportingFilesToGenerate.size() > 0) { if(supportingFilesToGenerate.contains(support.destinationFilename)) { diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java index e5fb6a27da6..3643c8c6a92 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java @@ -5,6 +5,10 @@ public class SupportingFile { public String folder; public String destinationFilename; + public SupportingFile(String templateFile, String destinationFilename) { + this(templateFile, "", destinationFilename); + } + public SupportingFile(String templateFile, String folder, String destinationFilename) { this.templateFile = templateFile; this.folder = folder; @@ -44,4 +48,17 @@ public class SupportingFile { result = 31 * result + (destinationFilename != null ? destinationFilename.hashCode() : 0); return result; } -} \ No newline at end of file + + static public class GlobalSupportingFile extends SupportingFile { + + GlobalSupportingFile(String templateFile, String folder, String destinationFilename) { + super(templateFile, folder, destinationFilename); + } + + GlobalSupportingFile(String templateFile, String destinationFilename) { + super(templateFile, destinationFilename); + } + } +} + + diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java index 57f14bf2bce..431bb4ba51f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java @@ -251,7 +251,6 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh")); supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore")); - supportingFiles.add(new SupportingFile("LICENSE.mustache", "", "LICENSE")); } @Override diff --git a/modules/swagger-codegen/src/main/resources/objc/LICENSE.mustache b/modules/swagger-codegen/src/main/resources/_common/LICENSE.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/objc/LICENSE.mustache rename to modules/swagger-codegen/src/main/resources/_common/LICENSE.mustache diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java index 795c6ee2d9c..f1d55e007da 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/objc/ObjcClientOptionsTest.java @@ -38,8 +38,6 @@ public class ObjcClientOptionsTest extends AbstractOptionsTest { times = 1; clientCodegen.setGitRepoURL(ObjcClientOptionsProvider.GIT_REPO_URL_VALUE); times = 1; - clientCodegen.setLicense(ObjcClientOptionsProvider.LICENSE_VALUE); - times = 1; }}; } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java index 2f76199e4f3..5057dd3b4ff 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/ObjcClientOptionsProvider.java @@ -14,7 +14,6 @@ public class ObjcClientOptionsProvider implements OptionsProvider { public static final String AUTHOR_NAME_VALUE = "SwaggerObjc"; public static final String AUTHOR_EMAIL_VALUE = "objc@swagger.io"; public static final String GIT_REPO_URL_VALUE = "https://github.com/swagger-api/swagger-codegen"; - public static final String LICENSE_VALUE = "MIT"; @Override public String getLanguage() { @@ -30,7 +29,6 @@ public class ObjcClientOptionsProvider implements OptionsProvider { .put(ObjcClientCodegen.AUTHOR_NAME, AUTHOR_NAME_VALUE) .put(ObjcClientCodegen.AUTHOR_EMAIL, AUTHOR_EMAIL_VALUE) .put(ObjcClientCodegen.GIT_REPO_URL, GIT_REPO_URL_VALUE) - .put(ObjcClientCodegen.LICENSE, LICENSE_VALUE) .build(); } diff --git a/samples/client/petstore/objc/README.md b/samples/client/petstore/objc/README.md index c30a7813e83..f129b95b501 100644 --- a/samples/client/petstore/objc/README.md +++ b/samples/client/petstore/objc/README.md @@ -6,7 +6,7 @@ This ObjC package is automatically generated by the [Swagger Codegen](https://gi - API version: 1.0.0 - Package version: -- Build date: 2016-05-25T18:06:49.729+02:00 +- Build date: 2016-05-27T12:41:24.581+02:00 - Build package: class io.swagger.codegen.languages.ObjcClientCodegen ## Requirements