From 20d8b63b15b1d8c3341dfd07df317c3c270985c0 Mon Sep 17 00:00:00 2001 From: David Grimm Date: Thu, 11 May 2017 10:25:46 +0200 Subject: [PATCH 1/4] Fixed Issue5162 consumes in GET-Methods --- .../codegen/languages/AbstractJavaCodegen.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java index 722586d930f..87beef719ef 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java @@ -848,11 +848,14 @@ public void preprocessSwagger(Swagger swagger) { hasFormParameters = true; } } - String defaultContentType = hasFormParameters ? "application/x-www-form-urlencoded" : "application/json"; - String contentType = operation.getConsumes() == null || operation.getConsumes().isEmpty() - ? defaultContentType : operation.getConsumes().get(0); + //only add content-Type if its no a GET-Method + if(!path.getGet().equals(operation)){ + String defaultContentType = hasFormParameters ? "application/x-www-form-urlencoded" : "application/json"; + String contentType = operation.getConsumes() == null || operation.getConsumes().isEmpty() + ? defaultContentType : operation.getConsumes().get(0); + operation.setVendorExtension("x-contentType", contentType); + } String accepts = getAccept(operation); - operation.setVendorExtension("x-contentType", contentType); operation.setVendorExtension("x-accepts", accepts); } } From 4902c9247d8e6cc62558d753be32f9d301266fac Mon Sep 17 00:00:00 2001 From: David Grimm Date: Thu, 11 May 2017 11:27:33 +0200 Subject: [PATCH 2/4] Fixed Issue5613 --- .../java/io/swagger/codegen/languages/AbstractJavaCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java index 87beef719ef..d0ed7207582 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java @@ -849,7 +849,7 @@ public void preprocessSwagger(Swagger swagger) { } } //only add content-Type if its no a GET-Method - if(!path.getGet().equals(operation)){ + if(path.getGet() != null || ! operation.equals(path.getGet())){ String defaultContentType = hasFormParameters ? "application/x-www-form-urlencoded" : "application/json"; String contentType = operation.getConsumes() == null || operation.getConsumes().isEmpty() ? defaultContentType : operation.getConsumes().get(0); From 185a8c03f92184fbe71797f51f82daa75823a808 Mon Sep 17 00:00:00 2001 From: David Grimm Date: Thu, 11 May 2017 12:05:49 +0200 Subject: [PATCH 3/4] Ran the shell scripts under bin --- .../java/okhttp-gson/.swagger-codegen/VERSION | 1 + samples/client/petstore/java/feign/.swagger-codegen/VERSION | 1 + samples/client/petstore/java/jersey1/.swagger-codegen/VERSION | 1 + .../client/petstore/java/jersey2-java6/.swagger-codegen/VERSION | 1 + .../client/petstore/java/jersey2-java8/.swagger-codegen/VERSION | 1 + samples/client/petstore/java/jersey2/.swagger-codegen/VERSION | 1 + .../java/okhttp-gson-parcelableModel/.swagger-codegen/VERSION | 1 + .../client/petstore/java/okhttp-gson/.swagger-codegen/VERSION | 1 + samples/client/petstore/java/resteasy/.swagger-codegen/VERSION | 1 + .../client/petstore/java/resttemplate/.swagger-codegen/VERSION | 1 + samples/client/petstore/java/retrofit/.swagger-codegen/VERSION | 1 + .../petstore/java/retrofit2-play24/.swagger-codegen/VERSION | 1 + samples/client/petstore/java/retrofit2/.swagger-codegen/VERSION | 1 + .../client/petstore/java/retrofit2rx/.swagger-codegen/VERSION | 1 + 14 files changed, 14 insertions(+) create mode 100644 samples/client/petstore-security-test/java/okhttp-gson/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/feign/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/jersey1/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/jersey2-java6/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/jersey2-java8/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/jersey2/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/okhttp-gson-parcelableModel/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/resteasy/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/resttemplate/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/retrofit/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/retrofit2-play24/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/retrofit2/.swagger-codegen/VERSION create mode 100644 samples/client/petstore/java/retrofit2rx/.swagger-codegen/VERSION diff --git a/samples/client/petstore-security-test/java/okhttp-gson/.swagger-codegen/VERSION b/samples/client/petstore-security-test/java/okhttp-gson/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore-security-test/java/okhttp-gson/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/feign/.swagger-codegen/VERSION b/samples/client/petstore/java/feign/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/feign/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/jersey1/.swagger-codegen/VERSION b/samples/client/petstore/java/jersey1/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/jersey1/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java6/.swagger-codegen/VERSION b/samples/client/petstore/java/jersey2-java6/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/jersey2-java6/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8/.swagger-codegen/VERSION b/samples/client/petstore/java/jersey2-java8/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/jersey2-java8/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2/.swagger-codegen/VERSION b/samples/client/petstore/java/jersey2/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/jersey2/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/.swagger-codegen/VERSION b/samples/client/petstore/java/okhttp-gson-parcelableModel/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION b/samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/resteasy/.swagger-codegen/VERSION b/samples/client/petstore/java/resteasy/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/resteasy/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate/.swagger-codegen/VERSION b/samples/client/petstore/java/resttemplate/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/resttemplate/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit/.swagger-codegen/VERSION b/samples/client/petstore/java/retrofit/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/retrofit/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2-play24/.swagger-codegen/VERSION b/samples/client/petstore/java/retrofit2-play24/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/retrofit2-play24/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/.swagger-codegen/VERSION b/samples/client/petstore/java/retrofit2/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx/.swagger-codegen/VERSION b/samples/client/petstore/java/retrofit2rx/.swagger-codegen/VERSION new file mode 100644 index 00000000000..7fea99011a6 --- /dev/null +++ b/samples/client/petstore/java/retrofit2rx/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file From af2993f02aa3ef9bfffbbd7a2d16371745aeedbd Mon Sep 17 00:00:00 2001 From: David Grimm Date: Thu, 11 May 2017 16:30:47 +0200 Subject: [PATCH 4/4] Tab removed --- .../io/swagger/codegen/languages/AbstractJavaCodegen.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java index d0ed7207582..20bb81f8685 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java @@ -850,10 +850,9 @@ public void preprocessSwagger(Swagger swagger) { } //only add content-Type if its no a GET-Method if(path.getGet() != null || ! operation.equals(path.getGet())){ - String defaultContentType = hasFormParameters ? "application/x-www-form-urlencoded" : "application/json"; - String contentType = operation.getConsumes() == null || operation.getConsumes().isEmpty() - ? defaultContentType : operation.getConsumes().get(0); - operation.setVendorExtension("x-contentType", contentType); + String defaultContentType = hasFormParameters ? "application/x-www-form-urlencoded" : "application/json"; + String contentType = operation.getConsumes() == null || operation.getConsumes().isEmpty() ? defaultContentType : operation.getConsumes().get(0); + operation.setVendorExtension("x-contentType", contentType); } String accepts = getAccept(operation); operation.setVendorExtension("x-accepts", accepts);