Skip to content

Commit 78e6442

Browse files
HugoMarioHugoMario
authored
Merge pull request #54 from swagger-api/revert-commit-e23815
reverted "e23815" commit.
2 parents c2d2cf7 + aa9e90b commit 78e6442

File tree

6 files changed

+15
-68
lines changed

6 files changed

+15
-68
lines changed

‎src/main/java/io/swagger/codegen/languages/DefaultCodegenConfig.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,24 +166,15 @@ public void processOpts() {
166166

167167
if (additionalProperties.containsKey(CodegenConstants.MODEL_PACKAGE)) {
168168
this.setModelPackage((String) additionalProperties.get(CodegenConstants.MODEL_PACKAGE));
169-
} else if (StringUtils.isNotEmpty(modelPackage)) {
170-
// not set in additionalProperties, add value from CodegenConfig in order to use it in templates
171-
additionalProperties.put(CodegenConstants.MODEL_PACKAGE, modelPackage);
172169
}
173170

174171
if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
175172
this.setApiPackage((String) additionalProperties.get(CodegenConstants.API_PACKAGE));
176-
} else if (StringUtils.isNotEmpty(apiPackage)) {
177-
// not set in additionalProperties, add value from CodegenConfig in order to use it in templates
178-
additionalProperties.put(CodegenConstants.API_PACKAGE, apiPackage);
179173
}
180174

181175
if (additionalProperties.containsKey(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG)) {
182176
this.setSortParamsByRequiredFlag(Boolean.valueOf(additionalProperties
183177
.get(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG).toString()));
184-
} else if (sortParamsByRequiredFlag != null) {
185-
// not set in additionalProperties, add value from CodegenConfig in order to use it in templates
186-
additionalProperties.put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, sortParamsByRequiredFlag);
187178
}
188179

189180
if (additionalProperties.containsKey(CodegenConstants.ENSURE_UNIQUE_PARAMS)) {

‎src/main/java/io/swagger/codegen/languages/java/AbstractJavaCodegen.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,20 @@ public AbstractJavaCodegen() {
167167

168168
@Override
169169
public void processOpts() {
170+
super.processOpts();
171+
172+
modelTemplateFiles.put("model.mustache", ".java");
173+
apiTemplateFiles.put("api.mustache", ".java");
174+
apiTestTemplateFiles.put("api_test.mustache", ".java");
175+
modelDocTemplateFiles.put("model_doc.mustache", ".md");
176+
apiDocTemplateFiles.put("api_doc.mustache", ".md");
177+
178+
if (additionalProperties.containsKey(SUPPORT_JAVA6)) {
179+
this.setSupportJava6(Boolean.valueOf(additionalProperties.get(SUPPORT_JAVA6).toString()));
180+
}
181+
additionalProperties.put(SUPPORT_JAVA6, supportJava6);
182+
183+
170184
if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
171185
this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
172186
} else if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
@@ -186,19 +200,6 @@ public void processOpts() {
186200
additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
187201
}
188202

189-
super.processOpts();
190-
191-
modelTemplateFiles.put("model.mustache", ".java");
192-
apiTemplateFiles.put("api.mustache", ".java");
193-
apiTestTemplateFiles.put("api_test.mustache", ".java");
194-
modelDocTemplateFiles.put("model_doc.mustache", ".md");
195-
apiDocTemplateFiles.put("api_doc.mustache", ".md");
196-
197-
if (additionalProperties.containsKey(SUPPORT_JAVA6)) {
198-
this.setSupportJava6(Boolean.valueOf(additionalProperties.get(SUPPORT_JAVA6).toString()));
199-
}
200-
additionalProperties.put(SUPPORT_JAVA6, supportJava6);
201-
202203
if (additionalProperties.containsKey(CodegenConstants.GROUP_ID)) {
203204
this.setGroupId((String) additionalProperties.get(CodegenConstants.GROUP_ID));
204205
} else if(StringUtils.isNotEmpty(groupId)) {

‎src/test/java/io/swagger/codegen/languages/DefaultCodegenConfigTest.java‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.swagger.codegen.languages;
22

33
import io.swagger.codegen.CodegenArgument;
4-
import io.swagger.codegen.CodegenConstants;
54
import io.swagger.codegen.CodegenType;
65
import org.testng.Assert;
76
import org.testng.annotations.Test;
@@ -15,13 +14,8 @@ public void testInitialValues() throws Exception {
1514
codegen.processOpts();
1615

1716
Assert.assertEquals(codegen.modelPackage, "");
18-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), null);
1917
Assert.assertEquals(codegen.apiPackage, "");
20-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), null);
2118
Assert.assertEquals(codegen.sortParamsByRequiredFlag, Boolean.TRUE);
22-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG), Boolean.TRUE);
23-
Assert.assertEquals(codegen.hideGenerationTimestamp, Boolean.TRUE);
24-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
2519
}
2620

2721
@Test
@@ -34,32 +28,8 @@ public void testSetters() throws Exception {
3428
codegen.processOpts();
3529

3630
Assert.assertEquals(codegen.modelPackage, "xxx.yyyyy.zzzzzzz.model");
37-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xxx.yyyyy.zzzzzzz.model");
3831
Assert.assertEquals(codegen.apiPackage, "xxx.yyyyy.zzzzzzz.api");
39-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "xxx.yyyyy.zzzzzzz.api");
4032
Assert.assertEquals(codegen.sortParamsByRequiredFlag, Boolean.FALSE);
41-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG), Boolean.FALSE);
42-
Assert.assertEquals(codegen.hideGenerationTimestamp, Boolean.FALSE);
43-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
44-
}
45-
46-
@Test
47-
public void testPutAdditionalProperties() throws Exception {
48-
final DefaultCodegenConfig codegen = new P_DefaultCodegenConfig();
49-
codegen.additionalProperties().put(CodegenConstants.MODEL_PACKAGE, "xx.yyyyy.model");
50-
codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "xx.yyyyy.api");
51-
codegen.additionalProperties().put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, false);
52-
codegen.additionalProperties().put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, false);
53-
codegen.processOpts();
54-
55-
Assert.assertEquals(codegen.modelPackage, "xx.yyyyy.model");
56-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xx.yyyyy.model");
57-
Assert.assertEquals(codegen.apiPackage, "xx.yyyyy.api");
58-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "xx.yyyyy.api");
59-
Assert.assertEquals(codegen.sortParamsByRequiredFlag, Boolean.FALSE);
60-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG), Boolean.FALSE);
61-
Assert.assertEquals(codegen.hideGenerationTimestamp, Boolean.FALSE);
62-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
6333
}
6434

6535
private static class P_DefaultCodegenConfig extends DefaultCodegenConfig{

‎src/test/java/io/swagger/codegen/languages/java/AbstractJavaCodegenTest.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,9 @@ public void testInitialPackageNamesValues() throws Exception {
111111
codegen.processOpts();
112112

113113
Assert.assertEquals(codegen.modelPackage(), "invalidPackageName");
114-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), null);
115114
Assert.assertEquals(codegen.apiPackage(), "invalidPackageName");
116-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), null);
115+
117116
Assert.assertEquals(codegen.invokerPackage, "io.swagger");
118-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "io.swagger");
119117
}
120118

121119
@Test
@@ -128,13 +126,10 @@ public void testPackageNamesSetWithSetters() throws Exception {
128126
codegen.processOpts();
129127

130128
Assert.assertEquals(codegen.modelPackage(), "xxx.yyyyy.zzzzzzz.model");
131-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xxx.yyyyy.zzzzzzz.model");
132129
Assert.assertEquals(codegen.apiPackage(), "xxx.yyyyy.zzzzzzz.api");
133-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "xxx.yyyyy.zzzzzzz.api");
134130
Assert.assertEquals(codegen.invokerPackage, "xxx.yyyyy.zzzzzzz.invoker");
135131
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "xxx.yyyyy.zzzzzzz.invoker");
136132
Assert.assertEquals(codegen.getSortParamsByRequiredFlag(), Boolean.FALSE);
137-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG), Boolean.FALSE);
138133
}
139134

140135
@Test
@@ -153,7 +148,6 @@ public void testPackageNamesSetWithAdditionalProperties() throws Exception {
153148
Assert.assertEquals(codegen.invokerPackage, "xxx.yyyyy.invoker.xxxxxx");
154149
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "xxx.yyyyy.invoker.xxxxxx");
155150
Assert.assertEquals(codegen.getSortParamsByRequiredFlag(), Boolean.TRUE);
156-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG), Boolean.TRUE);
157151
}
158152

159153
public static class P_AbstractJavaCodegen extends AbstractJavaCodegen {

‎src/test/java/io/swagger/codegen/languages/java/AbstractJavaJAXRSServerCodegenTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ public void testInitialPackageNamesValues() throws Exception {
2626
codegen.processOpts();
2727

2828
Assert.assertEquals(codegen.modelPackage(), "io.swagger.model");
29-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "io.swagger.model");
3029
Assert.assertEquals(codegen.apiPackage(), "io.swagger.api");
31-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "io.swagger.api");
3230
Assert.assertEquals(codegen.invokerPackage, "io.swagger.api");
3331
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "io.swagger.api");
3432
}
@@ -42,9 +40,7 @@ public void testPackageNamesSetWithSetters() throws Exception {
4240
codegen.processOpts();
4341

4442
Assert.assertEquals(codegen.modelPackage(), "xx.yyyyyyyy.model");
45-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xx.yyyyyyyy.model");
4643
Assert.assertEquals(codegen.apiPackage(), "xx.yyyyyyyy.api");
47-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "xx.yyyyyyyy.api");
4844
Assert.assertEquals(codegen.invokerPackage, "xx.yyyyyyyy.invoker");
4945
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "xx.yyyyyyyy.invoker");
5046
}

‎src/test/java/io/swagger/codegen/languages/java/JavaClientCodegenTest.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,7 @@ public void testInitialPackageNamesValues() throws Exception {
181181
codegen.processOpts();
182182

183183
Assert.assertEquals(codegen.modelPackage(), "io.swagger.client.model");
184-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "io.swagger.client.model");
185184
Assert.assertEquals(codegen.apiPackage(), "io.swagger.client.api");
186-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "io.swagger.client.api");
187185
Assert.assertEquals(codegen.invokerPackage, "io.swagger.client");
188186
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "io.swagger.client");
189187
}
@@ -197,9 +195,7 @@ public void testPackageNamesSetWithSetters() throws Exception {
197195
codegen.processOpts();
198196

199197
Assert.assertEquals(codegen.modelPackage(), "xxx.yyyyy.zzzzzzz.model");
200-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xxx.yyyyy.zzzzzzz.model");
201198
Assert.assertEquals(codegen.apiPackage(), "xxx.yyyyy.zzzzzzz.api");
202-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "xxx.yyyyy.zzzzzzz.api");
203199
Assert.assertEquals(codegen.invokerPackage, "xxx.yyyyy.zzzzzzz.invoker");
204200
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "xxx.yyyyy.zzzzzzz.invoker");
205201
}
@@ -244,7 +240,6 @@ public void testPackageNamesSetInvokerDerivedFromModel() throws Exception {
244240
Assert.assertEquals(codegen.modelPackage(), "xxx.yyyyy.zzzzzzz.mmmmm.model");
245241
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xxx.yyyyy.zzzzzzz.mmmmm.model");
246242
Assert.assertEquals(codegen.apiPackage(), "io.swagger.client.api");
247-
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "io.swagger.client.api");
248243
Assert.assertEquals(codegen.invokerPackage, "xxx.yyyyy.zzzzzzz.mmmmm");
249244
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "xxx.yyyyy.zzzzzzz.mmmmm");
250245
}

0 commit comments

Comments
 (0)