From 2e0c44a9bfe5dea35a9f9191bad52e10877223bb Mon Sep 17 00:00:00 2001 From: Ondrej Janus Date: Wed, 26 Feb 2020 15:57:37 +0100 Subject: [PATCH 1/6] [REQ][JAVA]: Add option to generate arrays with "uniqueItems" true as Sets rather than Lists - Update Java code generation to use sets instead of lists when uniqueItems is set to true - Add import resolution for sets - Add and update tests resolve #5254 --- .../okhttp-gson/api/PetApiTest.java | 8 +-- .../openapitools/codegen/DefaultCodegen.java | 23 ++++++-- .../languages/AbstractJavaCodegen.java | 23 ++++++-- .../codegen/java/AbstractJavaCodegenTest.java | 12 +++++ .../codegen/java/JavaModelTest.java | 53 +++++++++++++++++++ ...ith-fake-endpoints-models-for-testing.yaml | 1 + .../openapitools/client/api/PetApiTest.java | 8 +-- 7 files changed, 115 insertions(+), 13 deletions(-) diff --git a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java index a3febe1fba1e..76a4f3990455 100644 --- a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java +++ b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java @@ -26,8 +26,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -377,7 +379,7 @@ public void testEqualsAndHashCode() { assertTrue(pet1.hashCode() == pet1.hashCode()); pet2.setName("really-happy"); - pet2.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2")); + pet2.setPhotoUrls(new HashSet<>(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"))); assertFalse(pet1.equals(pet2)); assertFalse(pet2.equals(pet1)); assertFalse(pet1.hashCode() == (pet2.hashCode())); @@ -385,7 +387,7 @@ public void testEqualsAndHashCode() { assertTrue(pet2.hashCode() == pet2.hashCode()); pet1.setName("really-happy"); - pet1.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2")); + pet1.setPhotoUrls(new HashSet<>(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"))); assertTrue(pet1.equals(pet2)); assertTrue(pet2.equals(pet1)); assertTrue(pet1.hashCode() == pet2.hashCode()); @@ -404,7 +406,7 @@ private Pet createPet() { pet.setCategory(category); pet.setStatus(Pet.StatusEnum.AVAILABLE); - List photos = Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"); + Set photos = new HashSet<>(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2")); pet.setPhotoUrls(photos); return pet; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 7f39ec5c033f..4cab2960abc7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -1198,8 +1198,10 @@ public DefaultCodegen() { typeMapping = new HashMap(); typeMapping.put("array", "List"); + typeMapping.put("set", "Set"); typeMapping.put("map", "Map"); typeMapping.put("List", "List"); + typeMapping.put("Set", "Set"); typeMapping.put("boolean", "Boolean"); typeMapping.put("string", "String"); typeMapping.put("int", "Integer"); @@ -1235,6 +1237,7 @@ public DefaultCodegen() { importMapping.put("HashMap", "java.util.HashMap"); importMapping.put("Array", "java.util.List"); importMapping.put("ArrayList", "java.util.ArrayList"); + importMapping.put("HashSet", "java.util.HashSet"); importMapping.put("List", "java.util.*"); importMapping.put("Set", "java.util.*"); importMapping.put("DateTime", "org.joda.time.*"); @@ -1399,7 +1402,13 @@ public String toInstantiationType(Schema schema) { } else if (ModelUtils.isArraySchema(schema)) { ArraySchema arraySchema = (ArraySchema) schema; String inner = getSchemaType(getSchemaItems(arraySchema)); - return instantiationTypes.get("array") + "<" + inner + ">"; + String parentType; + if (ModelUtils.isSet(schema)) { + parentType = "set"; + } else { + parentType = "array"; + } + return instantiationTypes.get(parentType) + "<" + inner + ">"; } else { return null; } @@ -1760,7 +1769,11 @@ private String getPrimitiveType(Schema schema) { } else if (ModelUtils.isMapSchema(schema)) { return "map"; } else if (ModelUtils.isArraySchema(schema)) { - return "array"; + if (ModelUtils.isSet(schema)) { + return "set"; + } else { + return "array"; + } } else if (ModelUtils.isUUIDSchema(schema)) { return "UUID"; } else if (ModelUtils.isURISchema(schema)) { @@ -2481,7 +2494,11 @@ public CodegenProperty fromProperty(String name, Schema p) { if (ModelUtils.isArraySchema(p)) { property.isContainer = true; property.isListContainer = true; - property.containerType = "array"; + if (ModelUtils.isSet(p)) { + property.containerType = "set"; + } else { + property.containerType = "array"; + } property.baseType = getSchemaType(p); if (p.getXml() != null) { property.isXmlWrapped = p.getXml().getWrapped() == null ? false : p.getXml().getWrapped(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index af6e1cde6ccf..dd887d26e829 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -161,6 +161,7 @@ public AbstractJavaCodegen() { "byte[]") ); instantiationTypes.put("array", "ArrayList"); + instantiationTypes.put("set", "HashSet"); instantiationTypes.put("map", "HashMap"); typeMapping.put("date", "Date"); typeMapping.put("file", "File"); @@ -415,9 +416,11 @@ public void processOpts() { additionalProperties.put("modelDocPath", modelDocPath); importMapping.put("List", "java.util.List"); + importMapping.put("Set", "java.util.Set"); if (fullJavaUtil) { typeMapping.put("array", "java.util.List"); + typeMapping.put("set", "java.util.Set"); typeMapping.put("map", "java.util.Map"); typeMapping.put("DateTime", "java.util.Date"); typeMapping.put("UUID", "java.util.UUID"); @@ -429,9 +432,11 @@ public void processOpts() { importMapping.remove("ArrayList"); importMapping.remove("List"); importMapping.remove("Set"); + importMapping.remove("HashSet"); importMapping.remove("DateTime"); importMapping.remove("UUID"); instantiationTypes.put("array", "java.util.ArrayList"); + instantiationTypes.put("set", "java.util.HashSet"); instantiationTypes.put("map", "java.util.HashMap"); } @@ -760,10 +765,18 @@ public String toDefaultValue(Schema p) { p = ModelUtils.getReferencedSchema(this.openAPI, p); if (ModelUtils.isArraySchema(p)) { final String pattern; - if (fullJavaUtil) { - pattern = "new java.util.ArrayList<%s>()"; + if (ModelUtils.isSet(p)) { + if (fullJavaUtil) { + pattern = "new java.util.HashSet<%s>()"; + } else { + pattern = "new HashSet<%s>()"; + } } else { - pattern = "new ArrayList<%s>()"; + if (fullJavaUtil) { + pattern = "new java.util.ArrayList<%s>()"; + } else { + pattern = "new ArrayList<%s>()"; + } } Schema items = getSchemaItems((ArraySchema) p); @@ -1010,6 +1023,8 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert if (!fullJavaUtil) { if ("array".equals(property.containerType)) { model.imports.add("ArrayList"); + } else if ("set".equals(property.containerType)) { + model.imports.add("HashSet"); } else if ("map".equals(property.containerType)) { model.imports.add("HashMap"); } @@ -1049,7 +1064,7 @@ public Map postProcessOperationsWithModels(Map o // Remove imports of List, ArrayList, Map and HashMap as they are // imported in the template already. List> imports = (List>) objs.get("imports"); - Pattern pattern = Pattern.compile("java\\.util\\.(List|ArrayList|Map|HashMap)"); + Pattern pattern = Pattern.compile("java\\.util\\.(List|ArrayList|Set|HashSet|Map|HashMap)"); for (Iterator> itr = imports.iterator(); itr.hasNext(); ) { String itrImport = itr.next().get("import"); if (pattern.matcher(itrImport).matches()) { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index a69538180e12..0fafd163b5ef 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -436,6 +436,18 @@ public void getTypeDeclarationTest() { defaultValue = codegen.getTypeDeclaration(schema); Assert.assertEquals(defaultValue, "List"); + // Create an array schema with item type set to the array alias + schema = new ArraySchema().items(new Schema().$ref("#/components/schemas/NestedArray")); + schema.setUniqueItems(true); + + ModelUtils.setGenerateAliasAsModel(false); + defaultValue = codegen.getTypeDeclaration(schema); + Assert.assertEquals(defaultValue, "Set>"); + + ModelUtils.setGenerateAliasAsModel(true); + defaultValue = codegen.getTypeDeclaration(schema); + Assert.assertEquals(defaultValue, "Set"); + // Create a map schema with additionalProperties type set to array alias schema = new MapSchema().additionalProperties(new Schema().$ref("#/components/schemas/NestedArray")); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java index e8a461b705ac..bd90d158b800 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java @@ -138,6 +138,38 @@ public void listPropertyTest() { Assert.assertTrue(property.isContainer); } + @Test(description = "convert a model with set property") + public void setPropertyTest() { + final Schema schema = new Schema() + .description("a sample model") + .addProperties("id", new IntegerSchema().format(SchemaTypeUtil.INTEGER64_FORMAT)) + .addProperties("urls", new ArraySchema() + .items(new StringSchema()) + .uniqueItems(true)) + .addRequiredItem("id"); + final DefaultCodegen codegen = new JavaClientCodegen(); + OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", schema); + codegen.setOpenAPI(openAPI); + final CodegenModel cm = codegen.fromModel("sample", schema); + + Assert.assertEquals(cm.name, "sample"); + Assert.assertEquals(cm.classname, "Sample"); + Assert.assertEquals(cm.description, "a sample model"); + Assert.assertEquals(cm.vars.size(), 2); + + final CodegenProperty property = cm.vars.get(1); + Assert.assertEquals(property.baseName, "urls"); + Assert.assertEquals(property.getter, "getUrls"); + Assert.assertEquals(property.setter, "setUrls"); + Assert.assertEquals(property.dataType, "Set"); + Assert.assertEquals(property.name, "urls"); + Assert.assertEquals(property.defaultValue, "new HashSet()"); + Assert.assertEquals(property.baseType, "Set"); + Assert.assertEquals(property.containerType, "set"); + Assert.assertFalse(property.required); + Assert.assertTrue(property.isContainer); + } + @Test(description = "convert a model with a map property") public void mapPropertyTest() { final Schema schema = new Schema() @@ -401,6 +433,27 @@ public void arrayModelTest() { Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("ApiModel", "List", "ArrayList", "Children")).size(), 4); } + @Test(description = "convert a set model") + public void setModelTest() { + final Schema schema = new ArraySchema() + .items(new Schema().name("elobjeto").$ref("#/components/schemas/Children")) + .uniqueItems(true) + .name("arraySchema") + .description("an array model"); + final DefaultCodegen codegen = new JavaClientCodegen(); + OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", schema); + codegen.setOpenAPI(openAPI); + final CodegenModel cm = codegen.fromModel("sample", schema); + + Assert.assertEquals(cm.name, "sample"); + Assert.assertEquals(cm.classname, "Sample"); + Assert.assertEquals(cm.description, "an array model"); + Assert.assertEquals(cm.vars.size(), 0); + Assert.assertEquals(cm.parent, "HashSet"); + Assert.assertEquals(cm.imports.size(), 4); + Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("ApiModel", "Set", "HashSet", "Children")).size(), 4); + } + @Test(description = "convert a map model") public void mapModelTest() { final Schema schema = new Schema() diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml index e21b8fb7d259..c6df90a47b9b 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -1234,6 +1234,7 @@ definitions: example: doggie photoUrls: type: array + uniqueItems: true xml: name: photoUrl wrapped: true diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java index a3febe1fba1e..76a4f3990455 100644 --- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -26,8 +26,10 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -377,7 +379,7 @@ public void testEqualsAndHashCode() { assertTrue(pet1.hashCode() == pet1.hashCode()); pet2.setName("really-happy"); - pet2.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2")); + pet2.setPhotoUrls(new HashSet<>(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"))); assertFalse(pet1.equals(pet2)); assertFalse(pet2.equals(pet1)); assertFalse(pet1.hashCode() == (pet2.hashCode())); @@ -385,7 +387,7 @@ public void testEqualsAndHashCode() { assertTrue(pet2.hashCode() == pet2.hashCode()); pet1.setName("really-happy"); - pet1.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2")); + pet1.setPhotoUrls(new HashSet<>(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"))); assertTrue(pet1.equals(pet2)); assertTrue(pet2.equals(pet1)); assertTrue(pet1.hashCode() == pet2.hashCode()); @@ -404,7 +406,7 @@ private Pet createPet() { pet.setCategory(category); pet.setStatus(Pet.StatusEnum.AVAILABLE); - List photos = Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"); + Set photos = new HashSet<>(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2")); pet.setPhotoUrls(photos); return pet; From 1572e82e3ceccaf4e5a35f56dd0f04e7672a3f55 Mon Sep 17 00:00:00 2001 From: Ondrej Janus Date: Wed, 4 Mar 2020 09:38:40 +0100 Subject: [PATCH 2/6] Update Javascript, Perl, Python and Ruby to preserve current functionality --- .../openapitools/codegen/languages/AbstractRubyCodegen.java | 1 + .../codegen/languages/JavascriptClientCodegen.java | 4 +++- .../org/openapitools/codegen/languages/PerlClientCodegen.java | 1 + .../openapitools/codegen/languages/PythonClientCodegen.java | 1 + .../org/openapitools/codegen/languages/RustServerCodegen.java | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java index e2c1f1312828..9c84e5244b38 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java @@ -74,6 +74,7 @@ public AbstractRubyCodegen() { typeMapping.put("date", "Date"); typeMapping.put("DateTime", "DateTime"); typeMapping.put("array", "Array"); + typeMapping.put("set", "Array"); typeMapping.put("List", "Array"); typeMapping.put("map", "Hash"); typeMapping.put("object", "Object"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java index 1bb9c9f2b9ee..c9b66b7d0f4d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java @@ -141,9 +141,11 @@ public JavascriptClientCodegen() { instantiationTypes.put("array", "Array"); instantiationTypes.put("list", "Array"); + instantiationTypes.put("set", "Array"); instantiationTypes.put("map", "Object"); typeMapping.clear(); typeMapping.put("array", "Array"); + typeMapping.put("set", "Array"); typeMapping.put("map", "Object"); typeMapping.put("List", "Array"); typeMapping.put("boolean", "Boolean"); @@ -913,7 +915,7 @@ private String getModelledType(String dataType) { private String getJSDocType(CodegenModel cm, CodegenProperty cp) { if (Boolean.TRUE.equals(cp.isContainer)) { - if (cp.containerType.equals("array")) + if (cp.containerType.equals("array") || cp.containerType.equals("set")) return "Array.<" + getJSDocType(cm, cp.items) + ">"; else if (cp.containerType.equals("map")) return "Object."; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java index c11841e31598..07261448a3c9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java @@ -131,6 +131,7 @@ public PerlClientCodegen() { typeMapping.put("DateTime", "DateTime"); typeMapping.put("password", "string"); typeMapping.put("array", "ARRAY"); + typeMapping.put("set", "ARRAY"); typeMapping.put("map", "HASH"); typeMapping.put("object", "object"); typeMapping.put("binary", "string"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java index c621ebef024d..ad691cfa9abd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java @@ -127,6 +127,7 @@ public PythonClientCodegen() { typeMapping.put("long", "int"); typeMapping.put("double", "float"); typeMapping.put("array", "list"); + typeMapping.put("set", "list"); typeMapping.put("map", "dict"); typeMapping.put("boolean", "bool"); typeMapping.put("string", "str"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java index b1d8fe360d63..8f2380381343 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java @@ -206,6 +206,7 @@ public RustServerCodegen() { typeMapping.put("File", bytesType); typeMapping.put("file", bytesType); typeMapping.put("array", "Vec"); + typeMapping.put("set", "Vec"); typeMapping.put("map", "HashMap"); typeMapping.put("object", "serde_json::Value"); From c4c05e01f24855c81a02317c594735449edfb548 Mon Sep 17 00:00:00 2001 From: Ondrej Janus Date: Wed, 4 Mar 2020 09:58:47 +0100 Subject: [PATCH 3/6] Switch set implementation to LinkedHashSet --- .../java/org/openapitools/codegen/DefaultCodegen.java | 2 +- .../codegen/languages/AbstractJavaCodegen.java | 10 +++++----- .../org/openapitools/codegen/java/JavaModelTest.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 4cab2960abc7..9dfe0c02f659 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -1237,7 +1237,7 @@ public DefaultCodegen() { importMapping.put("HashMap", "java.util.HashMap"); importMapping.put("Array", "java.util.List"); importMapping.put("ArrayList", "java.util.ArrayList"); - importMapping.put("HashSet", "java.util.HashSet"); + importMapping.put("LinkedHashSet", "java.util.LinkedHashSet"); importMapping.put("List", "java.util.*"); importMapping.put("Set", "java.util.*"); importMapping.put("DateTime", "org.joda.time.*"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index dd887d26e829..b8ee7fa5022f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -161,7 +161,7 @@ public AbstractJavaCodegen() { "byte[]") ); instantiationTypes.put("array", "ArrayList"); - instantiationTypes.put("set", "HashSet"); + instantiationTypes.put("set", "LinkedHashSet"); instantiationTypes.put("map", "HashMap"); typeMapping.put("date", "Date"); typeMapping.put("file", "File"); @@ -436,7 +436,7 @@ public void processOpts() { importMapping.remove("DateTime"); importMapping.remove("UUID"); instantiationTypes.put("array", "java.util.ArrayList"); - instantiationTypes.put("set", "java.util.HashSet"); + instantiationTypes.put("set", "java.util.LinkedHashSet"); instantiationTypes.put("map", "java.util.HashMap"); } @@ -767,9 +767,9 @@ public String toDefaultValue(Schema p) { final String pattern; if (ModelUtils.isSet(p)) { if (fullJavaUtil) { - pattern = "new java.util.HashSet<%s>()"; + pattern = "new java.util.LinkedHashSet<%s>()"; } else { - pattern = "new HashSet<%s>()"; + pattern = "new LinkedHashSet<%s>()"; } } else { if (fullJavaUtil) { @@ -1024,7 +1024,7 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert if ("array".equals(property.containerType)) { model.imports.add("ArrayList"); } else if ("set".equals(property.containerType)) { - model.imports.add("HashSet"); + model.imports.add("LinkedHashSet"); } else if ("map".equals(property.containerType)) { model.imports.add("HashMap"); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java index bd90d158b800..fb18aa82cb2d 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java @@ -163,7 +163,7 @@ public void setPropertyTest() { Assert.assertEquals(property.setter, "setUrls"); Assert.assertEquals(property.dataType, "Set"); Assert.assertEquals(property.name, "urls"); - Assert.assertEquals(property.defaultValue, "new HashSet()"); + Assert.assertEquals(property.defaultValue, "new LinkedHashSet()"); Assert.assertEquals(property.baseType, "Set"); Assert.assertEquals(property.containerType, "set"); Assert.assertFalse(property.required); @@ -449,9 +449,9 @@ public void setModelTest() { Assert.assertEquals(cm.classname, "Sample"); Assert.assertEquals(cm.description, "an array model"); Assert.assertEquals(cm.vars.size(), 0); - Assert.assertEquals(cm.parent, "HashSet"); + Assert.assertEquals(cm.parent, "LinkedHashSet"); Assert.assertEquals(cm.imports.size(), 4); - Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("ApiModel", "Set", "HashSet", "Children")).size(), 4); + Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("ApiModel", "Set", "LinkedHashSet", "Children")).size(), 4); } @Test(description = "convert a map model") From 7675cc8e515502addd98b7ed315f3bf3e01357a4 Mon Sep 17 00:00:00 2001 From: Ondrej Janus Date: Wed, 11 Mar 2020 08:59:25 +0100 Subject: [PATCH 4/6] Fix missing import for uniqueItems used on param --- .../okhttp-gson/api/PetApiTest.java | 2 +- .../openapitools/codegen/DefaultCodegen.java | 4 +++ .../AbstractJavaJAXRSServerCodegen.java | 4 +++ .../newApiController.mustache | 7 ++-- .../jaxrs/JavaJAXRSSpecServerCodegenTest.java | 32 +++++++++++++++++++ ...ith-fake-endpoints-models-for-testing.yaml | 1 + 6 files changed, 46 insertions(+), 4 deletions(-) diff --git a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java index 76a4f3990455..b1760734ad3a 100644 --- a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java +++ b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java @@ -310,7 +310,7 @@ public void testFindPetsByTags() throws Exception { api.updatePet(pet); - List pets = api.findPetsByTags(Arrays.asList("friendly")); + List pets = api.findPetsByTags(new HashSet<>(Arrays.asList("friendly"))); assertNotNull(pets); boolean found = false; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 9dfe0c02f659..28f357dc47d8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -3446,6 +3446,9 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) if (ModelUtils.isObjectSchema(parameterSchema)) { codegenProperty.complexType = codegenParameter.dataType; } + if (ModelUtils.isSet(parameterSchema)) { + imports.add(codegenProperty.baseType); + } codegenParameter.dataFormat = codegenProperty.dataFormat; codegenParameter.required = codegenProperty.required; @@ -4956,6 +4959,7 @@ public List fromRequestBodyToFormParameters(RequestBody body, codegenParameter.isListContainer = true; codegenParameter.description = escapeText(s.getDescription()); codegenParameter.dataType = getTypeDeclaration(arraySchema); + codegenParameter.defaultValue = toDefaultValue(s); if (codegenParameter.baseType != null && codegenParameter.enumName != null) { codegenParameter.datatypeWithEnum = codegenParameter.dataType.replace(codegenParameter.baseType, codegenParameter.enumName); } else { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java index 45ffa3b36b70..c3edecbfbde8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java @@ -201,6 +201,8 @@ static Map jaxrsPostProcessOperations(Map objs) if ("array".equals(resp.containerType)) { resp.containerType = "List"; + } else if ("set".equals(resp.containerType)) { + resp.containerType = "Set"; } else if ("map".equals(resp.containerType)) { resp.containerType = "Map"; } @@ -216,6 +218,8 @@ static Map jaxrsPostProcessOperations(Map objs) if ("array".equals(operation.returnContainer)) { operation.returnContainer = "List"; + } else if ("set".equals(operation.returnContainer)) { + operation.returnContainer = "Set"; } else if ("map".equals(operation.returnContainer)) { operation.returnContainer = "Map"; } diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache index c3c2158499b6..8efc06c81830 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache @@ -9,6 +9,7 @@ import play.mvc.Http; import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -102,7 +103,7 @@ public class {{classname}}Controller extends Controller { } {{/required}} List {{paramName}}List = OpenAPIUtils.parametersToList("{{collectionFormat}}", {{paramName}}Array); - {{{dataType}}} {{paramName}} = new Array{{{dataType}}}(); + {{{dataType}}} {{paramName}} = {{{defaultValue}}}; for (String curParam : {{paramName}}List) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -143,7 +144,7 @@ public class {{classname}}Controller extends Controller { } {{/required}} List {{paramName}}List = OpenAPIUtils.parametersToList("{{collectionFormat}}", {{paramName}}Array); - {{{dataType}}} {{paramName}} = new Array{{{dataType}}}(); + {{{dataType}}} {{paramName}} = {{{defaultValue}}}; for (String curParam : {{paramName}}List) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -176,7 +177,7 @@ public class {{classname}}Controller extends Controller { } {{/required}} List {{paramName}}List = OpenAPIUtils.parametersToList("{{collectionFormat}}", {{paramName}}Array); - {{{dataType}}} {{paramName}} = new Array{{{dataType}}}(); + {{{dataType}}} {{paramName}} = {{{defaultValue}}}; for (String curParam : {{paramName}}List) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java index 7b26cd3bfdfe..9430fc46ed39 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java @@ -1,8 +1,11 @@ package org.openapitools.codegen.java.jaxrs; +import io.swagger.parser.OpenAPIParser; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; +import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.servers.Server; +import io.swagger.v3.parser.core.models.ParseOptions; import org.openapitools.codegen.ClientOptInput; import org.openapitools.codegen.CodegenConstants; @@ -13,16 +16,19 @@ import org.openapitools.codegen.languages.AbstractJavaJAXRSServerCodegen; import org.openapitools.codegen.languages.JavaClientCodegen; import org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen; +import org.openapitools.codegen.languages.features.CXFServerFeatures; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.File; +import java.io.IOException; import java.nio.file.Files; import java.util.HashMap; import java.util.List; import java.util.Map; +import static org.openapitools.codegen.TestUtils.assertFileContains; import static org.openapitools.codegen.TestUtils.validateJavaSourceFiles; /** @@ -312,4 +318,30 @@ public void testGenerateApiWithPreceedingPathParameter_issue1347() throws Except output.deleteOnExit(); } + + @Test + public void addsImportForSetArgument() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + String outputPath = output.getAbsolutePath().replace('\\', '/'); + + OpenAPI openAPI = new OpenAPIParser() + .readLocation("src/test/resources/3_0/arrayParameter.yaml", null, new ParseOptions()).getOpenAPI(); + + openAPI.getComponents().getParameters().get("operationsQueryParam").setSchema(new ArraySchema().uniqueItems(true)); + codegen.setOutputDir(output.getAbsolutePath()); + + codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true"); + + ClientOptInput input = new ClientOptInput() + .openAPI(openAPI) + .config(codegen); + + MockDefaultGenerator generator = new MockDefaultGenerator(); + generator.opts(input).generate(); + + String path = outputPath + "/src/gen/java/org/openapitools/api/ExamplesApi.java"; + + assertFileContains(generator, path, "\nimport java.util.Set;\n"); + } } diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml index c6df90a47b9b..f374239ff926 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -132,6 +132,7 @@ paths: description: Tags to filter by required: true type: array + uniqueItems: true items: type: string collectionFormat: csv From ca205d7c973b6733991925123f1ab0bb4694ee59 Mon Sep 17 00:00:00 2001 From: Ondrej Janus Date: Fri, 20 Mar 2020 13:15:50 +0100 Subject: [PATCH 5/6] Fix missing import and return type for responses with uniqueItems --- .../java/test-manual/okhttp-gson/api/PetApiTest.java | 2 +- .../org/openapitools/codegen/CodegenOperation.java | 10 ++++++---- .../java/org/openapitools/codegen/DefaultCodegen.java | 10 +++++++++- .../resources/JavaJaxRS/resteasy/returnTypes.mustache | 2 +- .../src/main/resources/JavaJaxRS/returnTypes.mustache | 2 +- .../JavaPlayFramework/exampleReturnTypes.mustache | 2 +- .../main/resources/JavaPlayFramework/newApi.mustache | 1 + .../resources/JavaPlayFramework/returnTypes.mustache | 2 +- .../JavaPlayFramework/returnTypesNoVoid.mustache | 2 +- .../returnTypesNoVoidNoAbstract.mustache | 2 +- .../src/main/resources/JavaSpring/returnTypes.mustache | 2 +- .../resources/java-msf4j-server/returnTypes.mustache | 2 +- .../resources/java-pkmst/exampleReturnTypes.mustache | 2 +- .../src/main/resources/java-pkmst/returnTypes.mustache | 2 +- .../main/resources/kotlin-spring/returnTypes.mustache | 2 +- ...etstore-with-fake-endpoints-models-for-testing.yaml | 1 + 16 files changed, 29 insertions(+), 17 deletions(-) diff --git a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java index b1760734ad3a..4d13094f44f4 100644 --- a/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java +++ b/CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/api/PetApiTest.java @@ -310,7 +310,7 @@ public void testFindPetsByTags() throws Exception { api.updatePet(pet); - List pets = api.findPetsByTags(new HashSet<>(Arrays.asList("friendly"))); + Set pets = api.findPetsByTags(new HashSet<>(Arrays.asList("friendly"))); assertNotNull(pets); boolean found = false; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java index 117eb9a1ed3b..db04ec4ba7c9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java @@ -29,7 +29,7 @@ public class CodegenOperation { isListContainer, isMultipart, hasMore = true, isResponseBinary = false, isResponseFile = false, hasReference = false, isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy, - isRestful, isDeprecated, isCallbackRequest; + isRestful, isDeprecated, isCallbackRequest, uniqueItems; public String path, operationId, returnType, httpMethod, returnBaseType, returnContainer, summary, unescapedNotes, notes, baseName, defaultResponse; public CodegenDiscriminator discriminator; @@ -270,6 +270,7 @@ public String toString() { sb.append(", isRestful=").append(isRestful); sb.append(", isDeprecated=").append(isDeprecated); sb.append(", isCallbackRequest=").append(isCallbackRequest); + sb.append(", uniqueItems='").append(uniqueItems); sb.append(", path='").append(path).append('\''); sb.append(", operationId='").append(operationId).append('\''); sb.append(", returnType='").append(returnType).append('\''); @@ -343,6 +344,7 @@ public boolean equals(Object o) { isRestful == that.isRestful && isDeprecated == that.isDeprecated && isCallbackRequest == that.isCallbackRequest && + uniqueItems == that.uniqueItems && Objects.equals(responseHeaders, that.responseHeaders) && Objects.equals(path, that.path) && Objects.equals(operationId, that.operationId) && @@ -393,9 +395,9 @@ public int hashCode() { hasRequiredParams, returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMapContainer, isListContainer, isMultipart, hasMore, isResponseBinary, isResponseFile, hasReference, isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy, isRestful, isDeprecated, - isCallbackRequest, path, operationId, returnType, httpMethod, returnBaseType, returnContainer, - summary, unescapedNotes, notes, baseName, defaultResponse, discriminator, consumes, produces, - prioritizedContentTypes, servers, bodyParam, allParams, bodyParams, pathParams, queryParams, + isCallbackRequest, uniqueItems, path, operationId, returnType, httpMethod, returnBaseType, + returnContainer, summary, unescapedNotes, notes, baseName, defaultResponse, discriminator, consumes, + produces, prioritizedContentTypes, servers, bodyParam, allParams, bodyParams, pathParams, queryParams, headerParams, formParams, cookieParams, requiredParams, optionalParams, authMethods, tags, responses, callbacks, imports, examples, requestBodyExamples, externalDocs, vendorExtensions, nickname, operationIdOriginal, operationIdLowerCase, operationIdCamelCase, operationIdSnakeCase); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 28f357dc47d8..d9cce4913327 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -2799,6 +2799,8 @@ protected void handleMethodResponse(Operation operation, op.isListContainer = true; } else if ("array".equalsIgnoreCase(cm.containerType)) { op.isListContainer = true; + } else if ("set".equalsIgnoreCase(cm.containerType)) { + op.isListContainer = true; } } else { op.returnSimpleType = true; @@ -2890,6 +2892,10 @@ public CodegenOperation fromOperation(String path, !languageSpecificPrimitives.contains(r.baseType)) { imports.add(r.baseType); } + if ("set".equals(r.containerType) && typeMapping.containsKey(r.containerType)) { + op.uniqueItems = true; + imports.add(typeMapping.get(r.containerType)); + } r.isDefault = response == methodResponse; op.responses.add(r); if (Boolean.TRUE.equals(r.isBinary) && Boolean.TRUE.equals(r.isDefault)) { @@ -3212,7 +3218,9 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) { r.simpleType = false; r.containerType = cp.containerType; r.isMapContainer = "map".equals(cp.containerType); - r.isListContainer = "list".equalsIgnoreCase(cp.containerType) || "array".equalsIgnoreCase(cp.containerType); + r.isListContainer = "list".equalsIgnoreCase(cp.containerType) || + "array".equalsIgnoreCase(cp.containerType) || + "set".equalsIgnoreCase(cp.containerType); } else { r.simpleType = true; } diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache index c8f7a56938aa..873e4fdc664a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache index c8f7a56938aa..873e4fdc664a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache index 395e3889c20d..e406c368dfd8 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}List{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache index 7355eae845c6..3570418394ec 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApi.mustache @@ -7,6 +7,7 @@ import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; {{#useBeanValidation}} import javax.validation.constraints.*; diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache index dbc2e613707d..2fc81df496f2 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache @@ -1 +1 @@ -{{#returnType}}{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}{{^returnType}}void{{/returnType}} \ No newline at end of file +{{#returnType}}{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}{{^returnType}}void{{/returnType}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoid.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoid.mustache index aba24782e7e2..fb106adb6354 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoid.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoid.mustache @@ -1 +1 @@ -{{#returnType}}{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}} \ No newline at end of file +{{#returnType}}{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoidNoAbstract.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoidNoAbstract.mustache index 39f2c32c4d10..49b189ace268 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoidNoAbstract.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoidNoAbstract.mustache @@ -1 +1 @@ -{{#returnType}}{{#returnContainer}}{{#isMapContainer}}HashMap{{/isMapContainer}}{{#isListContainer}}ArrayList<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}} \ No newline at end of file +{{#returnType}}{{#returnContainer}}{{#isMapContainer}}HashMap{{/isMapContainer}}{{#isListContainer}}{{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache index bd6283296dab..27f37ca8ef2f 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache @@ -1 +1 @@ -{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}List{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache index c8f7a56938aa..873e4fdc664a 100644 --- a/modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/exampleReturnTypes.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/exampleReturnTypes.mustache index 395e3889c20d..e406c368dfd8 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/exampleReturnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/exampleReturnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}List{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/returnTypes.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/returnTypes.mustache index c8f7a56938aa..873e4fdc664a 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/returnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/returnTypes.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/returnTypes.mustache index 498e0aab4fd1..5fa33ef700e9 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/returnTypes.mustache @@ -1 +1 @@ -{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{#reactive}}Flow{{/reactive}}{{^reactive}}List{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{#reactive}}Flow{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml index f374239ff926..27083db4ad70 100644 --- a/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -141,6 +141,7 @@ paths: description: successful operation schema: type: array + uniqueItems: true items: $ref: '#/definitions/Pet' '400': From 8c676a6e03758278f6c3a1f248e428d6526b8a52 Mon Sep 17 00:00:00 2001 From: Ondrej Janus Date: Fri, 20 Mar 2020 13:25:57 +0100 Subject: [PATCH 6/6] Update generated samples --- docs/generators/android.md | 1 + docs/generators/apache2.md | 1 + docs/generators/bash.md | 1 + docs/generators/clojure.md | 1 + docs/generators/eiffel.md | 1 + docs/generators/elixir.md | 1 + docs/generators/erlang-client.md | 1 + docs/generators/erlang-proper.md | 1 + docs/generators/erlang-server.md | 1 + .../graphql-nodejs-express-server.md | 1 + docs/generators/graphql-schema.md | 1 + docs/generators/groovy.md | 2 ++ docs/generators/java-inflector.md | 2 ++ docs/generators/java-msf4j.md | 2 ++ docs/generators/java-pkmst.md | 2 ++ docs/generators/java-play-framework.md | 2 ++ docs/generators/java-undertow-server.md | 2 ++ docs/generators/java-vertx-web.md | 2 ++ docs/generators/java-vertx.md | 2 ++ docs/generators/java.md | 2 ++ docs/generators/javascript.md | 1 + docs/generators/jaxrs-cxf-cdi.md | 2 ++ docs/generators/jaxrs-cxf-client.md | 2 ++ docs/generators/jaxrs-cxf-extended.md | 2 ++ docs/generators/jaxrs-cxf.md | 2 ++ docs/generators/jaxrs-jersey.md | 2 ++ docs/generators/jaxrs-resteasy-eap.md | 2 ++ docs/generators/jaxrs-resteasy.md | 2 ++ docs/generators/jaxrs-spec.md | 2 ++ docs/generators/jmeter.md | 1 + docs/generators/markdown.md | 1 + docs/generators/nim.md | 1 + docs/generators/nodejs-express-server.md | 1 + docs/generators/nodejs-server-deprecated.md | 1 + docs/generators/ocaml.md | 1 + docs/generators/openapi-yaml.md | 1 + docs/generators/openapi.md | 1 + docs/generators/php-laravel.md | 1 + docs/generators/php-lumen.md | 1 + docs/generators/php-silex.md | 1 + docs/generators/php-ze-ph.md | 1 + docs/generators/powershell.md | 1 + docs/generators/python-aiohttp.md | 1 + docs/generators/python-blueplanet.md | 1 + docs/generators/python-flask.md | 1 + docs/generators/ruby-on-rails.md | 1 + docs/generators/ruby-sinatra.md | 1 + docs/generators/rust.md | 1 + docs/generators/scala-akka.md | 1 + docs/generators/scala-gatling.md | 1 + .../generators/scala-httpclient-deprecated.md | 1 + docs/generators/scala-lagom-server.md | 1 + docs/generators/scala-play-server.md | 1 + docs/generators/scalaz.md | 1 + docs/generators/spring.md | 2 ++ .../OpenAPIClient/docs/FakeApi.md | 4 ++-- .../src/Org.OpenAPITools/Api/FakeApi.cs | 16 +++++++-------- .../OpenAPIClientCore/docs/FakeApi.md | 4 ++-- .../src/Org.OpenAPITools/Api/FakeApi.cs | 16 +++++++-------- .../csharp/OpenAPIClient/docs/FakeApi.md | 4 ++-- .../src/Org.OpenAPITools/Api/FakeApi.cs | 16 +++++++-------- .../elixir/lib/openapi_petstore/api/pet.ex | 2 +- .../go-petstore/api/openapi.yaml | 4 ++++ .../go-petstore/docs/FakeApi.md | 2 +- .../go/go-petstore-withXml/api/openapi.yaml | 4 ++++ .../go/go-petstore-withXml/docs/FakeApi.md | 2 +- .../petstore/go/go-petstore/api/openapi.yaml | 4 ++++ .../petstore/go/go-petstore/docs/FakeApi.md | 2 +- .../petstore/haskell-http-client/openapi.yaml | 4 ++++ .../org/openapitools/client/api/PetApi.java | 10 +++++----- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../org/openapitools/client/api/PetApi.java | 10 +++++----- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../java/google-api-client/docs/Pet.md | 2 +- .../java/google-api-client/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/PetApi.java | 16 +++++++-------- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../client/petstore/java/jersey1/docs/Pet.md | 2 +- .../petstore/java/jersey1/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/PetApi.java | 6 +++--- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../petstore/java/jersey2-java6/docs/Pet.md | 2 +- .../java/jersey2-java6/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 4 ++-- .../org/openapitools/client/api/PetApi.java | 10 +++++----- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../petstore/java/jersey2-java8/docs/Pet.md | 2 +- .../java/jersey2-java8/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 4 ++-- .../org/openapitools/client/api/PetApi.java | 10 +++++----- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../client/petstore/java/jersey2/docs/Pet.md | 2 +- .../petstore/java/jersey2/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 4 ++-- .../org/openapitools/client/api/PetApi.java | 10 +++++----- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../client/petstore/java/native/docs/Pet.md | 2 +- .../petstore/java/native/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/PetApi.java | 6 +++--- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../okhttp-gson-parcelableModel/docs/Pet.md | 2 +- .../docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/PetApi.java | 20 +++++++++---------- .../org/openapitools/client/model/Pet.java | 12 ++++++----- .../petstore/java/okhttp-gson/docs/Pet.md | 2 +- .../petstore/java/okhttp-gson/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/PetApi.java | 20 +++++++++---------- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../openapitools/client/api/PetApiTest.java | 2 +- .../java/rest-assured/docs/FakeApi.md | 2 +- .../petstore/java/rest-assured/docs/Pet.md | 2 +- .../petstore/java/rest-assured/docs/PetApi.md | 6 +++--- .../org/openapitools/client/api/FakeApi.java | 4 ++-- .../org/openapitools/client/api/PetApi.java | 10 +++++----- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../client/petstore/java/resteasy/docs/Pet.md | 2 +- .../petstore/java/resteasy/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 2 +- .../org/openapitools/client/api/PetApi.java | 6 +++--- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../java/resttemplate-withXml/docs/Pet.md | 2 +- .../java/resttemplate-withXml/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 4 ++-- .../org/openapitools/client/api/PetApi.java | 10 +++++----- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../petstore/java/resttemplate/docs/Pet.md | 2 +- .../petstore/java/resttemplate/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 4 ++-- .../org/openapitools/client/api/PetApi.java | 10 +++++----- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../org/openapitools/client/api/FakeApi.java | 4 ++-- .../org/openapitools/client/api/PetApi.java | 6 +++--- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../java/retrofit2-play24/docs/Pet.md | 2 +- .../java/retrofit2-play24/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 2 +- .../org/openapitools/client/api/PetApi.java | 4 ++-- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../java/retrofit2-play25/docs/Pet.md | 2 +- .../java/retrofit2-play25/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 2 +- .../org/openapitools/client/api/PetApi.java | 4 ++-- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../java/retrofit2-play26/docs/Pet.md | 2 +- .../java/retrofit2-play26/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 2 +- .../org/openapitools/client/api/PetApi.java | 4 ++-- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../petstore/java/retrofit2/docs/Pet.md | 2 +- .../petstore/java/retrofit2/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 2 +- .../org/openapitools/client/api/PetApi.java | 4 ++-- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../petstore/java/retrofit2rx/docs/Pet.md | 2 +- .../petstore/java/retrofit2rx/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 2 +- .../org/openapitools/client/api/PetApi.java | 4 ++-- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../petstore/java/retrofit2rx2/docs/Pet.md | 2 +- .../petstore/java/retrofit2rx2/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/FakeApi.java | 2 +- .../org/openapitools/client/api/PetApi.java | 4 ++-- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../client/petstore/java/vertx/docs/Pet.md | 2 +- .../client/petstore/java/vertx/docs/PetApi.md | 10 +++++----- .../openapitools/client/api/FakeApiImpl.java | 2 +- .../org/openapitools/client/api/PetApi.java | 2 +- .../openapitools/client/api/PetApiImpl.java | 4 ++-- .../client/api/rxjava/FakeApi.java | 4 ++-- .../client/api/rxjava/PetApi.java | 4 ++-- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../petstore/java/webclient/docs/Pet.md | 2 +- .../petstore/java/webclient/docs/PetApi.md | 10 +++++----- .../org/openapitools/client/api/PetApi.java | 4 ++-- .../org/openapitools/client/model/Pet.java | 10 ++++++---- .../petstore/javascript-es6/docs/FakeApi.md | 2 +- .../javascript-es6/src/api/FakeApi.js | 2 +- .../javascript-promise-es6/docs/FakeApi.md | 2 +- .../javascript-promise-es6/src/api/FakeApi.js | 4 ++-- .../javascript-promise/docs/FakeApi.md | 2 +- .../javascript-promise/src/api/FakeApi.js | 4 ++-- .../petstore/javascript/docs/FakeApi.md | 2 +- .../petstore/javascript/src/api/FakeApi.js | 2 +- samples/client/petstore/perl/docs/FakeApi.md | 2 +- .../perl/lib/WWW/OpenAPIClient/FakeApi.pm | 2 +- .../php/OpenAPIClient-php/docs/Api/FakeApi.md | 2 +- .../php/OpenAPIClient-php/lib/Api/FakeApi.php | 20 +++++++++---------- .../petstore/python-asyncio/docs/FakeApi.md | 4 ++-- .../python-experimental/docs/FakeApi.md | 4 ++-- .../petstore_api/api/fake_api.py | 2 +- .../petstore/python-tornado/docs/FakeApi.md | 4 ++-- .../client/petstore/python/docs/FakeApi.md | 4 ++-- .../petstore/ruby-faraday/docs/FakeApi.md | 2 +- .../ruby-faraday/lib/petstore/api/fake_api.rb | 2 +- samples/client/petstore/ruby/docs/FakeApi.md | 2 +- .../ruby/lib/petstore/api/fake_api.rb | 2 +- .../go-petstore/docs/FakeApi.md | 2 +- .../petstore/go/go-petstore/docs/FakeApi.md | 2 +- .../php/OpenAPIClient-php/docs/Api/FakeApi.md | 2 +- .../php/OpenAPIClient-php/lib/Api/FakeApi.php | 20 +++++++++---------- .../python-experimental/docs/FakeApi.md | 4 ++-- .../petstore_api/api/fake_api.py | 2 +- .../client/petstore/python/docs/FakeApi.md | 4 ++-- .../petstore/ruby-faraday/docs/FakeApi.md | 2 +- .../ruby-faraday/lib/petstore/api/fake_api.rb | 2 +- .../client/petstore/ruby/docs/FakeApi.md | 2 +- .../ruby/lib/petstore/api/fake_api.rb | 2 +- .../schema/petstore/mysql/mysql_schema.sql | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../gen/java/org/openapitools/api/PetApi.java | 9 +++++---- .../org/openapitools/api/PetApiService.java | 3 ++- .../gen/java/org/openapitools/model/Pet.java | 10 ++++++---- .../api/impl/PetApiServiceImpl.java | 3 ++- .../puppies/store/apis/PetApiController.java | 5 +++-- .../store/apis/PetApiControllerImp.java | 1 + .../store/apis/StoreApiController.java | 1 + .../store/apis/StoreApiControllerImp.java | 1 + .../puppies/store/apis/UserApiController.java | 1 + .../store/apis/UserApiControllerImp.java | 1 + .../app/controllers/PetApiController.java | 5 +++-- .../app/controllers/PetApiControllerImp.java | 1 + .../app/controllers/StoreApiController.java | 1 + .../controllers/StoreApiControllerImp.java | 1 + .../app/controllers/UserApiController.java | 1 + .../app/controllers/UserApiControllerImp.java | 1 + .../app/controllers/PetApiController.java | 5 +++-- .../app/controllers/StoreApiController.java | 1 + .../app/controllers/UserApiController.java | 1 + .../app/apimodels/Pet.java | 10 ++++++---- .../controllers/AnotherFakeApiController.java | 1 + .../AnotherFakeApiControllerImp.java | 1 + .../app/controllers/FakeApiController.java | 17 ++++++++-------- .../app/controllers/FakeApiControllerImp.java | 1 + .../FakeClassnameTags123ApiController.java | 1 + .../FakeClassnameTags123ApiControllerImp.java | 1 + .../app/controllers/PetApiController.java | 8 +++++--- .../app/controllers/PetApiControllerImp.java | 6 ++++-- .../PetApiControllerImpInterface.java | 3 ++- .../app/controllers/StoreApiController.java | 1 + .../controllers/StoreApiControllerImp.java | 1 + .../app/controllers/UserApiController.java | 1 + .../app/controllers/UserApiControllerImp.java | 1 + .../public/openapi.json | 10 +++++++--- .../app/controllers/PetApiController.java | 5 +++-- .../app/controllers/PetApiControllerImp.java | 1 + .../app/controllers/StoreApiController.java | 1 + .../controllers/StoreApiControllerImp.java | 1 + .../app/controllers/UserApiController.java | 1 + .../app/controllers/UserApiControllerImp.java | 1 + .../app/controllers/PetApiController.java | 5 +++-- .../app/controllers/PetApiControllerImp.java | 1 + .../app/controllers/StoreApiController.java | 1 + .../controllers/StoreApiControllerImp.java | 1 + .../app/controllers/UserApiController.java | 1 + .../app/controllers/UserApiControllerImp.java | 1 + .../app/controllers/PetApiController.java | 5 +++-- .../app/controllers/PetApiControllerImp.java | 1 + .../app/controllers/StoreApiController.java | 1 + .../controllers/StoreApiControllerImp.java | 1 + .../app/controllers/UserApiController.java | 1 + .../app/controllers/UserApiControllerImp.java | 1 + .../app/controllers/PetApiController.java | 5 +++-- .../app/controllers/PetApiControllerImp.java | 1 + .../app/controllers/StoreApiController.java | 1 + .../controllers/StoreApiControllerImp.java | 1 + .../app/controllers/UserApiController.java | 1 + .../app/controllers/UserApiControllerImp.java | 1 + .../app/controllers/PetApiController.java | 5 +++-- .../app/controllers/PetApiControllerImp.java | 1 + .../app/controllers/StoreApiController.java | 1 + .../controllers/StoreApiControllerImp.java | 1 + .../app/controllers/UserApiController.java | 1 + .../app/controllers/UserApiControllerImp.java | 1 + .../app/controllers/PetApiController.java | 5 +++-- .../app/controllers/PetApiControllerImp.java | 1 + .../app/controllers/StoreApiController.java | 1 + .../controllers/StoreApiControllerImp.java | 1 + .../app/controllers/UserApiController.java | 1 + .../app/controllers/UserApiControllerImp.java | 1 + .../gen/java/org/openapitools/api/PetApi.java | 5 +++-- .../gen/java/org/openapitools/model/Pet.java | 10 ++++++---- .../api/impl/PetApiServiceImpl.java | 3 ++- .../java/org/openapitools/api/PetApiTest.java | 5 +++-- .../java/org/openapitools/api/FakeApi.java | 2 +- .../gen/java/org/openapitools/api/PetApi.java | 7 ++++--- .../org/openapitools/api/PetApiService.java | 3 ++- .../gen/java/org/openapitools/model/Pet.java | 10 ++++++---- .../api/impl/PetApiServiceImpl.java | 3 ++- .../java/org/openapitools/api/FakeApi.java | 2 +- .../gen/java/org/openapitools/api/PetApi.java | 7 ++++--- .../gen/java/org/openapitools/model/Pet.java | 10 ++++++---- .../src/main/openapi/openapi.yaml | 4 ++++ .../gen/java/org/openapitools/api/PetApi.java | 7 ++++--- .../gen/java/org/openapitools/model/Pet.java | 10 ++++++---- .../jaxrs-spec/src/main/openapi/openapi.yaml | 4 ++++ .../java/org/openapitools/api/FakeApi.java | 2 +- .../gen/java/org/openapitools/api/PetApi.java | 7 ++++--- .../org/openapitools/api/PetApiService.java | 3 ++- .../gen/java/org/openapitools/model/Pet.java | 10 ++++++---- .../api/impl/PetApiServiceImpl.java | 3 ++- .../java/org/openapitools/api/FakeApi.java | 2 +- .../gen/java/org/openapitools/api/PetApi.java | 7 ++++--- .../org/openapitools/api/PetApiService.java | 3 ++- .../gen/java/org/openapitools/model/Pet.java | 10 ++++++---- .../api/impl/PetApiServiceImpl.java | 3 ++- .../java/org/openapitools/api/FakeApi.java | 2 +- .../gen/java/org/openapitools/api/PetApi.java | 7 ++++--- .../org/openapitools/api/PetApiService.java | 3 ++- .../gen/java/org/openapitools/model/Pet.java | 10 ++++++---- .../api/impl/PetApiServiceImpl.java | 3 ++- .../java/org/openapitools/api/FakeApi.java | 2 +- .../gen/java/org/openapitools/api/PetApi.java | 7 ++++--- .../org/openapitools/api/PetApiService.java | 3 ++- .../gen/java/org/openapitools/model/Pet.java | 10 ++++++---- .../api/impl/PetApiServiceImpl.java | 3 ++- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 7 ++++--- .../main/java/org/openapitools/model/Pet.java | 10 ++++++---- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 7 ++++--- .../main/java/org/openapitools/model/Pet.java | 10 ++++++---- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 2 +- .../java/org/openapitools/api/PetApi.java | 7 ++++--- .../openapitools/api/PetApiController.java | 3 ++- .../main/java/org/openapitools/model/Pet.java | 10 ++++++---- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 2 +- .../java/org/openapitools/api/PetApi.java | 7 ++++--- .../openapitools/api/PetApiController.java | 3 ++- .../main/java/org/openapitools/model/Pet.java | 10 ++++++---- .../java/org/openapitools/api/FakeApi.java | 2 +- .../org/openapitools/api/FakeApiDelegate.java | 2 +- .../java/org/openapitools/api/PetApi.java | 7 ++++--- .../org/openapitools/api/PetApiDelegate.java | 3 ++- .../main/java/org/openapitools/model/Pet.java | 10 ++++++---- .../java/org/openapitools/api/FakeApi.java | 2 +- .../openapitools/api/FakeApiController.java | 2 +- .../org/openapitools/api/FakeApiDelegate.java | 2 +- .../java/org/openapitools/api/PetApi.java | 7 ++++--- .../openapitools/api/PetApiController.java | 3 ++- .../org/openapitools/api/PetApiDelegate.java | 3 ++- .../main/java/org/openapitools/model/Pet.java | 10 ++++++---- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 7 ++++--- .../main/java/org/openapitools/model/Pet.java | 10 ++++++---- .../java/org/openapitools/api/FakeApi.java | 2 +- .../org/openapitools/api/FakeApiDelegate.java | 2 +- .../java/org/openapitools/api/PetApi.java | 7 ++++--- .../org/openapitools/api/PetApiDelegate.java | 3 ++- .../main/java/org/openapitools/model/Pet.java | 10 ++++++---- .../src/main/resources/openapi.yaml | 4 ++++ .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 7 ++++--- .../main/java/org/openapitools/model/Pet.java | 10 ++++++---- .../openapitools/virtualan/api/FakeApi.java | 2 +- .../openapitools/virtualan/api/PetApi.java | 7 ++++--- .../org/openapitools/virtualan/model/Pet.java | 10 ++++++---- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/api/PetApi.java | 7 ++++--- .../main/java/org/openapitools/model/Pet.java | 10 ++++++---- 361 files changed, 952 insertions(+), 653 deletions(-) diff --git a/docs/generators/android.md b/docs/generators/android.md index 0c13f292bf68..df34de74403b 100644 --- a/docs/generators/android.md +++ b/docs/generators/android.md @@ -35,6 +35,7 @@ sidebar_label: android |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/apache2.md b/docs/generators/apache2.md index 33b5a50f1a1a..ee7d312ba026 100644 --- a/docs/generators/apache2.md +++ b/docs/generators/apache2.md @@ -23,6 +23,7 @@ sidebar_label: apache2 |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/bash.md b/docs/generators/bash.md index 77647aa06980..362865df10a1 100644 --- a/docs/generators/bash.md +++ b/docs/generators/bash.md @@ -30,6 +30,7 @@ sidebar_label: bash |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/clojure.md b/docs/generators/clojure.md index dadd327272d9..bc659c10a475 100644 --- a/docs/generators/clojure.md +++ b/docs/generators/clojure.md @@ -29,6 +29,7 @@ sidebar_label: clojure |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/eiffel.md b/docs/generators/eiffel.md index 01cf9b7af96c..4f39d2b2fe0c 100644 --- a/docs/generators/eiffel.md +++ b/docs/generators/eiffel.md @@ -20,6 +20,7 @@ sidebar_label: eiffel |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/elixir.md b/docs/generators/elixir.md index f7ae13337cf9..07ee791101c7 100644 --- a/docs/generators/elixir.md +++ b/docs/generators/elixir.md @@ -25,6 +25,7 @@ sidebar_label: elixir |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/erlang-client.md b/docs/generators/erlang-client.md index 4186a3f6ecba..c0444034fced 100644 --- a/docs/generators/erlang-client.md +++ b/docs/generators/erlang-client.md @@ -19,6 +19,7 @@ sidebar_label: erlang-client |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/erlang-proper.md b/docs/generators/erlang-proper.md index 0f5c8e46ea1f..6321fa192712 100644 --- a/docs/generators/erlang-proper.md +++ b/docs/generators/erlang-proper.md @@ -19,6 +19,7 @@ sidebar_label: erlang-proper |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/erlang-server.md b/docs/generators/erlang-server.md index 490943d88c67..001614c1db24 100644 --- a/docs/generators/erlang-server.md +++ b/docs/generators/erlang-server.md @@ -19,6 +19,7 @@ sidebar_label: erlang-server |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/graphql-nodejs-express-server.md b/docs/generators/graphql-nodejs-express-server.md index c3585363a07f..0904b326ff18 100644 --- a/docs/generators/graphql-nodejs-express-server.md +++ b/docs/generators/graphql-nodejs-express-server.md @@ -20,6 +20,7 @@ sidebar_label: graphql-nodejs-express-server |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/graphql-schema.md b/docs/generators/graphql-schema.md index 9efd9611cafe..49b9bfeb2ebc 100644 --- a/docs/generators/graphql-schema.md +++ b/docs/generators/graphql-schema.md @@ -20,6 +20,7 @@ sidebar_label: graphql-schema |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md index c502298ba715..c030acded7e7 100644 --- a/docs/generators/groovy.md +++ b/docs/generators/groovy.md @@ -52,6 +52,7 @@ sidebar_label: groovy |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -69,6 +70,7 @@ sidebar_label: groovy | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md index 44630e5f05c7..18c25b7bdce2 100644 --- a/docs/generators/java-inflector.md +++ b/docs/generators/java-inflector.md @@ -54,6 +54,7 @@ sidebar_label: java-inflector |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -71,6 +72,7 @@ sidebar_label: java-inflector | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md index a0d46e7c1d92..397875a660c3 100644 --- a/docs/generators/java-msf4j.md +++ b/docs/generators/java-msf4j.md @@ -59,6 +59,7 @@ sidebar_label: java-msf4j |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -76,6 +77,7 @@ sidebar_label: java-msf4j | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md index a03b3c70960c..cecc7ba60be4 100644 --- a/docs/generators/java-pkmst.md +++ b/docs/generators/java-pkmst.md @@ -61,6 +61,7 @@ sidebar_label: java-pkmst |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -78,6 +79,7 @@ sidebar_label: java-pkmst | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md index 875c423a6a1a..c74df236cccc 100644 --- a/docs/generators/java-play-framework.md +++ b/docs/generators/java-play-framework.md @@ -63,6 +63,7 @@ sidebar_label: java-play-framework |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -80,6 +81,7 @@ sidebar_label: java-play-framework | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md index 5b41e7baa704..76e5310e4849 100644 --- a/docs/generators/java-undertow-server.md +++ b/docs/generators/java-undertow-server.md @@ -54,6 +54,7 @@ sidebar_label: java-undertow-server |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -71,6 +72,7 @@ sidebar_label: java-undertow-server | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/java-vertx-web.md b/docs/generators/java-vertx-web.md index eb5cd669a3a2..b331a4854f4c 100644 --- a/docs/generators/java-vertx-web.md +++ b/docs/generators/java-vertx-web.md @@ -54,6 +54,7 @@ sidebar_label: java-vertx-web |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -71,6 +72,7 @@ sidebar_label: java-vertx-web | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md index 1eba9c6c636f..1fdea4526d46 100644 --- a/docs/generators/java-vertx.md +++ b/docs/generators/java-vertx.md @@ -57,6 +57,7 @@ sidebar_label: java-vertx |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -74,6 +75,7 @@ sidebar_label: java-vertx | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/java.md b/docs/generators/java.md index 8127246b92ff..113d2f28acec 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -69,6 +69,7 @@ sidebar_label: java |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -86,6 +87,7 @@ sidebar_label: java | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/javascript.md b/docs/generators/javascript.md index 492a2f13abed..d436a3d09895 100644 --- a/docs/generators/javascript.md +++ b/docs/generators/javascript.md @@ -41,6 +41,7 @@ sidebar_label: javascript |array|Array| |list|Array| |map|Object| +|set|Array| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md index 6d8abb15dad3..90b23d42a7c6 100644 --- a/docs/generators/jaxrs-cxf-cdi.md +++ b/docs/generators/jaxrs-cxf-cdi.md @@ -64,6 +64,7 @@ sidebar_label: jaxrs-cxf-cdi |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.LocalDate| |LocalDateTime|org.joda.time.*| @@ -81,6 +82,7 @@ sidebar_label: jaxrs-cxf-cdi | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md index 0206dc3138a4..6d55152156c9 100644 --- a/docs/generators/jaxrs-cxf-client.md +++ b/docs/generators/jaxrs-cxf-client.md @@ -58,6 +58,7 @@ sidebar_label: jaxrs-cxf-client |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.LocalDate| |LocalDateTime|org.joda.time.*| @@ -75,6 +76,7 @@ sidebar_label: jaxrs-cxf-client | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md index e3d415818527..81d55769c5a7 100644 --- a/docs/generators/jaxrs-cxf-extended.md +++ b/docs/generators/jaxrs-cxf-extended.md @@ -80,6 +80,7 @@ sidebar_label: jaxrs-cxf-extended |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.LocalDate| |LocalDateTime|org.joda.time.*| @@ -97,6 +98,7 @@ sidebar_label: jaxrs-cxf-extended | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md index f80d3b8efb4a..439dc4bed529 100644 --- a/docs/generators/jaxrs-cxf.md +++ b/docs/generators/jaxrs-cxf.md @@ -75,6 +75,7 @@ sidebar_label: jaxrs-cxf |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.LocalDate| |LocalDateTime|org.joda.time.*| @@ -92,6 +93,7 @@ sidebar_label: jaxrs-cxf | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md index 359c80709be5..d340ebdff7fd 100644 --- a/docs/generators/jaxrs-jersey.md +++ b/docs/generators/jaxrs-jersey.md @@ -61,6 +61,7 @@ sidebar_label: jaxrs-jersey |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -78,6 +79,7 @@ sidebar_label: jaxrs-jersey | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md index 1e38e58691ac..becd68e99f66 100644 --- a/docs/generators/jaxrs-resteasy-eap.md +++ b/docs/generators/jaxrs-resteasy-eap.md @@ -60,6 +60,7 @@ sidebar_label: jaxrs-resteasy-eap |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -77,6 +78,7 @@ sidebar_label: jaxrs-resteasy-eap | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md index e37467c74bc5..86303031a053 100644 --- a/docs/generators/jaxrs-resteasy.md +++ b/docs/generators/jaxrs-resteasy.md @@ -59,6 +59,7 @@ sidebar_label: jaxrs-resteasy |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -76,6 +77,7 @@ sidebar_label: jaxrs-resteasy | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md index 697c33c7de52..b474c81ea19e 100644 --- a/docs/generators/jaxrs-spec.md +++ b/docs/generators/jaxrs-spec.md @@ -64,6 +64,7 @@ sidebar_label: jaxrs-spec |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.LocalDate| |LocalDateTime|org.joda.time.*| @@ -81,6 +82,7 @@ sidebar_label: jaxrs-spec | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/docs/generators/jmeter.md b/docs/generators/jmeter.md index ebb69073c58c..6f1f4adfbc25 100644 --- a/docs/generators/jmeter.md +++ b/docs/generators/jmeter.md @@ -22,6 +22,7 @@ sidebar_label: jmeter |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/markdown.md b/docs/generators/markdown.md index 8d8a2a907802..ac3ebb116c19 100644 --- a/docs/generators/markdown.md +++ b/docs/generators/markdown.md @@ -22,6 +22,7 @@ sidebar_label: markdown |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/nim.md b/docs/generators/nim.md index 306329177da8..51e92305fd4a 100644 --- a/docs/generators/nim.md +++ b/docs/generators/nim.md @@ -22,6 +22,7 @@ sidebar_label: nim |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/nodejs-express-server.md b/docs/generators/nodejs-express-server.md index 9a9bd5e7e748..e2c29269e8d5 100644 --- a/docs/generators/nodejs-express-server.md +++ b/docs/generators/nodejs-express-server.md @@ -23,6 +23,7 @@ sidebar_label: nodejs-express-server |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/nodejs-server-deprecated.md b/docs/generators/nodejs-server-deprecated.md index c3e70b7e84ba..6f8576608aa6 100644 --- a/docs/generators/nodejs-server-deprecated.md +++ b/docs/generators/nodejs-server-deprecated.md @@ -25,6 +25,7 @@ sidebar_label: nodejs-server-deprecated |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/ocaml.md b/docs/generators/ocaml.md index 6a87a5358abd..dbccec06a80b 100644 --- a/docs/generators/ocaml.md +++ b/docs/generators/ocaml.md @@ -21,6 +21,7 @@ sidebar_label: ocaml |Date|java.util.Date| |DateTime|org.joda.time.*| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/openapi-yaml.md b/docs/generators/openapi-yaml.md index cb5a6459bd93..d2b4193e72b3 100644 --- a/docs/generators/openapi-yaml.md +++ b/docs/generators/openapi-yaml.md @@ -23,6 +23,7 @@ sidebar_label: openapi-yaml |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/openapi.md b/docs/generators/openapi.md index 7a396ad773d2..6b2be94eb57f 100644 --- a/docs/generators/openapi.md +++ b/docs/generators/openapi.md @@ -22,6 +22,7 @@ sidebar_label: openapi |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/php-laravel.md b/docs/generators/php-laravel.md index b8caa87b5538..6d004aacfeec 100644 --- a/docs/generators/php-laravel.md +++ b/docs/generators/php-laravel.md @@ -29,6 +29,7 @@ sidebar_label: php-laravel |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/php-lumen.md b/docs/generators/php-lumen.md index 92f185a4bc6f..ae2b140def20 100644 --- a/docs/generators/php-lumen.md +++ b/docs/generators/php-lumen.md @@ -29,6 +29,7 @@ sidebar_label: php-lumen |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/php-silex.md b/docs/generators/php-silex.md index 2a5ea38682ce..57b9bf5110a2 100644 --- a/docs/generators/php-silex.md +++ b/docs/generators/php-silex.md @@ -22,6 +22,7 @@ sidebar_label: php-silex |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/php-ze-ph.md b/docs/generators/php-ze-ph.md index f58ace643c1b..39dde20b988d 100644 --- a/docs/generators/php-ze-ph.md +++ b/docs/generators/php-ze-ph.md @@ -29,6 +29,7 @@ sidebar_label: php-ze-ph |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/powershell.md b/docs/generators/powershell.md index e15091f87617..7e93eec4d2c8 100644 --- a/docs/generators/powershell.md +++ b/docs/generators/powershell.md @@ -20,6 +20,7 @@ sidebar_label: powershell |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/python-aiohttp.md b/docs/generators/python-aiohttp.md index bfc590021cb7..d7e2af216797 100644 --- a/docs/generators/python-aiohttp.md +++ b/docs/generators/python-aiohttp.md @@ -29,6 +29,7 @@ sidebar_label: python-aiohttp |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/python-blueplanet.md b/docs/generators/python-blueplanet.md index a1400e199a90..e448941d9286 100644 --- a/docs/generators/python-blueplanet.md +++ b/docs/generators/python-blueplanet.md @@ -29,6 +29,7 @@ sidebar_label: python-blueplanet |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/python-flask.md b/docs/generators/python-flask.md index 59eb4d75a80b..5ceb40f79777 100644 --- a/docs/generators/python-flask.md +++ b/docs/generators/python-flask.md @@ -29,6 +29,7 @@ sidebar_label: python-flask |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/ruby-on-rails.md b/docs/generators/ruby-on-rails.md index 94a9d1d37a76..83aafcad36e6 100644 --- a/docs/generators/ruby-on-rails.md +++ b/docs/generators/ruby-on-rails.md @@ -18,6 +18,7 @@ sidebar_label: ruby-on-rails |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/ruby-sinatra.md b/docs/generators/ruby-sinatra.md index b831c8b7182a..4e6ba082fc95 100644 --- a/docs/generators/ruby-sinatra.md +++ b/docs/generators/ruby-sinatra.md @@ -17,6 +17,7 @@ sidebar_label: ruby-sinatra |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/rust.md b/docs/generators/rust.md index 0fd4e880aa4b..158b17c5fc96 100644 --- a/docs/generators/rust.md +++ b/docs/generators/rust.md @@ -21,6 +21,7 @@ sidebar_label: rust |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| diff --git a/docs/generators/scala-akka.md b/docs/generators/scala-akka.md index 9ffaf33e713a..1d1ab3b168c1 100644 --- a/docs/generators/scala-akka.md +++ b/docs/generators/scala-akka.md @@ -26,6 +26,7 @@ sidebar_label: scala-akka |DateTime|org.joda.time.DateTime| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |ListBuffer|scala.collection.mutable.ListBuffer| |ListSet|scala.collection.immutable.ListSet| |LocalDate|org.joda.time.*| diff --git a/docs/generators/scala-gatling.md b/docs/generators/scala-gatling.md index 072d887e01dc..14d61f872ddd 100644 --- a/docs/generators/scala-gatling.md +++ b/docs/generators/scala-gatling.md @@ -25,6 +25,7 @@ sidebar_label: scala-gatling |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |ListBuffer|scala.collection.mutable.ListBuffer| |ListSet|scala.collection.immutable.ListSet| |LocalDate|org.joda.time.*| diff --git a/docs/generators/scala-httpclient-deprecated.md b/docs/generators/scala-httpclient-deprecated.md index a42a703fd2ec..edae609cc4c0 100644 --- a/docs/generators/scala-httpclient-deprecated.md +++ b/docs/generators/scala-httpclient-deprecated.md @@ -26,6 +26,7 @@ sidebar_label: scala-httpclient-deprecated |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |ListBuffer|scala.collection.mutable.ListBuffer| |ListSet|scala.collection.immutable.ListSet| |LocalDate|org.joda.time.*| diff --git a/docs/generators/scala-lagom-server.md b/docs/generators/scala-lagom-server.md index c43b6a82ec6d..deaeb47d63d0 100644 --- a/docs/generators/scala-lagom-server.md +++ b/docs/generators/scala-lagom-server.md @@ -26,6 +26,7 @@ sidebar_label: scala-lagom-server |DateTime|org.joda.time.DateTime| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |ListBuffer|scala.collection.mutable.ListBuffer| |ListSet|scala.collection.immutable.ListSet| |LocalDate|org.joda.time.*| diff --git a/docs/generators/scala-play-server.md b/docs/generators/scala-play-server.md index 01eabec58499..de6db1adf234 100644 --- a/docs/generators/scala-play-server.md +++ b/docs/generators/scala-play-server.md @@ -30,6 +30,7 @@ sidebar_label: scala-play-server |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |ListBuffer|scala.collection.mutable.ListBuffer| |ListSet|scala.collection.immutable.ListSet| diff --git a/docs/generators/scalaz.md b/docs/generators/scalaz.md index a5c62a788fba..95765c3792e7 100644 --- a/docs/generators/scalaz.md +++ b/docs/generators/scalaz.md @@ -26,6 +26,7 @@ sidebar_label: scalaz |DateTime|org.joda.time.DateTime| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |ListBuffer|scala.collection.mutable.ListBuffer| |ListSet|scala.collection.immutable.ListSet| |LocalDate|org.joda.time.LocalDate| diff --git a/docs/generators/spring.md b/docs/generators/spring.md index 600e22289664..98ea7da9bd8e 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -76,6 +76,7 @@ sidebar_label: spring |DateTime|org.joda.time.*| |File|java.io.File| |HashMap|java.util.HashMap| +|LinkedHashSet|java.util.LinkedHashSet| |List|java.util.*| |LocalDate|org.joda.time.*| |LocalDateTime|org.joda.time.*| @@ -93,6 +94,7 @@ sidebar_label: spring | ---------- | --------------- | |array|ArrayList| |map|HashMap| +|set|LinkedHashSet| ## LANGUAGE PRIMITIVES diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md index e1fcf6539731..174ae5c0e780 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md @@ -702,7 +702,7 @@ namespace Example var enumQueryString = enumQueryString_example; // string | Query parameter enum test (string) (optional) (default to -efg) var enumQueryInteger = 56; // int? | Query parameter enum test (double) (optional) var enumQueryDouble = 1.2D; // double? | Query parameter enum test (double) (optional) - var enumFormStringArray = new List(); // List | Form parameter enum test (string array) (optional) (default to $) + var enumFormStringArray = new List(); // List | Form parameter enum test (string array) (optional) var enumFormString = enumFormString_example; // string | Form parameter enum test (string) (optional) (default to -efg) try @@ -731,7 +731,7 @@ Name | Type | Description | Notes **enumQueryString** | **string**| Query parameter enum test (string) | [optional] [default to -efg] **enumQueryInteger** | **int?**| Query parameter enum test (double) | [optional] **enumQueryDouble** | **double?**| Query parameter enum test (double) | [optional] - **enumFormStringArray** | [**List<string>**](string.md)| Form parameter enum test (string array) | [optional] [default to $] + **enumFormStringArray** | [**List<string>**](string.md)| Form parameter enum test (string array) | [optional] **enumFormString** | **string**| Form parameter enum test (string) | [optional] [default to -efg] ### Return type diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs index a4ab49f4424d..1315e1d120c8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs @@ -257,7 +257,7 @@ public interface IFakeApiSync : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// void TestEnumParameters (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -275,7 +275,7 @@ public interface IFakeApiSync : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// ApiResponse of Object(void) ApiResponse TestEnumParametersWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -622,7 +622,7 @@ public interface IFakeApiAsync : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of void System.Threading.Tasks.Task TestEnumParametersAsync (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -640,7 +640,7 @@ public interface IFakeApiAsync : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of ApiResponse System.Threading.Tasks.Task> TestEnumParametersAsyncWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -2057,7 +2057,7 @@ public async System.Threading.Tasks.Task TestClientModelAsync (Mode /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// public void TestEnumParameters (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)) @@ -2075,7 +2075,7 @@ public async System.Threading.Tasks.Task TestClientModelAsync (Mode /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// ApiResponse of Object(void) public Org.OpenAPITools.Client.ApiResponse TestEnumParametersWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)) @@ -2148,7 +2148,7 @@ public async System.Threading.Tasks.Task TestClientModelAsync (Mode /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of void public async System.Threading.Tasks.Task TestEnumParametersAsync (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)) @@ -2167,7 +2167,7 @@ public async System.Threading.Tasks.Task TestClientModelAsync (Mode /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of ApiResponse public async System.Threading.Tasks.Task> TestEnumParametersAsyncWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md index e1fcf6539731..174ae5c0e780 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md @@ -702,7 +702,7 @@ namespace Example var enumQueryString = enumQueryString_example; // string | Query parameter enum test (string) (optional) (default to -efg) var enumQueryInteger = 56; // int? | Query parameter enum test (double) (optional) var enumQueryDouble = 1.2D; // double? | Query parameter enum test (double) (optional) - var enumFormStringArray = new List(); // List | Form parameter enum test (string array) (optional) (default to $) + var enumFormStringArray = new List(); // List | Form parameter enum test (string array) (optional) var enumFormString = enumFormString_example; // string | Form parameter enum test (string) (optional) (default to -efg) try @@ -731,7 +731,7 @@ Name | Type | Description | Notes **enumQueryString** | **string**| Query parameter enum test (string) | [optional] [default to -efg] **enumQueryInteger** | **int?**| Query parameter enum test (double) | [optional] **enumQueryDouble** | **double?**| Query parameter enum test (double) | [optional] - **enumFormStringArray** | [**List<string>**](string.md)| Form parameter enum test (string array) | [optional] [default to $] + **enumFormStringArray** | [**List<string>**](string.md)| Form parameter enum test (string array) | [optional] **enumFormString** | **string**| Form parameter enum test (string) | [optional] [default to -efg] ### Return type diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs index a4ab49f4424d..1315e1d120c8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -257,7 +257,7 @@ public interface IFakeApiSync : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// void TestEnumParameters (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -275,7 +275,7 @@ public interface IFakeApiSync : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// ApiResponse of Object(void) ApiResponse TestEnumParametersWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -622,7 +622,7 @@ public interface IFakeApiAsync : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of void System.Threading.Tasks.Task TestEnumParametersAsync (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -640,7 +640,7 @@ public interface IFakeApiAsync : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of ApiResponse System.Threading.Tasks.Task> TestEnumParametersAsyncWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -2057,7 +2057,7 @@ public async System.Threading.Tasks.Task TestClientModelAsync (Mode /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// public void TestEnumParameters (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)) @@ -2075,7 +2075,7 @@ public async System.Threading.Tasks.Task TestClientModelAsync (Mode /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// ApiResponse of Object(void) public Org.OpenAPITools.Client.ApiResponse TestEnumParametersWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)) @@ -2148,7 +2148,7 @@ public async System.Threading.Tasks.Task TestClientModelAsync (Mode /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of void public async System.Threading.Tasks.Task TestEnumParametersAsync (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)) @@ -2167,7 +2167,7 @@ public async System.Threading.Tasks.Task TestClientModelAsync (Mode /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of ApiResponse public async System.Threading.Tasks.Task> TestEnumParametersAsyncWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int? enumQueryInteger = default(int?), double? enumQueryDouble = default(double?), List enumFormStringArray = default(List), string enumFormString = default(string)) diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md index edffb58d3c79..ed9059714369 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md @@ -748,7 +748,7 @@ namespace Example var enumQueryString = enumQueryString_example; // string | Query parameter enum test (string) (optional) (default to -efg) var enumQueryInteger = 56; // int | Query parameter enum test (double) (optional) var enumQueryDouble = 1.2D; // double | Query parameter enum test (double) (optional) - var enumFormStringArray = new List(); // List | Form parameter enum test (string array) (optional) (default to $) + var enumFormStringArray = new List(); // List | Form parameter enum test (string array) (optional) var enumFormString = enumFormString_example; // string | Form parameter enum test (string) (optional) (default to -efg) try @@ -778,7 +778,7 @@ Name | Type | Description | Notes **enumQueryString** | **string**| Query parameter enum test (string) | [optional] [default to -efg] **enumQueryInteger** | **int**| Query parameter enum test (double) | [optional] **enumQueryDouble** | **double**| Query parameter enum test (double) | [optional] - **enumFormStringArray** | [**List<string>**](string.md)| Form parameter enum test (string array) | [optional] [default to $] + **enumFormStringArray** | [**List<string>**](string.md)| Form parameter enum test (string array) | [optional] **enumFormString** | **string**| Form parameter enum test (string) | [optional] [default to -efg] ### Return type diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs index 8739ddfa49a1..a2d260db1083 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs @@ -254,7 +254,7 @@ public interface IFakeApi : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// void TestEnumParameters (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int enumQueryInteger = default(int), double enumQueryDouble = default(double), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -272,7 +272,7 @@ public interface IFakeApi : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// ApiResponse of Object(void) ApiResponse TestEnumParametersWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int enumQueryInteger = default(int), double enumQueryDouble = default(double), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -612,7 +612,7 @@ public interface IFakeApi : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of void System.Threading.Tasks.Task TestEnumParametersAsync (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int enumQueryInteger = default(int), double enumQueryDouble = default(double), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -630,7 +630,7 @@ public interface IFakeApi : IApiAccessor /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of ApiResponse System.Threading.Tasks.Task> TestEnumParametersAsyncWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int enumQueryInteger = default(int), double enumQueryDouble = default(double), List enumFormStringArray = default(List), string enumFormString = default(string)); @@ -2268,7 +2268,7 @@ public async System.Threading.Tasks.Task> TestClientMod /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// public void TestEnumParameters (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int enumQueryInteger = default(int), double enumQueryDouble = default(double), List enumFormStringArray = default(List), string enumFormString = default(string)) @@ -2286,7 +2286,7 @@ public async System.Threading.Tasks.Task> TestClientMod /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// ApiResponse of Object(void) public ApiResponse TestEnumParametersWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int enumQueryInteger = default(int), double enumQueryDouble = default(double), List enumFormStringArray = default(List), string enumFormString = default(string)) @@ -2351,7 +2351,7 @@ public async System.Threading.Tasks.Task> TestClientMod /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of void public async System.Threading.Tasks.Task TestEnumParametersAsync (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int enumQueryInteger = default(int), double enumQueryDouble = default(double), List enumFormStringArray = default(List), string enumFormString = default(string)) @@ -2370,7 +2370,7 @@ public async System.Threading.Tasks.Task> TestClientMod /// Query parameter enum test (string) (optional, default to -efg) /// Query parameter enum test (double) (optional) /// Query parameter enum test (double) (optional) - /// Form parameter enum test (string array) (optional, default to $) + /// Form parameter enum test (string array) (optional) /// Form parameter enum test (string) (optional, default to -efg) /// Task of ApiResponse public async System.Threading.Tasks.Task> TestEnumParametersAsyncWithHttpInfo (List enumHeaderStringArray = default(List), string enumHeaderString = default(string), List enumQueryStringArray = default(List), string enumQueryString = default(string), int enumQueryInteger = default(int), double enumQueryDouble = default(double), List enumFormStringArray = default(List), string enumFormString = default(string)) diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex index 85c04b4d4030..2715a2c28a4d 100644 --- a/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex +++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/pet.ex @@ -111,7 +111,7 @@ defmodule OpenapiPetstore.Api.Pet do {:ok, [%Pet{}, ...]} on success {:error, info} on failure """ - @spec find_pets_by_tags(Tesla.Env.client, list(String.t), keyword()) :: {:ok, list(OpenapiPetstore.Model.Pet.t)} | {:error, Tesla.Env.t} + @spec find_pets_by_tags(Tesla.Env.client, list(String.t), keyword()) :: {:ok, } | {:error, Tesla.Env.t} def find_pets_by_tags(connection, tags, _opts \\ []) do %{} |> method(:get) diff --git a/samples/client/petstore/go-experimental/go-petstore/api/openapi.yaml b/samples/client/petstore/go-experimental/go-petstore/api/openapi.yaml index 5313659ef237..7a47b6f9bee7 100644 --- a/samples/client/petstore/go-experimental/go-petstore/api/openapi.yaml +++ b/samples/client/petstore/go-experimental/go-petstore/api/openapi.yaml @@ -139,6 +139,7 @@ paths: items: type: string type: array + uniqueItems: true style: form responses: "200": @@ -148,11 +149,13 @@ paths: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true application/json: schema: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true description: successful operation "400": content: {} @@ -1323,6 +1326,7 @@ components: items: type: string type: array + uniqueItems: true xml: name: photoUrl wrapped: true diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/FakeApi.md b/samples/client/petstore/go-experimental/go-petstore/docs/FakeApi.md index c81d4523824a..79e2b4e41e36 100644 --- a/samples/client/petstore/go-experimental/go-petstore/docs/FakeApi.md +++ b/samples/client/petstore/go-experimental/go-petstore/docs/FakeApi.md @@ -409,7 +409,7 @@ Name | Type | Description | Notes **enumQueryString** | **string** | Query parameter enum test (string) | [default to -efg] **enumQueryInteger** | **int32** | Query parameter enum test (double) | **enumQueryDouble** | **float64** | Query parameter enum test (double) | - **enumFormStringArray** | [**[]string**](string.md) | Form parameter enum test (string array) | [default to $] + **enumFormStringArray** | [**[]string**](string.md) | Form parameter enum test (string array) | **enumFormString** | **string** | Form parameter enum test (string) | [default to -efg] ### Return type diff --git a/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml b/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml index 5313659ef237..7a47b6f9bee7 100644 --- a/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml +++ b/samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml @@ -139,6 +139,7 @@ paths: items: type: string type: array + uniqueItems: true style: form responses: "200": @@ -148,11 +149,13 @@ paths: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true application/json: schema: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true description: successful operation "400": content: {} @@ -1323,6 +1326,7 @@ components: items: type: string type: array + uniqueItems: true xml: name: photoUrl wrapped: true diff --git a/samples/client/petstore/go/go-petstore-withXml/docs/FakeApi.md b/samples/client/petstore/go/go-petstore-withXml/docs/FakeApi.md index 6ba47e807f38..3a0de2cfd029 100644 --- a/samples/client/petstore/go/go-petstore-withXml/docs/FakeApi.md +++ b/samples/client/petstore/go/go-petstore-withXml/docs/FakeApi.md @@ -417,7 +417,7 @@ Name | Type | Description | Notes **enumQueryString** | **optional.String**| Query parameter enum test (string) | [default to -efg] **enumQueryInteger** | **optional.Int32**| Query parameter enum test (double) | **enumQueryDouble** | **optional.Float64**| Query parameter enum test (double) | - **enumFormStringArray** | [**optional.Interface of []string**](string.md)| Form parameter enum test (string array) | [default to $] + **enumFormStringArray** | [**optional.Interface of []string**](string.md)| Form parameter enum test (string array) | **enumFormString** | **optional.String**| Form parameter enum test (string) | [default to -efg] ### Return type diff --git a/samples/client/petstore/go/go-petstore/api/openapi.yaml b/samples/client/petstore/go/go-petstore/api/openapi.yaml index 5313659ef237..7a47b6f9bee7 100644 --- a/samples/client/petstore/go/go-petstore/api/openapi.yaml +++ b/samples/client/petstore/go/go-petstore/api/openapi.yaml @@ -139,6 +139,7 @@ paths: items: type: string type: array + uniqueItems: true style: form responses: "200": @@ -148,11 +149,13 @@ paths: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true application/json: schema: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true description: successful operation "400": content: {} @@ -1323,6 +1326,7 @@ components: items: type: string type: array + uniqueItems: true xml: name: photoUrl wrapped: true diff --git a/samples/client/petstore/go/go-petstore/docs/FakeApi.md b/samples/client/petstore/go/go-petstore/docs/FakeApi.md index 6ba47e807f38..3a0de2cfd029 100644 --- a/samples/client/petstore/go/go-petstore/docs/FakeApi.md +++ b/samples/client/petstore/go/go-petstore/docs/FakeApi.md @@ -417,7 +417,7 @@ Name | Type | Description | Notes **enumQueryString** | **optional.String**| Query parameter enum test (string) | [default to -efg] **enumQueryInteger** | **optional.Int32**| Query parameter enum test (double) | **enumQueryDouble** | **optional.Float64**| Query parameter enum test (double) | - **enumFormStringArray** | [**optional.Interface of []string**](string.md)| Form parameter enum test (string array) | [default to $] + **enumFormStringArray** | [**optional.Interface of []string**](string.md)| Form parameter enum test (string array) | **enumFormString** | **optional.String**| Form parameter enum test (string) | [default to -efg] ### Return type diff --git a/samples/client/petstore/haskell-http-client/openapi.yaml b/samples/client/petstore/haskell-http-client/openapi.yaml index 5313659ef237..7a47b6f9bee7 100644 --- a/samples/client/petstore/haskell-http-client/openapi.yaml +++ b/samples/client/petstore/haskell-http-client/openapi.yaml @@ -139,6 +139,7 @@ paths: items: type: string type: array + uniqueItems: true style: form responses: "200": @@ -148,11 +149,13 @@ paths: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true application/json: schema: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true description: successful operation "400": content: {} @@ -1323,6 +1326,7 @@ components: items: type: string type: array + uniqueItems: true xml: name: photoUrl wrapped: true diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java index 5226f7640860..f04e4e09eb98 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java @@ -90,13 +90,13 @@ public FindPetsByStatusQueryParams status(final List value) { * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> */ @RequestLine("GET /pet/findByTags?tags={tags}") @Headers({ "Accept: application/json", }) - List findPetsByTags(@Param("tags") List tags); + Set findPetsByTags(@Param("tags") Set tags); /** * Finds Pets by tags @@ -111,20 +111,20 @@ public FindPetsByStatusQueryParams status(final List value) { *
    *
  • tags - Tags to filter by (required)
  • *
- * @return List<Pet> + * @return Set<Pet> */ @RequestLine("GET /pet/findByTags?tags={tags}") @Headers({ "Accept: application/json", }) - List findPetsByTags(@QueryMap(encoded=true) Map queryParams); + Set findPetsByTags(@QueryMap(encoded=true) Map queryParams); /** * A convenience class for generating query parameters for the * findPetsByTags method in a fluent style. */ public static class FindPetsByTagsQueryParams extends HashMap { - public FindPetsByTagsQueryParams tags(final List value) { + public FindPetsByTagsQueryParams tags(final Set value) { put("tags", EncodingUtils.encodeCollection(value, "csv")); return this; } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java index 874476d41a34..986b5ba89dac 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -51,7 +53,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -171,7 +173,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -190,12 +192,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/PetApi.java index 5226f7640860..f04e4e09eb98 100644 --- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/PetApi.java @@ -90,13 +90,13 @@ public FindPetsByStatusQueryParams status(final List value) { * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> */ @RequestLine("GET /pet/findByTags?tags={tags}") @Headers({ "Accept: application/json", }) - List findPetsByTags(@Param("tags") List tags); + Set findPetsByTags(@Param("tags") Set tags); /** * Finds Pets by tags @@ -111,20 +111,20 @@ public FindPetsByStatusQueryParams status(final List value) { *
    *
  • tags - Tags to filter by (required)
  • *
- * @return List<Pet> + * @return Set<Pet> */ @RequestLine("GET /pet/findByTags?tags={tags}") @Headers({ "Accept: application/json", }) - List findPetsByTags(@QueryMap(encoded=true) Map queryParams); + Set findPetsByTags(@QueryMap(encoded=true) Map queryParams); /** * A convenience class for generating query parameters for the * findPetsByTags method in a fluent style. */ public static class FindPetsByTagsQueryParams extends HashMap { - public FindPetsByTagsQueryParams tags(final List value) { + public FindPetsByTagsQueryParams tags(final Set value) { put("tags", EncodingUtils.encodeCollection(value, "csv")); return this; } diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java index be74dd5ca081..cd98c32b8380 100644 --- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -50,7 +52,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -170,7 +172,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -189,12 +191,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/google-api-client/docs/Pet.md b/samples/client/petstore/java/google-api-client/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/google-api-client/docs/Pet.md +++ b/samples/client/petstore/java/google-api-client/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/google-api-client/docs/PetApi.md b/samples/client/petstore/java/google-api-client/docs/PetApi.md index 875a8e6783e9..d56efcd59677 100644 --- a/samples/client/petstore/java/google-api-client/docs/PetApi.md +++ b/samples/client/petstore/java/google-api-client/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java index 2502d00f9691..8edeb8bd853d 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java @@ -303,12 +303,12 @@ public HttpResponse findPetsByStatusForHttpResponse(List status, Map200 - successful operation *

400 - Invalid tag value * @param tags Tags to filter by - * @return List<Pet> + * @return Set<Pet> * @throws IOException if an error occurs while attempting to invoke the API **/ - public List findPetsByTags(List tags) throws IOException { + public Set findPetsByTags(Set tags) throws IOException { HttpResponse response = findPetsByTagsForHttpResponse(tags); - TypeReference> typeRef = new TypeReference>() {}; + TypeReference> typeRef = new TypeReference>() {}; return apiClient.getObjectMapper().readValue(response.getContent(), typeRef); } @@ -319,16 +319,16 @@ public List findPetsByTags(List tags) throws IOException { *

400 - Invalid tag value * @param tags Tags to filter by * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param. - * @return List<Pet> + * @return Set<Pet> * @throws IOException if an error occurs while attempting to invoke the API **/ - public List findPetsByTags(List tags, Map params) throws IOException { + public Set findPetsByTags(Set tags, Map params) throws IOException { HttpResponse response = findPetsByTagsForHttpResponse(tags, params); - TypeReference> typeRef = new TypeReference>() {}; + TypeReference> typeRef = new TypeReference>() {}; return apiClient.getObjectMapper().readValue(response.getContent(), typeRef); } - public HttpResponse findPetsByTagsForHttpResponse(List tags) throws IOException { + public HttpResponse findPetsByTagsForHttpResponse(Set tags) throws IOException { // verify the required parameter 'tags' is set if (tags == null) { throw new IllegalArgumentException("Missing the required parameter 'tags' when calling findPetsByTags"); @@ -353,7 +353,7 @@ public HttpResponse findPetsByTagsForHttpResponse(List tags) throws IOEx return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.GET, genericUrl, content).execute(); } - public HttpResponse findPetsByTagsForHttpResponse(List tags, Map params) throws IOException { + public HttpResponse findPetsByTagsForHttpResponse(Set tags, Map params) throws IOException { // verify the required parameter 'tags' is set if (tags == null) { throw new IllegalArgumentException("Missing the required parameter 'tags' when calling findPetsByTags"); diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java index be74dd5ca081..cd98c32b8380 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -50,7 +52,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -170,7 +172,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -189,12 +191,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/jersey1/docs/Pet.md b/samples/client/petstore/java/jersey1/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/jersey1/docs/Pet.md +++ b/samples/client/petstore/java/jersey1/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/jersey1/docs/PetApi.md b/samples/client/petstore/java/jersey1/docs/PetApi.md index 875a8e6783e9..d56efcd59677 100644 --- a/samples/client/petstore/java/jersey1/docs/PetApi.md +++ b/samples/client/petstore/java/jersey1/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java index 8480949a5ecf..1e9de839de58 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/PetApi.java @@ -189,12 +189,12 @@ public List findPetsByStatus(List status) throws ApiException { * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> * @throws ApiException if fails to make API call * @deprecated */ @Deprecated - public List findPetsByTags(List tags) throws ApiException { + public Set findPetsByTags(Set tags) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'tags' is set @@ -229,7 +229,7 @@ public List findPetsByTags(List tags) throws ApiException { String[] localVarAuthNames = new String[] { "petstore_auth" }; - GenericType> localVarReturnType = new GenericType>() {}; + GenericType> localVarReturnType = new GenericType>() {}; return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java index be74dd5ca081..cd98c32b8380 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -50,7 +52,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -170,7 +172,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -189,12 +191,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/jersey2-java6/docs/Pet.md b/samples/client/petstore/java/jersey2-java6/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/jersey2-java6/docs/Pet.md +++ b/samples/client/petstore/java/jersey2-java6/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/jersey2-java6/docs/PetApi.md b/samples/client/petstore/java/jersey2-java6/docs/PetApi.md index 875a8e6783e9..d56efcd59677 100644 --- a/samples/client/petstore/java/jersey2-java6/docs/PetApi.md +++ b/samples/client/petstore/java/jersey2-java6/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/FakeApi.java index fc2bb8b4367b..8d8ba2b06cd2 100644 --- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/FakeApi.java @@ -682,7 +682,7 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @throws ApiException if fails to make API call * @http.response.details @@ -705,7 +705,7 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return ApiResponse<Void> * @throws ApiException if fails to make API call diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/PetApi.java index 3a6881beecfc..0ff222b6effc 100644 --- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/api/PetApi.java @@ -242,7 +242,7 @@ public ApiResponse> findPetsByStatusWithHttpInfo(List status) * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> * @throws ApiException if fails to make API call * @http.response.details @@ -253,7 +253,7 @@ public ApiResponse> findPetsByStatusWithHttpInfo(List status) * @deprecated */ @Deprecated - public List findPetsByTags(List tags) throws ApiException { + public Set findPetsByTags(Set tags) throws ApiException { return findPetsByTagsWithHttpInfo(tags).getData(); } @@ -261,7 +261,7 @@ public List findPetsByTags(List tags) throws ApiException { * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return ApiResponse<List<Pet>> + * @return ApiResponse<Set<Pet>> * @throws ApiException if fails to make API call * @http.response.details
@@ -272,7 +272,7 @@ public List findPetsByTags(List tags) throws ApiException { * @deprecated */ @Deprecated - public ApiResponse> findPetsByTagsWithHttpInfo(List tags) throws ApiException { + public ApiResponse> findPetsByTagsWithHttpInfo(Set tags) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'tags' is set @@ -306,7 +306,7 @@ public ApiResponse> findPetsByTagsWithHttpInfo(List tags) thro String[] localVarAuthNames = new String[] { "petstore_auth" }; - GenericType> localVarReturnType = new GenericType>() {}; + GenericType> localVarReturnType = new GenericType>() {}; return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java index ab2be8bc687e..50bb3a9dec24 100644 --- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java @@ -21,7 +21,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -49,7 +51,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -169,7 +171,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -188,12 +190,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/jersey2-java8/docs/Pet.md b/samples/client/petstore/java/jersey2-java8/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/jersey2-java8/docs/Pet.md +++ b/samples/client/petstore/java/jersey2-java8/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/jersey2-java8/docs/PetApi.md b/samples/client/petstore/java/jersey2-java8/docs/PetApi.md index 875a8e6783e9..d56efcd59677 100644 --- a/samples/client/petstore/java/jersey2-java8/docs/PetApi.md +++ b/samples/client/petstore/java/jersey2-java8/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java index c1c2aa441348..550d3dd1f7ac 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java @@ -682,7 +682,7 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @throws ApiException if fails to make API call * @http.response.details @@ -705,7 +705,7 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return ApiResponse<Void> * @throws ApiException if fails to make API call diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java index 3a6881beecfc..0ff222b6effc 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java @@ -242,7 +242,7 @@ public ApiResponse> findPetsByStatusWithHttpInfo(List status) * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> * @throws ApiException if fails to make API call * @http.response.details
@@ -253,7 +253,7 @@ public ApiResponse> findPetsByStatusWithHttpInfo(List status) * @deprecated */ @Deprecated - public List findPetsByTags(List tags) throws ApiException { + public Set findPetsByTags(Set tags) throws ApiException { return findPetsByTagsWithHttpInfo(tags).getData(); } @@ -261,7 +261,7 @@ public List findPetsByTags(List tags) throws ApiException { * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return ApiResponse<List<Pet>> + * @return ApiResponse<Set<Pet>> * @throws ApiException if fails to make API call * @http.response.details
@@ -272,7 +272,7 @@ public List findPetsByTags(List tags) throws ApiException { * @deprecated */ @Deprecated - public ApiResponse> findPetsByTagsWithHttpInfo(List tags) throws ApiException { + public ApiResponse> findPetsByTagsWithHttpInfo(Set tags) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'tags' is set @@ -306,7 +306,7 @@ public ApiResponse> findPetsByTagsWithHttpInfo(List tags) thro String[] localVarAuthNames = new String[] { "petstore_auth" }; - GenericType> localVarReturnType = new GenericType>() {}; + GenericType> localVarReturnType = new GenericType>() {}; return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java index 2df466732f74..3baccce6f9c4 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -50,7 +52,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -170,7 +172,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -189,12 +191,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/jersey2/docs/Pet.md b/samples/client/petstore/java/jersey2/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/jersey2/docs/Pet.md +++ b/samples/client/petstore/java/jersey2/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/jersey2/docs/PetApi.md b/samples/client/petstore/java/jersey2/docs/PetApi.md index 875a8e6783e9..d56efcd59677 100644 --- a/samples/client/petstore/java/jersey2/docs/PetApi.md +++ b/samples/client/petstore/java/jersey2/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/api/FakeApi.java index fc2bb8b4367b..8d8ba2b06cd2 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -682,7 +682,7 @@ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, D * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @throws ApiException if fails to make API call * @http.response.details @@ -705,7 +705,7 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return ApiResponse<Void> * @throws ApiException if fails to make API call diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/api/PetApi.java index 3a6881beecfc..0ff222b6effc 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/api/PetApi.java @@ -242,7 +242,7 @@ public ApiResponse> findPetsByStatusWithHttpInfo(List status) * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> * @throws ApiException if fails to make API call * @http.response.details
@@ -253,7 +253,7 @@ public ApiResponse> findPetsByStatusWithHttpInfo(List status) * @deprecated */ @Deprecated - public List findPetsByTags(List tags) throws ApiException { + public Set findPetsByTags(Set tags) throws ApiException { return findPetsByTagsWithHttpInfo(tags).getData(); } @@ -261,7 +261,7 @@ public List findPetsByTags(List tags) throws ApiException { * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return ApiResponse<List<Pet>> + * @return ApiResponse<Set<Pet>> * @throws ApiException if fails to make API call * @http.response.details
@@ -272,7 +272,7 @@ public List findPetsByTags(List tags) throws ApiException { * @deprecated */ @Deprecated - public ApiResponse> findPetsByTagsWithHttpInfo(List tags) throws ApiException { + public ApiResponse> findPetsByTagsWithHttpInfo(Set tags) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'tags' is set @@ -306,7 +306,7 @@ public ApiResponse> findPetsByTagsWithHttpInfo(List tags) thro String[] localVarAuthNames = new String[] { "petstore_auth" }; - GenericType> localVarReturnType = new GenericType>() {}; + GenericType> localVarReturnType = new GenericType>() {}; return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java index be74dd5ca081..cd98c32b8380 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -50,7 +52,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -170,7 +172,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -189,12 +191,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/native/docs/Pet.md b/samples/client/petstore/java/native/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/native/docs/Pet.md +++ b/samples/client/petstore/java/native/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/native/docs/PetApi.md b/samples/client/petstore/java/native/docs/PetApi.md index 875a8e6783e9..d56efcd59677 100644 --- a/samples/client/petstore/java/native/docs/PetApi.md +++ b/samples/client/petstore/java/native/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java index 06629c1bf044..33f35c3c584c 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java @@ -217,12 +217,12 @@ public List findPetsByStatus(List status) throws ApiException { * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> * @throws ApiException if fails to make API call * @deprecated */ @Deprecated - public List findPetsByTags(List tags) throws ApiException { + public Set findPetsByTags(Set tags) throws ApiException { // verify the required parameter 'tags' is set if (tags == null) { throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags"); @@ -264,7 +264,7 @@ public List findPetsByTags(List tags) throws ApiException { localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes())); } - return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference>() {}); + return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference>() {}); } catch (IOException e) { throw new ApiException(e); } catch (InterruptedException e) { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java index 2df466732f74..3baccce6f9c4 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -50,7 +52,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -170,7 +172,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -189,12 +191,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md index a64a5b131dc5..932bd08f0c5b 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/PetApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/PetApi.md index ca6658ce094a..8d927130ceee 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/PetApi.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/PetApi.md @@ -217,7 +217,7 @@ Name | Type | Description | Notes # **findPetsByTags** -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -243,9 +243,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -262,11 +262,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java index 18c2941546db..28b50983c011 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java @@ -418,7 +418,7 @@ public okhttp3.Call findPetsByStatusAsync(List status, final ApiCallback * @deprecated */ @Deprecated - public okhttp3.Call findPetsByTagsCall(List tags, final ApiCallback _callback) throws ApiException { + public okhttp3.Call findPetsByTagsCall(Set tags, final ApiCallback _callback) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -453,7 +453,7 @@ public okhttp3.Call findPetsByTagsCall(List tags, final ApiCallback _cal @Deprecated @SuppressWarnings("rawtypes") - private okhttp3.Call findPetsByTagsValidateBeforeCall(List tags, final ApiCallback _callback) throws ApiException { + private okhttp3.Call findPetsByTagsValidateBeforeCall(Set tags, final ApiCallback _callback) throws ApiException { // verify the required parameter 'tags' is set if (tags == null) { @@ -470,7 +470,7 @@ private okhttp3.Call findPetsByTagsValidateBeforeCall(List tags, final A * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details
@@ -481,8 +481,8 @@ private okhttp3.Call findPetsByTagsValidateBeforeCall(List tags, final A * @deprecated */ @Deprecated - public List findPetsByTags(List tags) throws ApiException { - ApiResponse> localVarResp = findPetsByTagsWithHttpInfo(tags); + public Set findPetsByTags(Set tags) throws ApiException { + ApiResponse> localVarResp = findPetsByTagsWithHttpInfo(tags); return localVarResp.getData(); } @@ -490,7 +490,7 @@ public List findPetsByTags(List tags) throws ApiException { * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return ApiResponse<List<Pet>> + * @return ApiResponse<Set<Pet>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details
@@ -501,9 +501,9 @@ public List findPetsByTags(List tags) throws ApiException { * @deprecated */ @Deprecated - public ApiResponse> findPetsByTagsWithHttpInfo(List tags) throws ApiException { + public ApiResponse> findPetsByTagsWithHttpInfo(Set tags) throws ApiException { okhttp3.Call localVarCall = findPetsByTagsValidateBeforeCall(tags, null); - Type localVarReturnType = new TypeToken>(){}.getType(); + Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -523,10 +523,10 @@ public ApiResponse> findPetsByTagsWithHttpInfo(List tags) thro * @deprecated */ @Deprecated - public okhttp3.Call findPetsByTagsAsync(List tags, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call findPetsByTagsAsync(Set tags, final ApiCallback> _callback) throws ApiException { okhttp3.Call localVarCall = findPetsByTagsValidateBeforeCall(tags, _callback); - Type localVarReturnType = new TypeToken>(){}.getType(); + Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java index aba619a1c924..01ddfa84b9f8 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java @@ -24,7 +24,9 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import android.os.Parcelable; @@ -49,7 +51,7 @@ public class Pet implements Parcelable { public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls"; @SerializedName(SERIALIZED_NAME_PHOTO_URLS) - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) @@ -179,7 +181,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -196,12 +198,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { **/ @ApiModelProperty(required = true, value = "") - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } @@ -322,7 +324,7 @@ public void writeToParcel(Parcel out, int flags) { id = (Long)in.readValue(null); category = (Category)in.readValue(Category.class.getClassLoader()); name = (String)in.readValue(null); - photoUrls = (List)in.readValue(null); + photoUrls = (Set)in.readValue(null); tags = (List)in.readValue(Tag.class.getClassLoader()); status = (StatusEnum)in.readValue(null); } diff --git a/samples/client/petstore/java/okhttp-gson/docs/Pet.md b/samples/client/petstore/java/okhttp-gson/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/Pet.md +++ b/samples/client/petstore/java/okhttp-gson/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/okhttp-gson/docs/PetApi.md b/samples/client/petstore/java/okhttp-gson/docs/PetApi.md index ca6658ce094a..8d927130ceee 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/PetApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/PetApi.md @@ -217,7 +217,7 @@ Name | Type | Description | Notes # **findPetsByTags** -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -243,9 +243,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -262,11 +262,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java index 18c2941546db..28b50983c011 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java @@ -418,7 +418,7 @@ public okhttp3.Call findPetsByStatusAsync(List status, final ApiCallback * @deprecated */ @Deprecated - public okhttp3.Call findPetsByTagsCall(List tags, final ApiCallback _callback) throws ApiException { + public okhttp3.Call findPetsByTagsCall(Set tags, final ApiCallback _callback) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -453,7 +453,7 @@ public okhttp3.Call findPetsByTagsCall(List tags, final ApiCallback _cal @Deprecated @SuppressWarnings("rawtypes") - private okhttp3.Call findPetsByTagsValidateBeforeCall(List tags, final ApiCallback _callback) throws ApiException { + private okhttp3.Call findPetsByTagsValidateBeforeCall(Set tags, final ApiCallback _callback) throws ApiException { // verify the required parameter 'tags' is set if (tags == null) { @@ -470,7 +470,7 @@ private okhttp3.Call findPetsByTagsValidateBeforeCall(List tags, final A * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details
@@ -481,8 +481,8 @@ private okhttp3.Call findPetsByTagsValidateBeforeCall(List tags, final A * @deprecated */ @Deprecated - public List findPetsByTags(List tags) throws ApiException { - ApiResponse> localVarResp = findPetsByTagsWithHttpInfo(tags); + public Set findPetsByTags(Set tags) throws ApiException { + ApiResponse> localVarResp = findPetsByTagsWithHttpInfo(tags); return localVarResp.getData(); } @@ -490,7 +490,7 @@ public List findPetsByTags(List tags) throws ApiException { * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return ApiResponse<List<Pet>> + * @return ApiResponse<Set<Pet>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details
@@ -501,9 +501,9 @@ public List findPetsByTags(List tags) throws ApiException { * @deprecated */ @Deprecated - public ApiResponse> findPetsByTagsWithHttpInfo(List tags) throws ApiException { + public ApiResponse> findPetsByTagsWithHttpInfo(Set tags) throws ApiException { okhttp3.Call localVarCall = findPetsByTagsValidateBeforeCall(tags, null); - Type localVarReturnType = new TypeToken>(){}.getType(); + Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -523,10 +523,10 @@ public ApiResponse> findPetsByTagsWithHttpInfo(List tags) thro * @deprecated */ @Deprecated - public okhttp3.Call findPetsByTagsAsync(List tags, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call findPetsByTagsAsync(Set tags, final ApiCallback> _callback) throws ApiException { okhttp3.Call localVarCall = findPetsByTagsValidateBeforeCall(tags, _callback); - Type localVarReturnType = new TypeToken>(){}.getType(); + Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java index e50743626b47..4ea18b217b6e 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java @@ -24,7 +24,9 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; @@ -47,7 +49,7 @@ public class Pet { public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls"; @SerializedName(SERIALIZED_NAME_PHOTO_URLS) - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) @@ -175,7 +177,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -192,12 +194,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { **/ @ApiModelProperty(required = true, value = "") - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java index 76a4f3990455..4d13094f44f4 100644 --- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -310,7 +310,7 @@ public void testFindPetsByTags() throws Exception { api.updatePet(pet); - List pets = api.findPetsByTags(Arrays.asList("friendly")); + Set pets = api.findPetsByTags(new HashSet<>(Arrays.asList("friendly"))); assertNotNull(pets); boolean found = false; diff --git a/samples/client/petstore/java/rest-assured/docs/FakeApi.md b/samples/client/petstore/java/rest-assured/docs/FakeApi.md index 0cac20cb770b..37c929e9cee4 100644 --- a/samples/client/petstore/java/rest-assured/docs/FakeApi.md +++ b/samples/client/petstore/java/rest-assured/docs/FakeApi.md @@ -442,7 +442,7 @@ Name | Type | Description | Notes **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] **enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2] **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2] - **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to $] [enum: >, $] + **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to new ArrayList<String>()] [enum: >, $] **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] ### Return type diff --git a/samples/client/petstore/java/rest-assured/docs/Pet.md b/samples/client/petstore/java/rest-assured/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/rest-assured/docs/Pet.md +++ b/samples/client/petstore/java/rest-assured/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/rest-assured/docs/PetApi.md b/samples/client/petstore/java/rest-assured/docs/PetApi.md index e72ab3ae7db6..0dffe0775339 100644 --- a/samples/client/petstore/java/rest-assured/docs/PetApi.md +++ b/samples/client/petstore/java/rest-assured/docs/PetApi.md @@ -140,7 +140,7 @@ Name | Type | Description | Notes # **findPetsByTags** -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -165,11 +165,11 @@ api.findPetsByTags() Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | [default to new ArrayList<String>()] + **tags** | [**Set<String>**](String.md)| Tags to filter by | [default to new LinkedHashSet<String>()] ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java index 5049424b2d90..4625e6f3221b 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1020,7 +1020,7 @@ public TestEndpointParametersOper respSpec(Consumer respSpe * @see #enumQueryStringQuery Query parameter enum test (string) (optional, default to -efg) * @see #enumQueryIntegerQuery Query parameter enum test (double) (optional) * @see #enumQueryDoubleQuery Query parameter enum test (double) (optional) - * @see #enumFormStringArrayForm Form parameter enum test (string array) (optional, default to $) + * @see #enumFormStringArrayForm Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @see #enumFormStringForm Form parameter enum test (string) (optional, default to -efg) */ public static class TestEnumParametersOper implements Oper { @@ -1118,7 +1118,7 @@ public TestEnumParametersOper enumQueryDoubleQuery(Object... enumQueryDouble) { public static final String ENUM_FORM_STRING_ARRAY_FORM = "enum_form_string_array"; /** - * @param enumFormStringArray (List<String>) Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray (List<String>) Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @return operation */ public TestEnumParametersOper enumFormStringArrayForm(Object... enumFormStringArray) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java index fee22f69f3c2..49adc9f26991 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java @@ -396,7 +396,7 @@ public FindPetsByStatusOper respSpec(Consumer respSpecCusto * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * * @see #tagsQuery Tags to filter by (required) - * return List<Pet> + * return Set<Pet> * @deprecated */ @Deprecated @@ -428,17 +428,17 @@ public T execute(Function handler) { /** * GET /pet/findByTags * @param handler handler - * @return List<Pet> + * @return Set<Pet> */ - public List executeAs(Function handler) { - Type type = new TypeToken>(){}.getType(); + public Set executeAs(Function handler) { + Type type = new TypeToken>(){}.getType(); return execute(handler).as(type); } public static final String TAGS_QUERY = "tags"; /** - * @param tags (List<String>) Tags to filter by (required) + * @param tags (Set<String>) Tags to filter by (required) * @return operation */ public FindPetsByTagsOper tagsQuery(Object... tags) { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java index e50743626b47..4ea18b217b6e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java @@ -24,7 +24,9 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; @@ -47,7 +49,7 @@ public class Pet { public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls"; @SerializedName(SERIALIZED_NAME_PHOTO_URLS) - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) @@ -175,7 +177,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -192,12 +194,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { **/ @ApiModelProperty(required = true, value = "") - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/resteasy/docs/Pet.md b/samples/client/petstore/java/resteasy/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/resteasy/docs/Pet.md +++ b/samples/client/petstore/java/resteasy/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/resteasy/docs/PetApi.md b/samples/client/petstore/java/resteasy/docs/PetApi.md index 875a8e6783e9..d56efcd59677 100644 --- a/samples/client/petstore/java/resteasy/docs/PetApi.md +++ b/samples/client/petstore/java/resteasy/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java index 34b1bf258781..fd00e55aee4d 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java @@ -477,7 +477,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @throws ApiException if fails to make API call */ diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java index 2f4b2c8561d3..7bfba8ceb946 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/PetApi.java @@ -172,12 +172,12 @@ public List findPetsByStatus(List status) throws ApiException { * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return a {@code List} + * @return a {@code Set} * @throws ApiException if fails to make API call * @deprecated */ @Deprecated - public List findPetsByTags(List tags) throws ApiException { + public Set findPetsByTags(Set tags) throws ApiException { Object localVarPostBody = null; // verify the required parameter 'tags' is set @@ -211,7 +211,7 @@ public List findPetsByTags(List tags) throws ApiException { String[] localVarAuthNames = new String[] { "petstore_auth" }; - GenericType> localVarReturnType = new GenericType>() {}; + GenericType> localVarReturnType = new GenericType>() {}; return apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } /** diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java index be74dd5ca081..cd98c32b8380 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -50,7 +52,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -170,7 +172,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -189,12 +191,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Pet.md b/samples/client/petstore/java/resttemplate-withXml/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/resttemplate-withXml/docs/Pet.md +++ b/samples/client/petstore/java/resttemplate-withXml/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/PetApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/PetApi.md index 875a8e6783e9..d56efcd59677 100644 --- a/samples/client/petstore/java/resttemplate-withXml/docs/PetApi.md +++ b/samples/client/petstore/java/resttemplate-withXml/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index 16ef84563250..0c0b72fcf438 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -549,7 +549,7 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @throws RestClientException if an error occurs while attempting to invoke the API */ @@ -568,7 +568,7 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return ResponseEntity<Void> * @throws RestClientException if an error occurs while attempting to invoke the API diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java index 8edc76ba76d9..82c142ab86ec 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java @@ -209,11 +209,11 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(List statu *

200 - successful operation *

400 - Invalid tag value * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> * @throws RestClientException if an error occurs while attempting to invoke the API */ @Deprecated - public List findPetsByTags(List tags) throws RestClientException { + public Set findPetsByTags(Set tags) throws RestClientException { return findPetsByTagsWithHttpInfo(tags).getBody(); } @@ -223,11 +223,11 @@ public List findPetsByTags(List tags) throws RestClientException { *

200 - successful operation *

400 - Invalid tag value * @param tags Tags to filter by (required) - * @return ResponseEntity<List<Pet>> + * @return ResponseEntity<Set<Pet>> * @throws RestClientException if an error occurs while attempting to invoke the API */ @Deprecated - public ResponseEntity> findPetsByTagsWithHttpInfo(List tags) throws RestClientException { + public ResponseEntity> findPetsByTagsWithHttpInfo(Set tags) throws RestClientException { Object postBody = null; // verify the required parameter 'tags' is set @@ -253,7 +253,7 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(List tags) t String[] authNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference> returnType = new ParameterizedTypeReference>() {}; + ParameterizedTypeReference> returnType = new ParameterizedTypeReference>() {}; return apiClient.invokeAPI(path, HttpMethod.GET, queryParams, postBody, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType); } /** diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java index e4ad0c3e252e..ba6fca86e2f1 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -63,7 +65,7 @@ public class Pet { // items.example= items.type=String @XmlElement(name = "photoUrls") @XmlElementWrapper(name = "photoUrl") - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; // Is a container wrapped=true @@ -192,7 +194,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -213,12 +215,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { // items.xmlName= @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrls") - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/resttemplate/docs/Pet.md b/samples/client/petstore/java/resttemplate/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/resttemplate/docs/Pet.md +++ b/samples/client/petstore/java/resttemplate/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/resttemplate/docs/PetApi.md b/samples/client/petstore/java/resttemplate/docs/PetApi.md index 875a8e6783e9..d56efcd59677 100644 --- a/samples/client/petstore/java/resttemplate/docs/PetApi.md +++ b/samples/client/petstore/java/resttemplate/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index 16ef84563250..0c0b72fcf438 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -549,7 +549,7 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @throws RestClientException if an error occurs while attempting to invoke the API */ @@ -568,7 +568,7 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return ResponseEntity<Void> * @throws RestClientException if an error occurs while attempting to invoke the API diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java index 8edc76ba76d9..82c142ab86ec 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/PetApi.java @@ -209,11 +209,11 @@ public ResponseEntity> findPetsByStatusWithHttpInfo(List statu *

200 - successful operation *

400 - Invalid tag value * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> * @throws RestClientException if an error occurs while attempting to invoke the API */ @Deprecated - public List findPetsByTags(List tags) throws RestClientException { + public Set findPetsByTags(Set tags) throws RestClientException { return findPetsByTagsWithHttpInfo(tags).getBody(); } @@ -223,11 +223,11 @@ public List findPetsByTags(List tags) throws RestClientException { *

200 - successful operation *

400 - Invalid tag value * @param tags Tags to filter by (required) - * @return ResponseEntity<List<Pet>> + * @return ResponseEntity<Set<Pet>> * @throws RestClientException if an error occurs while attempting to invoke the API */ @Deprecated - public ResponseEntity> findPetsByTagsWithHttpInfo(List tags) throws RestClientException { + public ResponseEntity> findPetsByTagsWithHttpInfo(Set tags) throws RestClientException { Object postBody = null; // verify the required parameter 'tags' is set @@ -253,7 +253,7 @@ public ResponseEntity> findPetsByTagsWithHttpInfo(List tags) t String[] authNames = new String[] { "petstore_auth" }; - ParameterizedTypeReference> returnType = new ParameterizedTypeReference>() {}; + ParameterizedTypeReference> returnType = new ParameterizedTypeReference>() {}; return apiClient.invokeAPI(path, HttpMethod.GET, queryParams, postBody, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType); } /** diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java index be74dd5ca081..cd98c32b8380 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -50,7 +52,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -170,7 +172,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -189,12 +191,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/api/FakeApi.java index 1ce6dc060c27..2efeb28a1d3c 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/api/FakeApi.java @@ -278,7 +278,7 @@ void testEndpointParameters( * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Void */ @@ -298,7 +298,7 @@ Void testEnumParameters( * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param cb callback method */ diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/api/PetApi.java index 858b8107bee9..f7536c0713e8 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/api/PetApi.java @@ -95,11 +95,11 @@ void findPetsByStatus( * Sync method * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return List<Pet> + * @return Set<Pet> */ @GET("/pet/findByTags") - List findPetsByTags( + Set findPetsByTags( @retrofit.http.Query("tags") CSVParams tags ); @@ -112,7 +112,7 @@ List findPetsByTags( @GET("/pet/findByTags") void findPetsByTags( - @retrofit.http.Query("tags") CSVParams tags, Callback> cb + @retrofit.http.Query("tags") CSVParams tags, Callback> cb ); /** * Find pet by ID diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java index e50743626b47..4ea18b217b6e 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java @@ -24,7 +24,9 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; @@ -47,7 +49,7 @@ public class Pet { public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls"; @SerializedName(SERIALIZED_NAME_PHOTO_URLS) - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) @@ -175,7 +177,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -192,12 +194,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { **/ @ApiModelProperty(required = true, value = "") - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/retrofit2-play24/docs/Pet.md b/samples/client/petstore/java/retrofit2-play24/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/retrofit2-play24/docs/Pet.md +++ b/samples/client/petstore/java/retrofit2-play24/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/retrofit2-play24/docs/PetApi.md b/samples/client/petstore/java/retrofit2-play24/docs/PetApi.md index 088c67ee2141..ca4e8b4197a3 100644 --- a/samples/client/petstore/java/retrofit2-play24/docs/PetApi.md +++ b/samples/client/petstore/java/retrofit2-play24/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/FakeApi.java index 0c05259fb1e8..b61af1df94fa 100644 --- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/FakeApi.java @@ -165,7 +165,7 @@ F.Promise> testEndpointParameters( * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Call<Void> */ diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/PetApi.java index e2c5e7bfa495..c4af49a2f42e 100644 --- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/PetApi.java @@ -65,10 +65,10 @@ F.Promise>> findPetsByStatus( * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return Call<List<Pet>> + * @return Call<Set<Pet>> */ @GET("pet/findByTags") - F.Promise>> findPetsByTags( + F.Promise>> findPetsByTags( @retrofit2.http.Query("tags") CSVParams tags ); diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java index 4fdce22a0ca3..de960e6e5868 100644 --- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -52,7 +54,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -174,7 +176,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -194,12 +196,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/retrofit2-play25/docs/Pet.md b/samples/client/petstore/java/retrofit2-play25/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/retrofit2-play25/docs/Pet.md +++ b/samples/client/petstore/java/retrofit2-play25/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/retrofit2-play25/docs/PetApi.md b/samples/client/petstore/java/retrofit2-play25/docs/PetApi.md index 088c67ee2141..ca4e8b4197a3 100644 --- a/samples/client/petstore/java/retrofit2-play25/docs/PetApi.md +++ b/samples/client/petstore/java/retrofit2-play25/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/FakeApi.java index f8a5c1f9ec2f..c8f7625388f2 100644 --- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/FakeApi.java @@ -165,7 +165,7 @@ CompletionStage> testEndpointParameters( * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Call<Void> */ diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/PetApi.java index 581b909f2fe2..ecab3a7e7e53 100644 --- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/PetApi.java @@ -65,10 +65,10 @@ CompletionStage>> findPetsByStatus( * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return Call<List<Pet>> + * @return Call<Set<Pet>> */ @GET("pet/findByTags") - CompletionStage>> findPetsByTags( + CompletionStage>> findPetsByTags( @retrofit2.http.Query("tags") CSVParams tags ); diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java index 4fdce22a0ca3..de960e6e5868 100644 --- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -52,7 +54,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -174,7 +176,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -194,12 +196,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Pet.md b/samples/client/petstore/java/retrofit2-play26/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/retrofit2-play26/docs/Pet.md +++ b/samples/client/petstore/java/retrofit2-play26/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/retrofit2-play26/docs/PetApi.md b/samples/client/petstore/java/retrofit2-play26/docs/PetApi.md index 088c67ee2141..ca4e8b4197a3 100644 --- a/samples/client/petstore/java/retrofit2-play26/docs/PetApi.md +++ b/samples/client/petstore/java/retrofit2-play26/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java index f8a5c1f9ec2f..c8f7625388f2 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java @@ -165,7 +165,7 @@ CompletionStage> testEndpointParameters( * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Call<Void> */ diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java index 581b909f2fe2..ecab3a7e7e53 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java @@ -65,10 +65,10 @@ CompletionStage>> findPetsByStatus( * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return Call<List<Pet>> + * @return Call<Set<Pet>> */ @GET("pet/findByTags") - CompletionStage>> findPetsByTags( + CompletionStage>> findPetsByTags( @retrofit2.http.Query("tags") CSVParams tags ); diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java index 4fdce22a0ca3..de960e6e5868 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -52,7 +54,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -174,7 +176,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -194,12 +196,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/retrofit2/docs/Pet.md b/samples/client/petstore/java/retrofit2/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/retrofit2/docs/Pet.md +++ b/samples/client/petstore/java/retrofit2/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/retrofit2/docs/PetApi.md b/samples/client/petstore/java/retrofit2/docs/PetApi.md index 088c67ee2141..ca4e8b4197a3 100644 --- a/samples/client/petstore/java/retrofit2/docs/PetApi.md +++ b/samples/client/petstore/java/retrofit2/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java index d536945d5d43..a049a80c7d53 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -160,7 +160,7 @@ Call testEndpointParameters( * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Call<Void> */ diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java index ddf41efc73b1..91642b0a2709 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java @@ -60,12 +60,12 @@ Call> findPetsByStatus( * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return Call<List<Pet>> + * @return Call<Set<Pet>> * @deprecated */ @Deprecated @GET("pet/findByTags") - Call> findPetsByTags( + Call> findPetsByTags( @retrofit2.http.Query("tags") CSVParams tags ); diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java index e50743626b47..4ea18b217b6e 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java @@ -24,7 +24,9 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; @@ -47,7 +49,7 @@ public class Pet { public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls"; @SerializedName(SERIALIZED_NAME_PHOTO_URLS) - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) @@ -175,7 +177,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -192,12 +194,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { **/ @ApiModelProperty(required = true, value = "") - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/retrofit2rx/docs/Pet.md b/samples/client/petstore/java/retrofit2rx/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/retrofit2rx/docs/Pet.md +++ b/samples/client/petstore/java/retrofit2rx/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/retrofit2rx/docs/PetApi.md b/samples/client/petstore/java/retrofit2rx/docs/PetApi.md index 088c67ee2141..ca4e8b4197a3 100644 --- a/samples/client/petstore/java/retrofit2rx/docs/PetApi.md +++ b/samples/client/petstore/java/retrofit2rx/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/FakeApi.java index b17c3d20f2b4..2d42b17f092d 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/FakeApi.java @@ -160,7 +160,7 @@ Observable testEndpointParameters( * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Observable<Void> */ diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/PetApi.java index 5f295827ad31..a38e7cbbdc5a 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/PetApi.java @@ -60,12 +60,12 @@ Observable> findPetsByStatus( * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return Observable<List<Pet>> + * @return Observable<Set<Pet>> * @deprecated */ @Deprecated @GET("pet/findByTags") - Observable> findPetsByTags( + Observable> findPetsByTags( @retrofit2.http.Query("tags") CSVParams tags ); diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java index e50743626b47..4ea18b217b6e 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java @@ -24,7 +24,9 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; @@ -47,7 +49,7 @@ public class Pet { public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls"; @SerializedName(SERIALIZED_NAME_PHOTO_URLS) - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) @@ -175,7 +177,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -192,12 +194,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { **/ @ApiModelProperty(required = true, value = "") - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Pet.md b/samples/client/petstore/java/retrofit2rx2/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/retrofit2rx2/docs/Pet.md +++ b/samples/client/petstore/java/retrofit2rx2/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md b/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md index 088c67ee2141..ca4e8b4197a3 100644 --- a/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md +++ b/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java index 82a7657309f2..850ce8d32d45 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -161,7 +161,7 @@ Completable testEndpointParameters( * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Completable */ diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java index 4b54f3a32748..f340cdbc169c 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java @@ -61,12 +61,12 @@ Observable> findPetsByStatus( * Finds Pets by tags * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * @param tags Tags to filter by (required) - * @return Observable<List<Pet>> + * @return Observable<Set<Pet>> * @deprecated */ @Deprecated @GET("pet/findByTags") - Observable> findPetsByTags( + Observable> findPetsByTags( @retrofit2.http.Query("tags") CSVParams tags ); diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java index e50743626b47..4ea18b217b6e 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java @@ -24,7 +24,9 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; @@ -47,7 +49,7 @@ public class Pet { public static final String SERIALIZED_NAME_PHOTO_URLS = "photoUrls"; @SerializedName(SERIALIZED_NAME_PHOTO_URLS) - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) @@ -175,7 +177,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -192,12 +194,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { **/ @ApiModelProperty(required = true, value = "") - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/vertx/docs/Pet.md b/samples/client/petstore/java/vertx/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/vertx/docs/Pet.md +++ b/samples/client/petstore/java/vertx/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/vertx/docs/PetApi.md b/samples/client/petstore/java/vertx/docs/PetApi.md index 6b8fb662c806..4a8a3f1993a2 100644 --- a/samples/client/petstore/java/vertx/docs/PetApi.md +++ b/samples/client/petstore/java/vertx/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java index e32629442fd5..939cc630f4fc 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -416,7 +416,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param resultHandler Asynchronous result handler */ diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java index eaa6f805d852..f2a4190666df 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApi.java @@ -17,7 +17,7 @@ public interface PetApi { void findPetsByStatus(List status, Handler>> handler); - void findPetsByTags(List tags, Handler>> handler); + void findPetsByTags(Set tags, Handler>> handler); void getPetById(Long petId, Handler> handler); diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java index 545d14ebf2d2..bfe29271ed42 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/PetApiImpl.java @@ -160,7 +160,7 @@ public void findPetsByStatus(List status, Handler> * @param tags Tags to filter by (required) * @param resultHandler Asynchronous result handler */ - public void findPetsByTags(List tags, Handler>> resultHandler) { + public void findPetsByTags(Set tags, Handler>> resultHandler) { Object localVarBody = null; // verify the required parameter 'tags' is set @@ -189,7 +189,7 @@ public void findPetsByTags(List tags, Handler>> re String[] localVarAccepts = { "application/xml", "application/json" }; String[] localVarContentTypes = { }; String[] localVarAuthNames = new String[] { "petstore_auth" }; - TypeReference> localVarReturnType = new TypeReference>() {}; + TypeReference> localVarReturnType = new TypeReference>() {}; apiClient.invokeAPI(localVarPath, "GET", localVarQueryParams, localVarBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccepts, localVarContentTypes, localVarAuthNames, localVarReturnType, resultHandler); } /** diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java index c460d99e18fb..05404bb49d16 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java @@ -255,7 +255,7 @@ public Single rxTestEndpointParameters(BigDecimal number, Double _double, * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param resultHandler Asynchronous result handler */ @@ -272,7 +272,7 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Asynchronous result handler (RxJava Single) */ diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java index 4314f8dc9917..f77f10f7bba3 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/PetApi.java @@ -94,7 +94,7 @@ public Single> rxFindPetsByStatus(List status) { * @param tags Tags to filter by (required) * @param resultHandler Asynchronous result handler */ - public void findPetsByTags(List tags, Handler>> resultHandler) { + public void findPetsByTags(Set tags, Handler>> resultHandler) { delegate.findPetsByTags(tags, resultHandler); } @@ -104,7 +104,7 @@ public void findPetsByTags(List tags, Handler>> re * @param tags Tags to filter by (required) * @return Asynchronous result handler (RxJava Single) */ - public Single> rxFindPetsByTags(List tags) { + public Single> rxFindPetsByTags(Set tags) { return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut -> { delegate.findPetsByTags(tags, fut); })); diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java index 2df466732f74..3baccce6f9c4 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -50,7 +52,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -170,7 +172,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -189,12 +191,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/java/webclient/docs/Pet.md b/samples/client/petstore/java/webclient/docs/Pet.md index 37ac007b7931..bdcdad6b3e60 100644 --- a/samples/client/petstore/java/webclient/docs/Pet.md +++ b/samples/client/petstore/java/webclient/docs/Pet.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **id** | **Long** | | [optional] **category** | [**Category**](Category.md) | | [optional] **name** | **String** | | -**photoUrls** | **List<String>** | | +**photoUrls** | **Set<String>** | | **tags** | [**List<Tag>**](Tag.md) | | [optional] **status** | [**StatusEnum**](#StatusEnum) | pet status in the store | [optional] diff --git a/samples/client/petstore/java/webclient/docs/PetApi.md b/samples/client/petstore/java/webclient/docs/PetApi.md index 875a8e6783e9..d56efcd59677 100644 --- a/samples/client/petstore/java/webclient/docs/PetApi.md +++ b/samples/client/petstore/java/webclient/docs/PetApi.md @@ -227,7 +227,7 @@ Name | Type | Description | Notes ## findPetsByTags -> List<Pet> findPetsByTags(tags) +> Set<Pet> findPetsByTags(tags) Finds Pets by tags @@ -254,9 +254,9 @@ public class Example { petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); PetApi apiInstance = new PetApi(defaultClient); - List tags = Arrays.asList(); // List | Tags to filter by + Set tags = Arrays.asList(); // Set | Tags to filter by try { - List result = apiInstance.findPetsByTags(tags); + Set result = apiInstance.findPetsByTags(tags); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling PetApi#findPetsByTags"); @@ -274,11 +274,11 @@ public class Example { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **tags** | [**List<String>**](String.md)| Tags to filter by | + **tags** | [**Set<String>**](String.md)| Tags to filter by | ### Return type -[**List<Pet>**](Pet.md) +[**Set<Pet>**](Pet.md) ### Authorization diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java index 079890b3a06c..21cedf69d231 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/PetApi.java @@ -170,10 +170,10 @@ public Flux findPetsByStatus(List status) throws RestClientExceptio *

200 - successful operation *

400 - Invalid tag value * @param tags Tags to filter by - * @return List<Pet> + * @return Set<Pet> * @throws RestClientException if an error occurs while attempting to invoke the API */ - public Flux findPetsByTags(List tags) throws RestClientException { + public Flux findPetsByTags(Set tags) throws RestClientException { Object postBody = null; // verify the required parameter 'tags' is set diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java index 2df466732f74..3baccce6f9c4 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java @@ -22,7 +22,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.client.model.Category; import org.openapitools.client.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -50,7 +52,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -170,7 +172,7 @@ public void setName(String name) { } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; @@ -189,12 +191,12 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/client/petstore/javascript-es6/docs/FakeApi.md b/samples/client/petstore/javascript-es6/docs/FakeApi.md index 337fd96880b3..adc42ce957ff 100644 --- a/samples/client/petstore/javascript-es6/docs/FakeApi.md +++ b/samples/client/petstore/javascript-es6/docs/FakeApi.md @@ -511,7 +511,7 @@ Name | Type | Description | Notes **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to '-efg'] **enumQueryInteger** | **Number**| Query parameter enum test (double) | [optional] **enumQueryDouble** | **Number**| Query parameter enum test (double) | [optional] - **enumFormStringArray** | [**[String]**](String.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enumFormStringArray** | [**[String]**](String.md)| Form parameter enum test (string array) | [optional] **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/client/petstore/javascript-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-es6/src/api/FakeApi.js index 8c3bffd8c857..9b5dc7f30d8d 100644 --- a/samples/client/petstore/javascript-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-es6/src/api/FakeApi.js @@ -462,7 +462,7 @@ export default class FakeApi { * @param {module:model/String} opts.enumQueryString Query parameter enum test (string) (default to '-efg') * @param {module:model/Number} opts.enumQueryInteger Query parameter enum test (double) * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double) - * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) (default to '$') + * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) * @param {module:model/String} opts.enumFormString Form parameter enum test (string) (default to '-efg') * @param {module:api/FakeApi~testEnumParametersCallback} callback The callback function, accepting three arguments: error, data, response */ diff --git a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md index 21fe5b74ff57..39e5c272a6b6 100644 --- a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md +++ b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md @@ -501,7 +501,7 @@ Name | Type | Description | Notes **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to '-efg'] **enumQueryInteger** | **Number**| Query parameter enum test (double) | [optional] **enumQueryDouble** | **Number**| Query parameter enum test (double) | [optional] - **enumFormStringArray** | [**[String]**](String.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enumFormStringArray** | [**[String]**](String.md)| Form parameter enum test (string array) | [optional] **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js index 8c041077a12e..284e9de58056 100644 --- a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js @@ -516,7 +516,7 @@ export default class FakeApi { * @param {module:model/String} opts.enumQueryString Query parameter enum test (string) (default to '-efg') * @param {module:model/Number} opts.enumQueryInteger Query parameter enum test (double) * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double) - * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) (default to '$') + * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) * @param {module:model/String} opts.enumFormString Form parameter enum test (string) (default to '-efg') * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response */ @@ -562,7 +562,7 @@ export default class FakeApi { * @param {module:model/String} opts.enumQueryString Query parameter enum test (string) (default to '-efg') * @param {module:model/Number} opts.enumQueryInteger Query parameter enum test (double) * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double) - * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) (default to '$') + * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) * @param {module:model/String} opts.enumFormString Form parameter enum test (string) (default to '-efg') * @return {Promise} a {@link https://www.promisejs.org/|Promise} */ diff --git a/samples/client/petstore/javascript-promise/docs/FakeApi.md b/samples/client/petstore/javascript-promise/docs/FakeApi.md index 091f13eb5db8..cad5599bad23 100644 --- a/samples/client/petstore/javascript-promise/docs/FakeApi.md +++ b/samples/client/petstore/javascript-promise/docs/FakeApi.md @@ -511,7 +511,7 @@ Name | Type | Description | Notes **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to '-efg'] **enumQueryInteger** | **Number**| Query parameter enum test (double) | [optional] **enumQueryDouble** | **Number**| Query parameter enum test (double) | [optional] - **enumFormStringArray** | [**[String]**](String.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enumFormStringArray** | [**[String]**](String.md)| Form parameter enum test (string array) | [optional] **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/client/petstore/javascript-promise/src/api/FakeApi.js b/samples/client/petstore/javascript-promise/src/api/FakeApi.js index 6ba7dcd5431c..281b2187f2a1 100644 --- a/samples/client/petstore/javascript-promise/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-promise/src/api/FakeApi.js @@ -543,7 +543,7 @@ * @param {module:model/String} opts.enumQueryString Query parameter enum test (string) (default to '-efg') * @param {module:model/Number} opts.enumQueryInteger Query parameter enum test (double) * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double) - * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) (default to '$') + * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) * @param {module:model/String} opts.enumFormString Form parameter enum test (string) (default to '-efg') * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response */ @@ -594,7 +594,7 @@ * @param {module:model/String} opts.enumQueryString Query parameter enum test (string) (default to '-efg') * @param {module:model/Number} opts.enumQueryInteger Query parameter enum test (double) * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double) - * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) (default to '$') + * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) * @param {module:model/String} opts.enumFormString Form parameter enum test (string) (default to '-efg') * @return {Promise} a {@link https://www.promisejs.org/|Promise} */ diff --git a/samples/client/petstore/javascript/docs/FakeApi.md b/samples/client/petstore/javascript/docs/FakeApi.md index b613566621dc..003bdf8aa4d3 100644 --- a/samples/client/petstore/javascript/docs/FakeApi.md +++ b/samples/client/petstore/javascript/docs/FakeApi.md @@ -531,7 +531,7 @@ Name | Type | Description | Notes **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to '-efg'] **enumQueryInteger** | **Number**| Query parameter enum test (double) | [optional] **enumQueryDouble** | **Number**| Query parameter enum test (double) | [optional] - **enumFormStringArray** | [**[String]**](String.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enumFormStringArray** | [**[String]**](String.md)| Form parameter enum test (string array) | [optional] **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/client/petstore/javascript/src/api/FakeApi.js b/samples/client/petstore/javascript/src/api/FakeApi.js index 9512f4d082c2..931d4c2908d2 100644 --- a/samples/client/petstore/javascript/src/api/FakeApi.js +++ b/samples/client/petstore/javascript/src/api/FakeApi.js @@ -489,7 +489,7 @@ * @param {module:model/String} opts.enumQueryString Query parameter enum test (string) (default to '-efg') * @param {module:model/Number} opts.enumQueryInteger Query parameter enum test (double) * @param {module:model/Number} opts.enumQueryDouble Query parameter enum test (double) - * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) (default to '$') + * @param {Array.} opts.enumFormStringArray Form parameter enum test (string array) * @param {module:model/String} opts.enumFormString Form parameter enum test (string) (default to '-efg') * @param {module:api/FakeApi~testEnumParametersCallback} callback The callback function, accepting three arguments: error, data, response */ diff --git a/samples/client/petstore/perl/docs/FakeApi.md b/samples/client/petstore/perl/docs/FakeApi.md index 23c958d2a00f..48c4bae958dc 100644 --- a/samples/client/petstore/perl/docs/FakeApi.md +++ b/samples/client/petstore/perl/docs/FakeApi.md @@ -507,7 +507,7 @@ Name | Type | Description | Notes **enum_query_string** | **string**| Query parameter enum test (string) | [optional] [default to '-efg'] **enum_query_integer** | **int**| Query parameter enum test (double) | [optional] **enum_query_double** | **double**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | [**ARRAY[string]**](string.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enum_form_string_array** | [**ARRAY[string]**](string.md)| Form parameter enum test (string array) | [optional] **enum_form_string** | **string**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/client/petstore/perl/lib/WWW/OpenAPIClient/FakeApi.pm b/samples/client/petstore/perl/lib/WWW/OpenAPIClient/FakeApi.pm index 89e0e9b93ca1..50c3679843e2 100644 --- a/samples/client/petstore/perl/lib/WWW/OpenAPIClient/FakeApi.pm +++ b/samples/client/petstore/perl/lib/WWW/OpenAPIClient/FakeApi.pm @@ -783,7 +783,7 @@ sub test_endpoint_parameters { # @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg') # @param int $enum_query_integer Query parameter enum test (double) (optional) # @param double $enum_query_double Query parameter enum test (double) (optional) -# @param ARRAY[string] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$') +# @param ARRAY[string] $enum_form_string_array Form parameter enum test (string array) (optional) # @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg') { my $params = { diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md index c3ae680eff5d..4bf392226311 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md +++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md @@ -602,7 +602,7 @@ Name | Type | Description | Notes **enum_query_string** | **string**| Query parameter enum test (string) | [optional] [default to '-efg'] **enum_query_integer** | **int**| Query parameter enum test (double) | [optional] **enum_query_double** | **double**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | [**string[]**](../Model/string.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enum_form_string_array** | [**string[]**](../Model/string.md)| Form parameter enum test (string array) | [optional] **enum_form_string** | **string**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index 9daa406e93fe..7b1e04a579b3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -2492,14 +2492,14 @@ protected function testEndpointParametersRequest($number, $double, $pattern_with * @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg') * @param int $enum_query_integer Query parameter enum test (double) (optional) * @param double $enum_query_double Query parameter enum test (double) (optional) - * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$') + * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional) * @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg') * * @throws \OpenAPI\Client\ApiException on non-2xx response * @throws \InvalidArgumentException * @return void */ - public function testEnumParameters($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg') + public function testEnumParameters($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = null, $enum_form_string = '-efg') { $this->testEnumParametersWithHttpInfo($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string); } @@ -2515,14 +2515,14 @@ public function testEnumParameters($enum_header_string_array = null, $enum_heade * @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg') * @param int $enum_query_integer Query parameter enum test (double) (optional) * @param double $enum_query_double Query parameter enum test (double) (optional) - * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$') + * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional) * @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg') * * @throws \OpenAPI\Client\ApiException on non-2xx response * @throws \InvalidArgumentException * @return array of null, HTTP status code, HTTP response headers (array of strings) */ - public function testEnumParametersWithHttpInfo($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg') + public function testEnumParametersWithHttpInfo($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = null, $enum_form_string = '-efg') { $request = $this->testEnumParametersRequest($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string); @@ -2574,13 +2574,13 @@ public function testEnumParametersWithHttpInfo($enum_header_string_array = null, * @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg') * @param int $enum_query_integer Query parameter enum test (double) (optional) * @param double $enum_query_double Query parameter enum test (double) (optional) - * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$') + * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional) * @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg') * * @throws \InvalidArgumentException * @return \GuzzleHttp\Promise\PromiseInterface */ - public function testEnumParametersAsync($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg') + public function testEnumParametersAsync($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = null, $enum_form_string = '-efg') { return $this->testEnumParametersAsyncWithHttpInfo($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string) ->then( @@ -2601,13 +2601,13 @@ function ($response) { * @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg') * @param int $enum_query_integer Query parameter enum test (double) (optional) * @param double $enum_query_double Query parameter enum test (double) (optional) - * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$') + * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional) * @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg') * * @throws \InvalidArgumentException * @return \GuzzleHttp\Promise\PromiseInterface */ - public function testEnumParametersAsyncWithHttpInfo($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg') + public function testEnumParametersAsyncWithHttpInfo($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = null, $enum_form_string = '-efg') { $returnType = ''; $request = $this->testEnumParametersRequest($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string); @@ -2644,13 +2644,13 @@ function ($exception) { * @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg') * @param int $enum_query_integer Query parameter enum test (double) (optional) * @param double $enum_query_double Query parameter enum test (double) (optional) - * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$') + * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional) * @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg') * * @throws \InvalidArgumentException * @return \GuzzleHttp\Psr7\Request */ - protected function testEnumParametersRequest($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg') + protected function testEnumParametersRequest($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = null, $enum_form_string = '-efg') { $resourcePath = '/fake'; diff --git a/samples/client/petstore/python-asyncio/docs/FakeApi.md b/samples/client/petstore/python-asyncio/docs/FakeApi.md index 9ea1aa2a6b18..604b37a93dc5 100644 --- a/samples/client/petstore/python-asyncio/docs/FakeApi.md +++ b/samples/client/petstore/python-asyncio/docs/FakeApi.md @@ -574,7 +574,7 @@ enum_query_string_array = ['enum_query_string_array_example'] # list[str] | Quer enum_query_string = '-efg' # str | Query parameter enum test (string) (optional) (default to '-efg') enum_query_integer = 56 # int | Query parameter enum test (double) (optional) enum_query_double = 3.4 # float | Query parameter enum test (double) (optional) -enum_form_string_array = '$' # list[str] | Form parameter enum test (string array) (optional) (default to '$') +enum_form_string_array = '$' # list[str] | Form parameter enum test (string array) (optional) enum_form_string = '-efg' # str | Form parameter enum test (string) (optional) (default to '-efg') try: @@ -594,7 +594,7 @@ Name | Type | Description | Notes **enum_query_string** | **str**| Query parameter enum test (string) | [optional] [default to '-efg'] **enum_query_integer** | **int**| Query parameter enum test (double) | [optional] **enum_query_double** | **float**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | [**list[str]**](str.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enum_form_string_array** | [**list[str]**](str.md)| Form parameter enum test (string array) | [optional] **enum_form_string** | **str**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/client/petstore/python-experimental/docs/FakeApi.md b/samples/client/petstore/python-experimental/docs/FakeApi.md index bbe8aaccecdf..83be87cae1d4 100644 --- a/samples/client/petstore/python-experimental/docs/FakeApi.md +++ b/samples/client/petstore/python-experimental/docs/FakeApi.md @@ -699,7 +699,7 @@ enum_query_string_array = ['enum_query_string_array_example'] # [str] | Query pa enum_query_string = '-efg' # str | Query parameter enum test (string) (optional) if omitted the server will use the default value of '-efg' enum_query_integer = 56 # int | Query parameter enum test (double) (optional) enum_query_double = 3.4 # float | Query parameter enum test (double) (optional) -enum_form_string_array = '$' # [str] | Form parameter enum test (string array) (optional) if omitted the server will use the default value of '$' +enum_form_string_array = '$' # [str] | Form parameter enum test (string array) (optional) enum_form_string = '-efg' # str | Form parameter enum test (string) (optional) if omitted the server will use the default value of '-efg' # example passing only required values which don't have defaults set @@ -721,7 +721,7 @@ Name | Type | Description | Notes **enum_query_string** | **str**| Query parameter enum test (string) | [optional] if omitted the server will use the default value of '-efg' **enum_query_integer** | **int**| Query parameter enum test (double) | [optional] **enum_query_double** | **float**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | **[str]**| Form parameter enum test (string array) | [optional] if omitted the server will use the default value of '$' + **enum_form_string_array** | **[str]**| Form parameter enum test (string array) | [optional] **enum_form_string** | **str**| Form parameter enum test (string) | [optional] if omitted the server will use the default value of '-efg' ### Return type diff --git a/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py b/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py index 8c50f5e15d50..f540611412e5 100644 --- a/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py +++ b/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py @@ -1532,7 +1532,7 @@ def __test_enum_parameters( enum_query_string (str): Query parameter enum test (string). [optional] if omitted the server will use the default value of '-efg' enum_query_integer (int): Query parameter enum test (double). [optional] enum_query_double (float): Query parameter enum test (double). [optional] - enum_form_string_array ([str]): Form parameter enum test (string array). [optional] if omitted the server will use the default value of '$' + enum_form_string_array ([str]): Form parameter enum test (string array). [optional] enum_form_string (str): Form parameter enum test (string). [optional] if omitted the server will use the default value of '-efg' _return_http_data_only (bool): response data without head status code and headers. Default is True. diff --git a/samples/client/petstore/python-tornado/docs/FakeApi.md b/samples/client/petstore/python-tornado/docs/FakeApi.md index 9ea1aa2a6b18..604b37a93dc5 100644 --- a/samples/client/petstore/python-tornado/docs/FakeApi.md +++ b/samples/client/petstore/python-tornado/docs/FakeApi.md @@ -574,7 +574,7 @@ enum_query_string_array = ['enum_query_string_array_example'] # list[str] | Quer enum_query_string = '-efg' # str | Query parameter enum test (string) (optional) (default to '-efg') enum_query_integer = 56 # int | Query parameter enum test (double) (optional) enum_query_double = 3.4 # float | Query parameter enum test (double) (optional) -enum_form_string_array = '$' # list[str] | Form parameter enum test (string array) (optional) (default to '$') +enum_form_string_array = '$' # list[str] | Form parameter enum test (string array) (optional) enum_form_string = '-efg' # str | Form parameter enum test (string) (optional) (default to '-efg') try: @@ -594,7 +594,7 @@ Name | Type | Description | Notes **enum_query_string** | **str**| Query parameter enum test (string) | [optional] [default to '-efg'] **enum_query_integer** | **int**| Query parameter enum test (double) | [optional] **enum_query_double** | **float**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | [**list[str]**](str.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enum_form_string_array** | [**list[str]**](str.md)| Form parameter enum test (string array) | [optional] **enum_form_string** | **str**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/client/petstore/python/docs/FakeApi.md b/samples/client/petstore/python/docs/FakeApi.md index 9ea1aa2a6b18..604b37a93dc5 100644 --- a/samples/client/petstore/python/docs/FakeApi.md +++ b/samples/client/petstore/python/docs/FakeApi.md @@ -574,7 +574,7 @@ enum_query_string_array = ['enum_query_string_array_example'] # list[str] | Quer enum_query_string = '-efg' # str | Query parameter enum test (string) (optional) (default to '-efg') enum_query_integer = 56 # int | Query parameter enum test (double) (optional) enum_query_double = 3.4 # float | Query parameter enum test (double) (optional) -enum_form_string_array = '$' # list[str] | Form parameter enum test (string array) (optional) (default to '$') +enum_form_string_array = '$' # list[str] | Form parameter enum test (string array) (optional) enum_form_string = '-efg' # str | Form parameter enum test (string) (optional) (default to '-efg') try: @@ -594,7 +594,7 @@ Name | Type | Description | Notes **enum_query_string** | **str**| Query parameter enum test (string) | [optional] [default to '-efg'] **enum_query_integer** | **int**| Query parameter enum test (double) | [optional] **enum_query_double** | **float**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | [**list[str]**](str.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enum_form_string_array** | [**list[str]**](str.md)| Form parameter enum test (string array) | [optional] **enum_form_string** | **str**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/client/petstore/ruby-faraday/docs/FakeApi.md b/samples/client/petstore/ruby-faraday/docs/FakeApi.md index 43b7961e5be4..2e04ab6f7052 100644 --- a/samples/client/petstore/ruby-faraday/docs/FakeApi.md +++ b/samples/client/petstore/ruby-faraday/docs/FakeApi.md @@ -521,7 +521,7 @@ Name | Type | Description | Notes **enum_query_string** | **String**| Query parameter enum test (string) | [optional] [default to '-efg'] **enum_query_integer** | **Integer**| Query parameter enum test (double) | [optional] **enum_query_double** | **Float**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | [**Array<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enum_form_string_array** | [**Array<String>**](String.md)| Form parameter enum test (string array) | [optional] **enum_form_string** | **String**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb index ef91003dc4e8..8856ee37ea3c 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb @@ -671,7 +671,7 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli # @option opts [String] :enum_query_string Query parameter enum test (string) (default to '-efg') # @option opts [Integer] :enum_query_integer Query parameter enum test (double) # @option opts [Float] :enum_query_double Query parameter enum test (double) - # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) (default to '$') + # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg') # @return [nil] def test_enum_parameters(opts = {}) diff --git a/samples/client/petstore/ruby/docs/FakeApi.md b/samples/client/petstore/ruby/docs/FakeApi.md index 43b7961e5be4..2e04ab6f7052 100644 --- a/samples/client/petstore/ruby/docs/FakeApi.md +++ b/samples/client/petstore/ruby/docs/FakeApi.md @@ -521,7 +521,7 @@ Name | Type | Description | Notes **enum_query_string** | **String**| Query parameter enum test (string) | [optional] [default to '-efg'] **enum_query_integer** | **Integer**| Query parameter enum test (double) | [optional] **enum_query_double** | **Float**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | [**Array<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enum_form_string_array** | [**Array<String>**](String.md)| Form parameter enum test (string array) | [optional] **enum_form_string** | **String**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb index ef91003dc4e8..8856ee37ea3c 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -671,7 +671,7 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli # @option opts [String] :enum_query_string Query parameter enum test (string) (default to '-efg') # @option opts [Integer] :enum_query_integer Query parameter enum test (double) # @option opts [Float] :enum_query_double Query parameter enum test (double) - # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) (default to '$') + # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg') # @return [nil] def test_enum_parameters(opts = {}) diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FakeApi.md b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FakeApi.md index ca236912338a..38138ad693d5 100644 --- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FakeApi.md @@ -403,7 +403,7 @@ Name | Type | Description | Notes **enumQueryString** | **string** | Query parameter enum test (string) | [default to -efg] **enumQueryInteger** | **int32** | Query parameter enum test (double) | **enumQueryDouble** | **float64** | Query parameter enum test (double) | - **enumFormStringArray** | [**[]string**](string.md) | Form parameter enum test (string array) | [default to $] + **enumFormStringArray** | [**[]string**](string.md) | Form parameter enum test (string array) | **enumFormString** | **string** | Form parameter enum test (string) | [default to -efg] ### Return type diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md index 3634a8771e29..722465f7ee3d 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md @@ -411,7 +411,7 @@ Name | Type | Description | Notes **enumQueryString** | **optional.String**| Query parameter enum test (string) | [default to -efg] **enumQueryInteger** | **optional.Int32**| Query parameter enum test (double) | **enumQueryDouble** | **optional.Float64**| Query parameter enum test (double) | - **enumFormStringArray** | [**optional.Interface of []string**](string.md)| Form parameter enum test (string array) | [default to $] + **enumFormStringArray** | [**optional.Interface of []string**](string.md)| Form parameter enum test (string array) | **enumFormString** | **optional.String**| Form parameter enum test (string) | [default to -efg] ### Return type diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md index c3b5b2f1e279..3f9e97064ec4 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md @@ -597,7 +597,7 @@ Name | Type | Description | Notes **enum_query_string** | **string**| Query parameter enum test (string) | [optional] [default to '-efg'] **enum_query_integer** | **int**| Query parameter enum test (double) | [optional] **enum_query_double** | **double**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | [**string[]**](../Model/string.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enum_form_string_array** | [**string[]**](../Model/string.md)| Form parameter enum test (string array) | [optional] **enum_form_string** | **string**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index 2a42afbae7f4..125bc273fc7c 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -2526,14 +2526,14 @@ protected function testEndpointParametersRequest($number, $double, $pattern_with * @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg') * @param int $enum_query_integer Query parameter enum test (double) (optional) * @param double $enum_query_double Query parameter enum test (double) (optional) - * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$') + * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional) * @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg') * * @throws \OpenAPI\Client\ApiException on non-2xx response * @throws \InvalidArgumentException * @return void */ - public function testEnumParameters($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg') + public function testEnumParameters($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = null, $enum_form_string = '-efg') { $this->testEnumParametersWithHttpInfo($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string); } @@ -2549,14 +2549,14 @@ public function testEnumParameters($enum_header_string_array = null, $enum_heade * @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg') * @param int $enum_query_integer Query parameter enum test (double) (optional) * @param double $enum_query_double Query parameter enum test (double) (optional) - * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$') + * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional) * @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg') * * @throws \OpenAPI\Client\ApiException on non-2xx response * @throws \InvalidArgumentException * @return array of null, HTTP status code, HTTP response headers (array of strings) */ - public function testEnumParametersWithHttpInfo($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg') + public function testEnumParametersWithHttpInfo($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = null, $enum_form_string = '-efg') { $request = $this->testEnumParametersRequest($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string); @@ -2608,13 +2608,13 @@ public function testEnumParametersWithHttpInfo($enum_header_string_array = null, * @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg') * @param int $enum_query_integer Query parameter enum test (double) (optional) * @param double $enum_query_double Query parameter enum test (double) (optional) - * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$') + * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional) * @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg') * * @throws \InvalidArgumentException * @return \GuzzleHttp\Promise\PromiseInterface */ - public function testEnumParametersAsync($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg') + public function testEnumParametersAsync($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = null, $enum_form_string = '-efg') { return $this->testEnumParametersAsyncWithHttpInfo($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string) ->then( @@ -2635,13 +2635,13 @@ function ($response) { * @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg') * @param int $enum_query_integer Query parameter enum test (double) (optional) * @param double $enum_query_double Query parameter enum test (double) (optional) - * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$') + * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional) * @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg') * * @throws \InvalidArgumentException * @return \GuzzleHttp\Promise\PromiseInterface */ - public function testEnumParametersAsyncWithHttpInfo($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg') + public function testEnumParametersAsyncWithHttpInfo($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = null, $enum_form_string = '-efg') { $returnType = ''; $request = $this->testEnumParametersRequest($enum_header_string_array, $enum_header_string, $enum_query_string_array, $enum_query_string, $enum_query_integer, $enum_query_double, $enum_form_string_array, $enum_form_string); @@ -2678,13 +2678,13 @@ function ($exception) { * @param string $enum_query_string Query parameter enum test (string) (optional, default to '-efg') * @param int $enum_query_integer Query parameter enum test (double) (optional) * @param double $enum_query_double Query parameter enum test (double) (optional) - * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional, default to '$') + * @param string[] $enum_form_string_array Form parameter enum test (string array) (optional) * @param string $enum_form_string Form parameter enum test (string) (optional, default to '-efg') * * @throws \InvalidArgumentException * @return \GuzzleHttp\Psr7\Request */ - protected function testEnumParametersRequest($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = '$', $enum_form_string = '-efg') + protected function testEnumParametersRequest($enum_header_string_array = null, $enum_header_string = '-efg', $enum_query_string_array = null, $enum_query_string = '-efg', $enum_query_integer = null, $enum_query_double = null, $enum_form_string_array = null, $enum_form_string = '-efg') { $resourcePath = '/fake'; diff --git a/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md b/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md index 3fd53419eb7d..de9943bf84af 100644 --- a/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md @@ -580,7 +580,7 @@ enum_query_string_array = ['enum_query_string_array_example'] # [str] | Query pa enum_query_string = '-efg' # str | Query parameter enum test (string) (optional) if omitted the server will use the default value of '-efg' enum_query_integer = 56 # int | Query parameter enum test (double) (optional) enum_query_double = 3.4 # float | Query parameter enum test (double) (optional) -enum_form_string_array = '$' # [str] | Form parameter enum test (string array) (optional) if omitted the server will use the default value of '$' +enum_form_string_array = '$' # [str] | Form parameter enum test (string array) (optional) enum_form_string = '-efg' # str | Form parameter enum test (string) (optional) if omitted the server will use the default value of '-efg' # example passing only required values which don't have defaults set @@ -602,7 +602,7 @@ Name | Type | Description | Notes **enum_query_string** | **str**| Query parameter enum test (string) | [optional] if omitted the server will use the default value of '-efg' **enum_query_integer** | **int**| Query parameter enum test (double) | [optional] **enum_query_double** | **float**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | **[str]**| Form parameter enum test (string array) | [optional] if omitted the server will use the default value of '$' + **enum_form_string_array** | **[str]**| Form parameter enum test (string array) | [optional] **enum_form_string** | **str**| Form parameter enum test (string) | [optional] if omitted the server will use the default value of '-efg' ### Return type diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py index ad882a19c661..aa3fa8c90e7b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py @@ -1233,7 +1233,7 @@ def __test_enum_parameters( enum_query_string (str): Query parameter enum test (string). [optional] if omitted the server will use the default value of '-efg' enum_query_integer (int): Query parameter enum test (double). [optional] enum_query_double (float): Query parameter enum test (double). [optional] - enum_form_string_array ([str]): Form parameter enum test (string array). [optional] if omitted the server will use the default value of '$' + enum_form_string_array ([str]): Form parameter enum test (string array). [optional] enum_form_string (str): Form parameter enum test (string). [optional] if omitted the server will use the default value of '-efg' _return_http_data_only (bool): response data without head status code and headers. Default is True. diff --git a/samples/openapi3/client/petstore/python/docs/FakeApi.md b/samples/openapi3/client/petstore/python/docs/FakeApi.md index c17ac031d413..d406419860f6 100644 --- a/samples/openapi3/client/petstore/python/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python/docs/FakeApi.md @@ -569,7 +569,7 @@ enum_query_string_array = ['enum_query_string_array_example'] # list[str] | Quer enum_query_string = '-efg' # str | Query parameter enum test (string) (optional) (default to '-efg') enum_query_integer = 56 # int | Query parameter enum test (double) (optional) enum_query_double = 3.4 # float | Query parameter enum test (double) (optional) -enum_form_string_array = '$' # list[str] | Form parameter enum test (string array) (optional) (default to '$') +enum_form_string_array = '$' # list[str] | Form parameter enum test (string array) (optional) enum_form_string = '-efg' # str | Form parameter enum test (string) (optional) (default to '-efg') try: @@ -589,7 +589,7 @@ Name | Type | Description | Notes **enum_query_string** | **str**| Query parameter enum test (string) | [optional] [default to '-efg'] **enum_query_integer** | **int**| Query parameter enum test (double) | [optional] **enum_query_double** | **float**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | [**list[str]**](str.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enum_form_string_array** | [**list[str]**](str.md)| Form parameter enum test (string array) | [optional] **enum_form_string** | **str**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/openapi3/client/petstore/ruby-faraday/docs/FakeApi.md b/samples/openapi3/client/petstore/ruby-faraday/docs/FakeApi.md index e29e28ea1a3e..14cb3c6416a3 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/ruby-faraday/docs/FakeApi.md @@ -516,7 +516,7 @@ Name | Type | Description | Notes **enum_query_string** | **String**| Query parameter enum test (string) | [optional] [default to '-efg'] **enum_query_integer** | **Integer**| Query parameter enum test (double) | [optional] **enum_query_double** | **Float**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | [**Array<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enum_form_string_array** | [**Array<String>**](String.md)| Form parameter enum test (string array) | [optional] **enum_form_string** | **String**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb index c2b8c01eb3ba..af71dfebc859 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb @@ -671,7 +671,7 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli # @option opts [String] :enum_query_string Query parameter enum test (string) (default to '-efg') # @option opts [Integer] :enum_query_integer Query parameter enum test (double) # @option opts [Float] :enum_query_double Query parameter enum test (double) - # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) (default to '$') + # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg') # @return [nil] def test_enum_parameters(opts = {}) diff --git a/samples/openapi3/client/petstore/ruby/docs/FakeApi.md b/samples/openapi3/client/petstore/ruby/docs/FakeApi.md index e29e28ea1a3e..14cb3c6416a3 100644 --- a/samples/openapi3/client/petstore/ruby/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/ruby/docs/FakeApi.md @@ -516,7 +516,7 @@ Name | Type | Description | Notes **enum_query_string** | **String**| Query parameter enum test (string) | [optional] [default to '-efg'] **enum_query_integer** | **Integer**| Query parameter enum test (double) | [optional] **enum_query_double** | **Float**| Query parameter enum test (double) | [optional] - **enum_form_string_array** | [**Array<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to '$'] + **enum_form_string_array** | [**Array<String>**](String.md)| Form parameter enum test (string array) | [optional] **enum_form_string** | **String**| Form parameter enum test (string) | [optional] [default to '-efg'] ### Return type diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb index c2b8c01eb3ba..af71dfebc859 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -671,7 +671,7 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli # @option opts [String] :enum_query_string Query parameter enum test (string) (default to '-efg') # @option opts [Integer] :enum_query_integer Query parameter enum test (double) # @option opts [Float] :enum_query_double Query parameter enum test (double) - # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) (default to '$') + # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg') # @return [nil] def test_enum_parameters(opts = {}) diff --git a/samples/schema/petstore/mysql/mysql_schema.sql b/samples/schema/petstore/mysql/mysql_schema.sql index 21145731600d..e4689c3ac1df 100644 --- a/samples/schema/petstore/mysql/mysql_schema.sql +++ b/samples/schema/petstore/mysql/mysql_schema.sql @@ -385,7 +385,7 @@ CREATE TABLE IF NOT EXISTS `Pet` ( `id` BIGINT DEFAULT NULL, `category` TEXT DEFAULT NULL, `name` TEXT NOT NULL, - `photoUrls` JSON NOT NULL, + `photoUrls` TEXT NOT NULL, `tags` JSON DEFAULT NULL, `status` ENUM('available', 'pending', 'sold') DEFAULT NULL COMMENT 'pet status in the store' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java index 5e685103d4d2..78c3e96835b5 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java @@ -182,7 +182,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test ,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble -,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List enumFormStringArray +,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="new ArrayList()") @DefaultValue("new ArrayList()") @FormParam("enum_form_string_array") List enumFormStringArray ,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString ) throws NotFoundException { diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java index 2eda2bdbdfbb..151dcac98ff7 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApi.java @@ -10,6 +10,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -94,17 +95,17 @@ public Response findPetsByStatus(@ApiParam(value = "Status values that need to b @Path("/findByTags") @Produces({ "application/xml", "application/json" }) - @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { - @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), - @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class, responseContainer = "List") }) - public Response findPetsByTags(@ApiParam(value = "Tags to filter by",required=true, defaultValue="new ArrayList()") @DefaultValue("new ArrayList()") @QueryParam("tags") List tags + @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Pet.class, responseContainer = "Set") }) + public Response findPetsByTags(@ApiParam(value = "Tags to filter by",required=true, defaultValue="new LinkedHashSet()") @DefaultValue("new LinkedHashSet()") @QueryParam("tags") Set tags ) throws NotFoundException { return delegate.findPetsByTags(tags); diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java index c6635cfe24c9..9d78c3935c78 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/PetApiService.java @@ -9,6 +9,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -27,7 +28,7 @@ public abstract Response deletePet(Long petId ) throws NotFoundException; public abstract Response findPetsByStatus(List status ) throws NotFoundException; - public abstract Response findPetsByTags(List tags + public abstract Response findPetsByTags(Set tags ) throws NotFoundException; public abstract Response getPetById(Long petId ) throws NotFoundException; diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java index 4a45c8ddac2a..1b6018e36586 100644 --- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; @@ -26,7 +28,7 @@ public class Pet { private String name; @JsonProperty("photoUrls") - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); @JsonProperty("tags") private List tags = null; @@ -121,7 +123,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -136,11 +138,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * @return photoUrls **/ @ApiModelProperty(required = true, value = "") - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 272eec403ddb..82f6698c3766 100644 --- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -6,6 +6,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -40,7 +41,7 @@ public Response findPetsByStatus(List status return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response findPetsByTags(List tags + public Response findPetsByTags(Set tags ) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java index 253f6e33751c..3ae905dcd449 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -73,7 +74,7 @@ public Result findPetsByStatus() throws Exception { throw new IllegalArgumentException("'status' parameter is required"); } List statusList = OpenAPIUtils.parametersToList("csv", statusArray); - List status = new ArrayList(); + List status = new ArrayList<>(); for (String curParam : statusList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -97,7 +98,7 @@ public Result findPetsByTags() throws Exception { throw new IllegalArgumentException("'tags' parameter is required"); } List tagsList = OpenAPIUtils.parametersToList("csv", tagsArray); - List tags = new ArrayList(); + List tags = new ArrayList<>(); for (String curParam : tagsList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java index 8b6dde9c2d15..45c8a8ddb519 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiControllerImp.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java index 225d3009543f..20019cb4f1f1 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java index fe2cf4f6808e..aa29cbafda41 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/StoreApiControllerImp.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java index 5e103c7eeb6f..6b6c7a2664c1 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java index d53c2a82c11d..844b2c295752 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/UserApiControllerImp.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java index ef66614c27d9..da9485f9966b 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -80,7 +81,7 @@ public CompletionStage findPetsByStatus() throws Exception { throw new IllegalArgumentException("'status' parameter is required"); } List statusList = OpenAPIUtils.parametersToList("csv", statusArray); - List status = new ArrayList(); + List status = new ArrayList<>(); for (String curParam : statusList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -108,7 +109,7 @@ public CompletionStage findPetsByTags() throws Exception { throw new IllegalArgumentException("'tags' parameter is required"); } List tagsList = OpenAPIUtils.parametersToList("csv", tagsArray); - List tags = new ArrayList(); + List tags = new ArrayList<>(); for (String curParam : tagsList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java index 550cb3714350..ef1056ebacca 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiControllerImp.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java index 257e0f0e3324..eae5b3e937a7 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java index 2d7cea1cf01a..e3be6aab57bc 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/StoreApiControllerImp.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java index d003410d26f8..7d62582460fb 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java index fa6028517c0b..a32a9ffd7d02 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/UserApiControllerImp.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java index c00e111435b5..758fe2ddaf43 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -69,7 +70,7 @@ public Result findPetsByStatus() throws Exception { throw new IllegalArgumentException("'status' parameter is required"); } List statusList = OpenAPIUtils.parametersToList("csv", statusArray); - List status = new ArrayList(); + List status = new ArrayList<>(); for (String curParam : statusList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -86,7 +87,7 @@ public Result findPetsByTags() throws Exception { throw new IllegalArgumentException("'tags' parameter is required"); } List tagsList = OpenAPIUtils.parametersToList("csv", tagsArray); - List tags = new ArrayList(); + List tags = new ArrayList<>(); for (String curParam : tagsList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java index c6b50d599729..007892d9b480 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/StoreApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java index 9886a7b377a0..6ef0d5970fa4 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/UserApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java index cf7ff2912d9e..040f1bbb30b5 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/Pet.java @@ -3,7 +3,9 @@ import apimodels.Category; import apimodels.Tag; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import com.fasterxml.jackson.annotation.*; import java.util.Set; import javax.validation.*; @@ -25,7 +27,7 @@ public class Pet { private String name; @JsonProperty("photoUrls") - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); @JsonProperty("tags") private List tags = null; @@ -119,7 +121,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -134,11 +136,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * @return photoUrls **/ @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java index aa22bcb3ff80..40a495cf697c 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiController.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java index cb14f49165c8..c6219faf1f80 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/AnotherFakeApiControllerImp.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; 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 508aacee714e..59733b8c58b9 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 @@ -17,6 +17,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -295,7 +296,7 @@ public Result testEndpointParameters() throws Exception { public Result testEnumParameters() throws Exception { String[] enumQueryStringArrayArray = request().queryString().get("enum_query_string_array"); List enumQueryStringArrayList = OpenAPIUtils.parametersToList("csv", enumQueryStringArrayArray); - List enumQueryStringArray = new ArrayList(); + List enumQueryStringArray = new ArrayList<>(); for (String curParam : enumQueryStringArrayList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -325,7 +326,7 @@ public Result testEnumParameters() throws Exception { } String[] enumFormStringArrayArray = request().body().asMultipartFormData().asFormUrlEncoded().get("enum_form_string_array"); List enumFormStringArrayList = OpenAPIUtils.parametersToList("csv", enumFormStringArrayArray); - List enumFormStringArray = new ArrayList(); + List enumFormStringArray = new ArrayList<>(); for (String curParam : enumFormStringArrayList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -341,7 +342,7 @@ public Result testEnumParameters() throws Exception { } String[] enumHeaderStringArrayArray = request().headers().get("enum_header_string_array"); List enumHeaderStringArrayList = OpenAPIUtils.parametersToList("csv", enumHeaderStringArrayArray); - List enumHeaderStringArray = new ArrayList(); + List enumHeaderStringArray = new ArrayList<>(); for (String curParam : enumHeaderStringArrayList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -452,7 +453,7 @@ public Result testQueryParameterCollectionFormat() throws Exception { throw new IllegalArgumentException("'pipe' parameter is required"); } List pipeList = OpenAPIUtils.parametersToList("csv", pipeArray); - List pipe = new ArrayList(); + List pipe = new ArrayList<>(); for (String curParam : pipeList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -464,7 +465,7 @@ public Result testQueryParameterCollectionFormat() throws Exception { throw new IllegalArgumentException("'ioutil' parameter is required"); } List ioutilList = OpenAPIUtils.parametersToList("csv", ioutilArray); - List ioutil = new ArrayList(); + List ioutil = new ArrayList<>(); for (String curParam : ioutilList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -476,7 +477,7 @@ public Result testQueryParameterCollectionFormat() throws Exception { throw new IllegalArgumentException("'http' parameter is required"); } List httpList = OpenAPIUtils.parametersToList("space", httpArray); - List http = new ArrayList(); + List http = new ArrayList<>(); for (String curParam : httpList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -488,7 +489,7 @@ public Result testQueryParameterCollectionFormat() throws Exception { throw new IllegalArgumentException("'url' parameter is required"); } List urlList = OpenAPIUtils.parametersToList("csv", urlArray); - List url = new ArrayList(); + List url = new ArrayList<>(); for (String curParam : urlList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -500,7 +501,7 @@ public Result testQueryParameterCollectionFormat() throws Exception { throw new IllegalArgumentException("'context' parameter is required"); } List contextList = OpenAPIUtils.parametersToList("multi", contextArray); - List context = new ArrayList(); + List context = new ArrayList<>(); for (String curParam : contextList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation 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 d50832ef3b1d..eb70b4c105a0 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 @@ -15,6 +15,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java index 760b0a394169..f562306b210b 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiController.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java index 7d18dc42afba..0476f1f6fd8c 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeClassnameTags123ApiControllerImp.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java index e4427543e641..8c6b6817ea2a 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java @@ -3,6 +3,7 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.util.Set; import play.mvc.Controller; import play.mvc.Result; @@ -10,6 +11,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -73,7 +75,7 @@ public Result findPetsByStatus() throws Exception { throw new IllegalArgumentException("'status' parameter is required"); } List statusList = OpenAPIUtils.parametersToList("csv", statusArray); - List status = new ArrayList(); + List status = new ArrayList<>(); for (String curParam : statusList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -97,14 +99,14 @@ public Result findPetsByTags() throws Exception { throw new IllegalArgumentException("'tags' parameter is required"); } List tagsList = OpenAPIUtils.parametersToList("csv", tagsArray); - List tags = new ArrayList(); + Set tags = new LinkedHashSet<>(); for (String curParam : tagsList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation tags.add(curParam); } } - List obj = imp.findPetsByTags(tags); + Set obj = imp.findPetsByTags(tags); if (configuration.getBoolean("useOutputBeanValidation")) { for (Pet curItem : obj) { OpenAPIUtils.validate(curItem); 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 3d028b318637..7f50baee48a9 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 @@ -3,11 +3,13 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.util.Set; import play.mvc.Http; import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; @@ -29,9 +31,9 @@ public List findPetsByStatus( @NotNull List status) throws Exceptio } @Override - public List findPetsByTags( @NotNull List tags) throws Exception { + public Set findPetsByTags( @NotNull Set tags) throws Exception { //Do your magic!!! - return new ArrayList(); + return new LinkedHashSet(); } @Override diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java index a6c88443756b..77a658334b2d 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiControllerImpInterface.java @@ -3,6 +3,7 @@ import java.io.InputStream; import apimodels.ModelApiResponse; import apimodels.Pet; +import java.util.Set; import play.mvc.Http; import java.util.List; @@ -19,7 +20,7 @@ public interface PetApiControllerImpInterface { List findPetsByStatus( @NotNull List status) throws Exception; - List findPetsByTags( @NotNull List tags) throws Exception; + Set findPetsByTags( @NotNull Set tags) throws Exception; Pet getPetById(Long petId) throws Exception; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java index 831f15dfe3c7..deb55e4b2f0e 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/StoreApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 7c57d3d096c4..1e3c4774e970 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java index aa3bbd80ba15..45d4dcca32fe 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/UserApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 0ea7a808b9a4..cf9ab91ff6e2 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json b/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json index edbfa20608bc..ebe044bed921 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json +++ b/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json @@ -177,7 +177,8 @@ "items" : { "type" : "string" }, - "type" : "array" + "type" : "array", + "uniqueItems" : true }, "style" : "form" } ], @@ -189,7 +190,8 @@ "items" : { "$ref" : "#/components/schemas/Pet" }, - "type" : "array" + "type" : "array", + "uniqueItems" : true } }, "application/json" : { @@ -197,7 +199,8 @@ "items" : { "$ref" : "#/components/schemas/Pet" }, - "type" : "array" + "type" : "array", + "uniqueItems" : true } } }, @@ -1797,6 +1800,7 @@ "type" : "string" }, "type" : "array", + "uniqueItems" : true, "xml" : { "name" : "photoUrl", "wrapped" : true diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java index 1fa710bf5bc1..90a6c1e21d0f 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -66,7 +67,7 @@ public Result findPetsByStatus() throws Exception { throw new IllegalArgumentException("'status' parameter is required"); } List statusList = OpenAPIUtils.parametersToList("csv", statusArray); - List status = new ArrayList(); + List status = new ArrayList<>(); for (String curParam : statusList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -85,7 +86,7 @@ public Result findPetsByTags() throws Exception { throw new IllegalArgumentException("'tags' parameter is required"); } List tagsList = OpenAPIUtils.parametersToList("csv", tagsArray); - List tags = new ArrayList(); + List tags = new ArrayList<>(); for (String curParam : tagsList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation 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 ed9b151a2388..76098b8df125 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 @@ -8,6 +8,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; public class PetApiControllerImp implements PetApiControllerImpInterface { diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java index 029baa761df4..0b6e428ab556 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/StoreApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 b0d2d8f88a14..927150ecdc4c 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; public class StoreApiControllerImp implements StoreApiControllerImpInterface { diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java index 9b78e828229c..e5a73524b613 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/UserApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 8bf12fe7c82f..95c462d23fc3 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; public class UserApiControllerImp implements UserApiControllerImpInterface { diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java index f94630bf20c4..2da81d59b238 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -74,7 +75,7 @@ public Result findPetsByStatus() { throw new IllegalArgumentException("'status' parameter is required"); } List statusList = OpenAPIUtils.parametersToList("csv", statusArray); - List status = new ArrayList(); + List status = new ArrayList<>(); for (String curParam : statusList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -98,7 +99,7 @@ public Result findPetsByTags() { throw new IllegalArgumentException("'tags' parameter is required"); } List tagsList = OpenAPIUtils.parametersToList("csv", tagsArray); - List tags = new ArrayList(); + List tags = new ArrayList<>(); for (String curParam : tagsList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation 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 e8d4a8b504a1..0e10dc5b0129 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 @@ -8,6 +8,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java index 0836d1945e21..a6b0f9d4012f 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/StoreApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 6406ee40e1fe..5bb27ec6c59b 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java index 07e8f8316181..a56e39b5d79d 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/UserApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 a6a588b6c8e2..f4381eb16ecb 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java index dc9fa0cbbdf1..78f2dc15baff 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -73,7 +74,7 @@ public Result findPetsByStatus() throws Exception { throw new IllegalArgumentException("'status' parameter is required"); } List statusList = OpenAPIUtils.parametersToList("csv", statusArray); - List status = new ArrayList(); + List status = new ArrayList<>(); for (String curParam : statusList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -97,7 +98,7 @@ public Result findPetsByTags() throws Exception { throw new IllegalArgumentException("'tags' parameter is required"); } List tagsList = OpenAPIUtils.parametersToList("csv", tagsArray); - List tags = new ArrayList(); + List tags = new ArrayList<>(); for (String curParam : tagsList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation 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 3af35ea53033..72d2e76c4378 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 @@ -8,6 +8,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java index db21a0523d9e..24548ab65d8b 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/StoreApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 119afe97fbff..2bc751fb4d60 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java index d4365213a672..162d47bf6344 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/UserApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 569811fe0954..03c8290dd60f 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java index 1344ffe7afb1..99c053d0a8f4 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -73,7 +74,7 @@ public Result findPetsByStatus() throws Exception { throw new IllegalArgumentException("'status' parameter is required"); } List statusList = OpenAPIUtils.parametersToList("csv", statusArray); - List status = new ArrayList(); + List status = new ArrayList<>(); for (String curParam : statusList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -97,7 +98,7 @@ public Result findPetsByTags() throws Exception { throw new IllegalArgumentException("'tags' parameter is required"); } List tagsList = OpenAPIUtils.parametersToList("csv", tagsArray); - List tags = new ArrayList(); + List tags = new ArrayList<>(); for (String curParam : tagsList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation 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 c025993f7c13..b228698b7021 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 @@ -8,6 +8,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java index 831f15dfe3c7..deb55e4b2f0e 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/StoreApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 7c57d3d096c4..1e3c4774e970 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java index aa3bbd80ba15..45d4dcca32fe 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/UserApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 0ea7a808b9a4..cf9ab91ff6e2 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java index 9059f7e2d912..4a3f756111b9 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -72,7 +73,7 @@ public Result findPetsByStatus() throws Exception { throw new IllegalArgumentException("'status' parameter is required"); } List statusList = OpenAPIUtils.parametersToList("csv", statusArray); - List status = new ArrayList(); + List status = new ArrayList<>(); for (String curParam : statusList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -96,7 +97,7 @@ public Result findPetsByTags() throws Exception { throw new IllegalArgumentException("'tags' parameter is required"); } List tagsList = OpenAPIUtils.parametersToList("csv", tagsArray); - List tags = new ArrayList(); + List tags = new ArrayList<>(); for (String curParam : tagsList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation 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 c025993f7c13..b228698b7021 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 @@ -8,6 +8,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java index da1876d0b998..84ce1f3ae3ed 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/StoreApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 7c57d3d096c4..1e3c4774e970 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java index 6bb020422605..65a000b663c9 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/UserApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 0ea7a808b9a4..cf9ab91ff6e2 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 @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java index 1344ffe7afb1..99c053d0a8f4 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; @@ -73,7 +74,7 @@ public Result findPetsByStatus() throws Exception { throw new IllegalArgumentException("'status' parameter is required"); } List statusList = OpenAPIUtils.parametersToList("csv", statusArray); - List status = new ArrayList(); + List status = new ArrayList<>(); for (String curParam : statusList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation @@ -97,7 +98,7 @@ public Result findPetsByTags() throws Exception { throw new IllegalArgumentException("'tags' parameter is required"); } List tagsList = OpenAPIUtils.parametersToList("csv", tagsArray); - List tags = new ArrayList(); + List tags = new ArrayList<>(); for (String curParam : tagsList) { if (!curParam.isEmpty()) { //noinspection UseBulkOperation 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 c025993f7c13..b228698b7021 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java index 831f15dfe3c7..deb55e4b2f0e 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 7c57d3d096c4..1e3c4774e970 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java index aa3bbd80ba15..45d4dcca32fe 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.ArrayList; +import java.util.LinkedHashSet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.JsonNode; import com.google.inject.Inject; 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 0ea7a808b9a4..cf9ab91ff6e2 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java +++ b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.io.FileInputStream; import javax.validation.constraints.*; diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java index 7c9b45495e0f..51d9b79c80d1 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java @@ -3,6 +3,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.io.InputStream; import java.io.OutputStream; @@ -82,9 +83,9 @@ public interface PetApi { @Produces({ "application/xml", "application/json" }) @ApiOperation(value = "Finds Pets by tags", tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) - public List findPetsByTags(@QueryParam("tags") @NotNull List tags); + public Set findPetsByTags(@QueryParam("tags") @NotNull Set tags); /** * Find pet by ID diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java index 3042dd056482..52b6814fc241 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java @@ -1,7 +1,9 @@ package org.openapitools.model; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import javax.validation.constraints.*; @@ -30,7 +32,7 @@ public class Pet { private String name; @ApiModelProperty(required = true, value = "") - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); @ApiModelProperty(value = "") @Valid @@ -134,15 +136,15 @@ public Pet name(String name) { **/ @JsonProperty("photoUrls") @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } diff --git a/samples/server/petstore/jaxrs-cxf/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index f58a97994e16..d6c02584e374 100644 --- a/samples/server/petstore/jaxrs-cxf/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -4,6 +4,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.io.InputStream; import java.io.OutputStream; @@ -63,7 +64,7 @@ public List findPetsByStatus(List status) { * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. * */ - public List findPetsByTags(List tags) { + public Set findPetsByTags(Set tags) { // TODO: Implement... return null; diff --git a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/PetApiTest.java b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/PetApiTest.java index 265416d6e4aa..583edd073b30 100644 --- a/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/PetApiTest.java +++ b/samples/server/petstore/jaxrs-cxf/src/test/java/org/openapitools/api/PetApiTest.java @@ -28,6 +28,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import org.junit.Test; import org.junit.Before; import static org.junit.Assert.*; @@ -134,8 +135,8 @@ public void findPetsByStatusTest() { */ @Test public void findPetsByTagsTest() { - List tags = null; - //List response = api.findPetsByTags(tags); + Set tags = null; + //Set response = api.findPetsByTags(tags); //assertNotNull(response); // TODO: test validations diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java index 1ad02e7601df..36d4591ddd3c 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java @@ -208,7 +208,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test ,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble -,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List enumFormStringArray +,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="new ArrayList<>()") @DefaultValue("new ArrayList<>()") @FormParam("enum_form_string_array") List enumFormStringArray ,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString ,@Context SecurityContext securityContext) throws NotFoundException { diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java index 782ed5b41571..34acf0291b34 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java @@ -10,6 +10,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.Map; import java.util.List; @@ -119,17 +120,17 @@ public Response findPetsByStatus(@ApiParam(value = "Status values that need to b @Path("/findByTags") @Produces({ "application/xml", "application/json" }) - @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { - @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) }) - public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid List tags + public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid Set tags ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.findPetsByTags(tags, securityContext); diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java index a51e840bba5c..23f190664163 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApiService.java @@ -8,6 +8,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -22,7 +23,7 @@ public abstract class PetApiService { public abstract Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException; public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException; public abstract Response findPetsByStatus( @NotNull List status,SecurityContext securityContext) throws NotFoundException; - public abstract Response findPetsByTags( @NotNull List tags,SecurityContext securityContext) throws NotFoundException; + public abstract Response findPetsByTags( @NotNull Set tags,SecurityContext securityContext) throws NotFoundException; public abstract Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException; public abstract Response updatePet(Pet body,SecurityContext securityContext) throws NotFoundException; public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException; diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java index 9c7856935f86..7b0c77c9ebcd 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java @@ -20,7 +20,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -55,7 +57,7 @@ public class Pet implements Serializable { public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; @JsonProperty(JSON_PROPERTY_PHOTO_URLS) - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) @@ -158,7 +160,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -175,11 +177,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 4fe468d6787c..168693768dd5 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -6,6 +6,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -35,7 +36,7 @@ public Response findPetsByStatus( @NotNull List status, SecurityContext return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response findPetsByTags( @NotNull List tags, SecurityContext securityContext) throws NotFoundException { + public Response findPetsByTags( @NotNull Set tags, SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java index fe96bc373074..3ed45dc477eb 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java @@ -206,7 +206,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test ,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble -,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List enumFormStringArray +,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="new ArrayList()") @DefaultValue("new ArrayList()") @FormParam("enum_form_string_array") List enumFormStringArray ,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString ,@Context SecurityContext securityContext) throws NotFoundException { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java index ee49bb3f7287..72899f7a4feb 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/PetApi.java @@ -3,6 +3,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import javax.ws.rs.*; import javax.ws.rs.core.Response; @@ -69,9 +70,9 @@ public interface PetApi { }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), - @ApiResponse(code = 400, message = "Invalid tag value", response = Void.class, responseContainer = "List") }) - List findPetsByTags(@QueryParam("tags") @NotNull @ApiParam("Tags to filter by") List tags); + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), + @ApiResponse(code = 400, message = "Invalid tag value", response = Void.class, responseContainer = "Set") }) + Set findPetsByTags(@QueryParam("tags") @NotNull @ApiParam("Tags to filter by") Set tags); @GET @Path("/{petId}") diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java index 6718025e6926..e95586a98ff9 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Pet.java @@ -3,7 +3,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import java.io.Serializable; @@ -23,7 +25,7 @@ public class Pet implements Serializable { private @Valid Long id; private @Valid Category category; private @Valid String name; - private @Valid List photoUrls = new ArrayList(); + private @Valid Set photoUrls = new LinkedHashSet(); private @Valid List tags = new ArrayList(); public enum StatusEnum { @@ -114,7 +116,7 @@ public void setName(String name) { /** **/ - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -123,10 +125,10 @@ public Pet photoUrls(List photoUrls) { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml index f6f5c60294f7..da95378bbc81 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml @@ -150,6 +150,7 @@ paths: items: type: string type: array + uniqueItems: true style: form responses: "200": @@ -159,11 +160,13 @@ paths: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true application/json: schema: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true description: successful operation "400": content: {} @@ -1458,6 +1461,7 @@ components: items: type: string type: array + uniqueItems: true xml: name: photoUrl wrapped: true diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java index 9d6b3584ef8c..a890a8764b97 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/PetApi.java @@ -3,6 +3,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import javax.ws.rs.*; import javax.ws.rs.core.Response; @@ -71,17 +72,17 @@ public Response findPetsByStatus(@QueryParam("status") @NotNull @ApiParam("Sta @GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) - @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) }) - public Response findPetsByTags(@QueryParam("tags") @NotNull @ApiParam("Tags to filter by") List tags) { + public Response findPetsByTags(@QueryParam("tags") @NotNull @ApiParam("Tags to filter by") Set tags) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java index 6718025e6926..e95586a98ff9 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/Pet.java @@ -3,7 +3,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import java.io.Serializable; @@ -23,7 +25,7 @@ public class Pet implements Serializable { private @Valid Long id; private @Valid Category category; private @Valid String name; - private @Valid List photoUrls = new ArrayList(); + private @Valid Set photoUrls = new LinkedHashSet(); private @Valid List tags = new ArrayList(); public enum StatusEnum { @@ -114,7 +116,7 @@ public void setName(String name) { /** **/ - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -123,10 +125,10 @@ public Pet photoUrls(List photoUrls) { @ApiModelProperty(required = true, value = "") @JsonProperty("photoUrls") @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml index f6f5c60294f7..da95378bbc81 100644 --- a/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml @@ -150,6 +150,7 @@ paths: items: type: string type: array + uniqueItems: true style: form responses: "200": @@ -159,11 +160,13 @@ paths: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true application/json: schema: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true description: successful operation "400": content: {} @@ -1458,6 +1461,7 @@ components: items: type: string type: array + uniqueItems: true xml: name: photoUrl wrapped: true diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java index 56aa03322408..ff10b45aa302 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApi.java @@ -191,7 +191,7 @@ public Response testEnumParameters( @ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString, @ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger, @ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List enumFormStringArray, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="new ArrayList()") @DefaultValue("new ArrayList()") @FormParam("enum_form_string_array") List enumFormStringArray, @ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString, @Context SecurityContext securityContext) throws NotFoundException { diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java index 64c45c3b9aa2..28144817d147 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -10,6 +10,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.Map; import java.util.List; @@ -97,17 +98,17 @@ public Response findPetsByStatus( @Path("/pet/findByTags") @Produces({ "application/xml", "application/json" }) - @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { - @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) }) public Response findPetsByTags( - @ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid List tags, + @ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid Set tags, @Context SecurityContext securityContext) throws NotFoundException { return delegate.findPetsByTags(tags,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java index e230cb93194a..26ad8543c823 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/PetApiService.java @@ -8,6 +8,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -28,7 +29,7 @@ public abstract Response deletePet(Long petId,String apiKey,SecurityContext secu throws NotFoundException; public abstract Response findPetsByStatus( @NotNull List status,SecurityContext securityContext) throws NotFoundException; - public abstract Response findPetsByTags( @NotNull List tags,SecurityContext securityContext) + public abstract Response findPetsByTags( @NotNull Set tags,SecurityContext securityContext) throws NotFoundException; public abstract Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java index 29963f3d63b4..3ba558b701b2 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/Pet.java @@ -20,7 +20,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -54,7 +56,7 @@ public class Pet { public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; @JsonProperty(JSON_PROPERTY_PHOTO_URLS) - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) @@ -157,7 +159,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -174,11 +176,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 0961ee570afa..609b3420af21 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -8,6 +8,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -41,7 +42,7 @@ public Response findPetsByStatus( @NotNull List status, SecurityContext return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response findPetsByTags( @NotNull List tags, SecurityContext securityContext) + public Response findPetsByTags( @NotNull Set tags, SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java index b55cea62bf07..5b4ddcd66e4e 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApi.java @@ -192,7 +192,7 @@ public Response testEnumParameters( @ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString, @ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger, @ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble, - @ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List enumFormStringArray, + @ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="new ArrayList()") @DefaultValue("new ArrayList()") @FormParam("enum_form_string_array") List enumFormStringArray, @ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString, @Context SecurityContext securityContext) throws NotFoundException { diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java index cde1c2442872..883566833475 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApi.java @@ -10,6 +10,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.Map; import java.util.List; @@ -97,17 +98,17 @@ public Response findPetsByStatus( @Path("/findByTags") @Produces({ "application/xml", "application/json" }) - @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { - @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) }) public Response findPetsByTags( - @ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid List tags, + @ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid Set tags, @Context SecurityContext securityContext) throws NotFoundException { return delegate.findPetsByTags(tags,securityContext); diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java index 93a3c1c79ddc..bddeca287df3 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/PetApiService.java @@ -8,6 +8,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -28,7 +29,7 @@ public abstract Response deletePet(Long petId,String apiKey,SecurityContext secu throws NotFoundException; public abstract Response findPetsByStatus( @NotNull List status,SecurityContext securityContext) throws NotFoundException; - public abstract Response findPetsByTags( @NotNull List tags,SecurityContext securityContext) + public abstract Response findPetsByTags( @NotNull Set tags,SecurityContext securityContext) throws NotFoundException; public abstract Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java index 29963f3d63b4..3ba558b701b2 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/Pet.java @@ -20,7 +20,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -54,7 +56,7 @@ public class Pet { public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; @JsonProperty(JSON_PROPERTY_PHOTO_URLS) - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) @@ -157,7 +159,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -174,11 +176,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index fa3ece8bce5b..f2dc84317542 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -8,6 +8,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -41,7 +42,7 @@ public Response findPetsByStatus( @NotNull List status, SecurityContext return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response findPetsByTags( @NotNull List tags, SecurityContext securityContext) + public Response findPetsByTags( @NotNull Set tags, SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java index a290f8b59966..986627272b64 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java @@ -206,7 +206,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test ,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble -,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List enumFormStringArray +,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="new ArrayList()") @DefaultValue("new ArrayList()") @FormParam("enum_form_string_array") List enumFormStringArray ,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString ,@Context SecurityContext securityContext) throws NotFoundException { diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java index d4947d0538a1..82f486dab969 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -10,6 +10,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.Map; import java.util.List; @@ -119,17 +120,17 @@ public Response findPetsByStatus(@ApiParam(value = "Status values that need to b @Path("/pet/findByTags") @Produces({ "application/xml", "application/json" }) - @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { - @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) }) - public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid List tags + public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid Set tags ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.findPetsByTags(tags, securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java index 54ad9f5c9a4f..76db01fa359f 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApiService.java @@ -8,6 +8,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -22,7 +23,7 @@ public abstract class PetApiService { public abstract Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException; public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException; public abstract Response findPetsByStatus( @NotNull List status,SecurityContext securityContext) throws NotFoundException; - public abstract Response findPetsByTags( @NotNull List tags,SecurityContext securityContext) throws NotFoundException; + public abstract Response findPetsByTags( @NotNull Set tags,SecurityContext securityContext) throws NotFoundException; public abstract Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException; public abstract Response updatePet(Pet body,SecurityContext securityContext) throws NotFoundException; public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java index 29963f3d63b4..3ba558b701b2 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java @@ -20,7 +20,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -54,7 +56,7 @@ public class Pet { public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; @JsonProperty(JSON_PROPERTY_PHOTO_URLS) - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) @@ -157,7 +159,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -174,11 +176,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index fdd548f79e5d..0e22a5673173 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -6,6 +6,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -35,7 +36,7 @@ public Response findPetsByStatus( @NotNull List status, SecurityContext return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response findPetsByTags( @NotNull List tags, SecurityContext securityContext) throws NotFoundException { + public Response findPetsByTags( @NotNull Set tags, SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java index e2b50df52b77..f263501d7d20 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java @@ -207,7 +207,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test ,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger ,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble -,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List enumFormStringArray +,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="new ArrayList()") @DefaultValue("new ArrayList()") @FormParam("enum_form_string_array") List enumFormStringArray ,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString ,@Context SecurityContext securityContext) throws NotFoundException { diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java index 782ed5b41571..34acf0291b34 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java @@ -10,6 +10,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.Map; import java.util.List; @@ -119,17 +120,17 @@ public Response findPetsByStatus(@ApiParam(value = "Status values that need to b @Path("/findByTags") @Produces({ "application/xml", "application/json" }) - @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @io.swagger.annotations.Authorization(value = "petstore_auth", scopes = { @io.swagger.annotations.AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @io.swagger.annotations.AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @io.swagger.annotations.ApiResponses(value = { - @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value", response = Void.class) }) - public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid List tags + public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid Set tags ,@Context SecurityContext securityContext) throws NotFoundException { return delegate.findPetsByTags(tags, securityContext); diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java index a51e840bba5c..23f190664163 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApiService.java @@ -8,6 +8,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -22,7 +23,7 @@ public abstract class PetApiService { public abstract Response addPet(Pet body,SecurityContext securityContext) throws NotFoundException; public abstract Response deletePet(Long petId,String apiKey,SecurityContext securityContext) throws NotFoundException; public abstract Response findPetsByStatus( @NotNull List status,SecurityContext securityContext) throws NotFoundException; - public abstract Response findPetsByTags( @NotNull List tags,SecurityContext securityContext) throws NotFoundException; + public abstract Response findPetsByTags( @NotNull Set tags,SecurityContext securityContext) throws NotFoundException; public abstract Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException; public abstract Response updatePet(Pet body,SecurityContext securityContext) throws NotFoundException; public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java index 29963f3d63b4..3ba558b701b2 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java @@ -20,7 +20,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -54,7 +56,7 @@ public class Pet { public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; @JsonProperty(JSON_PROPERTY_PHOTO_URLS) - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); public static final String JSON_PROPERTY_TAGS = "tags"; @JsonProperty(JSON_PROPERTY_TAGS) @@ -157,7 +159,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -174,11 +176,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @JsonProperty("photoUrls") @ApiModelProperty(required = true, value = "") @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java index 4fe468d6787c..168693768dd5 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java @@ -6,6 +6,7 @@ import java.io.File; import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; +import java.util.Set; import java.util.List; import org.openapitools.api.NotFoundException; @@ -35,7 +36,7 @@ public Response findPetsByStatus( @NotNull List status, SecurityContext return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response findPetsByTags( @NotNull List tags, SecurityContext securityContext) throws NotFoundException { + public Response findPetsByTags( @NotNull Set tags, SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java index d5e24bb19e0f..2bf3cebe11ac 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java @@ -267,7 +267,7 @@ default CompletableFuture> testEndpointParameters(@ApiParam * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java index 58c2d72cdc0b..33647a38bac9 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -139,19 +140,19 @@ default CompletableFuture>> findPetsByStatus(@NotNull @ * or Invalid tag value (status code 400) * @deprecated */ - @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) @RequestMapping(value = "/pet/findByTags", produces = { "application/xml", "application/json" }, method = RequestMethod.GET) - default CompletableFuture>> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags) { + default CompletableFuture>> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags) { return CompletableFuture.supplyAsync(()-> { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java index c30fc1653d41..6b815c789260 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.openapitools.jackson.nullable.JsonNullable; @@ -30,7 +32,7 @@ public class Pet { @JsonProperty("photoUrls") @Valid - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); @JsonProperty("tags") @Valid @@ -138,7 +140,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -156,11 +158,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java index 1ecfa4128fed..1fed5f60b4f7 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java @@ -262,7 +262,7 @@ default ResponseEntity testEndpointParameters(@ApiParam(value = "None", re * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java index 186fddfb0908..a23b226f2bb3 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -136,19 +137,19 @@ default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "S * or Invalid tag value (status code 400) * @deprecated */ - @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) @RequestMapping(value = "/pet/findByTags", produces = { "application/xml", "application/json" }, method = RequestMethod.GET) - default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags) { + default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Pet.java index c30fc1653d41..6b815c789260 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.openapitools.jackson.nullable.JsonNullable; @@ -30,7 +32,7 @@ public class Pet { @JsonProperty("photoUrls") @Valid - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); @JsonProperty("tags") @Valid @@ -138,7 +140,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -156,11 +158,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java index 956f35a95953..91a698eaf4b9 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java @@ -209,7 +209,7 @@ public interface FakeApi { * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java index b4d0e8b828fa..4e36c1f2fb2c 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApiController.java @@ -196,7 +196,7 @@ public ResponseEntity testEndpointParameters(@ApiParam(value = "None", req * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java index ac0da6bc88c5..1dc78e84dc6a 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -105,19 +106,19 @@ public interface PetApi { * or Invalid tag value (status code 400) * @deprecated */ - @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) @RequestMapping(value = "/pet/findByTags", produces = { "application/xml", "application/json" }, method = RequestMethod.GET) - ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags); + ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags); /** diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java index ee5e3d0e13be..bed161cfe228 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApiController.java @@ -3,6 +3,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -96,7 +97,7 @@ public ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "St * @deprecated * @see PetApi#findPetsByTags */ - public ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags) { + public ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags) { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java index e91bc5697c75..3e66cbdb75df 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.openapitools.jackson.nullable.JsonNullable; @@ -30,7 +32,7 @@ public class Pet { @JsonProperty("photoUrls") @Valid - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); @JsonProperty("tags") @Valid @@ -138,7 +140,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -156,11 +158,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index 956f35a95953..91a698eaf4b9 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -209,7 +209,7 @@ public interface FakeApi { * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java index 5d82a5f27c28..bc41a337a3a8 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java @@ -196,7 +196,7 @@ public ResponseEntity testEndpointParameters(@ApiParam(value = "None", req * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index ac0da6bc88c5..1dc78e84dc6a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -105,19 +106,19 @@ public interface PetApi { * or Invalid tag value (status code 400) * @deprecated */ - @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) @RequestMapping(value = "/pet/findByTags", produces = { "application/xml", "application/json" }, method = RequestMethod.GET) - ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags); + ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags); /** diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java index efb678fc1253..c72da56d8407 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApiController.java @@ -3,6 +3,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -96,7 +97,7 @@ public ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "St * @deprecated * @see PetApi#findPetsByTags */ - public ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags) { + public ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags) { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java index e91bc5697c75..3e66cbdb75df 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.openapitools.jackson.nullable.JsonNullable; @@ -30,7 +32,7 @@ public class Pet { @JsonProperty("photoUrls") @Valid - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); @JsonProperty("tags") @Valid @@ -138,7 +140,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -156,11 +158,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index eca895881f56..78759307de2a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -231,7 +231,7 @@ default ResponseEntity testEndpointParameters(@ApiParam(value = "None", re * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index d1dd5548a627..a0957651bef4 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -206,7 +206,7 @@ default ResponseEntity testEndpointParameters(BigDecimal number, * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java index 5a7e3460a0da..55976e9af338 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -115,19 +116,19 @@ default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "S * or Invalid tag value (status code 400) * @deprecated */ - @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) @RequestMapping(value = "/pet/findByTags", produces = { "application/xml", "application/json" }, method = RequestMethod.GET) - default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags) { + default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags) { return getDelegate().findPetsByTags(tags); } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java index 44d7d779d04c..c8b6b0ad5ef7 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -3,6 +3,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -91,7 +92,7 @@ default ResponseEntity> findPetsByStatus(List status) { * @deprecated * @see PetApi#findPetsByTags */ - default ResponseEntity> findPetsByTags(List tags) { + default ResponseEntity> findPetsByTags(Set tags) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java index c30fc1653d41..6b815c789260 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.openapitools.jackson.nullable.JsonNullable; @@ -30,7 +32,7 @@ public class Pet { @JsonProperty("photoUrls") @Valid - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); @JsonProperty("tags") @Valid @@ -138,7 +140,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -156,11 +158,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 956f35a95953..91a698eaf4b9 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -209,7 +209,7 @@ public interface FakeApi { * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java index 6528d71f79af..63470afbf402 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java @@ -171,7 +171,7 @@ public ResponseEntity testEndpointParameters(@ApiParam(value = "None", req * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index 77c9d65965d8..0cb542e3f8d9 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -153,7 +153,7 @@ ResponseEntity testEndpointParameters(BigDecimal number, * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<String>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index ac0da6bc88c5..1dc78e84dc6a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -105,19 +106,19 @@ public interface PetApi { * or Invalid tag value (status code 400) * @deprecated */ - @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) @RequestMapping(value = "/pet/findByTags", produces = { "application/xml", "application/json" }, method = RequestMethod.GET) - ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags); + ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags); /** diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java index 02670b32e6a7..c72363a2ad1f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiController.java @@ -3,6 +3,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -79,7 +80,7 @@ public ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "St * @deprecated * @see PetApi#findPetsByTags */ - public ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags) { + public ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags) { return delegate.findPetsByTags(tags); } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java index da180785c563..6a9c39f47b09 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -3,6 +3,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; @@ -60,7 +61,7 @@ ResponseEntity deletePet(Long petId, * @deprecated * @see PetApi#findPetsByTags */ - ResponseEntity> findPetsByTags(List tags); + ResponseEntity> findPetsByTags(Set tags); /** * GET /pet/{petId} : Find pet by ID diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java index e91bc5697c75..3e66cbdb75df 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.openapitools.jackson.nullable.JsonNullable; @@ -30,7 +32,7 @@ public class Pet { @JsonProperty("photoUrls") @Valid - private List photoUrls = new ArrayList(); + private Set photoUrls = new LinkedHashSet(); @JsonProperty("tags") @Valid @@ -138,7 +140,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -156,11 +158,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index c378f4777411..ef838de37afc 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -278,7 +278,7 @@ default ResponseEntity testEndpointParameters(@ApiParam(value = "None", re * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 0e43ad6372da..ac00dfbdb154 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -142,21 +143,21 @@ default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "S * or Invalid tag value (status code 400) * @deprecated */ - @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) @ApiImplicitParams({ }) @RequestMapping(value = "/pet/findByTags", produces = { "application/xml", "application/json" }, method = RequestMethod.GET) - default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags) { + default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java index c30fc1653d41..6b815c789260 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.openapitools.jackson.nullable.JsonNullable; @@ -30,7 +32,7 @@ public class Pet { @JsonProperty("photoUrls") @Valid - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); @JsonProperty("tags") @Valid @@ -138,7 +140,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -156,11 +158,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index b52f33bdf48c..6e04a23e9520 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -234,7 +234,7 @@ default Mono> testEndpointParameters(@ApiParam(value = "Non * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java index 2f4d5ac28753..af2483ff2512 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -232,7 +232,7 @@ default Mono> testEndpointParameters(BigDecimal number, * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index d57d946edc2b..7e7072f1b5f6 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; @@ -118,19 +119,19 @@ default Mono>> findPetsByStatus(@NotNull @ApiParam(valu * or Invalid tag value (status code 400) * @deprecated */ - @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) @RequestMapping(value = "/pet/findByTags", produces = { "application/xml", "application/json" }, method = RequestMethod.GET) - default Mono>> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags, ServerWebExchange exchange) { + default Mono>> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags, ServerWebExchange exchange) { return getDelegate().findPetsByTags(tags, exchange); } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java index 69511f246743..538ca335758c 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -3,6 +3,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -101,7 +102,7 @@ default Mono>> findPetsByStatus(List status, * @deprecated * @see PetApi#findPetsByTags */ - default Mono>> findPetsByTags(List tags, + default Mono>> findPetsByTags(Set tags, ServerWebExchange exchange) { Mono result = Mono.empty(); exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java index c30fc1653d41..6b815c789260 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.openapitools.jackson.nullable.JsonNullable; @@ -30,7 +32,7 @@ public class Pet { @JsonProperty("photoUrls") @Valid - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); @JsonProperty("tags") @Valid @@ -138,7 +140,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -156,11 +158,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml index f6f5c60294f7..da95378bbc81 100644 --- a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml @@ -150,6 +150,7 @@ paths: items: type: string type: array + uniqueItems: true style: form responses: "200": @@ -159,11 +160,13 @@ paths: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true application/json: schema: items: $ref: '#/components/schemas/Pet' type: array + uniqueItems: true description: successful operation "400": content: {} @@ -1458,6 +1461,7 @@ components: items: type: string type: array + uniqueItems: true xml: name: photoUrl wrapped: true diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index db6a7fc11276..2d7746b6c4a8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -262,7 +262,7 @@ default ResponseEntity testEndpointParameters(@ApiParam(value = "None", re * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index d58ca42f7149..efedc0e0c472 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -136,19 +137,19 @@ default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "S * or Invalid tag value (status code 400) * @deprecated */ - @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) @RequestMapping(value = "/pet/findByTags", produces = { "application/xml", "application/json" }, method = RequestMethod.GET) - default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags) { + default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index c30fc1653d41..6b815c789260 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.openapitools.jackson.nullable.JsonNullable; @@ -30,7 +32,7 @@ public class Pet { @JsonProperty("photoUrls") @Valid - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); @JsonProperty("tags") @Valid @@ -138,7 +140,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -156,11 +158,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index 7300afdee130..d81692539c5f 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -274,7 +274,7 @@ default ResponseEntity testEndpointParameters(@ApiParam(value = "None", re * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index 42ec53c1a40f..f9c4e8911fc2 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -8,6 +8,7 @@ import org.openapitools.virtualan.model.ModelApiResponse; import org.openapitools.virtualan.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import io.virtualan.annotation.ApiVirtual; import io.virtualan.annotation.VirtualService; @@ -143,19 +144,19 @@ default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "S * @deprecated */ @ApiVirtual - @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) @RequestMapping(value = "/pet/findByTags", produces = { "application/xml", "application/json" }, method = RequestMethod.GET) - default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags) { + default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java index 052fdc5308bb..196538b59e8a 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.virtualan.model.Category; import org.openapitools.virtualan.model.Tag; import org.openapitools.jackson.nullable.JsonNullable; @@ -30,7 +32,7 @@ public class Pet { @JsonProperty("photoUrls") @Valid - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); @JsonProperty("tags") @Valid @@ -138,7 +140,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -156,11 +158,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index b3fc1afb8671..56cf57727519 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -262,7 +262,7 @@ default ResponseEntity testEndpointParameters(@ApiParam(value = "None", re * @param enumQueryString Query parameter enum test (string) (optional, default to -efg) * @param enumQueryInteger Query parameter enum test (double) (optional) * @param enumQueryDouble Query parameter enum test (double) (optional) - * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) + * @param enumFormStringArray Form parameter enum test (string array) (optional, default to new ArrayList<>()) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return Invalid request (status code 400) * or Not found (status code 404) diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index 186fddfb0908..a23b226f2bb3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -8,6 +8,7 @@ import org.openapitools.model.ModelApiResponse; import org.openapitools.model.Pet; import org.springframework.core.io.Resource; +import java.util.Set; import io.swagger.annotations.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -136,19 +137,19 @@ default ResponseEntity> findPetsByStatus(@NotNull @ApiParam(value = "S * or Invalid tag value (status code 400) * @deprecated */ - @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "Set", authorizations = { @Authorization(value = "petstore_auth", scopes = { @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"), @AuthorizationScope(scope = "read:pets", description = "read your pets") }) }, tags={ "pet", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"), + @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"), @ApiResponse(code = 400, message = "Invalid tag value") }) @RequestMapping(value = "/pet/findByTags", produces = { "application/xml", "application/json" }, method = RequestMethod.GET) - default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List tags) { + default ResponseEntity> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) Set tags) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java index c30fc1653d41..6b815c789260 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java @@ -7,7 +7,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.openapitools.model.Category; import org.openapitools.model.Tag; import org.openapitools.jackson.nullable.JsonNullable; @@ -30,7 +32,7 @@ public class Pet { @JsonProperty("photoUrls") @Valid - private List photoUrls = new ArrayList<>(); + private Set photoUrls = new LinkedHashSet<>(); @JsonProperty("tags") @Valid @@ -138,7 +140,7 @@ public void setName(String name) { this.name = name; } - public Pet photoUrls(List photoUrls) { + public Pet photoUrls(Set photoUrls) { this.photoUrls = photoUrls; return this; } @@ -156,11 +158,11 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @NotNull - public List getPhotoUrls() { + public Set getPhotoUrls() { return photoUrls; } - public void setPhotoUrls(List photoUrls) { + public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; }