Skip to content

Commit e0ea653

Browse files
lion7lion7
authored
Merge branch 'master' into fix-tests-on-windows
2 parents 4ee5003 + 458be6c commit e0ea653

File tree

625 files changed

+25
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

625 files changed

+25
-112
lines changed

‎src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public abstract class DefaultCodegenConfig implements CodegenConfig {
106106

107107
public static final String DEFAULT_CONTENT_TYPE = "application/json";
108108
public static final String REQUEST_BODY_NAME = "body";
109-
public static final String DEFAULT_TEMPLATE_VERSION = "v2";
109+
public static final String DEFAULT_TEMPLATE_DIR = "handlebars";
110110

111111
protected String inputSpec;
112112
protected String outputFolder = StringUtils.EMPTY;

‎src/main/java/io/swagger/codegen/v3/generators/html/StaticDocCodegen.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,7 @@ public String getHelp() {
7676
public void processOpts() {
7777
super.processOpts();
7878

79-
String templateVersion = getTemplateVersion();
80-
if (StringUtils.isNotBlank(templateVersion)) {
81-
embeddedTemplateDir = templateDir = String.format("%s/swagger-static", templateVersion);
82-
}
83-
else {
84-
embeddedTemplateDir = templateDir = String.format("%s/swagger-static", DEFAULT_TEMPLATE_VERSION);
85-
}
79+
embeddedTemplateDir = templateDir = String.format("%s/swagger-static", DEFAULT_TEMPLATE_DIR);
8680
}
8781

8882
@Override

‎src/main/java/io/swagger/codegen/v3/generators/html/StaticHtml2Codegen.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,7 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
144144
public void processOpts() {
145145
super.processOpts();
146146

147-
String templateVersion = getTemplateVersion();
148-
if (StringUtils.isNotBlank(templateVersion)) {
149-
embeddedTemplateDir = templateDir = String.format("%s/htmlDocs2", templateVersion);
150-
}
151-
else {
152-
embeddedTemplateDir = templateDir = String.format("%s/htmlDocs2", DEFAULT_TEMPLATE_VERSION);
153-
}
147+
embeddedTemplateDir = templateDir = String.format("%s/htmlDocs2", DEFAULT_TEMPLATE_DIR);
154148
}
155149

156150
@Override

‎src/main/java/io/swagger/codegen/v3/generators/html/StaticHtmlCodegen.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,7 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
126126
public void processOpts() {
127127
super.processOpts();
128128

129-
String templateVersion = getTemplateVersion();
130-
if (StringUtils.isNotBlank(templateVersion)) {
131-
embeddedTemplateDir = templateDir = String.format("%s/htmlDocs", templateVersion);
132-
}
133-
else {
134-
embeddedTemplateDir = templateDir = String.format("%s/htmlDocs", DEFAULT_TEMPLATE_VERSION);
135-
}
129+
embeddedTemplateDir = templateDir = String.format("%s/htmlDocs", DEFAULT_TEMPLATE_DIR);
136130
}
137131

138132
@Override

‎src/main/java/io/swagger/codegen/v3/generators/java/JavaCXFClientCodegen.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,7 @@ public void processOpts() {
6868
super.processOpts();
6969

7070
if (StringUtils.isBlank(templateDir)) {
71-
if (StringUtils.isNotBlank(templateVersion)) {
72-
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", templateVersion);
73-
} else {
74-
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", DEFAULT_TEMPLATE_VERSION);
75-
}
71+
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", DEFAULT_TEMPLATE_DIR);
7672
}
7773

7874
// clear model and api doc template as this codegen

‎src/main/java/io/swagger/codegen/v3/generators/java/JavaCXFServerCodegen.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,7 @@ public void processOpts() {
100100
super.processOpts();
101101

102102
if (StringUtils.isBlank(templateDir)) {
103-
if (StringUtils.isNotBlank(templateVersion)) {
104-
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", templateVersion);
105-
} else {
106-
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", DEFAULT_TEMPLATE_VERSION);
107-
}
103+
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf", DEFAULT_TEMPLATE_DIR);
108104
}
109105

110106
apiTemplateFiles.put("apiServiceImpl.mustache", ".java");

‎src/main/java/io/swagger/codegen/v3/generators/java/JavaClientCodegen.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,7 @@ public void processOpts() {
122122
super.processOpts();
123123
if (StringUtils.isBlank(templateDir)) {
124124
String templateVersion = getTemplateVersion();
125-
if (StringUtils.isNotBlank(templateVersion)) {
126-
embeddedTemplateDir = templateDir = String.format("%s" + File.separator + "Java", templateVersion);
127-
} else {
128-
embeddedTemplateDir = templateDir = String.format("%s" + File.separator + "Java", DEFAULT_TEMPLATE_VERSION);
129-
}
125+
embeddedTemplateDir = templateDir = String.format("%s" + File.separator + "Java", DEFAULT_TEMPLATE_DIR);
130126
}
131127

132128
if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2)) {

‎src/main/java/io/swagger/codegen/v3/generators/java/JavaInflectorServerCodegen.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,7 @@ public void processOpts() {
7474
super.processOpts();
7575

7676
if (StringUtils.isBlank(templateDir)) {
77-
String templateVersion = getTemplateVersion();
78-
if (StringUtils.isNotBlank(templateVersion)) {
79-
embeddedTemplateDir = templateDir = String.format("%s/JavaInflector", templateVersion);
80-
} else {
81-
embeddedTemplateDir = templateDir = String.format("%s/JavaInflector", DEFAULT_TEMPLATE_VERSION);
82-
}
77+
embeddedTemplateDir = templateDir = String.format("%s/JavaInflector", DEFAULT_TEMPLATE_DIR);
8378
}
8479
writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
8580
writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));

‎src/main/java/io/swagger/codegen/v3/generators/java/JavaJAXRSCXFCDIServerCodegen.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,7 @@ public void processOpts() {
4343
// Set the template dir first, before super.processOpts(), otherwise it is going to
4444
// be set to /spec location.
4545
if (StringUtils.isBlank(templateDir)) {
46-
if (StringUtils.isNotBlank(templateVersion)) {
47-
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf-cdi", templateVersion);
48-
}
49-
else {
50-
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf-cdi", DEFAULT_TEMPLATE_VERSION);
51-
}
46+
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/cxf-cdi", DEFAULT_TEMPLATE_DIR);
5247
}
5348

5449
super.processOpts();

‎src/main/java/io/swagger/codegen/v3/generators/java/JavaJAXRSSpecServerCodegen.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,7 @@ public void processOpts() {
7676
super.processOpts();
7777

7878
if (StringUtils.isBlank(templateDir)) {
79-
if (StringUtils.isNotBlank(templateVersion)) {
80-
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/spec", templateVersion);
81-
} else {
82-
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/spec", DEFAULT_TEMPLATE_VERSION);
83-
}
79+
embeddedTemplateDir = templateDir = String.format("%s/" + JAXRS_TEMPLATE_DIRECTORY_NAME + "/spec", DEFAULT_TEMPLATE_DIR);
8480
}
8581

8682
modelTemplateFiles.put("model.mustache", ".java");

0 commit comments

Comments
 (0)