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

Merge pull request #1406 from testn/fix-meta

Browse Source 
Use the version from the codegen for meta generator
This commit is contained in:
wing328 2015-11-23 17:20:46 +08:00
commit 3872599be2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java
View File

@ -1,6 +1,7 @@
package io.swagger.codegen.cmd; package io.swagger.codegen.cmd;
import ch.lambdaj.function.convert.Converter; import ch.lambdaj.function.convert.Converter;
import com.google.common.base.CaseFormat;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Mustache;
@ -9,7 +10,6 @@ import io.airlift.airline.Option;
import io.swagger.codegen.DefaultGenerator; import io.swagger.codegen.DefaultGenerator;
import io.swagger.codegen.SupportingFile; import io.swagger.codegen.SupportingFile;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -55,7 +55,7 @@ public class Meta implements Runnable {
final File targetDir = new File(outputFolder); final File targetDir = new File(outputFolder);
LOG.info("writing to folder [{}]", targetDir.getAbsolutePath()); LOG.info("writing to folder [{}]", targetDir.getAbsolutePath());
String mainClass = StringUtils.capitalize(name) + "Generator"; String mainClass = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, name) + "Generator";
List<SupportingFile> supportingFiles = ImmutableList.of( List<SupportingFile> supportingFiles = ImmutableList.of(
new SupportingFile("pom.mustache", "", "pom.xml"), new SupportingFile("pom.mustache", "", "pom.xml"),
@ -68,11 +68,18 @@ public class Meta implements Runnable {
"src/main/resources/META-INF/services", "io.swagger.codegen.CodegenConfig") "src/main/resources/META-INF/services", "io.swagger.codegen.CodegenConfig")
); );
String swaggerVersion = this.getClass().getPackage().getImplementationVersion();
// if the code is running outside of the jar (i.e. from the IDE), it will not have the version available.
// let's default it with something.
if (swaggerVersion==null) {
swaggerVersion = "2.1.3";
}
Map<String, Object> data = new ImmutableMap.Builder<String, Object>() Map<String, Object> data = new ImmutableMap.Builder<String, Object>()
.put("generatorPackage", targetPackage) .put("generatorPackage", targetPackage)
.put("generatorClass", mainClass) .put("generatorClass", mainClass)
.put("name", name) .put("name", name)
.put("fullyQualifiedGeneratorClass", targetPackage + "." + mainClass).build(); .put("fullyQualifiedGeneratorClass", targetPackage + "." + mainClass)
.put("swaggerCodegenVersion", swaggerVersion).build();
with(supportingFiles).convert(processFiles(targetDir, data)); with(supportingFiles).convert(processFiles(targetDir, data));

2
modules/swagger-codegen/src/main/resources/codegen/pom.mustache
View File

@ -95,7 +95,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<swagger-codegen-version>2.1.3</swagger-codegen-version> <swagger-codegen-version>{{swaggerCodegenVersion}}</swagger-codegen-version>
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.8.1</junit-version> <junit-version>4.8.1</junit-version>
</properties> </properties>