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

[Java] Fix outputFolder in java-related server stub generators (#4076)

Browse Source 
* fix outputFolder in java-related server stub generator

* fix style in JavaJAXRSCXFCDIServerCodegen
This commit is contained in:
wing328 2016-10-26 16:31:47 +08:00 committed by GitHub
parent e8063b0b5e
commit 4a1ef9dec9
3 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java
View File

@ -6,53 +6,46 @@ import io.swagger.codegen.CodegenProperty;
import java.io.File; import java.io.File;
public class JavaJAXRSCXFCDIServerCodegen extends JavaJAXRSSpecServerCodegen public class JavaJAXRSCXFCDIServerCodegen extends JavaJAXRSSpecServerCodegen {
{ public JavaJAXRSCXFCDIServerCodegen() {
public JavaJAXRSCXFCDIServerCodegen() outputFolder = "generated-code/JavaJaxRS-CXF-CDI";
{ artifactId = "swagger-jaxrs-cxf-cdi-server";
artifactId = "swagger-jaxrs-cxf-cdi-server"; sourceFolder = "src" + File.separator + "gen" + File.separator + "java";
sourceFolder = "src" + File.separator + "gen" + File.separator + "java"; // Three API templates to support CDI injection
apiTemplateFiles.put("apiService.mustache", ".java");
apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
// Three API templates to support CDI injection // Use standard types
apiTemplateFiles.put("apiService.mustache", ".java"); typeMapping.put("DateTime", "java.util.Date");
apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
// Use standard types // Updated template directory
typeMapping.put("DateTime", "java.util.Date"); embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf-cdi";
}
// Updated template directory @Override
embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf-cdi"; public String getName() {
} return "jaxrs-cxf-cdi";
}
@Override @Override
public String getName() public void processOpts() {
{ super.processOpts();
return "jaxrs-cxf-cdi"; supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen
} writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
}
@Override @Override
public void processOpts() public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
{ super.postProcessModelProperty(model, property);
super.processOpts();
supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen // Reinstate JsonProperty
model.imports.add("JsonProperty");
}
writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml")); @Override
} public String getHelp() {
return "Generates a Java JAXRS Server according to JAXRS 2.0 specification, assuming an Apache CXF runtime and a Java EE runtime with CDI enabled.";
@Override }
public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
super.postProcessModelProperty(model, property);
// Reinstate JsonProperty
model.imports.add("JsonProperty");
}
@Override
public String getHelp()
{
return "Generates a Java JAXRS Server according to JAXRS 2.0 specification, assuming an Apache CXF runtime and a Java EE runtime with CDI enabled.";
}
} }

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaMSF4JServerCodegen.java
View File

@ -18,7 +18,7 @@ public class JavaMSF4JServerCodegen extends AbstractJavaJAXRSServerCodegen {
public JavaMSF4JServerCodegen() { public JavaMSF4JServerCodegen() {
super(); super();
outputFolder = "generated-code/JavaJaxRS-Jersey"; outputFolder = "generated-code/JavaJaxRS-MSF4J";
apiTemplateFiles.put("apiService.mustache", ".java"); apiTemplateFiles.put("apiService.mustache", ".java");
apiTemplateFiles.put("apiServiceImpl.mustache", ".java"); apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
apiTemplateFiles.put("apiServiceFactory.mustache", ".java"); apiTemplateFiles.put("apiServiceFactory.mustache", ".java");

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyServerCodegen.java
View File

@ -16,7 +16,7 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen {
artifactId = "swagger-jaxrs-resteasy-server"; artifactId = "swagger-jaxrs-resteasy-server";
outputFolder = "generated-code/javaJaxRS"; outputFolder = "generated-code/JavaJaxRS-Resteasy";
apiTemplateFiles.put("apiService.mustache", ".java"); apiTemplateFiles.put("apiService.mustache", ".java");
apiTemplateFiles.put("apiServiceImpl.mustache", ".java"); apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
apiTemplateFiles.put("apiServiceFactory.mustache", ".java"); apiTemplateFiles.put("apiServiceFactory.mustache", ".java");