From 16373b9f70b1ad3db74dae1137953384e04a31cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20C=C3=B4t=C3=A9?= Date: Thu, 2 Nov 2017 05:54:34 -0400 Subject: [PATCH] Fix the fake endpoint example. Now all cases are handled by the java play framework! (#6850) --- .../io/swagger/codegen/CodegenParameter.java | 6 ++- .../io/swagger/codegen/CodegenProperty.java | 6 ++- .../io/swagger/codegen/CodegenResponse.java | 2 +- .../io/swagger/codegen/DefaultCodegen.java | 51 +++++++------------ .../languages/JavaPlayFrameworkCodegen.java | 6 +++ .../conversionBegin.mustache | 2 +- .../JavaPlayFramework/conversionEnd.mustache | 2 +- .../itemConversionBegin.mustache | 2 +- .../itemConversionEnd.mustache | 2 +- .../JavaPlayFramework/newApi.mustache | 9 +++- .../app/controllers/FakeApiController.java | 4 +- .../app/controllers/FakeApiControllerImp.java | 8 +-- .../app/controllers/PetApiControllerImp.java | 4 -- .../controllers/StoreApiControllerImp.java | 1 - .../app/controllers/UserApiControllerImp.java | 6 --- .../public/swagger.json | 6 ++- .../app/controllers/PetApiControllerImp.java | 4 -- .../controllers/StoreApiControllerImp.java | 1 - .../app/controllers/UserApiControllerImp.java | 6 --- .../app/controllers/PetApiControllerImp.java | 4 -- .../controllers/StoreApiControllerImp.java | 1 - .../app/controllers/UserApiControllerImp.java | 6 --- .../app/controllers/PetApiControllerImp.java | 4 -- .../controllers/StoreApiControllerImp.java | 1 - .../app/controllers/UserApiControllerImp.java | 6 --- .../app/controllers/PetApiControllerImp.java | 4 -- .../controllers/StoreApiControllerImp.java | 1 - .../app/controllers/UserApiControllerImp.java | 6 --- .../app/controllers/PetApiControllerImp.java | 4 -- .../controllers/StoreApiControllerImp.java | 1 - .../app/controllers/UserApiControllerImp.java | 6 --- .../app/controllers/PetApiControllerImp.java | 4 -- .../controllers/StoreApiControllerImp.java | 1 - .../app/controllers/UserApiControllerImp.java | 6 --- 34 files changed, 54 insertions(+), 129 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java index bb437c9a036..296122899b8 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java @@ -14,7 +14,7 @@ public class CodegenParameter { public String example; // example value (x-example) public String jsonSchema; - public boolean isString, isNumeric, isInteger, isLong, isFloat, isDouble, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid; + public boolean isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid; public boolean isListContainer, isMapContainer; public boolean isFile, notFile; public boolean isEnum; @@ -138,6 +138,7 @@ public class CodegenParameter { output.isLong = this.isLong; output.isDouble = this.isDouble; output.isFloat = this.isFloat; + output.isNumber = this.isNumber; output.isBoolean = this.isBoolean; output.isDate = this.isDate; output.isDateTime = this.isDateTime; @@ -217,6 +218,8 @@ public class CodegenParameter { return false; if (isLong != that.isLong) return false; + if (isNumber != that.isNumber) + return false; if (isFloat != that.isFloat) return false; if (isDouble != that.isDouble) @@ -308,6 +311,7 @@ public class CodegenParameter { result = 31 * result + (isInteger ? 13:31); result = 31 * result + (isLong ? 13:31); result = 31 * result + (isFloat ? 13:31); + result = 31 * result + (isNumber ? 13:31); result = 31 * result + (isDouble ? 13:31); result = 31 * result + (isByteArray ? 13:31); result = 31 * result + (isBinary ? 13:31); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java index a7fa9385cc7..e50364ce1cd 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java @@ -39,7 +39,7 @@ public class CodegenProperty implements Cloneable { public boolean hasMore, required, secondaryParam; public boolean hasMoreNonReadOnly; // for model constructor, true if next properyt is not readonly public boolean isPrimitiveType, isContainer, isNotContainer; - public boolean isString, isNumeric, isInteger, isLong, isFloat, isDouble, isByteArray, isBinary, isFile, isBoolean, isDate, isDateTime, isUuid; + public boolean isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isFile, isBoolean, isDate, isDateTime, isUuid; public boolean isListContainer, isMapContainer; public boolean isEnum; public boolean isReadOnly = false; @@ -118,6 +118,7 @@ public class CodegenProperty implements Cloneable { result = prime * result + ((isNumeric ? 13:31)); result = prime * result + ((isInteger ? 13:31)); result = prime * result + ((isLong ?13:31)); + result = prime * result + ((isNumber ? 13:31)); result = prime * result + ((isFloat ? 13:31)); result = prime * result + ((isDouble ? 13:31)); result = prime * result + ((isByteArray ? 13:31)); @@ -272,6 +273,9 @@ public class CodegenProperty implements Cloneable { if (this.isLong != other.isLong) { return false; } + if (this.isNumber != other.isNumber) { + return false; + } if (this.isFloat != other.isFloat) { return false; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java index 1b2b74214d0..6a0dfa44c4e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java @@ -11,7 +11,7 @@ public class CodegenResponse { public List> examples; public String dataType, baseType, containerType; public boolean hasHeaders; - public boolean isString, isNumeric, isInteger, isLong, isFloat, isDouble, isByteArray, isBoolean, isDate, isDateTime, isUuid; + public boolean isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBoolean, isDate, isDateTime, isUuid; public boolean isDefault; public boolean simpleType; public boolean primitiveType; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 2e8b0ebab5b..3292ce14adc 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -2,20 +2,8 @@ package io.swagger.codegen; import javax.annotation.Nullable; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; -import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -1130,7 +1118,7 @@ public class DefaultCodegen { String datatype = null; if (p instanceof StringProperty && "number".equals(p.getFormat())) { datatype = "BigDecimal"; - } else if (p instanceof ByteArrayProperty) { + } else if ((p instanceof ByteArrayProperty) || (p instanceof StringProperty && "byte".equals(p.getFormat()))) { datatype = "ByteArray"; } else if (p instanceof BinaryProperty) { datatype = "binary"; @@ -1706,20 +1694,7 @@ public class DefaultCodegen { // type is number and without format if (p instanceof DecimalProperty && !(p instanceof DoubleProperty) && !(p instanceof FloatProperty)) { DecimalProperty sp = (DecimalProperty) p; - property.isFloat = true; - /*if (sp.getEnum() != null) { - List _enum = sp.getEnum(); - property._enum = new ArrayList(); - for(Double i : _enum) { - property._enum.add(i.toString()); - } - property.isEnum = true; - - // legacy support - Map allowableValues = new HashMap(); - allowableValues.put("values", _enum); - property.allowableValues = allowableValues; - }*/ + property.isNumber = true; } if (p instanceof DoubleProperty) { DoubleProperty sp = (DoubleProperty) p; @@ -2371,7 +2346,9 @@ public class DefaultCodegen { } r.dataType = cm.datatype; - if (Boolean.TRUE.equals(cm.isString)) { + if (Boolean.TRUE.equals(cm.isByteArray)) { + r.isByteArray = true; + } else if (Boolean.TRUE.equals(cm.isString)) { r.isString = true; } else if (Boolean.TRUE.equals(cm.isBoolean)) { r.isBoolean = true; @@ -2381,14 +2358,15 @@ public class DefaultCodegen { } else if (Boolean.TRUE.equals(cm.isInteger)) { r.isInteger = true; r.isNumeric = true; + } else if (Boolean.TRUE.equals(cm.isNumber)) { + r.isNumber = true; + r.isNumeric = true; } else if (Boolean.TRUE.equals(cm.isDouble)) { r.isDouble = true; r.isNumeric = true; } else if (Boolean.TRUE.equals(cm.isFloat)) { r.isFloat = true; r.isNumeric = true; - } else if (Boolean.TRUE.equals(cm.isByteArray)) { - r.isByteArray = true; } else if (Boolean.TRUE.equals(cm.isBinary)) { r.isBinary = true; } else if (Boolean.TRUE.equals(cm.isFile)) { @@ -2712,6 +2690,8 @@ public class DefaultCodegen { p.example = "56"; } else if (Boolean.TRUE.equals(p.isFloat)) { p.example = "3.4"; + } else if (Boolean.TRUE.equals(p.isNumber)) { + p.example = "8.14"; } else if (Boolean.TRUE.equals(p.isDouble)) { p.example = "1.2"; } else if (Boolean.TRUE.equals(p.isBinary)) { @@ -3593,7 +3573,10 @@ public class DefaultCodegen { return; } - if (Boolean.TRUE.equals(property.isString)) { + if (Boolean.TRUE.equals(property.isByteArray)) { + parameter.isByteArray = true; + parameter.isPrimitiveType = true; + } else if (Boolean.TRUE.equals(property.isString)) { parameter.isString = true; parameter.isPrimitiveType = true; } else if (Boolean.TRUE.equals(property.isBoolean)) { @@ -3611,8 +3594,8 @@ public class DefaultCodegen { } else if (Boolean.TRUE.equals(property.isFloat)) { parameter.isFloat = true; parameter.isPrimitiveType = true; - } else if (Boolean.TRUE.equals(property.isByteArray)) { - parameter.isByteArray = true; + } else if (Boolean.TRUE.equals(property.isNumber)) { + parameter.isNumber = true; parameter.isPrimitiveType = true; } else if (Boolean.TRUE.equals(property.isBinary)) { parameter.isByteArray = true; diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaPlayFrameworkCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaPlayFrameworkCodegen.java index 452bfdd29e9..45aa089a97e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaPlayFrameworkCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaPlayFrameworkCodegen.java @@ -272,6 +272,12 @@ public class JavaPlayFrameworkCodegen extends AbstractJavaCodegen implements Bea } if (operation.returnType != null) { + if (operation.returnType.equals("Boolean")) { + operation.vendorExtensions.put("missingReturnInfoIfNeeded", "true"); + } + if (operation.returnType.equals("BigDecimal")) { + operation.vendorExtensions.put("missingReturnInfoIfNeeded", "1.0"); + } if (operation.returnType.startsWith("List")) { String rt = operation.returnType; int end = rt.lastIndexOf(">"); diff --git a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/conversionBegin.mustache b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/conversionBegin.mustache index 69001e01d84..19954287202 100644 --- a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/conversionBegin.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/conversionBegin.mustache @@ -1 +1 @@ -{{#isBoolean}}Boolean.valueOf({{/isBoolean}}{{#isInteger}}Integer.parseInt({{/isInteger}}{{#isDouble}}Double.parseDouble({{/isDouble}}{{#isLong}}Long.parseLong({{/isLong}}{{#isFloat}}Float.parseFloat({{/isFloat}}{{#isUuid}}UUID.fromString({{/isUuid}}{{#isDateTime}}OffsetDateTime.parse({{/isDateTime}}{{#isDate}}LocalDate.parse({{/isDate}}{{#isByteArray}}{{/isByteArray}} \ No newline at end of file +{{#isBoolean}}Boolean.valueOf({{/isBoolean}}{{#isInteger}}Integer.parseInt({{/isInteger}}{{#isDouble}}Double.parseDouble({{/isDouble}}{{#isLong}}Long.parseLong({{/isLong}}{{#isFloat}}Float.parseFloat({{/isFloat}}{{#isUuid}}UUID.fromString({{/isUuid}}{{#isDateTime}}OffsetDateTime.parse({{/isDateTime}}{{#isDate}}LocalDate.parse({{/isDate}}{{#isByteArray}}{{/isByteArray}}{{#isNumber}}new BigDecimal({{/isNumber}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/conversionEnd.mustache b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/conversionEnd.mustache index fc7e52c40e8..cc6940fb4df 100644 --- a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/conversionEnd.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/conversionEnd.mustache @@ -1 +1 @@ -{{#isBoolean}}){{/isBoolean}}{{#isInteger}}){{/isInteger}}{{#isDouble}}){{/isDouble}}{{#isLong}}){{/isLong}}{{#isFloat}}){{/isFloat}}{{#isUuid}}){{/isUuid}}{{#isDateTime}}){{/isDateTime}}{{#isDate}}){{/isDate}}{{#isByteArray}}.getBytes(){{/isByteArray}} \ No newline at end of file +{{#isBoolean}}){{/isBoolean}}{{#isInteger}}){{/isInteger}}{{#isDouble}}){{/isDouble}}{{#isLong}}){{/isLong}}{{#isFloat}}){{/isFloat}}{{#isUuid}}){{/isUuid}}{{#isDateTime}}){{/isDateTime}}{{#isDate}}){{/isDate}}{{#isByteArray}}.getBytes(){{/isByteArray}}{{#isNumber}}){{/isNumber}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/itemConversionBegin.mustache b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/itemConversionBegin.mustache index 962109d36db..42b024ec340 100644 --- a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/itemConversionBegin.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/itemConversionBegin.mustache @@ -1 +1 @@ -{{#items.isBoolean}}Boolean.valueOf({{/items.isBoolean}}{{#items.isInteger}}Integer.parseInt({{/items.isInteger}}{{#items.isDouble}}Double.parseDouble({{/items.isDouble}}{{#items.isLong}}Long.parseLong({{/items.isLong}}{{#items.isFloat}}Float.parseFloat({{/items.isFloat}}{{#items.isUuid}}UUID.fromString({{/items.isUuid}}{{#items.isDateTime}}OffsetDateTime.parse({{/items.isDateTime}}{{#items.isDate}}LocalDate.parse({{/items.isDate}}{{#isByteArray}}{{/isByteArray}} \ No newline at end of file +{{#items.isBoolean}}Boolean.valueOf({{/items.isBoolean}}{{#items.isInteger}}Integer.parseInt({{/items.isInteger}}{{#items.isDouble}}Double.parseDouble({{/items.isDouble}}{{#items.isLong}}Long.parseLong({{/items.isLong}}{{#items.isFloat}}Float.parseFloat({{/items.isFloat}}{{#items.isUuid}}UUID.fromString({{/items.isUuid}}{{#items.isDateTime}}OffsetDateTime.parse({{/items.isDateTime}}{{#items.isDate}}LocalDate.parse({{/items.isDate}}{{#isByteArray}}{{/isByteArray}}{{#isNumber}}new BigDecimal({{/isNumber}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/itemConversionEnd.mustache b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/itemConversionEnd.mustache index 771cf4f349d..66edac4ea93 100644 --- a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/itemConversionEnd.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/itemConversionEnd.mustache @@ -1 +1 @@ -{{#items.isBoolean}}){{/items.isBoolean}}{{#items.isInteger}}){{/items.isInteger}}{{#items.isDouble}}){{/items.isDouble}}{{#items.isLong}}){{/items.isLong}}{{#items.isFloat}}){{/items.isFloat}}{{#items.isUuid}}){{/items.isUuid}}{{#items.isDateTime}}){{/items.isDateTime}}{{#items.isDate}}){{/items.isDate}}{{#isByteArray}}.getBytes(){{/isByteArray}} \ No newline at end of file +{{#items.isBoolean}}){{/items.isBoolean}}{{#items.isInteger}}){{/items.isInteger}}{{#items.isDouble}}){{/items.isDouble}}{{#items.isLong}}){{/items.isLong}}{{#items.isFloat}}){{/items.isFloat}}{{#items.isUuid}}){{/items.isUuid}}{{#items.isDateTime}}){{/items.isDateTime}}{{#items.isDate}}){{/items.isDate}}{{#isByteArray}}.getBytes(){{/isByteArray}}{{#isNumber}}){{/isNumber}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApi.mustache b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApi.mustache index 1c23543a7e7..6862b7402a3 100644 --- a/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApi.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApi.mustache @@ -18,7 +18,14 @@ public class {{classname}}ControllerImp {{#useInterfaces}}implements {{classname {{#useInterfaces}}@Override{{/useInterfaces}} public {{>returnTypes}} {{operationId}}({{#allParams}}{{>pathParams}}{{>queryParams}}{{>bodyParams}}{{>formParams}}{{>headerParams}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {{#handleExceptions}}throws Exception{{/handleExceptions}} { //Do your magic!!! - {{#returnType}}{{#isResponseFile}}return new FileInputStream("replace this");{{/isResponseFile}}{{^isResponseFile}}return new {{>returnTypesNoVoidNoAbstract}}();{{/isResponseFile}}{{/returnType}} + {{#returnType}} + {{#isResponseFile}} + return new FileInputStream("replace this"); + {{/isResponseFile}} + {{^isResponseFile}} + return new {{>returnTypesNoVoidNoAbstract}}({{#vendorExtensions.missingReturnInfoIfNeeded}}{{vendorExtensions.missingReturnInfoIfNeeded}}{{/vendorExtensions.missingReturnInfoIfNeeded}}); + {{/isResponseFile}} + {{/returnType}} } {{/operation}} diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java index 0fcefacfa3b..0e9f0e0a580 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java @@ -159,7 +159,7 @@ public class FakeApiController extends Controller { String valuenumber = (request().body().asMultipartFormData().asFormUrlEncoded().get("number"))[0]; BigDecimal number; if (valuenumber != null) { - number = Float.parseFloat(valuenumber); + number = new BigDecimal(valuenumber); } else { throw new IllegalArgumentException("'number' parameter is required"); } @@ -194,7 +194,7 @@ public class FakeApiController extends Controller { String value_byte = (request().body().asMultipartFormData().asFormUrlEncoded().get("byte"))[0]; byte[] _byte; if (value_byte != null) { - _byte = value_byte; + _byte = value_byte.getBytes(); } else { throw new IllegalArgumentException("'byte' parameter is required"); } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java index 8756c4226c3..f4d890300e1 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java @@ -17,7 +17,7 @@ public class FakeApiControllerImp implements FakeApiControllerImpInterface { @Override public Boolean fakeOuterBooleanSerialize(Boolean body) throws Exception { //Do your magic!!! - return new Boolean(); + return new Boolean(true); } @Override @@ -29,7 +29,7 @@ public class FakeApiControllerImp implements FakeApiControllerImpInterface { @Override public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws Exception { //Do your magic!!! - return new BigDecimal(); + return new BigDecimal(1.0); } @Override @@ -47,25 +47,21 @@ public class FakeApiControllerImp implements FakeApiControllerImpInterface { @Override public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception { //Do your magic!!! - } @Override public void testEnumParameters(List enumFormStringArray, String enumFormString, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble) throws Exception { //Do your magic!!! - } @Override public void testInlineAdditionalProperties(Object param) throws Exception { //Do your magic!!! - } @Override public void testJsonFormData(String param, String param2) throws Exception { //Do your magic!!! - } } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java index c5ef552623e..c025993f7c1 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImp.java @@ -15,13 +15,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void addPet(Pet body) throws Exception { //Do your magic!!! - } @Override public void deletePet(Long petId, String apiKey) throws Exception { //Do your magic!!! - } @Override @@ -45,13 +43,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void updatePet(Pet body) throws Exception { //Do your magic!!! - } @Override public void updatePetWithForm(Long petId, String name, String status) throws Exception { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java index 88fce8c14ed..7c57d3d096c 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiControllerImp.java @@ -14,7 +14,6 @@ public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override public void deleteOrder(String orderId) throws Exception { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java index 82b9003b0fc..0ea7a808b9a 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiControllerImp.java @@ -14,25 +14,21 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void createUser(User body) throws Exception { //Do your magic!!! - } @Override public void createUsersWithArrayInput(List body) throws Exception { //Do your magic!!! - } @Override public void createUsersWithListInput(List body) throws Exception { //Do your magic!!! - } @Override public void deleteUser(String username) throws Exception { //Do your magic!!! - } @Override @@ -50,13 +46,11 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void logoutUser() throws Exception { //Do your magic!!! - } @Override public void updateUser(String username, User body) throws Exception { //Do your magic!!! - } } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json b/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json index 368be2e2b4d..8943dddcaa2 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json +++ b/samples/server/petstore/java-play-framework-fake-endpoints/public/swagger.json @@ -978,7 +978,8 @@ } }, "x-contentType" : "application/json", - "x-accepts" : "application/json" + "x-accepts" : "application/json", + "missingReturnInfoIfNeeded" : "1.0" } }, "/fake/outer/string" : { @@ -1030,7 +1031,8 @@ } }, "x-contentType" : "application/json", - "x-accepts" : "application/json" + "x-accepts" : "application/json", + "missingReturnInfoIfNeeded" : "true" } }, "/fake/outer/composite" : { diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java index 147b7e8bd65..ed9b151a238 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiControllerImp.java @@ -14,13 +14,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void addPet(Pet body) throws Exception { //Do your magic!!! - } @Override public void deletePet(Long petId, String apiKey) throws Exception { //Do your magic!!! - } @Override @@ -44,13 +42,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void updatePet(Pet body) throws Exception { //Do your magic!!! - } @Override public void updatePetWithForm(Long petId, String name, String status) throws Exception { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java index 181813a0462..b0d2d8f88a1 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiControllerImp.java @@ -13,7 +13,6 @@ public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override public void deleteOrder(String orderId) throws Exception { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java index 24d66f17eed..8bf12fe7c82 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiControllerImp.java @@ -13,25 +13,21 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void createUser(User body) throws Exception { //Do your magic!!! - } @Override public void createUsersWithArrayInput(List body) throws Exception { //Do your magic!!! - } @Override public void createUsersWithListInput(List body) throws Exception { //Do your magic!!! - } @Override public void deleteUser(String username) throws Exception { //Do your magic!!! - } @Override @@ -49,13 +45,11 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void logoutUser() throws Exception { //Do your magic!!! - } @Override public void updateUser(String username, User body) throws Exception { //Do your magic!!! - } } diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java index bfe0bf69fff..e8d4a8b504a 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiControllerImp.java @@ -15,13 +15,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void addPet(Pet body) { //Do your magic!!! - } @Override public void deletePet(Long petId, String apiKey) { //Do your magic!!! - } @Override @@ -45,13 +43,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void updatePet(Pet body) { //Do your magic!!! - } @Override public void updatePetWithForm(Long petId, String name, String status) { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java index 695b357ad91..6406ee40e1f 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiControllerImp.java @@ -14,7 +14,6 @@ public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override public void deleteOrder(String orderId) { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java index aed4ff87261..a6a588b6c8e 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiControllerImp.java @@ -14,25 +14,21 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void createUser(User body) { //Do your magic!!! - } @Override public void createUsersWithArrayInput(List body) { //Do your magic!!! - } @Override public void createUsersWithListInput(List body) { //Do your magic!!! - } @Override public void deleteUser(String username) { //Do your magic!!! - } @Override @@ -50,13 +46,11 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void logoutUser() { //Do your magic!!! - } @Override public void updateUser(String username, User body) { //Do your magic!!! - } } diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java index f24f8ee836d..3af35ea5303 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiControllerImp.java @@ -15,13 +15,11 @@ public class PetApiControllerImp { public void addPet(Pet body) throws Exception { //Do your magic!!! - } public void deletePet(Long petId, String apiKey) throws Exception { //Do your magic!!! - } @@ -45,13 +43,11 @@ public class PetApiControllerImp { public void updatePet(Pet body) throws Exception { //Do your magic!!! - } public void updatePetWithForm(Long petId, String name, String status) throws Exception { //Do your magic!!! - } diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java index e4cbe331a22..119afe97fbf 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiControllerImp.java @@ -14,7 +14,6 @@ public class StoreApiControllerImp { public void deleteOrder(String orderId) throws Exception { //Do your magic!!! - } diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java index 06d9b91f681..569811fe095 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiControllerImp.java @@ -14,25 +14,21 @@ public class UserApiControllerImp { public void createUser(User body) throws Exception { //Do your magic!!! - } public void createUsersWithArrayInput(List body) throws Exception { //Do your magic!!! - } public void createUsersWithListInput(List body) throws Exception { //Do your magic!!! - } public void deleteUser(String username) throws Exception { //Do your magic!!! - } @@ -50,13 +46,11 @@ public class UserApiControllerImp { public void logoutUser() throws Exception { //Do your magic!!! - } public void updateUser(String username, User body) throws Exception { //Do your magic!!! - } } diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java index c5ef552623e..c025993f7c1 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiControllerImp.java @@ -15,13 +15,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void addPet(Pet body) throws Exception { //Do your magic!!! - } @Override public void deletePet(Long petId, String apiKey) throws Exception { //Do your magic!!! - } @Override @@ -45,13 +43,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void updatePet(Pet body) throws Exception { //Do your magic!!! - } @Override public void updatePetWithForm(Long petId, String name, String status) throws Exception { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java index 88fce8c14ed..7c57d3d096c 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiControllerImp.java @@ -14,7 +14,6 @@ public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override public void deleteOrder(String orderId) throws Exception { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java index 82b9003b0fc..0ea7a808b9a 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiControllerImp.java @@ -14,25 +14,21 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void createUser(User body) throws Exception { //Do your magic!!! - } @Override public void createUsersWithArrayInput(List body) throws Exception { //Do your magic!!! - } @Override public void createUsersWithListInput(List body) throws Exception { //Do your magic!!! - } @Override public void deleteUser(String username) throws Exception { //Do your magic!!! - } @Override @@ -50,13 +46,11 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void logoutUser() throws Exception { //Do your magic!!! - } @Override public void updateUser(String username, User body) throws Exception { //Do your magic!!! - } } diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java index c5ef552623e..c025993f7c1 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiControllerImp.java @@ -15,13 +15,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void addPet(Pet body) throws Exception { //Do your magic!!! - } @Override public void deletePet(Long petId, String apiKey) throws Exception { //Do your magic!!! - } @Override @@ -45,13 +43,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void updatePet(Pet body) throws Exception { //Do your magic!!! - } @Override public void updatePetWithForm(Long petId, String name, String status) throws Exception { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java index 88fce8c14ed..7c57d3d096c 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiControllerImp.java @@ -14,7 +14,6 @@ public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override public void deleteOrder(String orderId) throws Exception { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java index 82b9003b0fc..0ea7a808b9a 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiControllerImp.java @@ -14,25 +14,21 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void createUser(User body) throws Exception { //Do your magic!!! - } @Override public void createUsersWithArrayInput(List body) throws Exception { //Do your magic!!! - } @Override public void createUsersWithListInput(List body) throws Exception { //Do your magic!!! - } @Override public void deleteUser(String username) throws Exception { //Do your magic!!! - } @Override @@ -50,13 +46,11 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void logoutUser() throws Exception { //Do your magic!!! - } @Override public void updateUser(String username, User body) throws Exception { //Do your magic!!! - } } diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java index c5ef552623e..c025993f7c1 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java @@ -15,13 +15,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void addPet(Pet body) throws Exception { //Do your magic!!! - } @Override public void deletePet(Long petId, String apiKey) throws Exception { //Do your magic!!! - } @Override @@ -45,13 +43,11 @@ public class PetApiControllerImp implements PetApiControllerImpInterface { @Override public void updatePet(Pet body) throws Exception { //Do your magic!!! - } @Override public void updatePetWithForm(Long petId, String name, String status) throws Exception { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java index 88fce8c14ed..7c57d3d096c 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java @@ -14,7 +14,6 @@ public class StoreApiControllerImp implements StoreApiControllerImpInterface { @Override public void deleteOrder(String orderId) throws Exception { //Do your magic!!! - } @Override diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java index 82b9003b0fc..0ea7a808b9a 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java @@ -14,25 +14,21 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void createUser(User body) throws Exception { //Do your magic!!! - } @Override public void createUsersWithArrayInput(List body) throws Exception { //Do your magic!!! - } @Override public void createUsersWithListInput(List body) throws Exception { //Do your magic!!! - } @Override public void deleteUser(String username) throws Exception { //Do your magic!!! - } @Override @@ -50,13 +46,11 @@ public class UserApiControllerImp implements UserApiControllerImpInterface { @Override public void logoutUser() throws Exception { //Do your magic!!! - } @Override public void updateUser(String username, User body) throws Exception { //Do your magic!!! - } }