Skip to content

Commit b81b5b2

Browse files
frantumafrantuma
authored
Merge branch 'master' into issues/534
2 parents c54805c + a12d675 commit b81b5b2

File tree

73 files changed

+2568
-110
lines changed

Some content is hidden

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

73 files changed

+2568
-110
lines changed

‎.gitignore

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@
1414
# Mobile Tools for Java (J2ME)
1515
.mtj.tmp/
1616

17-
# Package Files #
18-
*.jar
19-
*.war
20-
*.ear
21-
*.zip
22-
*.tar.gz
23-
*.rar
24-
2517
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
2618
hs_err_pid*
2719

‎pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>io.swagger.codegen.v3</groupId>
1414
<artifactId>swagger-codegen-generators</artifactId>
15-
<version>1.0.14-SNAPSHOT</version>
15+
<version>1.0.15-SNAPSHOT</version>
1616
<packaging>jar</packaging>
1717

1818
<build>
@@ -246,10 +246,10 @@
246246
</dependency>
247247
</dependencies>
248248
<properties>
249-
<swagger-codegen-version>3.0.14-SNAPSHOT</swagger-codegen-version>
250-
<swagger-parser-version>2.0.16-SNAPSHOT</swagger-parser-version>
251-
<swagger-core-version>2.0.10</swagger-core-version>
252-
<jackson-version>2.9.10</jackson-version>
249+
<swagger-codegen-version>3.0.15-SNAPSHOT</swagger-codegen-version>
250+
<swagger-parser-version>2.0.17-SNAPSHOT</swagger-parser-version>
251+
<swagger-core-version>2.1.1-SNAPSHOT</swagger-core-version>
252+
<jackson-version>2.10.1</jackson-version>
253253
<scala-version>2.11.1</scala-version>
254254
<felix-version>3.3.0</felix-version>
255255
<commons-io-version>2.4</commons-io-version>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,7 +1324,7 @@ else if (schema instanceof ComposedSchema) {
13241324
if(composed.getAllOf() != null) {
13251325
for (Schema innerModel : composed.getAllOf()) {
13261326
if (codegenModel.discriminator == null) {
1327-
codegenModel.discriminator = schema
1327+
codegenModel.discriminator = innerModel
13281328
.getDiscriminator();
13291329
}
13301330
if (innerModel.getXml() != null) {
@@ -1387,9 +1387,11 @@ else if (schema instanceof ComposedSchema) {
13871387
}
13881388
}
13891389
if (oneOf != null && !oneOf.isEmpty()) {
1390+
codegenModel.dataType = getSchemaType(composed);
13901391
this.schemaHandler.configureOneOfModel(codegenModel, oneOf);
13911392
}
13921393
if (anyOf != null && !anyOf.isEmpty()) {
1394+
codegenModel.dataType = getSchemaType(composed);
13931395
this.schemaHandler.configureAnyOfModel(codegenModel, anyOf);
13941396
}
13951397
if (parent != null) {
@@ -2223,7 +2225,7 @@ public int compare(CodegenParameter one, CodegenParameter another) {
22232225
codegenOperation.pathParams = addHasMore(pathParams);
22242226
codegenOperation.queryParams = addHasMore(queryParams);
22252227
codegenOperation.headerParams = addHasMore(headerParams);
2226-
// op.cookieParams = cookieParams;
2228+
codegenOperation.cookieParams = addHasMore(cookieParams);
22272229
codegenOperation.formParams = addHasMore(formParams);
22282230
codegenOperation.requiredParams = addHasMore(requiredParams);
22292231
codegenOperation.externalDocs = operation.getExternalDocs();

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import io.swagger.codegen.v3.CodegenProperty;
77
import io.swagger.codegen.v3.generators.util.OpenAPIUtil;
88
import io.swagger.v3.oas.models.media.ComposedSchema;
9-
import io.swagger.v3.oas.models.media.ObjectSchema;
109
import io.swagger.v3.oas.models.media.Schema;
1110
import org.apache.commons.lang3.StringUtils;
1211

@@ -15,7 +14,7 @@
1514

1615
public class SchemaHandler {
1716

18-
private DefaultCodegenConfig codegenConfig;
17+
protected DefaultCodegenConfig codegenConfig;
1918

2019
public SchemaHandler(DefaultCodegenConfig codegenConfig) {
2120
this.codegenConfig = codegenConfig;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public void processOpts() {
9292
@Override
9393
public void preprocessOpenAPI(OpenAPI openAPI) {
9494
//this.openAPIUtil = new OpenAPIUtil(openAPI);
95+
this.openAPI = openAPI;
9596
if (!this.additionalProperties.containsKey("serverPort")) {
9697
final URL urlInfo = URLPathUtil.getServerURL(openAPI);
9798
String port = "8080"; // Default value for a JEE Server

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ public JavaClientCodegen() {
8383
cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
8484
cliOptions.add(CliOption.newBoolean(USE_RUNTIME_EXCEPTION, "Use RuntimeException instead of Exception"));
8585

86-
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.9.10. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
87-
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.9.10");
88-
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.10");
86+
supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.10.1. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
87+
supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.10.1");
88+
supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.26. JSON processing: Jackson 2.10.1");
8989
supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.8.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
9090
supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.3.1 (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.");
9191
supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.8.0. JSON processing: Gson 2.6.1 (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)");

‎src/main/java/io/swagger/codegen/v3/generators/openapi/OpenAPIYamlGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void setOutputFile(String outputFile) {
3636

3737
@Override
3838
public void preprocessOpenAPI(OpenAPI openAPI) {
39-
super.preprocessOpenAPI(openAPI);
39+
this.openAPI = openAPI;
4040
try {
4141
final String outputString;
4242
if (flattenSpec) {

0 commit comments

Comments
 (0)