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

fix for #5182

Browse Source
This commit is contained in:
Tony Tam 2017-03-23 11:02:53 -07:00
parent b3b392dc79
commit 417b69b98c
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaInflectorServerCodegen.java
View File

@ -1,16 +1,22 @@
package io.swagger.codegen.languages; package io.swagger.codegen.languages;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.codegen.*; import io.swagger.codegen.CodegenModel;
import io.swagger.codegen.CodegenOperation;
import io.swagger.codegen.CodegenProperty;
import io.swagger.codegen.CodegenType;
import io.swagger.codegen.SupportingFile;
import io.swagger.models.Operation; import io.swagger.models.Operation;
import io.swagger.models.Swagger; import io.swagger.models.Swagger;
import io.swagger.util.Yaml; import io.swagger.util.Yaml;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class JavaInflectorServerCodegen extends AbstractJavaCodegen { public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
@ -24,7 +30,7 @@ public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
sourceFolder = "src/gen/java"; sourceFolder = "src/gen/java";
apiTestTemplateFiles.clear(); // TODO: add test template apiTestTemplateFiles.clear(); // TODO: add test template
embeddedTemplateDir = templateDir = "JavaInflector"; embeddedTemplateDir = templateDir = "JavaInflector";
invokerPackage = "io.swagger.handler"; invokerPackage = "io.swagger.controllers";
artifactId = "swagger-inflector-server"; artifactId = "swagger-inflector-server";
dateLibrary = "legacy"; //TODO: add joda support dateLibrary = "legacy"; //TODO: add joda support
@ -35,7 +41,7 @@ public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
apiDocTemplateFiles.remove("api_doc.mustache"); apiDocTemplateFiles.remove("api_doc.mustache");
apiPackage = System.getProperty("swagger.codegen.inflector.apipackage", "io.swagger.handler"); apiPackage = System.getProperty("swagger.codegen.inflector.apipackage", "io.swagger.controllers");
modelPackage = System.getProperty("swagger.codegen.inflector.modelpackage", "io.swagger.model"); modelPackage = System.getProperty("swagger.codegen.inflector.modelpackage", "io.swagger.model");
additionalProperties.put("title", title); additionalProperties.put("title", title);
@ -173,6 +179,11 @@ public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
return objs; return objs;
} }
@Override
protected String getOrGenerateOperationId(Operation operation, String path, String httpMethod) {
return super.getOrGenerateOperationId(operation, path, httpMethod.toUpperCase());
}
public String apiFilename(String templateName, String tag) { public String apiFilename(String templateName, String tag) {
String result = super.apiFilename(templateName, tag); String result = super.apiFilename(templateName, tag);
@ -204,7 +215,7 @@ public class JavaInflectorServerCodegen extends AbstractJavaCodegen {
if (name.length() == 0) { if (name.length() == 0) {
return "DefaultController"; return "DefaultController";
} }
name = name.replaceAll("[^a-zA-Z0-9]+", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. name = name.replaceAll("[^a-zA-Z0-9]+", "_");
return camelize(name)+ "Controller"; return camelize(name)+ "Controller";
} }
} }