From 9ba24b46b72dfc06b95b86556a0a0c5f752ff1df Mon Sep 17 00:00:00 2001
From: itaru2622 <itaru2622@gmail.com>
Date: Fri, 4 Sep 2020 11:35:49 +0900
Subject: [PATCH 1/5] Fix [jaxrs-jersey][java][jersey] multipart/form-data file
array issue on generating jaxrs-jersey.
This commit aims to fix https://github.com/OpenAPITools/openapi-generator/issues/7330 with described solution 'choice C'.
---
.../src/main/resources/JavaJaxRS/api.mustache | 4 ++--
.../src/main/resources/JavaJaxRS/apiService.mustache | 2 +-
.../src/main/resources/JavaJaxRS/apiServiceImpl.mustache | 2 +-
.../src/main/resources/JavaJaxRS/formParams.mustache | 3 +--
.../src/main/resources/JavaJaxRS/serviceFormParams.mustache | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache
index 5f51cb4e010..2ab14b8e56e 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache
@@ -16,8 +16,8 @@ import {{package}}.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -76,7 +76,7 @@ public class {{classname}} {
{{/hasMore}}{{/responses}} })
public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},{{/allParams}}@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.{{nickname}}({{#allParams}}{{#isFormParam}}{{#isFile}}{{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{/isFormParam}}{{^isFile}}{{paramName}}{{/isFile}}{{^isFormParam}}{{#isFile}}{{paramName}}{{/isFile}}{{/isFormParam}}, {{/allParams}}securityContext);
+ return delegate.{{nickname}}({{#allParams}}{{#isFormParam}}{{#isFile}}{{paramName}}Bodypart{{/isFile}}{{/isFormParam}}{{^isFile}}{{paramName}}{{/isFile}}{{^isFormParam}}{{#isFile}}{{paramName}}{{/isFile}}{{/isFormParam}}, {{/allParams}}securityContext);
}
{{/operation}}
}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache
index eb8d9aaaa02..d395bb8ee2b 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiService.mustache
@@ -3,7 +3,7 @@ package {{package}};
import {{package}}.*;
import {{modelPackage}}.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
{{#imports}}import {{import}};
{{/imports}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
index bc577e6f609..af96791e89b 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/apiServiceImpl.mustache
@@ -11,7 +11,7 @@ import {{package}}.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/formParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/formParams.mustache
index b80ad9643a1..6580e896f6a 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/formParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/formParams.mustache
@@ -1,3 +1,2 @@
{{#isFormParam}}{{^isFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/isFile}}{{#isFile}}
- @FormDataParam("{{baseName}}") InputStream {{paramName}}InputStream,
- @FormDataParam("{{baseName}}") FormDataContentDisposition {{paramName}}Detail{{/isFile}}{{/isFormParam}}
+{{^isListContainer}} @FormDataParam("{{baseName}}") FormDataBodyPart {{paramName}}Bodypart {{/isListContainer}}{{#isListContainer}} @FormDataParam("{{baseName}}") List<FormDataBodyPart> {{paramName}}Bodypart {{/isListContainer}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/serviceFormParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/serviceFormParams.mustache
index b4b46dc7a42..9834749e13b 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/serviceFormParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/serviceFormParams.mustache
@@ -1 +1 @@
-{{#isFormParam}}{{^isFile}}{{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}InputStream {{paramName}}InputStream, FormDataContentDisposition {{paramName}}Detail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{^isFile}}{{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}{{^isListContainer}}FormDataBodyPart {{paramName}}Bodypart{{/isListContainer}}{{#isListContainer}}List<FormDataBodyPart> {{paramName}}Bodypart{{/isListContainer}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
--
GitLab
From aa9a19fb099d47adb4ddfc5240476fc12f756874 Mon Sep 17 00:00:00 2001
From: itaru2622 <itaru2622@gmail.com>
Date: Fri, 4 Sep 2020 11:58:56 +0900
Subject: [PATCH 2/5] add test code [jaxrs-jersey][java][jersey] for
multipart/form-data file on generating
---
.../jaxrs/JavaJerseyServerCodegenTest.java | 57 +++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java
index ca05c71b3a0..c58d24fa788 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java
@@ -1,23 +1,33 @@
package org.openapitools.codegen.java.jaxrs;
+import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.parser.core.models.ParseOptions;
+
import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.MockDefaultGenerator;
import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.JavaJerseyServerCodegen;
+import org.openapitools.codegen.languages.features.CXFServerFeatures;
import org.openapitools.codegen.templating.MustacheEngineAdapter;
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.List;
import java.util.Map;
+import java.util.stream.Collectors;
public class JavaJerseyServerCodegenTest extends JavaJaxrsBaseTest {
@@ -87,4 +97,51 @@ public class JavaJerseyServerCodegenTest extends JavaJaxrsBaseTest {
Assert.assertEquals(codegen.additionalProperties().get(JavaJerseyServerCodegen.SERVER_PORT), "8088");
}
+ // Helper function, intended to reduce boilerplate @ copied from ../spring/SpringCodegenTest.java
+ private Map<String, String> generateFiles(DefaultCodegen codegen, String filePath) throws IOException {
+ final File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+ output.deleteOnExit();
+ final String outputPath = output.getAbsolutePath().replace('\\', '/');
+
+ codegen.setOutputDir(output.getAbsolutePath());
+ codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true");
+
+ final ClientOptInput input = new ClientOptInput();
+ final OpenAPI openAPI = new OpenAPIParser().readLocation(filePath, null, new ParseOptions()).getOpenAPI();
+ input.openAPI(openAPI);
+ input.config(codegen);
+
+ final MockDefaultGenerator generator = new MockDefaultGenerator();
+ generator.opts(input).generate();
+
+ return generator.getFiles().entrySet().stream().collect(Collectors.toMap(e -> e.getKey().replace(outputPath, ""), Map.Entry::getValue));
+ }
+
+ // almost same test as issue #3139 on Spring
+ @Test
+ public void testMultipartJerseyServer() throws Exception {
+
+ final Map<String, String> files = generateFiles(codegen, "src/test/resources/3_0/form-multipart-binary-array.yaml");
+
+ // Check files and parameters if List<> or Single
+ final String[] fileS = new String[] {
+ "/src/gen/java/org/openapitools/api/MultipartSingleApi.java",
+ "/src/gen/java/org/openapitools/api/MultipartSingleApiService.java",
+ "/src/main/java/org/openapitools/api/impl/MultipartSingleApiServiceImpl.java"};
+ for (String f : fileS) {
+ final String contents = files.get(f);
+ Assert.assertTrue(contents.contains("FormDataBodyPart file"));
+ }
+
+ final String[] fileA = new String[] {
+ "/src/gen/java/org/openapitools/api/MultipartArrayApiService.java",
+ "/src/gen/java/org/openapitools/api/MultipartArrayApi.java",
+ "/src/main/java/org/openapitools/api/impl/MultipartArrayApiServiceImpl.java"};
+ for (String f : fileA) {
+ final String contents = files.get(f);
+ Assert.assertTrue(contents.contains("List<FormDataBodyPart> files"));
+ }
+
+ }
+
}
--
GitLab
From 3fe4ad50c8ad6feea873a5f6aaf935c4f755e57c Mon Sep 17 00:00:00 2001
From: itaru2622 <itaru2622@gmail.com>
Date: Fri, 4 Sep 2020 16:26:55 +0900
Subject: [PATCH 3/5] update test code [jaxrs-jersey][java][jersey] for
multipart/form-data file on generating
followed latest master branch of OpenAPITools/openapi-generator
---
.../jaxrs/JavaJerseyServerCodegenTest.java | 36 +++++++++----------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java
index c58d24fa788..fc812d93334 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java
@@ -18,10 +18,13 @@ import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.JavaJerseyServerCodegen;
import org.openapitools.codegen.languages.features.CXFServerFeatures;
import org.openapitools.codegen.templating.MustacheEngineAdapter;
+import org.openapitools.codegen.DefaultGenerator;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import static org.openapitools.codegen.TestUtils.assertFileContains;
+
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
@@ -98,7 +101,7 @@ public class JavaJerseyServerCodegenTest extends JavaJaxrsBaseTest {
}
// Helper function, intended to reduce boilerplate @ copied from ../spring/SpringCodegenTest.java
- private Map<String, String> generateFiles(DefaultCodegen codegen, String filePath) throws IOException {
+ private Map<String, File> generateFiles(DefaultCodegen codegen, String filePath) throws IOException {
final File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
output.deleteOnExit();
final String outputPath = output.getAbsolutePath().replace('\\', '/');
@@ -111,35 +114,30 @@ public class JavaJerseyServerCodegenTest extends JavaJaxrsBaseTest {
input.openAPI(openAPI);
input.config(codegen);
- final MockDefaultGenerator generator = new MockDefaultGenerator();
- generator.opts(input).generate();
+ final DefaultGenerator generator = new DefaultGenerator();
+ List<File> files = generator.opts(input).generate();
- return generator.getFiles().entrySet().stream().collect(Collectors.toMap(e -> e.getKey().replace(outputPath, ""), Map.Entry::getValue));
+ return files.stream().collect(Collectors.toMap(e -> e.getName().replace(outputPath, ""), i -> i));
}
// almost same test as issue #3139 on Spring
@Test
public void testMultipartJerseyServer() throws Exception {
- final Map<String, String> files = generateFiles(codegen, "src/test/resources/3_0/form-multipart-binary-array.yaml");
+ final Map<String, File> files = generateFiles(codegen, "src/test/resources/3_0/form-multipart-binary-array.yaml");
- // Check files and parameters if List<> or Single
- final String[] fileS = new String[] {
- "/src/gen/java/org/openapitools/api/MultipartSingleApi.java",
- "/src/gen/java/org/openapitools/api/MultipartSingleApiService.java",
- "/src/main/java/org/openapitools/api/impl/MultipartSingleApiServiceImpl.java"};
- for (String f : fileS) {
- final String contents = files.get(f);
- Assert.assertTrue(contents.contains("FormDataBodyPart file"));
+ // Check files for Single, Mixed
+ String[] fileS = new String[] {
+ "MultipartSingleApi.java", "MultipartSingleApiService.java", "MultipartSingleApiServiceImpl.java",
+ "MultipartMixedApi.java", "MultipartMixedApiService.java", "MultipartMixedApiServiceImpl.java" };
+ for (String f : fileS){
+ assertFileContains( files.get(f).toPath(), "FormDataBodyPart file" );
}
- final String[] fileA = new String[] {
- "/src/gen/java/org/openapitools/api/MultipartArrayApiService.java",
- "/src/gen/java/org/openapitools/api/MultipartArrayApi.java",
- "/src/main/java/org/openapitools/api/impl/MultipartArrayApiServiceImpl.java"};
+ // Check files for Array
+ final String[] fileA = new String[] { "MultipartArrayApiService.java", "MultipartArrayApi.java", "MultipartArrayApiServiceImpl.java"};
for (String f : fileA) {
- final String contents = files.get(f);
- Assert.assertTrue(contents.contains("List<FormDataBodyPart> files"));
+ assertFileContains( files.get(f).toPath(), "List<FormDataBodyPart> files");
}
}
--
GitLab
From 0dcb1d32e6050998911b2c55be1a8eb70ea9ec33 Mon Sep 17 00:00:00 2001
From: itaru2622 <itaru2622@gmail.com>
Date: Wed, 9 Sep 2020 01:33:46 +0900
Subject: [PATCH 4/5] update samples/* by executing ./bin/generate-samples.sh
---
.../org/openapitools/api/AnotherFakeApi.java | 5 +-
.../api/AnotherFakeApiService.java | 2 +-
.../java/org/openapitools/api/FakeApi.java | 90 ++++--------------
.../org/openapitools/api/FakeApiService.java | 6 +-
.../api/FakeClassnameTestApi.java | 5 +-
.../api/FakeClassnameTestApiService.java | 2 +-
.../gen/java/org/openapitools/api/PetApi.java | 36 +++-----
.../org/openapitools/api/PetApiService.java | 4 +-
.../java/org/openapitools/api/StoreApi.java | 11 +--
.../org/openapitools/api/StoreApiService.java | 2 +-
.../java/org/openapitools/api/UserApi.java | 25 ++---
.../org/openapitools/api/UserApiService.java | 2 +-
.../api/impl/AnotherFakeApiServiceImpl.java | 2 +-
.../api/impl/FakeApiServiceImpl.java | 6 +-
.../impl/FakeClassnameTestApiServiceImpl.java | 2 +-
.../api/impl/PetApiServiceImpl.java | 4 +-
.../api/impl/StoreApiServiceImpl.java | 2 +-
.../api/impl/UserApiServiceImpl.java | 2 +-
.../org/openapitools/api/AnotherFakeApi.java | 5 +-
.../api/AnotherFakeApiService.java | 2 +-
.../java/org/openapitools/api/FakeApi.java | 92 ++++---------------
.../org/openapitools/api/FakeApiService.java | 6 +-
.../api/FakeClassnameTestApi.java | 5 +-
.../api/FakeClassnameTestApiService.java | 2 +-
.../gen/java/org/openapitools/api/FooApi.java | 2 +-
.../org/openapitools/api/FooApiService.java | 2 +-
.../gen/java/org/openapitools/api/PetApi.java | 36 +++-----
.../org/openapitools/api/PetApiService.java | 4 +-
.../java/org/openapitools/api/StoreApi.java | 11 +--
.../org/openapitools/api/StoreApiService.java | 2 +-
.../java/org/openapitools/api/UserApi.java | 25 ++---
.../org/openapitools/api/UserApiService.java | 2 +-
.../api/impl/AnotherFakeApiServiceImpl.java | 2 +-
.../api/impl/FakeApiServiceImpl.java | 6 +-
.../impl/FakeClassnameTestApiServiceImpl.java | 2 +-
.../api/impl/FooApiServiceImpl.java | 2 +-
.../api/impl/PetApiServiceImpl.java | 4 +-
.../api/impl/StoreApiServiceImpl.java | 2 +-
.../api/impl/UserApiServiceImpl.java | 2 +-
.../org/openapitools/api/FakeApiService.java | 2 +-
.../org/openapitools/api/PetApiService.java | 4 +-
.../api/impl/FakeApiServiceImpl.java | 2 +-
.../api/impl/PetApiServiceImpl.java | 4 +-
.../org/openapitools/api/FakeApiService.java | 4 +-
.../org/openapitools/api/PetApiService.java | 2 +-
.../api/impl/FakeApiServiceImpl.java | 4 +-
.../api/impl/PetApiServiceImpl.java | 2 +-
.../org/openapitools/api/AnotherFakeApi.java | 5 +-
.../api/AnotherFakeApiService.java | 2 +-
.../java/org/openapitools/api/FakeApi.java | 80 ++++------------
.../org/openapitools/api/FakeApiService.java | 4 +-
.../api/FakeClassnameTags123Api.java | 5 +-
.../api/FakeClassnameTags123ApiService.java | 2 +-
.../gen/java/org/openapitools/api/PetApi.java | 46 +++-------
.../org/openapitools/api/PetApiService.java | 6 +-
.../java/org/openapitools/api/StoreApi.java | 11 +--
.../org/openapitools/api/StoreApiService.java | 2 +-
.../java/org/openapitools/api/UserApi.java | 25 ++---
.../org/openapitools/api/UserApiService.java | 2 +-
.../api/impl/AnotherFakeApiServiceImpl.java | 2 +-
.../api/impl/FakeApiServiceImpl.java | 4 +-
.../FakeClassnameTags123ApiServiceImpl.java | 2 +-
.../api/impl/PetApiServiceImpl.java | 6 +-
.../api/impl/StoreApiServiceImpl.java | 2 +-
.../api/impl/UserApiServiceImpl.java | 2 +-
.../org/openapitools/api/AnotherFakeApi.java | 5 +-
.../api/AnotherFakeApiService.java | 2 +-
.../java/org/openapitools/api/FakeApi.java | 90 ++++--------------
.../org/openapitools/api/FakeApiService.java | 6 +-
.../api/FakeClassnameTestApi.java | 5 +-
.../api/FakeClassnameTestApiService.java | 2 +-
.../gen/java/org/openapitools/api/PetApi.java | 36 +++-----
.../org/openapitools/api/PetApiService.java | 4 +-
.../java/org/openapitools/api/StoreApi.java | 11 +--
.../org/openapitools/api/StoreApiService.java | 2 +-
.../java/org/openapitools/api/UserApi.java | 25 ++---
.../org/openapitools/api/UserApiService.java | 2 +-
.../api/impl/AnotherFakeApiServiceImpl.java | 2 +-
.../api/impl/FakeApiServiceImpl.java | 6 +-
.../impl/FakeClassnameTestApiServiceImpl.java | 2 +-
.../api/impl/PetApiServiceImpl.java | 4 +-
.../api/impl/StoreApiServiceImpl.java | 2 +-
.../api/impl/UserApiServiceImpl.java | 2 +-
83 files changed, 275 insertions(+), 589 deletions(-)
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 77578e62d3d..c3b6939b7e7 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -62,8 +62,7 @@ public class AnotherFakeApi {
@io.swagger.annotations.ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response call123testSpecialTags(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body
-,@Context SecurityContext securityContext)
+ public Response call123testSpecialTags(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.call123testSpecialTags(body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index 1096acf12f0..2dc873d3a75 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.openapitools.model.Client;
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 a9fa5ad0eac..c1790615497 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
@@ -25,8 +25,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -72,8 +72,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "creates an XmlItem", notes = "this route creates an XmlItem", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createXmlItem(@ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid XmlItem xmlItem
-,@Context SecurityContext securityContext)
+ public Response createXmlItem(@ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid XmlItem xmlItem,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createXmlItem(xmlItem, securityContext);
}
@@ -84,8 +83,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
- public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body") Boolean body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body") Boolean body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterBooleanSerialize(body, securityContext);
}
@@ -96,8 +94,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
- public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body") @Valid OuterComposite body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body") @Valid OuterComposite body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterCompositeSerialize(body, securityContext);
}
@@ -108,8 +105,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
- public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body") BigDecimal body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body") BigDecimal body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterNumberSerialize(body, securityContext);
}
@@ -120,8 +116,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output string", response = String.class) })
- public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body") String body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body") String body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterStringSerialize(body, securityContext);
}
@@ -132,8 +127,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @NotNull @Valid FileSchemaTestClass body
-,@Context SecurityContext securityContext)
+ public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @NotNull @Valid FileSchemaTestClass body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testBodyWithFileSchema(body, securityContext);
}
@@ -144,9 +138,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @QueryParam("query") @NotNull String query
-,@ApiParam(value = "", required = true) @NotNull @Valid User body
-,@Context SecurityContext securityContext)
+ public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @QueryParam("query") @NotNull String query,@ApiParam(value = "", required = true) @NotNull @Valid User body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testBodyWithQueryParams(query, body, securityContext);
}
@@ -157,8 +149,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response testClientModel(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body
-,@Context SecurityContext securityContext)
+ public Response testClientModel(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testClientModel(body, securityContext);
}
@@ -173,25 +164,10 @@ public class FakeApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number
-,@ApiParam(value = "None", required=true) @FormParam("double") Double _double
-,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter
-,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte
-,@ApiParam(value = "None") @FormParam("integer") Integer integer
-,@ApiParam(value = "None") @FormParam("int32") Integer int32
-,@ApiParam(value = "None") @FormParam("int64") Long int64
-,@ApiParam(value = "None") @FormParam("float") Float _float
-,@ApiParam(value = "None") @FormParam("string") String string
-,
- @FormDataParam("binary") InputStream binaryInputStream,
- @FormDataParam("binary") FormDataContentDisposition binaryDetail
-,@ApiParam(value = "None") @FormParam("date") LocalDate date
-,@ApiParam(value = "None") @FormParam("dateTime") OffsetDateTime dateTime
-,@ApiParam(value = "None") @FormParam("password") String password
-,@ApiParam(value = "None") @FormParam("callback") String paramCallback
-,@Context SecurityContext securityContext)
+ public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String string,
+ @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") LocalDate date,@ApiParam(value = "None") @FormParam("dateTime") OffsetDateTime dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryInputStream, binaryDetail, date, dateTime, password, paramCallback, securityContext);
+ return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext);
}
@GET
@@ -202,15 +178,7 @@ public class FakeApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid request", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Not found", response = Void.class) })
- public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $", defaultValue="new ArrayList<>()")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray
-,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString
-,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") @Valid List<String> enumQueryStringArray
-,@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<String> 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)
+ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $", defaultValue="new ArrayList<>()")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") @Valid List<String> enumQueryStringArray,@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<String> 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 {
return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, securityContext);
}
@@ -221,13 +189,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 400, message = "Someting wrong", response = Void.class) })
- public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull Integer requiredStringGroup
-,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup
-,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull Long requiredInt64Group
-,@ApiParam(value = "String in group parameters") @QueryParam("string_group") Integer stringGroup
-,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup
-,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group") Long int64Group
-,@Context SecurityContext securityContext)
+ public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull Long requiredInt64Group,@ApiParam(value = "String in group parameters") @QueryParam("string_group") Integer stringGroup,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group") Long int64Group,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, securityContext);
}
@@ -238,8 +200,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response testInlineAdditionalProperties(@ApiParam(value = "request body", required = true) @NotNull @Valid Map<String, String> param
-,@Context SecurityContext securityContext)
+ public Response testInlineAdditionalProperties(@ApiParam(value = "request body", required = true) @NotNull @Valid Map<String, String> param,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testInlineAdditionalProperties(param, securityContext);
}
@@ -250,9 +211,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "test json serialization of form data", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response testJsonFormData(@ApiParam(value = "field1", required=true) @FormParam("param") String param
-,@ApiParam(value = "field2", required=true) @FormParam("param2") String param2
-,@Context SecurityContext securityContext)
+ public Response testJsonFormData(@ApiParam(value = "field1", required=true) @FormParam("param") String param,@ApiParam(value = "field2", required=true) @FormParam("param2") String param2,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testJsonFormData(param, param2, securityContext);
}
@@ -263,12 +222,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "To test the collection format in query parameters", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testQueryParameterCollectionFormat(@ApiParam(value = "", required = true) @QueryParam("pipe") @NotNull @Valid List<String> pipe
-,@ApiParam(value = "", required = true) @QueryParam("ioutil") @NotNull @Valid List<String> ioutil
-,@ApiParam(value = "", required = true) @QueryParam("http") @NotNull @Valid List<String> http
-,@ApiParam(value = "", required = true) @QueryParam("url") @NotNull @Valid List<String> url
-,@ApiParam(value = "", required = true) @QueryParam("context") @NotNull @Valid List<String> context
-,@Context SecurityContext securityContext)
+ public Response testQueryParameterCollectionFormat(@ApiParam(value = "", required = true) @QueryParam("pipe") @NotNull @Valid List<String> pipe,@ApiParam(value = "", required = true) @QueryParam("ioutil") @NotNull @Valid List<String> ioutil,@ApiParam(value = "", required = true) @QueryParam("http") @NotNull @Valid List<String> http,@ApiParam(value = "", required = true) @QueryParam("url") @NotNull @Valid List<String> url,@ApiParam(value = "", required = true) @QueryParam("context") @NotNull @Valid List<String> context,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, securityContext);
}
@@ -284,13 +238,9 @@ public class FakeApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
- public Response uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId
-,
- @FormDataParam("requiredFile") InputStream requiredFileInputStream,
- @FormDataParam("requiredFile") FormDataContentDisposition requiredFileDetail
-,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata
-,@Context SecurityContext securityContext)
+ public Response uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,
+ @FormDataParam("requiredFile") FormDataBodyPart requiredFileBodypart ,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFileWithRequiredFile(petId, requiredFileInputStream, requiredFileDetail, additionalMetadata, securityContext);
+ return delegate.uploadFileWithRequiredFile(petId, requiredFileBodypart, additionalMetadata, securityContext);
}
}
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java
index 1d56ff1af5c..a3ab5e2e151 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.math.BigDecimal;
import org.openapitools.model.Client;
@@ -35,11 +35,11 @@ public abstract class FakeApiService {
public abstract Response testBodyWithFileSchema(FileSchemaTestClass body,SecurityContext securityContext) throws NotFoundException;
public abstract Response testBodyWithQueryParams( @NotNull String query,User body,SecurityContext securityContext) throws NotFoundException;
public abstract Response testClientModel(Client body,SecurityContext securityContext) throws NotFoundException;
- public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,InputStream binaryInputStream, FormDataContentDisposition binaryDetail,LocalDate date,OffsetDateTime dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,LocalDate date,OffsetDateTime dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException;
public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException;
public abstract Response testInlineAdditionalProperties(Map<String, String> param,SecurityContext securityContext) throws NotFoundException;
public abstract Response testJsonFormData(String param,String param2,SecurityContext securityContext) throws NotFoundException;
public abstract Response testQueryParameterCollectionFormat( @NotNull List<String> pipe, @NotNull List<String> ioutil, @NotNull List<String> http, @NotNull List<String> url, @NotNull List<String> context,SecurityContext securityContext) throws NotFoundException;
- public abstract Response uploadFileWithRequiredFile(Long petId,InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail,String additionalMetadata,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response uploadFileWithRequiredFile(Long petId,FormDataBodyPart requiredFileBodypart,String additionalMetadata,SecurityContext securityContext) throws NotFoundException;
}
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index 66be9a4e963..d0b9ebe7ab7 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -64,8 +64,7 @@ public class FakeClassnameTestApi {
}, tags={ "fake_classname_tags 123#$%^", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response testClassname(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body
-,@Context SecurityContext securityContext)
+ public Response testClassname(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testClassname(body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
index f81b0a146ee..b5890e14dc4 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.openapitools.model.Client;
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 f426e3d49b9..22e390d6d75 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
@@ -18,8 +18,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -72,8 +72,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
- public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body
-,@Context SecurityContext securityContext)
+ public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.addPet(body, securityContext);
}
@@ -91,9 +90,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
- public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey
-,@Context SecurityContext securityContext)
+ public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deletePet(petId, apiKey, securityContext);
}
@@ -111,8 +108,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Void.class) })
- public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true) @QueryParam("status") @NotNull @Valid List<String> status
-,@Context SecurityContext securityContext)
+ public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true) @QueryParam("status") @NotNull @Valid List<String> status,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.findPetsByStatus(status, securityContext);
}
@@ -130,8 +126,7 @@ public class PetApi {
@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 Set<String> tags
-,@Context SecurityContext securityContext)
+ public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid Set<String> tags,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.findPetsByTags(tags, securityContext);
}
@@ -148,8 +143,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class) })
- public Response getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathParam("petId") @NotNull Long petId
-,@Context SecurityContext securityContext)
+ public Response getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathParam("petId") @NotNull Long petId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getPetById(petId, securityContext);
}
@@ -171,8 +165,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
- public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body
-,@Context SecurityContext securityContext)
+ public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updatePet(body, securityContext);
}
@@ -188,10 +181,7 @@ public class PetApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
- public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "Updated name of the pet") @FormParam("name") String name
-,@ApiParam(value = "Updated status of the pet") @FormParam("status") String status
-,@Context SecurityContext securityContext)
+ public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "Updated name of the pet") @FormParam("name") String name,@ApiParam(value = "Updated status of the pet") @FormParam("status") String status,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updatePetWithForm(petId, name, status, securityContext);
}
@@ -207,13 +197,9 @@ public class PetApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
- public Response uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata
-,
- @FormDataParam("file") InputStream fileInputStream,
- @FormDataParam("file") FormDataContentDisposition fileDetail
-,@Context SecurityContext securityContext)
+ public Response uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata,
+ @FormDataParam("file") FormDataBodyPart fileBodypart ,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFile(petId, additionalMetadata, fileInputStream, fileDetail, securityContext);
+ return delegate.uploadFile(petId, additionalMetadata, fileBodypart, 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 1f44eee7c80..1bf9b537255 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
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.io.File;
import org.openapitools.model.ModelApiResponse;
@@ -27,5 +27,5 @@ public abstract class PetApiService {
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;
- public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream fileInputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response uploadFile(Long petId,String additionalMetadata,FormDataBodyPart fileBodypart,SecurityContext securityContext) throws NotFoundException;
}
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java
index eb37ae7f4e6..11a88fa9459 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -65,8 +65,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
- public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathParam("order_id") @NotNull String orderId
-,@Context SecurityContext securityContext)
+ public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathParam("order_id") @NotNull String orderId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deleteOrder(orderId, securityContext);
}
@@ -94,8 +93,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
- public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathParam("order_id") @NotNull @Min(1L) @Max(5L) Long orderId
-,@Context SecurityContext securityContext)
+ public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathParam("order_id") @NotNull @Min(1L) @Max(5L) Long orderId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getOrderById(orderId, securityContext);
}
@@ -108,8 +106,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) })
- public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid Order body
-,@Context SecurityContext securityContext)
+ public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid Order body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.placeOrder(body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java
index 885579d9f0f..6cc42048700 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.util.Map;
import org.openapitools.model.Order;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java
index 748e6cf83b5..8f8e8f72c01 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -63,8 +63,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUser(@ApiParam(value = "Created user object", required = true) @NotNull @Valid User body
-,@Context SecurityContext securityContext)
+ public Response createUser(@ApiParam(value = "Created user object", required = true) @NotNull @Valid User body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUser(body, securityContext);
}
@@ -75,8 +74,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body
-,@Context SecurityContext securityContext)
+ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUsersWithArrayInput(body, securityContext);
}
@@ -87,8 +85,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body
-,@Context SecurityContext securityContext)
+ public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUsersWithListInput(body, securityContext);
}
@@ -101,8 +98,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathParam("username") @NotNull String username
-,@Context SecurityContext securityContext)
+ public Response deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathParam("username") @NotNull String username,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deleteUser(username, securityContext);
}
@@ -117,8 +113,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathParam("username") @NotNull String username
-,@Context SecurityContext securityContext)
+ public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathParam("username") @NotNull String username,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getUserByName(username, securityContext);
}
@@ -131,9 +126,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) })
- public Response loginUser(@ApiParam(value = "The user name for login", required = true) @QueryParam("username") @NotNull String username
-,@ApiParam(value = "The password for login in clear text", required = true) @QueryParam("password") @NotNull String password
-,@Context SecurityContext securityContext)
+ public Response loginUser(@ApiParam(value = "The user name for login", required = true) @QueryParam("username") @NotNull String username,@ApiParam(value = "The password for login in clear text", required = true) @QueryParam("password") @NotNull String password,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.loginUser(username, password, securityContext);
}
@@ -157,9 +150,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathParam("username") @NotNull String username
-,@ApiParam(value = "Updated user object", required = true) @NotNull @Valid User body
-,@Context SecurityContext securityContext)
+ public Response updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathParam("username") @NotNull String username,@ApiParam(value = "Updated user object", required = true) @NotNull @Valid User body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updateUser(username, body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApiService.java
index 97ec792f0f7..15e4486bc6c 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.util.List;
import org.openapitools.model.User;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index 661940c66dd..cb1a8cd7e00 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -10,7 +10,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index f5ed05e48d0..40cfa39e705 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -20,7 +20,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
@@ -68,7 +68,7 @@ public class FakeApiServiceImpl extends FakeApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, InputStream binaryInputStream, FormDataContentDisposition binaryDetail, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
+ public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
// do some magic!
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@@ -98,7 +98,7 @@ public class FakeApiServiceImpl extends FakeApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFileWithRequiredFile(Long petId, InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail, String additionalMetadata, SecurityContext securityContext) throws NotFoundException {
+ public Response uploadFileWithRequiredFile(Long petId, FormDataBodyPart requiredFileBodypart, String additionalMetadata, SecurityContext securityContext) throws NotFoundException {
// do some magic!
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
index 2204800cb83..35349641b7a 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
@@ -10,7 +10,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
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 8e3cf747147..b075fabf211 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
@@ -13,7 +13,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
@@ -56,7 +56,7 @@ public class PetApiServiceImpl extends PetApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFile(Long petId, String additionalMetadata, InputStream fileInputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext) throws NotFoundException {
+ public Response uploadFile(Long petId, String additionalMetadata, FormDataBodyPart fileBodypart, SecurityContext securityContext) throws NotFoundException {
// do some magic!
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 1e67037417e..51a7d07d47b 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -11,7 +11,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 03a2c24f326..1e5df1742f1 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -11,7 +11,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 93cf7245b72..df37d6838b2 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -62,8 +62,7 @@ public class AnotherFakeApi {
@io.swagger.annotations.ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response call123testSpecialTags(@ApiParam(value = "client model", required = true) @NotNull @Valid Client client
-,@Context SecurityContext securityContext)
+ public Response call123testSpecialTags(@ApiParam(value = "client model", required = true) @NotNull @Valid Client client,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.call123testSpecialTags(client, securityContext);
}
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index 4e372fb7b55..1b0692e8bb3 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.openapitools.model.Client;
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 682b8970589..e3e8e029a2d 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
@@ -25,8 +25,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -85,10 +85,7 @@ public class FakeApi {
}, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "The instance started successfully", response = Void.class) })
- public Response fakeHttpSignatureTest(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet pet
-,@ApiParam(value = "query parameter") @QueryParam("query_1") String query1
-,@ApiParam(value = "header parameter" )@HeaderParam("header_1") String header1
-,@Context SecurityContext securityContext)
+ public Response fakeHttpSignatureTest(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet pet,@ApiParam(value = "query parameter") @QueryParam("query_1") String query1,@ApiParam(value = "header parameter" )@HeaderParam("header_1") String header1,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeHttpSignatureTest(pet, query1, header1, securityContext);
}
@@ -99,8 +96,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
- public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body") Boolean body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body") Boolean body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterBooleanSerialize(body, securityContext);
}
@@ -111,8 +107,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
- public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body") @Valid OuterComposite outerComposite
-,@Context SecurityContext securityContext)
+ public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body") @Valid OuterComposite outerComposite,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterCompositeSerialize(outerComposite, securityContext);
}
@@ -123,8 +118,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
- public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body") BigDecimal body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body") BigDecimal body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterNumberSerialize(body, securityContext);
}
@@ -135,8 +129,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output string", response = String.class) })
- public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body") String body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body") String body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterStringSerialize(body, securityContext);
}
@@ -147,8 +140,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @NotNull @Valid FileSchemaTestClass fileSchemaTestClass
-,@Context SecurityContext securityContext)
+ public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @NotNull @Valid FileSchemaTestClass fileSchemaTestClass,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testBodyWithFileSchema(fileSchemaTestClass, securityContext);
}
@@ -159,9 +151,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @QueryParam("query") @NotNull String query
-,@ApiParam(value = "", required = true) @NotNull @Valid User user
-,@Context SecurityContext securityContext)
+ public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @QueryParam("query") @NotNull String query,@ApiParam(value = "", required = true) @NotNull @Valid User user,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testBodyWithQueryParams(query, user, securityContext);
}
@@ -172,8 +162,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response testClientModel(@ApiParam(value = "client model", required = true) @NotNull @Valid Client client
-,@Context SecurityContext securityContext)
+ public Response testClientModel(@ApiParam(value = "client model", required = true) @NotNull @Valid Client client,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testClientModel(client, securityContext);
}
@@ -188,25 +177,10 @@ public class FakeApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number
-,@ApiParam(value = "None", required=true) @FormParam("double") Double _double
-,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter
-,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte
-,@ApiParam(value = "None") @FormParam("integer") Integer integer
-,@ApiParam(value = "None") @FormParam("int32") Integer int32
-,@ApiParam(value = "None") @FormParam("int64") Long int64
-,@ApiParam(value = "None") @FormParam("float") Float _float
-,@ApiParam(value = "None") @FormParam("string") String string
-,
- @FormDataParam("binary") InputStream binaryInputStream,
- @FormDataParam("binary") FormDataContentDisposition binaryDetail
-,@ApiParam(value = "None") @FormParam("date") Date date
-,@ApiParam(value = "None") @FormParam("dateTime") Date dateTime
-,@ApiParam(value = "None") @FormParam("password") String password
-,@ApiParam(value = "None") @FormParam("callback") String paramCallback
-,@Context SecurityContext securityContext)
+ public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String string,
+ @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") Date date,@ApiParam(value = "None") @FormParam("dateTime") Date dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryInputStream, binaryDetail, date, dateTime, password, paramCallback, securityContext);
+ return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext);
}
@GET
@@ -217,15 +191,7 @@ public class FakeApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid request", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Not found", response = Void.class) })
- public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $", defaultValue="new ArrayList<String>()")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray
-,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString
-,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") @Valid List<String> enumQueryStringArray
-,@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<String> 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)
+ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $", defaultValue="new ArrayList<String>()")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") @Valid List<String> enumQueryStringArray,@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<String> 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 {
return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, securityContext);
}
@@ -238,13 +204,7 @@ public class FakeApi {
}, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 400, message = "Someting wrong", response = Void.class) })
- public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull Integer requiredStringGroup
-,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup
-,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull Long requiredInt64Group
-,@ApiParam(value = "String in group parameters") @QueryParam("string_group") Integer stringGroup
-,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup
-,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group") Long int64Group
-,@Context SecurityContext securityContext)
+ public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull Long requiredInt64Group,@ApiParam(value = "String in group parameters") @QueryParam("string_group") Integer stringGroup,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group") Long int64Group,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, securityContext);
}
@@ -255,8 +215,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response testInlineAdditionalProperties(@ApiParam(value = "request body", required = true) @NotNull @Valid Map<String, String> requestBody
-,@Context SecurityContext securityContext)
+ public Response testInlineAdditionalProperties(@ApiParam(value = "request body", required = true) @NotNull @Valid Map<String, String> requestBody,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testInlineAdditionalProperties(requestBody, securityContext);
}
@@ -267,9 +226,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "test json serialization of form data", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response testJsonFormData(@ApiParam(value = "field1", required=true) @FormParam("param") String param
-,@ApiParam(value = "field2", required=true) @FormParam("param2") String param2
-,@Context SecurityContext securityContext)
+ public Response testJsonFormData(@ApiParam(value = "field1", required=true) @FormParam("param") String param,@ApiParam(value = "field2", required=true) @FormParam("param2") String param2,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testJsonFormData(param, param2, securityContext);
}
@@ -280,12 +237,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "To test the collection format in query parameters", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testQueryParameterCollectionFormat(@ApiParam(value = "", required = true) @QueryParam("pipe") @NotNull @Valid List<String> pipe
-,@ApiParam(value = "", required = true) @QueryParam("ioutil") @NotNull @Valid List<String> ioutil
-,@ApiParam(value = "", required = true) @QueryParam("http") @NotNull @Valid List<String> http
-,@ApiParam(value = "", required = true) @QueryParam("url") @NotNull @Valid List<String> url
-,@ApiParam(value = "", required = true) @QueryParam("context") @NotNull @Valid List<String> context
-,@Context SecurityContext securityContext)
+ public Response testQueryParameterCollectionFormat(@ApiParam(value = "", required = true) @QueryParam("pipe") @NotNull @Valid List<String> pipe,@ApiParam(value = "", required = true) @QueryParam("ioutil") @NotNull @Valid List<String> ioutil,@ApiParam(value = "", required = true) @QueryParam("http") @NotNull @Valid List<String> http,@ApiParam(value = "", required = true) @QueryParam("url") @NotNull @Valid List<String> url,@ApiParam(value = "", required = true) @QueryParam("context") @NotNull @Valid List<String> context,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, securityContext);
}
@@ -301,13 +253,9 @@ public class FakeApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
- public Response uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId
-,
- @FormDataParam("requiredFile") InputStream requiredFileInputStream,
- @FormDataParam("requiredFile") FormDataContentDisposition requiredFileDetail
-,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata
-,@Context SecurityContext securityContext)
+ public Response uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,
+ @FormDataParam("requiredFile") FormDataBodyPart requiredFileBodypart ,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFileWithRequiredFile(petId, requiredFileInputStream, requiredFileDetail, additionalMetadata, securityContext);
+ return delegate.uploadFileWithRequiredFile(petId, requiredFileBodypart, additionalMetadata, securityContext);
}
}
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
index 2c42464c17c..63068f1fcba 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.math.BigDecimal;
import org.openapitools.model.Client;
@@ -36,11 +36,11 @@ public abstract class FakeApiService {
public abstract Response testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass,SecurityContext securityContext) throws NotFoundException;
public abstract Response testBodyWithQueryParams( @NotNull String query,User user,SecurityContext securityContext) throws NotFoundException;
public abstract Response testClientModel(Client client,SecurityContext securityContext) throws NotFoundException;
- public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,InputStream binaryInputStream, FormDataContentDisposition binaryDetail,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException;
public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException;
public abstract Response testInlineAdditionalProperties(Map<String, String> requestBody,SecurityContext securityContext) throws NotFoundException;
public abstract Response testJsonFormData(String param,String param2,SecurityContext securityContext) throws NotFoundException;
public abstract Response testQueryParameterCollectionFormat( @NotNull List<String> pipe, @NotNull List<String> ioutil, @NotNull List<String> http, @NotNull List<String> url, @NotNull List<String> context,SecurityContext securityContext) throws NotFoundException;
- public abstract Response uploadFileWithRequiredFile(Long petId,InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail,String additionalMetadata,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response uploadFileWithRequiredFile(Long petId,FormDataBodyPart requiredFileBodypart,String additionalMetadata,SecurityContext securityContext) throws NotFoundException;
}
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index b8044b9ddcf..d0c2ed09e19 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -64,8 +64,7 @@ public class FakeClassnameTestApi {
}, tags={ "fake_classname_tags 123#$%^", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response testClassname(@ApiParam(value = "client model", required = true) @NotNull @Valid Client client
-,@Context SecurityContext securityContext)
+ public Response testClassname(@ApiParam(value = "client model", required = true) @NotNull @Valid Client client,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testClassname(client, securityContext);
}
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
index 0fc31f0c473..139bc662787 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.openapitools.model.Client;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java
index 665a7a3ecb2..b8c8acf12a9 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApiService.java
index 9ce244a6c1a..a4dc114ae7e 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.openapitools.model.InlineResponseDefault;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java
index 2049e604b87..e4e091bf1d8 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java
@@ -17,8 +17,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -69,8 +69,7 @@ public class PetApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
- public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet pet
-,@Context SecurityContext securityContext)
+ public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet pet,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.addPet(pet, securityContext);
}
@@ -86,9 +85,7 @@ public class PetApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
- public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey
-,@Context SecurityContext securityContext)
+ public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deletePet(petId, apiKey, securityContext);
}
@@ -106,8 +103,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Void.class) })
- public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true) @QueryParam("status") @NotNull @Valid List<String> status
-,@Context SecurityContext securityContext)
+ public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true) @QueryParam("status") @NotNull @Valid List<String> status,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.findPetsByStatus(status, securityContext);
}
@@ -125,8 +121,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
@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<String> tags
-,@Context SecurityContext securityContext)
+ public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid List<String> tags,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.findPetsByTags(tags, securityContext);
}
@@ -143,8 +138,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class) })
- public Response getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathParam("petId") @NotNull Long petId
-,@Context SecurityContext securityContext)
+ public Response getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathParam("petId") @NotNull Long petId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getPetById(petId, securityContext);
}
@@ -164,8 +158,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
- public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet pet
-,@Context SecurityContext securityContext)
+ public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet pet,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updatePet(pet, securityContext);
}
@@ -181,10 +174,7 @@ public class PetApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
- public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "Updated name of the pet") @FormParam("name") String name
-,@ApiParam(value = "Updated status of the pet") @FormParam("status") String status
-,@Context SecurityContext securityContext)
+ public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "Updated name of the pet") @FormParam("name") String name,@ApiParam(value = "Updated status of the pet") @FormParam("status") String status,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updatePetWithForm(petId, name, status, securityContext);
}
@@ -200,13 +190,9 @@ public class PetApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
- public Response uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata
-,
- @FormDataParam("file") InputStream fileInputStream,
- @FormDataParam("file") FormDataContentDisposition fileDetail
-,@Context SecurityContext securityContext)
+ public Response uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata,
+ @FormDataParam("file") FormDataBodyPart fileBodypart ,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFile(petId, additionalMetadata, fileInputStream, fileDetail, securityContext);
+ return delegate.uploadFile(petId, additionalMetadata, fileBodypart, securityContext);
}
}
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java
index 9271117c1c7..980e4a86f31 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.io.File;
import org.openapitools.model.ModelApiResponse;
@@ -26,5 +26,5 @@ public abstract class PetApiService {
public abstract Response getPetById(Long petId,SecurityContext securityContext) throws NotFoundException;
public abstract Response updatePet(Pet pet,SecurityContext securityContext) throws NotFoundException;
public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext) throws NotFoundException;
- public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream fileInputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response uploadFile(Long petId,String additionalMetadata,FormDataBodyPart fileBodypart,SecurityContext securityContext) throws NotFoundException;
}
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java
index 54a5de5fc1c..8b8feaa5aa3 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -65,8 +65,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
- public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathParam("order_id") @NotNull String orderId
-,@Context SecurityContext securityContext)
+ public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathParam("order_id") @NotNull String orderId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deleteOrder(orderId, securityContext);
}
@@ -94,8 +93,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
- public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathParam("order_id") @NotNull @Min(1L) @Max(5L) Long orderId
-,@Context SecurityContext securityContext)
+ public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathParam("order_id") @NotNull @Min(1L) @Max(5L) Long orderId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getOrderById(orderId, securityContext);
}
@@ -108,8 +106,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) })
- public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid Order order
-,@Context SecurityContext securityContext)
+ public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid Order order,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.placeOrder(order, securityContext);
}
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java
index db5973e5e18..ac681a28f25 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.util.Map;
import org.openapitools.model.Order;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java
index 985068a9a91..bd4006d8d8c 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -63,8 +63,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUser(@ApiParam(value = "Created user object", required = true) @NotNull @Valid User user
-,@Context SecurityContext securityContext)
+ public Response createUser(@ApiParam(value = "Created user object", required = true) @NotNull @Valid User user,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUser(user, securityContext);
}
@@ -75,8 +74,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> user
-,@Context SecurityContext securityContext)
+ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> user,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUsersWithArrayInput(user, securityContext);
}
@@ -87,8 +85,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> user
-,@Context SecurityContext securityContext)
+ public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> user,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUsersWithListInput(user, securityContext);
}
@@ -101,8 +98,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathParam("username") @NotNull String username
-,@Context SecurityContext securityContext)
+ public Response deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathParam("username") @NotNull String username,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deleteUser(username, securityContext);
}
@@ -117,8 +113,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathParam("username") @NotNull String username
-,@Context SecurityContext securityContext)
+ public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathParam("username") @NotNull String username,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getUserByName(username, securityContext);
}
@@ -131,9 +126,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) })
- public Response loginUser(@ApiParam(value = "The user name for login", required = true) @QueryParam("username") @NotNull String username
-,@ApiParam(value = "The password for login in clear text", required = true) @QueryParam("password") @NotNull String password
-,@Context SecurityContext securityContext)
+ public Response loginUser(@ApiParam(value = "The user name for login", required = true) @QueryParam("username") @NotNull String username,@ApiParam(value = "The password for login in clear text", required = true) @QueryParam("password") @NotNull String password,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.loginUser(username, password, securityContext);
}
@@ -157,9 +150,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathParam("username") @NotNull String username
-,@ApiParam(value = "Updated user object", required = true) @NotNull @Valid User user
-,@Context SecurityContext securityContext)
+ public Response updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathParam("username") @NotNull String username,@ApiParam(value = "Updated user object", required = true) @NotNull @Valid User user,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updateUser(username, user, securityContext);
}
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java
index a25672ffa0d..1464a5adacb 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.util.List;
import org.openapitools.model.User;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index 2217a5b8ca4..fdee4655636 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -10,7 +10,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index eb5903498e5..0a6baad8ade 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -20,7 +20,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
@@ -73,7 +73,7 @@ public class FakeApiServiceImpl extends FakeApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, InputStream binaryInputStream, FormDataContentDisposition binaryDetail, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
+ public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
// do some magic!
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@@ -103,7 +103,7 @@ public class FakeApiServiceImpl extends FakeApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFileWithRequiredFile(Long petId, InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail, String additionalMetadata, SecurityContext securityContext) throws NotFoundException {
+ public Response uploadFileWithRequiredFile(Long petId, FormDataBodyPart requiredFileBodypart, String additionalMetadata, 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/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
index 690693d4a5a..7fd09a048e1 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
@@ -10,7 +10,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FooApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FooApiServiceImpl.java
index 8e70dbf3be2..1b87caa98f6 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FooApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FooApiServiceImpl.java
@@ -10,7 +10,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index fc29b062439..6d874bf7d91 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
@@ -12,7 +12,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
@@ -55,7 +55,7 @@ public class PetApiServiceImpl extends PetApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFile(Long petId, String additionalMetadata, InputStream fileInputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext) throws NotFoundException {
+ public Response uploadFile(Long petId, String additionalMetadata, FormDataBodyPart fileBodypart, 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/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index ea00608349f..6fdfb60073a 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -11,7 +11,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 2591ff60535..2d7b2e001a4 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -11,7 +11,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
index 8e38855afa7..57c02e3b530 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -44,7 +44,7 @@ public abstract class FakeApiService {
throws NotFoundException;
public abstract Response testClientModel(Client body,SecurityContext securityContext)
throws NotFoundException;
- public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,InputStream binaryInputStream, FormDataContentDisposition binaryDetail,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext)
+ public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext)
throws NotFoundException;
public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext)
throws NotFoundException;
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 f68ba1ccb37..1e0abab3bd5 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
@@ -37,8 +37,8 @@ public abstract class PetApiService {
throws NotFoundException;
public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext)
throws NotFoundException;
- public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream fileInputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext)
+ public abstract Response uploadFile(Long petId,String additionalMetadata,FormDataBodyPart fileBodypart,SecurityContext securityContext)
throws NotFoundException;
- public abstract Response uploadFileWithRequiredFile(Long petId,InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail,String additionalMetadata,SecurityContext securityContext)
+ public abstract Response uploadFileWithRequiredFile(Long petId,FormDataBodyPart requiredFileBodypart,String additionalMetadata,SecurityContext securityContext)
throws NotFoundException;
}
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 64ce9b34b3a..66c59b39aa3 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -77,7 +77,7 @@ public class FakeApiServiceImpl extends FakeApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, InputStream binaryInputStream, FormDataContentDisposition binaryDetail, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext)
+ public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, 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-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 aa93e350cf0..be36601de24 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
@@ -66,13 +66,13 @@ public class PetApiServiceImpl extends PetApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFile(Long petId, String additionalMetadata, InputStream fileInputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext)
+ public Response uploadFile(Long petId, String additionalMetadata, FormDataBodyPart fileBodypart, SecurityContext securityContext)
throws NotFoundException {
// do some magic!
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFileWithRequiredFile(Long petId, InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail, String additionalMetadata, SecurityContext securityContext)
+ public Response uploadFileWithRequiredFile(Long petId, FormDataBodyPart requiredFileBodypart, String additionalMetadata, 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/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java
index a6ac294ff42..ebfa3cf239e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -45,7 +45,7 @@ public abstract class FakeApiService {
throws NotFoundException;
public abstract Response testClientModel(Client body,SecurityContext securityContext)
throws NotFoundException;
- public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,InputStream binaryInputStream, FormDataContentDisposition binaryDetail,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext)
+ public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext)
throws NotFoundException;
public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext)
throws NotFoundException;
@@ -57,6 +57,6 @@ public abstract class FakeApiService {
throws NotFoundException;
public abstract Response testQueryParameterCollectionFormat( @NotNull List<String> pipe, @NotNull List<String> ioutil, @NotNull List<String> http, @NotNull List<String> url, @NotNull List<String> context,SecurityContext securityContext)
throws NotFoundException;
- public abstract Response uploadFileWithRequiredFile(Long petId,InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail,String additionalMetadata,SecurityContext securityContext)
+ public abstract Response uploadFileWithRequiredFile(Long petId,FormDataBodyPart requiredFileBodypart,String additionalMetadata,SecurityContext securityContext)
throws NotFoundException;
}
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 c1e3d168cce..bb967730381 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
@@ -37,6 +37,6 @@ public abstract class PetApiService {
throws NotFoundException;
public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext)
throws NotFoundException;
- public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream fileInputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext)
+ public abstract Response uploadFile(Long petId,String additionalMetadata,FormDataBodyPart fileBodypart,SecurityContext securityContext)
throws NotFoundException;
}
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 39ad737f4e8..f5711713bed 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -78,7 +78,7 @@ public class FakeApiServiceImpl extends FakeApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, InputStream binaryInputStream, FormDataContentDisposition binaryDetail, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext)
+ public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext)
throws NotFoundException {
// do some magic!
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
@@ -114,7 +114,7 @@ public class FakeApiServiceImpl extends FakeApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFileWithRequiredFile(Long petId, InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail, String additionalMetadata, SecurityContext securityContext)
+ public Response uploadFileWithRequiredFile(Long petId, FormDataBodyPart requiredFileBodypart, String additionalMetadata, 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/main/java/org/openapitools/api/impl/PetApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/PetApiServiceImpl.java
index 8c6ed665c94..a153875ba1d 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
@@ -66,7 +66,7 @@ public class PetApiServiceImpl extends PetApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFile(Long petId, String additionalMetadata, InputStream fileInputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext)
+ public Response uploadFile(Long petId, String additionalMetadata, FormDataBodyPart fileBodypart, 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/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 887d0fe1785..828b1a21e67 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -62,8 +62,7 @@ public class AnotherFakeApi {
@io.swagger.annotations.ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response call123testSpecialTags(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body
-,@Context SecurityContext securityContext)
+ public Response call123testSpecialTags(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.call123testSpecialTags(body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index 1096acf12f0..2dc873d3a75 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.openapitools.model.Client;
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 1c33d651b21..1db92cafd33 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
@@ -23,8 +23,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -70,8 +70,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "creates an XmlItem", notes = "this route creates an XmlItem", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createXmlItem(@ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid XmlItem xmlItem
-,@Context SecurityContext securityContext)
+ public Response createXmlItem(@ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid XmlItem xmlItem,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createXmlItem(xmlItem, securityContext);
}
@@ -82,8 +81,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
- public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body") Boolean body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body") Boolean body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterBooleanSerialize(body, securityContext);
}
@@ -94,8 +92,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
- public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body") @Valid OuterComposite body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body") @Valid OuterComposite body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterCompositeSerialize(body, securityContext);
}
@@ -106,8 +103,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
- public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body") BigDecimal body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body") BigDecimal body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterNumberSerialize(body, securityContext);
}
@@ -118,8 +114,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output string", response = String.class) })
- public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body") String body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body") String body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterStringSerialize(body, securityContext);
}
@@ -130,8 +125,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @NotNull @Valid FileSchemaTestClass body
-,@Context SecurityContext securityContext)
+ public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @NotNull @Valid FileSchemaTestClass body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testBodyWithFileSchema(body, securityContext);
}
@@ -142,9 +136,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @QueryParam("query") @NotNull String query
-,@ApiParam(value = "", required = true) @NotNull @Valid User body
-,@Context SecurityContext securityContext)
+ public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @QueryParam("query") @NotNull String query,@ApiParam(value = "", required = true) @NotNull @Valid User body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testBodyWithQueryParams(query, body, securityContext);
}
@@ -155,8 +147,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response testClientModel(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body
-,@Context SecurityContext securityContext)
+ public Response testClientModel(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testClientModel(body, securityContext);
}
@@ -171,25 +162,10 @@ public class FakeApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number
-,@ApiParam(value = "None", required=true) @FormParam("double") Double _double
-,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter
-,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte
-,@ApiParam(value = "None") @FormParam("integer") Integer integer
-,@ApiParam(value = "None") @FormParam("int32") Integer int32
-,@ApiParam(value = "None") @FormParam("int64") Long int64
-,@ApiParam(value = "None") @FormParam("float") Float _float
-,@ApiParam(value = "None") @FormParam("string") String string
-,
- @FormDataParam("binary") InputStream binaryInputStream,
- @FormDataParam("binary") FormDataContentDisposition binaryDetail
-,@ApiParam(value = "None") @FormParam("date") Date date
-,@ApiParam(value = "None") @FormParam("dateTime") Date dateTime
-,@ApiParam(value = "None") @FormParam("password") String password
-,@ApiParam(value = "None") @FormParam("callback") String paramCallback
-,@Context SecurityContext securityContext)
+ public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String string,
+ @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") Date date,@ApiParam(value = "None") @FormParam("dateTime") Date dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryInputStream, binaryDetail, date, dateTime, password, paramCallback, securityContext);
+ return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext);
}
@GET
@@ -200,15 +176,7 @@ public class FakeApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid request", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Not found", response = Void.class) })
- public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $", defaultValue="new ArrayList<String>()")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray
-,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString
-,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") @Valid List<String> enumQueryStringArray
-,@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<String> 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)
+ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $", defaultValue="new ArrayList<String>()")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") @Valid List<String> enumQueryStringArray,@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<String> 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 {
return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, securityContext);
}
@@ -219,13 +187,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 400, message = "Someting wrong", response = Void.class) })
- public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull Integer requiredStringGroup
-,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup
-,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull Long requiredInt64Group
-,@ApiParam(value = "String in group parameters") @QueryParam("string_group") Integer stringGroup
-,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup
-,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group") Long int64Group
-,@Context SecurityContext securityContext)
+ public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull Long requiredInt64Group,@ApiParam(value = "String in group parameters") @QueryParam("string_group") Integer stringGroup,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group") Long int64Group,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, securityContext);
}
@@ -236,8 +198,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response testInlineAdditionalProperties(@ApiParam(value = "request body", required = true) @NotNull @Valid Map<String, String> param
-,@Context SecurityContext securityContext)
+ public Response testInlineAdditionalProperties(@ApiParam(value = "request body", required = true) @NotNull @Valid Map<String, String> param,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testInlineAdditionalProperties(param, securityContext);
}
@@ -248,9 +209,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "test json serialization of form data", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response testJsonFormData(@ApiParam(value = "field1", required=true) @FormParam("param") String param
-,@ApiParam(value = "field2", required=true) @FormParam("param2") String param2
-,@Context SecurityContext securityContext)
+ public Response testJsonFormData(@ApiParam(value = "field1", required=true) @FormParam("param") String param,@ApiParam(value = "field2", required=true) @FormParam("param2") String param2,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testJsonFormData(param, param2, securityContext);
}
@@ -261,12 +220,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "To test the collection format in query parameters", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testQueryParameterCollectionFormat(@ApiParam(value = "", required = true) @QueryParam("pipe") @NotNull @Valid List<String> pipe
-,@ApiParam(value = "", required = true) @QueryParam("ioutil") @NotNull @Valid List<String> ioutil
-,@ApiParam(value = "", required = true) @QueryParam("http") @NotNull @Valid List<String> http
-,@ApiParam(value = "", required = true) @QueryParam("url") @NotNull @Valid List<String> url
-,@ApiParam(value = "", required = true) @QueryParam("context") @NotNull @Valid List<String> context
-,@Context SecurityContext securityContext)
+ public Response testQueryParameterCollectionFormat(@ApiParam(value = "", required = true) @QueryParam("pipe") @NotNull @Valid List<String> pipe,@ApiParam(value = "", required = true) @QueryParam("ioutil") @NotNull @Valid List<String> ioutil,@ApiParam(value = "", required = true) @QueryParam("http") @NotNull @Valid List<String> http,@ApiParam(value = "", required = true) @QueryParam("url") @NotNull @Valid List<String> url,@ApiParam(value = "", required = true) @QueryParam("context") @NotNull @Valid List<String> context,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, securityContext);
}
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
index 04525b1f5df..b74ceeb26a3 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.math.BigDecimal;
import org.openapitools.model.Client;
@@ -33,7 +33,7 @@ public abstract class FakeApiService {
public abstract Response testBodyWithFileSchema(FileSchemaTestClass body,SecurityContext securityContext) throws NotFoundException;
public abstract Response testBodyWithQueryParams( @NotNull String query,User body,SecurityContext securityContext) throws NotFoundException;
public abstract Response testClientModel(Client body,SecurityContext securityContext) throws NotFoundException;
- public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,InputStream binaryInputStream, FormDataContentDisposition binaryDetail,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException;
public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException;
public abstract Response testInlineAdditionalProperties(Map<String, String> param,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
index 7ac43c4b2dd..7576189e356 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -64,8 +64,7 @@ public class FakeClassnameTags123Api {
}, tags={ "fake_classname_tags 123#$%^", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response testClassname(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body
-,@Context SecurityContext securityContext)
+ public Response testClassname(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testClassname(body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
index 145d6a55888..224bd192b52 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.openapitools.model.Client;
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 a0e63a03a9e..1f5fd171a90 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
@@ -18,8 +18,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -72,8 +72,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
- public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body
-,@Context SecurityContext securityContext)
+ public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.addPet(body, securityContext);
}
@@ -91,9 +90,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
- public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey
-,@Context SecurityContext securityContext)
+ public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deletePet(petId, apiKey, securityContext);
}
@@ -111,8 +108,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Void.class) })
- public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true) @QueryParam("status") @NotNull @Valid List<String> status
-,@Context SecurityContext securityContext)
+ public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true) @QueryParam("status") @NotNull @Valid List<String> status,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.findPetsByStatus(status, securityContext);
}
@@ -130,8 +126,7 @@ public class PetApi {
@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 Set<String> tags
-,@Context SecurityContext securityContext)
+ public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid Set<String> tags,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.findPetsByTags(tags, securityContext);
}
@@ -148,8 +143,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class) })
- public Response getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathParam("petId") @NotNull Long petId
-,@Context SecurityContext securityContext)
+ public Response getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathParam("petId") @NotNull Long petId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getPetById(petId, securityContext);
}
@@ -171,8 +165,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
- public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body
-,@Context SecurityContext securityContext)
+ public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updatePet(body, securityContext);
}
@@ -188,10 +181,7 @@ public class PetApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
- public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "Updated name of the pet") @FormParam("name") String name
-,@ApiParam(value = "Updated status of the pet") @FormParam("status") String status
-,@Context SecurityContext securityContext)
+ public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "Updated name of the pet") @FormParam("name") String name,@ApiParam(value = "Updated status of the pet") @FormParam("status") String status,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updatePetWithForm(petId, name, status, securityContext);
}
@@ -207,14 +197,10 @@ public class PetApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
- public Response uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata
-,
- @FormDataParam("file") InputStream fileInputStream,
- @FormDataParam("file") FormDataContentDisposition fileDetail
-,@Context SecurityContext securityContext)
+ public Response uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata,
+ @FormDataParam("file") FormDataBodyPart fileBodypart ,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFile(petId, additionalMetadata, fileInputStream, fileDetail, securityContext);
+ return delegate.uploadFile(petId, additionalMetadata, fileBodypart, securityContext);
}
@POST
@Path("/fake/{petId}/uploadImageWithRequiredFile")
@@ -228,13 +214,9 @@ public class PetApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
- public Response uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId
-,
- @FormDataParam("requiredFile") InputStream requiredFileInputStream,
- @FormDataParam("requiredFile") FormDataContentDisposition requiredFileDetail
-,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata
-,@Context SecurityContext securityContext)
+ public Response uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,
+ @FormDataParam("requiredFile") FormDataBodyPart requiredFileBodypart ,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFileWithRequiredFile(petId, requiredFileInputStream, requiredFileDetail, additionalMetadata, securityContext);
+ return delegate.uploadFileWithRequiredFile(petId, requiredFileBodypart, additionalMetadata, 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 c1479cf7190..97cfb1e1042 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
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.io.File;
import org.openapitools.model.ModelApiResponse;
@@ -27,6 +27,6 @@ public abstract class PetApiService {
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;
- public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream fileInputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext) throws NotFoundException;
- public abstract Response uploadFileWithRequiredFile(Long petId,InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail,String additionalMetadata,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response uploadFile(Long petId,String additionalMetadata,FormDataBodyPart fileBodypart,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response uploadFileWithRequiredFile(Long petId,FormDataBodyPart requiredFileBodypart,String additionalMetadata,SecurityContext securityContext) throws NotFoundException;
}
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java
index 99c5047915d..3f9f55d4acc 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -65,8 +65,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
- public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathParam("order_id") @NotNull String orderId
-,@Context SecurityContext securityContext)
+ public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathParam("order_id") @NotNull String orderId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deleteOrder(orderId, securityContext);
}
@@ -94,8 +93,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
- public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathParam("order_id") @NotNull @Min(1L) @Max(5L) Long orderId
-,@Context SecurityContext securityContext)
+ public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathParam("order_id") @NotNull @Min(1L) @Max(5L) Long orderId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getOrderById(orderId, securityContext);
}
@@ -108,8 +106,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) })
- public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid Order body
-,@Context SecurityContext securityContext)
+ public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid Order body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.placeOrder(body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
index 885579d9f0f..6cc42048700 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.util.Map;
import org.openapitools.model.Order;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java
index e1a98f9cd06..7ad517e4c0d 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -63,8 +63,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUser(@ApiParam(value = "Created user object", required = true) @NotNull @Valid User body
-,@Context SecurityContext securityContext)
+ public Response createUser(@ApiParam(value = "Created user object", required = true) @NotNull @Valid User body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUser(body, securityContext);
}
@@ -75,8 +74,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body
-,@Context SecurityContext securityContext)
+ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUsersWithArrayInput(body, securityContext);
}
@@ -87,8 +85,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body
-,@Context SecurityContext securityContext)
+ public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUsersWithListInput(body, securityContext);
}
@@ -101,8 +98,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathParam("username") @NotNull String username
-,@Context SecurityContext securityContext)
+ public Response deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathParam("username") @NotNull String username,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deleteUser(username, securityContext);
}
@@ -117,8 +113,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathParam("username") @NotNull String username
-,@Context SecurityContext securityContext)
+ public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathParam("username") @NotNull String username,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getUserByName(username, securityContext);
}
@@ -131,9 +126,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) })
- public Response loginUser(@ApiParam(value = "The user name for login", required = true) @QueryParam("username") @NotNull String username
-,@ApiParam(value = "The password for login in clear text", required = true) @QueryParam("password") @NotNull String password
-,@Context SecurityContext securityContext)
+ public Response loginUser(@ApiParam(value = "The user name for login", required = true) @QueryParam("username") @NotNull String username,@ApiParam(value = "The password for login in clear text", required = true) @QueryParam("password") @NotNull String password,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.loginUser(username, password, securityContext);
}
@@ -157,9 +150,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathParam("username") @NotNull String username
-,@ApiParam(value = "Updated user object", required = true) @NotNull @Valid User body
-,@Context SecurityContext securityContext)
+ public Response updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathParam("username") @NotNull String username,@ApiParam(value = "Updated user object", required = true) @NotNull @Valid User body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updateUser(username, body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApiService.java
index 97ec792f0f7..15e4486bc6c 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.util.List;
import org.openapitools.model.User;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index 661940c66dd..cb1a8cd7e00 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -10,7 +10,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index a0aab5f5ddf..a948630d224 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -18,7 +18,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
@@ -66,7 +66,7 @@ public class FakeApiServiceImpl extends FakeApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, InputStream binaryInputStream, FormDataContentDisposition binaryDetail, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
+ public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, 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/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
index e1a09f86ecb..4e066abcbee 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
@@ -10,7 +10,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
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 0d819b4333a..1f250a1a44c 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
@@ -13,7 +13,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
@@ -56,12 +56,12 @@ public class PetApiServiceImpl extends PetApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFile(Long petId, String additionalMetadata, InputStream fileInputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext) throws NotFoundException {
+ public Response uploadFile(Long petId, String additionalMetadata, FormDataBodyPart fileBodypart, SecurityContext securityContext) throws NotFoundException {
// do some magic!
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFileWithRequiredFile(Long petId, InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail, String additionalMetadata, SecurityContext securityContext) throws NotFoundException {
+ public Response uploadFileWithRequiredFile(Long petId, FormDataBodyPart requiredFileBodypart, String additionalMetadata, 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/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 1e67037417e..51a7d07d47b 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -11,7 +11,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 03a2c24f326..1e5df1742f1 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -11,7 +11,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 77578e62d3d..c3b6939b7e7 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -62,8 +62,7 @@ public class AnotherFakeApi {
@io.swagger.annotations.ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", response = Client.class, tags={ "$another-fake?", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response call123testSpecialTags(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body
-,@Context SecurityContext securityContext)
+ public Response call123testSpecialTags(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.call123testSpecialTags(body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index 1096acf12f0..2dc873d3a75 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.openapitools.model.Client;
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 dbac80bce28..847f76099f9 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
@@ -24,8 +24,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -71,8 +71,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "creates an XmlItem", notes = "this route creates an XmlItem", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createXmlItem(@ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid XmlItem xmlItem
-,@Context SecurityContext securityContext)
+ public Response createXmlItem(@ApiParam(value = "XmlItem Body", required = true) @NotNull @Valid XmlItem xmlItem,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createXmlItem(xmlItem, securityContext);
}
@@ -83,8 +82,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer boolean types", response = Boolean.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
- public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body") Boolean body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as post body") Boolean body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterBooleanSerialize(body, securityContext);
}
@@ -95,8 +93,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of object with outer number type", response = OuterComposite.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
- public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body") @Valid OuterComposite body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite as post body") @Valid OuterComposite body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterCompositeSerialize(body, securityContext);
}
@@ -107,8 +104,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer number types", response = BigDecimal.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
- public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body") BigDecimal body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post body") BigDecimal body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterNumberSerialize(body, securityContext);
}
@@ -119,8 +115,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of outer string types", response = String.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Output string", response = String.class) })
- public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body") String body
-,@Context SecurityContext securityContext)
+ public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post body") String body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.fakeOuterStringSerialize(body, securityContext);
}
@@ -131,8 +126,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @NotNull @Valid FileSchemaTestClass body
-,@Context SecurityContext securityContext)
+ public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @NotNull @Valid FileSchemaTestClass body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testBodyWithFileSchema(body, securityContext);
}
@@ -143,9 +137,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @QueryParam("query") @NotNull String query
-,@ApiParam(value = "", required = true) @NotNull @Valid User body
-,@Context SecurityContext securityContext)
+ public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @QueryParam("query") @NotNull String query,@ApiParam(value = "", required = true) @NotNull @Valid User body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testBodyWithQueryParams(query, body, securityContext);
}
@@ -156,8 +148,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response testClientModel(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body
-,@Context SecurityContext securityContext)
+ public Response testClientModel(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testClientModel(body, securityContext);
}
@@ -172,25 +163,10 @@ public class FakeApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number
-,@ApiParam(value = "None", required=true) @FormParam("double") Double _double
-,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter
-,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte
-,@ApiParam(value = "None") @FormParam("integer") Integer integer
-,@ApiParam(value = "None") @FormParam("int32") Integer int32
-,@ApiParam(value = "None") @FormParam("int64") Long int64
-,@ApiParam(value = "None") @FormParam("float") Float _float
-,@ApiParam(value = "None") @FormParam("string") String string
-,
- @FormDataParam("binary") InputStream binaryInputStream,
- @FormDataParam("binary") FormDataContentDisposition binaryDetail
-,@ApiParam(value = "None") @FormParam("date") Date date
-,@ApiParam(value = "None") @FormParam("dateTime") Date dateTime
-,@ApiParam(value = "None") @FormParam("password") String password
-,@ApiParam(value = "None") @FormParam("callback") String paramCallback
-,@Context SecurityContext securityContext)
+ public Response testEndpointParameters(@ApiParam(value = "None", required=true) @FormParam("number") BigDecimal number,@ApiParam(value = "None", required=true) @FormParam("double") Double _double,@ApiParam(value = "None", required=true) @FormParam("pattern_without_delimiter") String patternWithoutDelimiter,@ApiParam(value = "None", required=true) @FormParam("byte") byte[] _byte,@ApiParam(value = "None") @FormParam("integer") Integer integer,@ApiParam(value = "None") @FormParam("int32") Integer int32,@ApiParam(value = "None") @FormParam("int64") Long int64,@ApiParam(value = "None") @FormParam("float") Float _float,@ApiParam(value = "None") @FormParam("string") String string,
+ @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None") @FormParam("date") Date date,@ApiParam(value = "None") @FormParam("dateTime") Date dateTime,@ApiParam(value = "None") @FormParam("password") String password,@ApiParam(value = "None") @FormParam("callback") String paramCallback,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryInputStream, binaryDetail, date, dateTime, password, paramCallback, securityContext);
+ return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext);
}
@GET
@@ -201,15 +177,7 @@ public class FakeApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid request", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Not found", response = Void.class) })
- public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $", defaultValue="new ArrayList<String>()")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray
-,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString
-,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") @Valid List<String> enumQueryStringArray
-,@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<String> 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)
+ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $", defaultValue="new ArrayList<String>()")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") @Valid List<String> enumQueryStringArray,@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<String> 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 {
return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, securityContext);
}
@@ -220,13 +188,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 400, message = "Someting wrong", response = Void.class) })
- public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull Integer requiredStringGroup
-,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup
-,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull Long requiredInt64Group
-,@ApiParam(value = "String in group parameters") @QueryParam("string_group") Integer stringGroup
-,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup
-,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group") Long int64Group
-,@Context SecurityContext securityContext)
+ public Response testGroupParameters(@ApiParam(value = "Required String in group parameters", required = true) @QueryParam("required_string_group") @NotNull Integer requiredStringGroup,@ApiParam(value = "Required Boolean in group parameters" ,required=true)@HeaderParam("required_boolean_group") Boolean requiredBooleanGroup,@ApiParam(value = "Required Integer in group parameters", required = true) @QueryParam("required_int64_group") @NotNull Long requiredInt64Group,@ApiParam(value = "String in group parameters") @QueryParam("string_group") Integer stringGroup,@ApiParam(value = "Boolean in group parameters" )@HeaderParam("boolean_group") Boolean booleanGroup,@ApiParam(value = "Integer in group parameters") @QueryParam("int64_group") Long int64Group,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, securityContext);
}
@@ -237,8 +199,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "test inline additionalProperties", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response testInlineAdditionalProperties(@ApiParam(value = "request body", required = true) @NotNull @Valid Map<String, String> param
-,@Context SecurityContext securityContext)
+ public Response testInlineAdditionalProperties(@ApiParam(value = "request body", required = true) @NotNull @Valid Map<String, String> param,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testInlineAdditionalProperties(param, securityContext);
}
@@ -249,9 +210,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "test json serialization of form data", notes = "", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response testJsonFormData(@ApiParam(value = "field1", required=true) @FormParam("param") String param
-,@ApiParam(value = "field2", required=true) @FormParam("param2") String param2
-,@Context SecurityContext securityContext)
+ public Response testJsonFormData(@ApiParam(value = "field1", required=true) @FormParam("param") String param,@ApiParam(value = "field2", required=true) @FormParam("param2") String param2,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testJsonFormData(param, param2, securityContext);
}
@@ -262,12 +221,7 @@ public class FakeApi {
@io.swagger.annotations.ApiOperation(value = "", notes = "To test the collection format in query parameters", response = Void.class, tags={ "fake", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "Success", response = Void.class) })
- public Response testQueryParameterCollectionFormat(@ApiParam(value = "", required = true) @QueryParam("pipe") @NotNull @Valid List<String> pipe
-,@ApiParam(value = "", required = true) @QueryParam("ioutil") @NotNull @Valid List<String> ioutil
-,@ApiParam(value = "", required = true) @QueryParam("http") @NotNull @Valid List<String> http
-,@ApiParam(value = "", required = true) @QueryParam("url") @NotNull @Valid List<String> url
-,@ApiParam(value = "", required = true) @QueryParam("context") @NotNull @Valid List<String> context
-,@Context SecurityContext securityContext)
+ public Response testQueryParameterCollectionFormat(@ApiParam(value = "", required = true) @QueryParam("pipe") @NotNull @Valid List<String> pipe,@ApiParam(value = "", required = true) @QueryParam("ioutil") @NotNull @Valid List<String> ioutil,@ApiParam(value = "", required = true) @QueryParam("http") @NotNull @Valid List<String> http,@ApiParam(value = "", required = true) @QueryParam("url") @NotNull @Valid List<String> url,@ApiParam(value = "", required = true) @QueryParam("context") @NotNull @Valid List<String> context,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, securityContext);
}
@@ -283,13 +237,9 @@ public class FakeApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
- public Response uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId
-,
- @FormDataParam("requiredFile") InputStream requiredFileInputStream,
- @FormDataParam("requiredFile") FormDataContentDisposition requiredFileDetail
-,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata
-,@Context SecurityContext securityContext)
+ public Response uploadFileWithRequiredFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,
+ @FormDataParam("requiredFile") FormDataBodyPart requiredFileBodypart ,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFileWithRequiredFile(petId, requiredFileInputStream, requiredFileDetail, additionalMetadata, securityContext);
+ return delegate.uploadFileWithRequiredFile(petId, requiredFileBodypart, additionalMetadata, securityContext);
}
}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java
index ef99e405ede..145a097c86c 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.math.BigDecimal;
import org.openapitools.model.Client;
@@ -34,11 +34,11 @@ public abstract class FakeApiService {
public abstract Response testBodyWithFileSchema(FileSchemaTestClass body,SecurityContext securityContext) throws NotFoundException;
public abstract Response testBodyWithQueryParams( @NotNull String query,User body,SecurityContext securityContext) throws NotFoundException;
public abstract Response testClientModel(Client body,SecurityContext securityContext) throws NotFoundException;
- public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,InputStream binaryInputStream, FormDataContentDisposition binaryDetail,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException;
public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException;
public abstract Response testInlineAdditionalProperties(Map<String, String> param,SecurityContext securityContext) throws NotFoundException;
public abstract Response testJsonFormData(String param,String param2,SecurityContext securityContext) throws NotFoundException;
public abstract Response testQueryParameterCollectionFormat( @NotNull List<String> pipe, @NotNull List<String> ioutil, @NotNull List<String> http, @NotNull List<String> url, @NotNull List<String> context,SecurityContext securityContext) throws NotFoundException;
- public abstract Response uploadFileWithRequiredFile(Long petId,InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail,String additionalMetadata,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response uploadFileWithRequiredFile(Long petId,FormDataBodyPart requiredFileBodypart,String additionalMetadata,SecurityContext securityContext) throws NotFoundException;
}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index 66be9a4e963..d0b9ebe7ab7 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -64,8 +64,7 @@ public class FakeClassnameTestApi {
}, tags={ "fake_classname_tags 123#$%^", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Client.class) })
- public Response testClassname(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body
-,@Context SecurityContext securityContext)
+ public Response testClassname(@ApiParam(value = "client model", required = true) @NotNull @Valid Client body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.testClassname(body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
index f81b0a146ee..b5890e14dc4 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.openapitools.model.Client;
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 f426e3d49b9..22e390d6d75 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
@@ -18,8 +18,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -72,8 +72,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
- public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body
-,@Context SecurityContext securityContext)
+ public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.addPet(body, securityContext);
}
@@ -91,9 +90,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
- public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey
-,@Context SecurityContext securityContext)
+ public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "" )@HeaderParam("api_key") String apiKey,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deletePet(petId, apiKey, securityContext);
}
@@ -111,8 +108,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value", response = Void.class) })
- public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true) @QueryParam("status") @NotNull @Valid List<String> status
-,@Context SecurityContext securityContext)
+ public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", required = true) @QueryParam("status") @NotNull @Valid List<String> status,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.findPetsByStatus(status, securityContext);
}
@@ -130,8 +126,7 @@ public class PetApi {
@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 Set<String> tags
-,@Context SecurityContext securityContext)
+ public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = true) @QueryParam("tags") @NotNull @Valid Set<String> tags,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.findPetsByTags(tags, securityContext);
}
@@ -148,8 +143,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class) })
- public Response getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathParam("petId") @NotNull Long petId
-,@Context SecurityContext securityContext)
+ public Response getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathParam("petId") @NotNull Long petId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getPetById(petId, securityContext);
}
@@ -171,8 +165,7 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
- public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body
-,@Context SecurityContext securityContext)
+ public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @NotNull @Valid Pet body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updatePet(body, securityContext);
}
@@ -188,10 +181,7 @@ public class PetApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
- public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "Updated name of the pet") @FormParam("name") String name
-,@ApiParam(value = "Updated status of the pet") @FormParam("status") String status
-,@Context SecurityContext securityContext)
+ public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "Updated name of the pet") @FormParam("name") String name,@ApiParam(value = "Updated status of the pet") @FormParam("status") String status,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updatePetWithForm(petId, name, status, securityContext);
}
@@ -207,13 +197,9 @@ public class PetApi {
}, tags={ "pet", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
- public Response uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId
-,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata
-,
- @FormDataParam("file") InputStream fileInputStream,
- @FormDataParam("file") FormDataContentDisposition fileDetail
-,@Context SecurityContext securityContext)
+ public Response uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata") String additionalMetadata,
+ @FormDataParam("file") FormDataBodyPart fileBodypart ,@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFile(petId, additionalMetadata, fileInputStream, fileDetail, securityContext);
+ return delegate.uploadFile(petId, additionalMetadata, fileBodypart, 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 1f44eee7c80..1bf9b537255 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
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.io.File;
import org.openapitools.model.ModelApiResponse;
@@ -27,5 +27,5 @@ public abstract class PetApiService {
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;
- public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream fileInputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext) throws NotFoundException;
+ public abstract Response uploadFile(Long petId,String additionalMetadata,FormDataBodyPart fileBodypart,SecurityContext securityContext) throws NotFoundException;
}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java
index eb37ae7f4e6..11a88fa9459 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -65,8 +65,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
- public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathParam("order_id") @NotNull String orderId
-,@Context SecurityContext securityContext)
+ public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathParam("order_id") @NotNull String orderId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deleteOrder(orderId, securityContext);
}
@@ -94,8 +93,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "Order not found", response = Void.class) })
- public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathParam("order_id") @NotNull @Min(1L) @Max(5L) Long orderId
-,@Context SecurityContext securityContext)
+ public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathParam("order_id") @NotNull @Min(1L) @Max(5L) Long orderId,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getOrderById(orderId, securityContext);
}
@@ -108,8 +106,7 @@ public class StoreApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Order.class),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order", response = Void.class) })
- public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid Order body
-,@Context SecurityContext securityContext)
+ public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @NotNull @Valid Order body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.placeOrder(body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java
index 885579d9f0f..6cc42048700 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.util.Map;
import org.openapitools.model.Order;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java
index 748e6cf83b5..8f8e8f72c01 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Context;
@@ -63,8 +63,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUser(@ApiParam(value = "Created user object", required = true) @NotNull @Valid User body
-,@Context SecurityContext securityContext)
+ public Response createUser(@ApiParam(value = "Created user object", required = true) @NotNull @Valid User body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUser(body, securityContext);
}
@@ -75,8 +74,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body
-,@Context SecurityContext securityContext)
+ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUsersWithArrayInput(body, securityContext);
}
@@ -87,8 +85,7 @@ public class UserApi {
@io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class, tags={ "user", })
@io.swagger.annotations.ApiResponses(value = {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = Void.class) })
- public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body
-,@Context SecurityContext securityContext)
+ public Response createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @NotNull @Valid List<User> body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.createUsersWithListInput(body, securityContext);
}
@@ -101,8 +98,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathParam("username") @NotNull String username
-,@Context SecurityContext securityContext)
+ public Response deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathParam("username") @NotNull String username,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.deleteUser(username, securityContext);
}
@@ -117,8 +113,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathParam("username") @NotNull String username
-,@Context SecurityContext securityContext)
+ public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathParam("username") @NotNull String username,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.getUserByName(username, securityContext);
}
@@ -131,9 +126,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = String.class),
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) })
- public Response loginUser(@ApiParam(value = "The user name for login", required = true) @QueryParam("username") @NotNull String username
-,@ApiParam(value = "The password for login in clear text", required = true) @QueryParam("password") @NotNull String password
-,@Context SecurityContext securityContext)
+ public Response loginUser(@ApiParam(value = "The user name for login", required = true) @QueryParam("username") @NotNull String username,@ApiParam(value = "The password for login in clear text", required = true) @QueryParam("password") @NotNull String password,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.loginUser(username, password, securityContext);
}
@@ -157,9 +150,7 @@ public class UserApi {
@io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
@io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class) })
- public Response updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathParam("username") @NotNull String username
-,@ApiParam(value = "Updated user object", required = true) @NotNull @Valid User body
-,@Context SecurityContext securityContext)
+ public Response updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathParam("username") @NotNull String username,@ApiParam(value = "Updated user object", required = true) @NotNull @Valid User body,@Context SecurityContext securityContext)
throws NotFoundException {
return delegate.updateUser(username, body, securityContext);
}
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApiService.java
index 97ec792f0f7..15e4486bc6c 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApiService.java
@@ -3,7 +3,7 @@ package org.openapitools.api;
import org.openapitools.api.*;
import org.openapitools.model.*;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import java.util.List;
import org.openapitools.model.User;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index 661940c66dd..cb1a8cd7e00 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -10,7 +10,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index e7e51e70e84..1a05630abc4 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -19,7 +19,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
@@ -67,7 +67,7 @@ public class FakeApiServiceImpl extends FakeApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, InputStream binaryInputStream, FormDataContentDisposition binaryDetail, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
+ public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
// do some magic!
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@@ -97,7 +97,7 @@ public class FakeApiServiceImpl extends FakeApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFileWithRequiredFile(Long petId, InputStream requiredFileInputStream, FormDataContentDisposition requiredFileDetail, String additionalMetadata, SecurityContext securityContext) throws NotFoundException {
+ public Response uploadFileWithRequiredFile(Long petId, FormDataBodyPart requiredFileBodypart, String additionalMetadata, 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/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
index 2204800cb83..35349641b7a 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
@@ -10,7 +10,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
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 8e3cf747147..b075fabf211 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
@@ -13,7 +13,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
@@ -56,7 +56,7 @@ public class PetApiServiceImpl extends PetApiService {
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
}
@Override
- public Response uploadFile(Long petId, String additionalMetadata, InputStream fileInputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext) throws NotFoundException {
+ public Response uploadFile(Long petId, String additionalMetadata, FormDataBodyPart fileBodypart, 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/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 1e67037417e..51a7d07d47b 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -11,7 +11,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index 03a2c24f326..1e5df1742f1 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -11,7 +11,7 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
--
GitLab
From 7be9c94be3a01ba8eaf34e532c8929f1a747f2fb Mon Sep 17 00:00:00 2001
From: itaru2622 <itaru2622@gmail.com>
Date: Wed, 9 Sep 2020 02:40:50 +0900
Subject: [PATCH 5/5] update mustaches for JavaJaxxRS/libraries/jersey1/* and
samples/* to resolve failure of CI test on PR.
---
.../JavaJaxRS/libraries/jersey1/api.mustache | 4 ++--
.../JavaJaxRS/libraries/jersey1/apiService.mustache | 2 +-
.../libraries/jersey1/apiServiceImpl.mustache | 2 +-
.../JavaJaxRS/libraries/jersey1/formParams.mustache | 3 +--
.../java/org/openapitools/api/AnotherFakeApi.java | 2 +-
.../org/openapitools/api/AnotherFakeApiService.java | 2 +-
.../src/gen/java/org/openapitools/api/FakeApi.java | 7 +++----
.../java/org/openapitools/api/FakeApiService.java | 2 +-
.../openapitools/api/FakeClassnameTags123Api.java | 2 +-
.../api/FakeClassnameTags123ApiService.java | 2 +-
.../src/gen/java/org/openapitools/api/PetApi.java | 12 +++++-------
.../gen/java/org/openapitools/api/PetApiService.java | 2 +-
.../src/gen/java/org/openapitools/api/StoreApi.java | 2 +-
.../java/org/openapitools/api/StoreApiService.java | 2 +-
.../src/gen/java/org/openapitools/api/UserApi.java | 2 +-
.../java/org/openapitools/api/UserApiService.java | 2 +-
.../api/impl/AnotherFakeApiServiceImpl.java | 2 +-
.../openapitools/api/impl/FakeApiServiceImpl.java | 2 +-
.../api/impl/FakeClassnameTags123ApiServiceImpl.java | 2 +-
.../org/openapitools/api/impl/PetApiServiceImpl.java | 2 +-
.../openapitools/api/impl/StoreApiServiceImpl.java | 2 +-
.../openapitools/api/impl/UserApiServiceImpl.java | 2 +-
.../java/org/openapitools/api/AnotherFakeApi.java | 2 +-
.../org/openapitools/api/AnotherFakeApiService.java | 2 +-
.../src/gen/java/org/openapitools/api/FakeApi.java | 12 +++++-------
.../java/org/openapitools/api/FakeApiService.java | 2 +-
.../org/openapitools/api/FakeClassnameTestApi.java | 2 +-
.../api/FakeClassnameTestApiService.java | 2 +-
.../src/gen/java/org/openapitools/api/PetApi.java | 7 +++----
.../gen/java/org/openapitools/api/PetApiService.java | 2 +-
.../src/gen/java/org/openapitools/api/StoreApi.java | 2 +-
.../java/org/openapitools/api/StoreApiService.java | 2 +-
.../src/gen/java/org/openapitools/api/UserApi.java | 2 +-
.../java/org/openapitools/api/UserApiService.java | 2 +-
.../api/impl/AnotherFakeApiServiceImpl.java | 2 +-
.../openapitools/api/impl/FakeApiServiceImpl.java | 2 +-
.../api/impl/FakeClassnameTestApiServiceImpl.java | 2 +-
.../org/openapitools/api/impl/PetApiServiceImpl.java | 2 +-
.../openapitools/api/impl/StoreApiServiceImpl.java | 2 +-
.../openapitools/api/impl/UserApiServiceImpl.java | 2 +-
40 files changed, 53 insertions(+), 60 deletions(-)
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/api.mustache
index 8da501e3f56..c69ae4a7abe 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/api.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/api.mustache
@@ -16,8 +16,8 @@ import {{package}}.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
@@ -55,7 +55,7 @@ public class {{classname}} {
{{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},
{{/allParams}}@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.{{nickname}}({{#allParams}}{{#isFile}}inputStream, fileDetail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/allParams}}securityContext);
+ return delegate.{{nickname}}({{#allParams}}{{#isFile}}{{paramName}}Bodypart{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/allParams}}securityContext);
}
{{/operation}}
}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/apiService.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/apiService.mustache
index 0d3ab0ebe17..156d1201fec 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/apiService.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/apiService.mustache
@@ -13,8 +13,8 @@ import {{package}}.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache
index abe789f1cbf..5578b4aaa28 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache
@@ -13,8 +13,8 @@ import {{package}}.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/formParams.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/formParams.mustache
index 4b54a8d38d9..55febc473f6 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/formParams.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/formParams.mustache
@@ -1,2 +1 @@
-{{#isFormParam}}{{^isFile}}{{^vendorExtensions.x-multipart}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{/vendorExtensions.x-multipart}}{{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/isFile}}{{#isFile}}@FormDataParam("{{baseName}}") InputStream inputStream,
- @FormDataParam("{{baseName}}") FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{^isFile}}{{^vendorExtensions.x-multipart}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{/vendorExtensions.x-multipart}}{{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/isFile}}{{#isFile}}{{^isListContainer}}@FormDataParam("{{baseName}}") FormDataBodyPart {{paramName}}Bodypart{{/isListContainer}}{{#isListContainer}}@FormDataParam("{{baseName}}") List<FormDataBodyPart> {{paramName}}Bodypart{{/isListContainer}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 93a2826b027..9297f3be361 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index a870fe32fa3..316764a22ab 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -12,8 +12,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
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 e48d4263746..b1f864f391c 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
@@ -23,8 +23,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
@@ -166,15 +166,14 @@ public class FakeApi {
@ApiParam(value = "None") @FormParam("int64") Long int64,
@ApiParam(value = "None") @FormParam("float") Float _float,
@ApiParam(value = "None") @FormParam("string") String string,
- @FormDataParam("binary") InputStream inputStream,
- @FormDataParam("binary") FormDataContentDisposition fileDetail,
+ @FormDataParam("binary") FormDataBodyPart binaryBodypart,
@ApiParam(value = "None") @FormParam("date") Date date,
@ApiParam(value = "None") @FormParam("dateTime") Date dateTime,
@ApiParam(value = "None") @FormParam("password") String password,
@ApiParam(value = "None") @FormParam("callback") String paramCallback,
@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.testEndpointParameters(number,_double,patternWithoutDelimiter,_byte,integer,int32,int64,_float,string,inputStream, fileDetail,date,dateTime,password,paramCallback,securityContext);
+ return delegate.testEndpointParameters(number,_double,patternWithoutDelimiter,_byte,integer,int32,int64,_float,string,binaryBodypart,date,dateTime,password,paramCallback,securityContext);
}
@GET
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
index 57c02e3b530..61cd6b21f53 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -20,8 +20,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
index 089dc5d2fbd..e07831a0326 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
index 27a9f27ca39..2534e637b7a 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123ApiService.java
@@ -12,8 +12,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
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 6654eabce4e..a52b6d1e94d 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
@@ -18,8 +18,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
@@ -186,11 +186,10 @@ public class PetApi {
public Response uploadFile(
@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,
@FormDataParam("additionalMetadata") String additionalMetadata,
- @FormDataParam("file") InputStream inputStream,
- @FormDataParam("file") FormDataContentDisposition fileDetail,
+ @FormDataParam("file") FormDataBodyPart fileBodypart,
@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFile(petId,additionalMetadata,inputStream, fileDetail,securityContext);
+ return delegate.uploadFile(petId,additionalMetadata,fileBodypart,securityContext);
}
@POST
@Path("/fake/{petId}/uploadImageWithRequiredFile")
@@ -206,11 +205,10 @@ public class PetApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
public Response uploadFileWithRequiredFile(
@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,
- @FormDataParam("requiredFile") InputStream inputStream,
- @FormDataParam("requiredFile") FormDataContentDisposition fileDetail,
+ @FormDataParam("requiredFile") FormDataBodyPart requiredFileBodypart,
@FormDataParam("additionalMetadata") String additionalMetadata,
@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFileWithRequiredFile(petId,inputStream, fileDetail,additionalMetadata,securityContext);
+ return delegate.uploadFileWithRequiredFile(petId,requiredFileBodypart,additionalMetadata,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 1e0abab3bd5..7d30265df3c 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
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java
index cd8db201131..252b35cfff2 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
index ff8059b1df2..1a12290f7b6 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -13,8 +13,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java
index d00be06c61f..16e72425e5f 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApiService.java
index d8b932aaf91..79b52a8a5ec 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/api/UserApiService.java
@@ -13,8 +13,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index e14a221d613..6ba48ecea15 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -12,8 +12,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 66c59b39aa3..0010027de9c 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -20,8 +20,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
index 9cc4c383054..ea29edfca10 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/FakeClassnameTags123ApiServiceImpl.java
@@ -12,8 +12,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
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 be36601de24..1a08268b822 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
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 8ec3bc61171..8b0d872caf2 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -13,8 +13,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index f4654e2effe..5df04a4d533 100644
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -13,8 +13,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 8d692f26e1c..2c0575b98ed 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
index a870fe32fa3..316764a22ab 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/AnotherFakeApiService.java
@@ -12,8 +12,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
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 188218d7f8c..dcc05be23a2 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
@@ -24,8 +24,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
@@ -167,15 +167,14 @@ public class FakeApi {
@ApiParam(value = "None") @FormParam("int64") Long int64,
@ApiParam(value = "None") @FormParam("float") Float _float,
@ApiParam(value = "None") @FormParam("string") String string,
- @FormDataParam("binary") InputStream inputStream,
- @FormDataParam("binary") FormDataContentDisposition fileDetail,
+ @FormDataParam("binary") FormDataBodyPart binaryBodypart,
@ApiParam(value = "None") @FormParam("date") Date date,
@ApiParam(value = "None") @FormParam("dateTime") Date dateTime,
@ApiParam(value = "None") @FormParam("password") String password,
@ApiParam(value = "None") @FormParam("callback") String paramCallback,
@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.testEndpointParameters(number,_double,patternWithoutDelimiter,_byte,integer,int32,int64,_float,string,inputStream, fileDetail,date,dateTime,password,paramCallback,securityContext);
+ return delegate.testEndpointParameters(number,_double,patternWithoutDelimiter,_byte,integer,int32,int64,_float,string,binaryBodypart,date,dateTime,password,paramCallback,securityContext);
}
@GET
@@ -274,11 +273,10 @@ public class FakeApi {
@io.swagger.annotations.ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
public Response uploadFileWithRequiredFile(
@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,
- @FormDataParam("requiredFile") InputStream inputStream,
- @FormDataParam("requiredFile") FormDataContentDisposition fileDetail,
+ @FormDataParam("requiredFile") FormDataBodyPart requiredFileBodypart,
@FormDataParam("additionalMetadata") String additionalMetadata,
@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFileWithRequiredFile(petId,inputStream, fileDetail,additionalMetadata,securityContext);
+ return delegate.uploadFileWithRequiredFile(petId,requiredFileBodypart,additionalMetadata,securityContext);
}
}
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java
index ebfa3cf239e..ab7dfc9b067 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -21,8 +21,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index afa6ce5872c..403116aab5e 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
index 22cfad90a84..105cf103c53 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/FakeClassnameTestApiService.java
@@ -12,8 +12,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
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 0b5a6256e57..009d6c5de1b 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
@@ -18,8 +18,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
@@ -186,10 +186,9 @@ public class PetApi {
public Response uploadFile(
@ApiParam(value = "ID of pet to update", required = true) @PathParam("petId") @NotNull Long petId,
@FormDataParam("additionalMetadata") String additionalMetadata,
- @FormDataParam("file") InputStream inputStream,
- @FormDataParam("file") FormDataContentDisposition fileDetail,
+ @FormDataParam("file") FormDataBodyPart fileBodypart,
@Context SecurityContext securityContext)
throws NotFoundException {
- return delegate.uploadFile(petId,additionalMetadata,inputStream, fileDetail,securityContext);
+ return delegate.uploadFile(petId,additionalMetadata,fileBodypart,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 bb967730381..2fdee428263 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
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java
index 8b264671b46..292ba459751 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java
index ff8059b1df2..1a12290f7b6 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/StoreApiService.java
@@ -13,8 +13,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java
index 7242bab60f4..dcee9d27899 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApi.java
@@ -16,8 +16,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApiService.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApiService.java
index d8b932aaf91..79b52a8a5ec 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApiService.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/api/UserApiService.java
@@ -13,8 +13,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
index e14a221d613..6ba48ecea15 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/AnotherFakeApiServiceImpl.java
@@ -12,8 +12,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index f5711713bed..aafbec155af 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -21,8 +21,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
index db04360f200..a576d4dec01 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/FakeClassnameTestApiServiceImpl.java
@@ -12,8 +12,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
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 a153875ba1d..b904ffb5508 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
@@ -15,8 +15,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
index 8ec3bc61171..8b0d872caf2 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/StoreApiServiceImpl.java
@@ -13,8 +13,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
diff --git a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
index f4654e2effe..5df04a4d533 100644
--- a/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/main/java/org/openapitools/api/impl/UserApiServiceImpl.java
@@ -13,8 +13,8 @@ import org.openapitools.api.NotFoundException;
import java.io.InputStream;
-import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
+import com.sun.jersey.multipart.FormDataBodyPart;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;
--
GitLab