Skip to content

Commit 8f1af14

Browse files
HugoMarioHugoMario
authored
Merge pull request #1118 from swagger-api/oss-planning-663
Fixed errors on generators
2 parents 24629d8 + d7c35cd commit 8f1af14

File tree

5 files changed

+48
-26
lines changed

5 files changed

+48
-26
lines changed

‎src/main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptAngularClientCodegen.java

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,7 @@ private void addNpmPackageGeneration(SemVer ngVersion) {
212212
this.setNpmVersion(additionalProperties.get(NPM_VERSION).toString());
213213
}
214214

215-
if (additionalProperties.containsKey(SNAPSHOT)
216-
&& Boolean.valueOf(additionalProperties.get(SNAPSHOT).toString())) {
215+
if (additionalProperties.containsKey(SNAPSHOT) && Boolean.parseBoolean(additionalProperties.get(SNAPSHOT).toString())) {
217216
this.setNpmVersion(npmVersion + "-SNAPSHOT." + SNAPSHOT_SUFFIX_FORMAT.format(new Date()));
218217
}
219218
additionalProperties.put(NPM_VERSION, npmVersion);
@@ -223,51 +222,64 @@ private void addNpmPackageGeneration(SemVer ngVersion) {
223222
}
224223

225224
additionalProperties.put("useHttpClientPackage", false);
226-
if (ngVersion.atLeast("11.0.0")) {
225+
if (ngVersion.atLeast("15.0.0")) {
226+
additionalProperties.put("tsVersion", ">=4.8.2 <4.10.0");
227+
additionalProperties.put("rxjsVersion", "7.5.5");
228+
additionalProperties.put("ngPackagrVersion", "15.0.2");
229+
additionalProperties.put("zonejsVersion", "0.11.5");
230+
} else if (ngVersion.atLeast("14.0.0")) {
231+
additionalProperties.put("tsVersion", ">=4.6.0 <=4.8.0");
232+
additionalProperties.put("rxjsVersion", "7.5.5");
233+
additionalProperties.put("ngPackagrVersion", "14.0.2");
234+
additionalProperties.put("zonejsVersion", "0.11.5");
235+
} else if (ngVersion.atLeast("13.0.0")) {
236+
additionalProperties.put("tsVersion", ">=4.4.2 <4.5.0");
237+
additionalProperties.put("rxjsVersion", "7.4.0");
238+
additionalProperties.put("ngPackagrVersion", "13.0.3");
239+
additionalProperties.put("zonejsVersion", "0.11.4");
240+
} else if (ngVersion.atLeast("12.0.0")) {
241+
additionalProperties.put("tsVersion", ">=4.3.0 <4.4.0");
242+
additionalProperties.put("rxjsVersion", "7.4.0");
243+
additionalProperties.put("ngPackagrVersion", "12.2.1");
244+
additionalProperties.put("zonejsVersion", "0.11.4");
245+
} else if (ngVersion.atLeast("11.0.0")) {
227246
additionalProperties.put("tsVersion", ">=4.0.0 <4.1.0");
228247
additionalProperties.put("rxjsVersion", "6.6.0");
229248
additionalProperties.put("ngPackagrVersion", "11.0.2");
230-
additionalProperties.put("tsickleVersion", "0.39.1");
231249
additionalProperties.put("zonejsVersion", "0.11.3");
232250
} else if (ngVersion.atLeast("10.0.0")) {
233251
additionalProperties.put("tsVersion", ">=3.9.2 <4.0.0");
234252
additionalProperties.put("rxjsVersion", "6.6.0");
235253
additionalProperties.put("ngPackagrVersion", "10.0.3");
236-
additionalProperties.put("tsickleVersion", "0.39.1");
237254
additionalProperties.put("zonejsVersion", "0.10.2");
238255
} else if (ngVersion.atLeast("9.0.0")) {
239256
additionalProperties.put("tsVersion", ">=3.6.0 <3.8.0");
240257
additionalProperties.put("rxjsVersion", "6.5.3");
241258
additionalProperties.put("ngPackagrVersion", "9.0.1");
242-
additionalProperties.put("tsickleVersion", "0.38.0");
243259
additionalProperties.put("zonejsVersion", "0.10.2");
244260
} else if (ngVersion.atLeast("8.0.0")) {
245261
additionalProperties.put("tsVersion", ">=3.4.0 <3.6.0");
246262
additionalProperties.put("rxjsVersion", "6.5.0");
247263
additionalProperties.put("ngPackagrVersion", "5.4.0");
248-
additionalProperties.put("tsickleVersion", "0.35.0");
249264
additionalProperties.put("zonejsVersion", "0.9.1");
250265
} else if (ngVersion.atLeast("7.0.0")) {
251266
additionalProperties.put("tsVersion", ">=3.1.1 <3.2.0");
252267
additionalProperties.put("rxjsVersion", "6.3.0");
253268
additionalProperties.put("ngPackagrVersion", "5.1.0");
254-
additionalProperties.put("tsickleVersion", "0.34.0");
255269
additionalProperties.put("zonejsVersion", "0.8.26");
256270

257271
additionalProperties.put("useHttpClientPackage", true);
258272
} else if (ngVersion.atLeast("6.0.0")) {
259273
additionalProperties.put("tsVersion", ">=2.7.2 and <2.10.0");
260274
additionalProperties.put("rxjsVersion", "6.1.0");
261275
additionalProperties.put("ngPackagrVersion", "3.0.6");
262-
additionalProperties.put("tsickleVersion", "0.32.1");
263276
additionalProperties.put("zonejsVersion", "0.8.26");
264277

265278
additionalProperties.put("useHttpClientPackage", true);
266279
} else {
267280
additionalProperties.put("tsVersion", ">=2.1.5 and <2.8");
268281
additionalProperties.put("rxjsVersion", "6.1.0");
269282
additionalProperties.put("ngPackagrVersion", "3.0.6");
270-
additionalProperties.put("tsickleVersion", "0.32.1");
271283
additionalProperties.put("zonejsVersion", "0.8.26");
272284

273285
additionalProperties.put("useHttpClientPackage", true);
@@ -356,6 +368,24 @@ private boolean isLanguageGenericType(String type) {
356368
return false;
357369
}
358370

371+
protected void addOperationImports(CodegenOperation codegenOperation, Set<String> operationImports) {
372+
for (String operationImport : operationImports) {
373+
if (operationImport.contains("|")) {
374+
String[] importNames = operationImport.split("\\|");
375+
for (String importName : importNames) {
376+
importName = importName.trim();
377+
if (needToImport(importName)) {
378+
codegenOperation.imports.add(importName);
379+
}
380+
}
381+
} else {
382+
if (needToImport(operationImport)) {
383+
codegenOperation.imports.add(operationImport);
384+
}
385+
}
386+
}
387+
}
388+
359389
@Override
360390
public void postProcessParameter(CodegenParameter parameter) {
361391
super.postProcessParameter(parameter);

‎src/main/resources/handlebars/JavaJaxRS/api.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public class {{classname}} {
107107
{{/useOas2}}
108108
public Response {{nickname}}({{#parameters}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{>cookieParams}},{{/parameters}}@Context SecurityContext securityContext)
109109
throws NotFoundException {
110-
return delegate.{{nickname}}({{#parameters}}{{paramName}},{{/parameters}}securityContext);
110+
return delegate.{{nickname}}({{#parameters}}{{#isBinary}}{{#isBodyParam}}{{paramName}}{{/isBodyParam}}{{^isBodyParam}}{{paramName}}InputStream, {{paramName}}Detail{{/isBodyParam}}{{/isBinary}}{{^isBinary}}{{paramName}}{{/isBinary}},{{/parameters}}securityContext);
111111
}
112112
{{/@first}}
113113
{{/contents}}

‎src/main/resources/handlebars/JavaJaxRS/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/{{#description}}
44
{{#useOas2}}@ApiModel{{/useOas2}}{{^useOas2}}@Schema{{/useOas2}}(description = "{{{description}}}"){{/description}}
55
{{>generatedAnnotation}}
6-
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable {{#interfaceModels}}, {{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}}{{^serializableModel}}{{#interfaceModels}}{{#@first}}implements {{/@first}}{{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}} {
6+
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable {{#interfaceModels}}{{#@first}},{{/@first}} {{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}}{{^serializableModel}}{{#interfaceModels}}{{#@first}}implements {{/@first}}{{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}} {
77
{{#vars}}
88
{{#baseItems this}}
99
{{#is this 'enum'}}

‎src/main/resources/handlebars/aspnetcore/NuGet.Config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<packageSources>
44
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
55
<clear />
6-
<add key="dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
76
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
87
</packageSources>
98
</configuration>

‎src/main/resources/handlebars/typescript-angular/package.mustache

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,16 @@
2020
"build": "ngc && npm pack"
2121
},
2222
{{/useNgPackagr}}
23-
"peerDependencies": {
24-
"@angular/core": "^{{ngVersion}}",{{#useHttpClientPackage}}
25-
"@angular/http": "^{{ngVersion}}",{{/useHttpClientPackage}}
26-
"@angular/common": "^{{ngVersion}}",
27-
"@angular/compiler": "^{{ngVersion}}",
28-
"core-js": "^2.4.0",
29-
"reflect-metadata": "^0.1.3",
30-
"rxjs": "^{{rxjsVersion}}"
31-
},
3223
"devDependencies": {
3324
"@angular/compiler-cli": "^{{ngVersion}}",
34-
"@angular/core": "^{{ngVersion}}",{{#useHttpClientPackage}}
35-
"@angular/http": "^{{ngVersion}}",{{/useHttpClientPackage}}
25+
"@angular/core": "^{{ngVersion}}",
26+
{{#useHttpClientPackage}}
27+
"@angular/http": "^{{ngVersion}}",
28+
{{/useHttpClientPackage}}
3629
"@angular/common": "^{{ngVersion}}",
3730
"@angular/compiler": "^{{ngVersion}}",
38-
"@angular/platform-browser": "^{{ngVersion}}",{{#useNgPackagr}}
39-
"ng-packagr": "^{{ngPackagrVersion}}",{{/useNgPackagr}}
31+
"@angular/platform-browser": "^{{ngVersion}}",
32+
"ng-packagr": "^{{ngPackagrVersion}}",
4033
"reflect-metadata": "^0.1.3",
4134
"rxjs": "^{{rxjsVersion}}",
4235
"typescript": "{{{tsVersion}}}",

0 commit comments

Comments
 (0)