diff --git a/docs/generators/fsharp-functions.md b/docs/generators/fsharp-functions.md index a20382152aab..33bd1f1c2922 100644 --- a/docs/generators/fsharp-functions.md +++ b/docs/generators/fsharp-functions.md @@ -34,7 +34,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| -|sourceFolder|source folder for generated code| |OpenAPI/src| +|sourceFolder|source folder for generated code| |OpenAPI\src| ## IMPORT MAPPING diff --git a/docs/generators/fsharp-giraffe-server.md b/docs/generators/fsharp-giraffe-server.md index abe079e504fa..fb3e25b3d776 100644 --- a/docs/generators/fsharp-giraffe-server.md +++ b/docs/generators/fsharp-giraffe-server.md @@ -30,7 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |packageVersion|F# package version.| |1.0.0| |returnICollection|Return ICollection<T> instead of the concrete type.| |false| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| -|sourceFolder|source folder for generated code| |OpenAPI/src| +|sourceFolder|source folder for generated code| |OpenAPI\src| |useCollection|Deserialize array types to Collection<T> instead of List<T>.| |false| |useDateTimeOffset|Use DateTimeOffset to model date-time properties| |false| |useSwashbuckle|Uses the Swashbuckle.AspNetCore NuGet package for documentation.| |false| diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md index 210db1efcb9a..6fa2edb47f90 100644 --- a/docs/generators/java-inflector.md +++ b/docs/generators/java-inflector.md @@ -66,7 +66,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |snapshotVersion|Uses a SNAPSHOT version.|
**true**
Use a SnapShot Version
**false**
Use a Release Version
|null| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| -|sourceFolder|source folder for generated code| |src/gen/java| +|sourceFolder|source folder for generated code| |src\gen\java| |testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi| |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false| |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false| diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md index 29a7923078b0..d89f12fbf3ab 100644 --- a/docs/generators/jaxrs-cxf-client.md +++ b/docs/generators/jaxrs-cxf-client.md @@ -66,7 +66,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |snapshotVersion|Uses a SNAPSHOT version.|
**true**
Use a SnapShot Version
**false**
Use a Release Version
|null| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| -|sourceFolder|source folder for generated code| |src/gen/java| +|sourceFolder|source folder for generated code| |src\gen\java| |testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi| |useAbstractionForFiles|Use alternative types instead of java.io.File to allow passing bytes without a file on disk.| |false| |useBeanValidation|Use BeanValidation API annotations| |false| diff --git a/docs/generators/swift5.md b/docs/generators/swift5.md index 9d565bf5993f..df0b0e1f3ccd 100644 --- a/docs/generators/swift5.md +++ b/docs/generators/swift5.md @@ -49,13 +49,13 @@ These options may be applied as additional-properties (cli) or configOptions (pl |responseAs|Optionally use libraries to manage response. Currently PromiseKit, RxSwift, Result, Combine, AsyncAwait are available.| |null| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| -|swiftPackagePath|Set a custom source path instead of OpenAPIClient/Classes/OpenAPIs.| |null| +|swiftPackagePath|Set a custom source path instead of OpenAPIClient\Classes\OpenAPIs.| |null| |swiftUseApiNamespace|Flag to make all the API classes inner-class of {{projectName}}API| |null| |useBacktickEscapes|Escape reserved words using backticks (default: false)| |false| |useClasses|Use final classes for models instead of structs (default: false)| |false| |useCustomDateWithoutTime|Uses a custom type to decode and encode dates without time information to support OpenAPIs date format (default: false)| |false| |useJsonEncodable|Make models conform to JSONEncodable protocol (default: true)| |true| -|useSPMFileStructure|Use SPM file structure and set the source path to Sources/{{projectName}} (default: false).| |null| +|useSPMFileStructure|Use SPM file structure and set the source path to Sources\{{projectName}} (default: false).| |null| |validatable|Make validation rules and validator for model properties (default: true)| |true| ## IMPORT MAPPING diff --git a/docs/generators/swift6.md b/docs/generators/swift6.md index a49865462eba..f19516ff2449 100644 --- a/docs/generators/swift6.md +++ b/docs/generators/swift6.md @@ -51,13 +51,13 @@ These options may be applied as additional-properties (cli) or configOptions (pl |responseAs|Optionally use libraries to manage response. Currently AsyncAwait, Combine, Result, RxSwift, ObjcBlock, PromiseKit are available.| |null| |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true| |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true| -|swiftPackagePath|Set a custom source path instead of Sources/{{projectName}}.| |null| +|swiftPackagePath|Set a custom source path instead of Sources\{{projectName}}.| |null| |swiftUseApiNamespace|Flag to make all the API classes inner-class of {{projectName}}API| |null| |useBacktickEscapes|Escape reserved words using backticks (default: false)| |false| |useClasses|Use final classes for models instead of structs (default: false)| |false| |useCustomDateWithoutTime|Uses a custom type to decode and encode dates without time information to support OpenAPIs date format (default: false)| |false| |useJsonEncodable|Make models conform to JSONEncodable protocol (default: true)| |true| -|useSPMFileStructure|Use SPM file structure and set the source path to Sources/{{projectName}} (default: true).| |null| +|useSPMFileStructure|Use SPM file structure and set the source path to Sources\{{projectName}} (default: true).| |null| |validatable|Make validation rules and validator for model properties (default: true)| |true| ## IMPORT MAPPING diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache index 0b0a7c4badd4..fea41ac720bd 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api.mustache @@ -12,9 +12,7 @@ import java.util.Set; import {{rootJavaEEPackage}}.ws.rs.*; import {{rootJavaEEPackage}}.ws.rs.core.Response; import {{rootJavaEEPackage}}.ws.rs.core.MediaType; -{{^disableMultipart}} -import org.apache.cxf.jaxrs.ext.multipart.*; -{{/disableMultipart}} + {{#microprofileMutiny}} import io.smallrye.mutiny.Uni; {{/microprofileMutiny}} @@ -27,6 +25,7 @@ import {{rootJavaEEPackage}}.validation.Valid; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + {{#appName}} /** * {{{appName}}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache index d9af87719b47..b124fa062566 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache @@ -4,6 +4,9 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} +{{#isFile}} +import java.io.File; +{{/isFile}} import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; @@ -70,7 +73,7 @@ public class {{classname}}Test { public void {{operationId}}Test() { // TODO: test validations {{#allParams}} - {{^isFile}}{{{dataType}}} {{paramName}} = null;{{/isFile}}{{#isFile}}org.apache.cxf.jaxrs.ext.multipart.Attachment {{paramName}} = null;{{/isFile}} + {{^isFile}}{{{dataType}}} {{paramName}} = null;{{/isFile}}{{#isFile}}File {{paramName}} = null;{{/isFile}} {{/allParams}} //{{^vendorExtensions.x-java-is-response-void}}{{#microprofileMutiny}}Uni<{{{returnType}}}>{{/microprofileMutiny}}{{^microprofileMutiny}}{{{returnType}}}{{/microprofileMutiny}} response = {{/vendorExtensions.x-java-is-response-void}}api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}}); //{{#returnType}}Assertions.assertNotNull(response);{{/returnType}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache index 97216dc1806f..3ec6fb98c9f3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{^isFile}}@Multipart(value = "{{baseName}}"{{^required}}, required = false{{/required}}) {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} @Multipart(value = "{{baseName}}" {{^required}}, required = false{{/required}}) Attachment {{paramName}}Detail{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}{{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} {{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}") File {{paramName}}Detail{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache index 2be40e1ddd3d..1cdf27390222 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache @@ -1 +1 @@ -{{#isFormParam}}{{^isFile}}{{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} Attachment {{paramName}}Detail{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}{{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} File {{paramName}}Detail{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache index 4fefd6db233e..2ebe8f0a7006 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache @@ -12,7 +12,7 @@ src/main/java - org.jboss.jandex + io.smallrye jandex-maven-plugin ${jandex.maven.plugin.version} @@ -101,13 +101,7 @@ ${smallrye.config.version} test - {{^disableMultipart}} - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - - {{/disableMultipart}} + {{#jsonb}} jakarta.json.bind @@ -227,7 +221,6 @@ {{#useBeanValidation}} 3.0.2 {{/useBeanValidation}} - 3.2.7 2.17.1 {{#jackson}} 2.17.1 @@ -241,11 +234,10 @@ {{microprofileRestClientVersion}} 1.2.1 1.3.5 - 3.2.6 2.2.11 2.2.11 5.2.2.Final - 1.1.0 + 3.2.7 2.6 1.9.1 {{#microprofileMutiny}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache index 9462e0d9236b..b3d7cddde2d2 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache @@ -12,7 +12,7 @@ src/main/java - org.jboss.jandex + io.smallrye jandex-maven-plugin ${jandex.maven.plugin.version} @@ -101,13 +101,7 @@ test - {{^disableMultipart}} - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - - {{/disableMultipart}} + {{#jsonb}} jakarta.json.bind @@ -245,7 +239,7 @@ 3.0.2 3.0.2 7.0.4.Final - 1.1.0 + 3.2.7 2.6 1.9.1 {{#microprofileMutiny}} diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml index a5df70c97604..c06b972dab5e 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml @@ -10,7 +10,7 @@ src/main/java - org.jboss.jandex + io.smallrye jandex-maven-plugin ${jandex.maven.plugin.version} @@ -90,11 +90,7 @@ test - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - + com.fasterxml.jackson.core @@ -174,7 +170,7 @@ 3.0.2 3.0.2 7.0.4.Final - 1.1.0 + 3.2.7 2.6 1.9.1 diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java index d353688861ca..c878e1ca94b9 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java @@ -24,12 +24,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * @@ -120,7 +121,7 @@ public interface PetApi { @POST @Path("/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) - void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false) String name, @Multipart(value = "status", required = false) String status) throws ApiException, ProcessingException; + void updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name") String name, @FormParam("status") String status) throws ApiException, ProcessingException; /** * uploads an image @@ -132,5 +133,5 @@ public interface PetApi { @Path("/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException; + ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata") String additionalMetadata, @FormParam("file") File _fileDetail) throws ApiException, ProcessingException; } diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java index cd94c5b3bca6..9d530689f8d4 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/StoreApi.java @@ -22,12 +22,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java index 7f8c13c9e080..3c191bab5e68 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/UserApi.java @@ -23,12 +23,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/PetApiTest.java index 797c05009b01..c38211f41b24 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -188,7 +188,7 @@ public void uploadFileTest() { // TODO: test validations Long petId = null; String additionalMetadata = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null; + File _file = null; //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file); //Assertions.assertNotNull(response); diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml index e79da281f43c..99532a9cb71d 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml @@ -10,7 +10,7 @@ src/main/java - org.jboss.jandex + io.smallrye jandex-maven-plugin ${jandex.maven.plugin.version} @@ -90,11 +90,7 @@ test - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - + com.fasterxml.jackson.core @@ -169,7 +165,7 @@ 3.0.2 3.0.2 7.0.4.Final - 1.1.0 + 3.2.7 2.6 1.9.1 3.17.0 diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index c22b045c6ed9..3c313a6bf023 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -22,12 +22,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java index 2c7f381b9336..748fef678aac 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -22,12 +22,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java index c23faf8ba1b8..20cc52762bb3 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -35,12 +35,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * @@ -153,7 +154,7 @@ public interface FakeApi { @POST @Consumes({ "application/x-www-form-urlencoded" }) - void testEndpointParameters(@Multipart(value = "number") BigDecimal number, @Multipart(value = "double") Double _double, @Multipart(value = "pattern_without_delimiter") String patternWithoutDelimiter, @Multipart(value = "byte") byte[] _byte, @Multipart(value = "integer", required = false) Integer integer, @Multipart(value = "int32", required = false) Integer int32, @Multipart(value = "int64", required = false) Long int64, @Multipart(value = "float", required = false) Float _float, @Multipart(value = "string", required = false) String string, @Multipart(value = "binary" , required = false) Attachment binaryDetail, @Multipart(value = "date", required = false) Date date, @Multipart(value = "dateTime", required = false) Date dateTime, @Multipart(value = "password", required = false) String password, @Multipart(value = "callback", required = false) String paramCallback) throws ApiException, ProcessingException; + void testEndpointParameters(@FormParam("number") BigDecimal number, @FormParam("double") Double _double, @FormParam("pattern_without_delimiter") String patternWithoutDelimiter, @FormParam("byte") byte[] _byte, @FormParam("integer") Integer integer, @FormParam("int32") Integer int32, @FormParam("int64") Long int64, @FormParam("float") Float _float, @FormParam("string") String string, @FormParam("binary") File binaryDetail, @FormParam("date") Date date, @FormParam("dateTime") Date dateTime, @FormParam("password") String password, @FormParam("callback") String paramCallback) throws ApiException, ProcessingException; /** * To test enum parameters @@ -164,7 +165,7 @@ public interface FakeApi { @GET @Consumes({ "application/x-www-form-urlencoded" }) - void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Multipart(value = "enum_form_string", required = false) String enumFormString) throws ApiException, ProcessingException; + void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List enumQueryModelArray, @FormParam("enum_form_string_array") List enumFormStringArray, @FormParam("enum_form_string") String enumFormString) throws ApiException, ProcessingException; /** * Fake endpoint to test group parameters (optional) @@ -207,7 +208,7 @@ public interface FakeApi { @GET @Path("/jsonFormData") @Consumes({ "application/x-www-form-urlencoded" }) - void testJsonFormData(@Multipart(value = "param") String param, @Multipart(value = "param2") String param2) throws ApiException, ProcessingException; + void testJsonFormData(@FormParam("param") String param, @FormParam("param2") String param2) throws ApiException, ProcessingException; /** * test nullable parent property diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 1db471b03658..1ea0afe8a41c 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -22,12 +22,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java index 224b962916ed..72ad43c84a2d 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java @@ -25,12 +25,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * @@ -119,7 +120,7 @@ public interface PetApi { @POST @Path("/pet/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) - void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false) String name, @Multipart(value = "status", required = false) String status) throws ApiException, ProcessingException; + void updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name") String name, @FormParam("status") String status) throws ApiException, ProcessingException; /** * uploads an image @@ -131,7 +132,7 @@ public interface PetApi { @Path("/pet/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException; + ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata") String additionalMetadata, @FormParam("file") File _fileDetail) throws ApiException, ProcessingException; /** * uploads an image (required) @@ -143,5 +144,5 @@ public interface PetApi { @Path("/fake/{petId}/uploadImageWithRequiredFile") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId, @Multipart(value = "requiredFile" ) Attachment requiredFileDetail, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata) throws ApiException, ProcessingException; + ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId, @FormParam("requiredFile") File requiredFileDetail, @FormParam("additionalMetadata") String additionalMetadata) throws ApiException, ProcessingException; } diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java index 0fdf70e0825b..e11a06ce2618 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/StoreApi.java @@ -22,12 +22,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java index 515c42ae977d..e841c00185b3 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/UserApi.java @@ -23,12 +23,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java index 26ec6bf6711c..9bf431f6a13b 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -198,7 +198,7 @@ public void testAdditionalPropertiesReferenceTest() { @Test public void testBodyWithBinaryTest() { // TODO: test validations - org.apache.cxf.jaxrs.ext.multipart.Attachment body = null; + File body = null; //api.testBodyWithBinary(body); //Assertions.assertNotNull(response); @@ -272,7 +272,7 @@ public void testEndpointParametersTest() { Long int64 = null; Float _float = null; String string = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment binary = null; + File binary = null; Date date = null; Date dateTime = null; String password = null; diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java index 10e6a3f86060..0e81ba3d3382 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -189,7 +189,7 @@ public void uploadFileTest() { // TODO: test validations Long petId = null; String additionalMetadata = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null; + File _file = null; //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file); //Assertions.assertNotNull(response); @@ -208,7 +208,7 @@ public void uploadFileTest() { public void uploadFileWithRequiredFileTest() { // TODO: test validations Long petId = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment requiredFile = null; + File requiredFile = null; String additionalMetadata = null; //ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); //Assertions.assertNotNull(response); diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml index d930a9f96dc9..1b2452350a40 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml @@ -10,7 +10,7 @@ src/main/java - org.jboss.jandex + io.smallrye jandex-maven-plugin ${jandex.maven.plugin.version} @@ -90,11 +90,7 @@ test - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - + jakarta.json.bind jakarta.json.bind-api @@ -176,7 +172,7 @@ 3.0.2 3.0.2 7.0.4.Final - 1.1.0 + 3.2.7 2.6 1.9.1 1.10.0 diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java index 78f825370542..6f498ac9770d 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/PetApi.java @@ -24,13 +24,14 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * @@ -121,7 +122,7 @@ public interface PetApi { @POST @Path("/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) - Uni updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false) String name, @Multipart(value = "status", required = false) String status) throws ApiException, ProcessingException; + Uni updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name") String name, @FormParam("status") String status) throws ApiException, ProcessingException; /** * uploads an image @@ -133,5 +134,5 @@ public interface PetApi { @Path("/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - Uni uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException; + Uni uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata") String additionalMetadata, @FormParam("file") File _fileDetail) throws ApiException, ProcessingException; } diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java index 3e3568235bc9..cf7090a9a561 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java @@ -22,13 +22,14 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java index 398314fe46cd..aa8413b4f0e6 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/api/UserApi.java @@ -23,13 +23,14 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java index a08c4178f405..e1008ad720dc 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -188,7 +188,7 @@ public void uploadFileTest() { // TODO: test validations Long petId = null; String additionalMetadata = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null; + File _file = null; //Uni response = api.uploadFile(petId, additionalMetadata, _file); //Assertions.assertNotNull(response); diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml b/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml index 7b03483c49eb..36a96e56aca1 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/pom.xml @@ -10,7 +10,7 @@ src/main/java - org.jboss.jandex + io.smallrye jandex-maven-plugin ${jandex.maven.plugin.version} @@ -90,11 +90,7 @@ test - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - + jakarta.json.bind jakarta.json.bind-api @@ -171,7 +167,7 @@ 3.0.2 3.0.2 7.0.4.Final - 1.1.0 + 3.2.7 2.6 1.9.1 diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index c22b045c6ed9..3c313a6bf023 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -22,12 +22,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java index 2c7f381b9336..748fef678aac 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -22,12 +22,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java index c23faf8ba1b8..20cc52762bb3 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java @@ -35,12 +35,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * @@ -153,7 +154,7 @@ public interface FakeApi { @POST @Consumes({ "application/x-www-form-urlencoded" }) - void testEndpointParameters(@Multipart(value = "number") BigDecimal number, @Multipart(value = "double") Double _double, @Multipart(value = "pattern_without_delimiter") String patternWithoutDelimiter, @Multipart(value = "byte") byte[] _byte, @Multipart(value = "integer", required = false) Integer integer, @Multipart(value = "int32", required = false) Integer int32, @Multipart(value = "int64", required = false) Long int64, @Multipart(value = "float", required = false) Float _float, @Multipart(value = "string", required = false) String string, @Multipart(value = "binary" , required = false) Attachment binaryDetail, @Multipart(value = "date", required = false) Date date, @Multipart(value = "dateTime", required = false) Date dateTime, @Multipart(value = "password", required = false) String password, @Multipart(value = "callback", required = false) String paramCallback) throws ApiException, ProcessingException; + void testEndpointParameters(@FormParam("number") BigDecimal number, @FormParam("double") Double _double, @FormParam("pattern_without_delimiter") String patternWithoutDelimiter, @FormParam("byte") byte[] _byte, @FormParam("integer") Integer integer, @FormParam("int32") Integer int32, @FormParam("int64") Long int64, @FormParam("float") Float _float, @FormParam("string") String string, @FormParam("binary") File binaryDetail, @FormParam("date") Date date, @FormParam("dateTime") Date dateTime, @FormParam("password") String password, @FormParam("callback") String paramCallback) throws ApiException, ProcessingException; /** * To test enum parameters @@ -164,7 +165,7 @@ public interface FakeApi { @GET @Consumes({ "application/x-www-form-urlencoded" }) - void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Multipart(value = "enum_form_string", required = false) String enumFormString) throws ApiException, ProcessingException; + void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List enumQueryModelArray, @FormParam("enum_form_string_array") List enumFormStringArray, @FormParam("enum_form_string") String enumFormString) throws ApiException, ProcessingException; /** * Fake endpoint to test group parameters (optional) @@ -207,7 +208,7 @@ public interface FakeApi { @GET @Path("/jsonFormData") @Consumes({ "application/x-www-form-urlencoded" }) - void testJsonFormData(@Multipart(value = "param") String param, @Multipart(value = "param2") String param2) throws ApiException, ProcessingException; + void testJsonFormData(@FormParam("param") String param, @FormParam("param2") String param2) throws ApiException, ProcessingException; /** * test nullable parent property diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 1db471b03658..1ea0afe8a41c 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -22,12 +22,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java index 224b962916ed..72ad43c84a2d 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/PetApi.java @@ -25,12 +25,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * @@ -119,7 +120,7 @@ public interface PetApi { @POST @Path("/pet/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) - void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false) String name, @Multipart(value = "status", required = false) String status) throws ApiException, ProcessingException; + void updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name") String name, @FormParam("status") String status) throws ApiException, ProcessingException; /** * uploads an image @@ -131,7 +132,7 @@ public interface PetApi { @Path("/pet/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException; + ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata") String additionalMetadata, @FormParam("file") File _fileDetail) throws ApiException, ProcessingException; /** * uploads an image (required) @@ -143,5 +144,5 @@ public interface PetApi { @Path("/fake/{petId}/uploadImageWithRequiredFile") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId, @Multipart(value = "requiredFile" ) Attachment requiredFileDetail, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata) throws ApiException, ProcessingException; + ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId, @FormParam("requiredFile") File requiredFileDetail, @FormParam("additionalMetadata") String additionalMetadata) throws ApiException, ProcessingException; } diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java index 0fdf70e0825b..e11a06ce2618 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/StoreApi.java @@ -22,12 +22,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java index 515c42ae977d..e841c00185b3 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/UserApi.java @@ -23,12 +23,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/FakeApiTest.java index 26ec6bf6711c..9bf431f6a13b 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/FakeApiTest.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -198,7 +198,7 @@ public void testAdditionalPropertiesReferenceTest() { @Test public void testBodyWithBinaryTest() { // TODO: test validations - org.apache.cxf.jaxrs.ext.multipart.Attachment body = null; + File body = null; //api.testBodyWithBinary(body); //Assertions.assertNotNull(response); @@ -272,7 +272,7 @@ public void testEndpointParametersTest() { Long int64 = null; Float _float = null; String string = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment binary = null; + File binary = null; Date date = null; Date dateTime = null; String password = null; diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/PetApiTest.java index 10e6a3f86060..0e81ba3d3382 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -189,7 +189,7 @@ public void uploadFileTest() { // TODO: test validations Long petId = null; String additionalMetadata = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null; + File _file = null; //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file); //Assertions.assertNotNull(response); @@ -208,7 +208,7 @@ public void uploadFileTest() { public void uploadFileWithRequiredFileTest() { // TODO: test validations Long petId = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment requiredFile = null; + File requiredFile = null; String additionalMetadata = null; //ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); //Assertions.assertNotNull(response); diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml b/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml index 57273ef43a84..6aa3a855eaef 100644 --- a/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml +++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/pom.xml @@ -10,7 +10,7 @@ src/main/java - org.jboss.jandex + io.smallrye jandex-maven-plugin ${jandex.maven.plugin.version} @@ -90,11 +90,7 @@ ${smallrye.config.version} test - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - + jakarta.json.bind jakarta.json.bind-api @@ -161,7 +157,6 @@ 9.2.9.v20150224 5.10.2 1.5.13 - 3.2.7 2.17.1 1.2.2 1.3.5 @@ -172,11 +167,10 @@ 2.0 1.2.1 1.3.5 - 3.2.6 2.2.11 2.2.11 5.2.2.Final - 1.1.0 + 3.2.7 2.6 1.9.1 1.10.0 diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java index 0964ae15d4c7..3515eacea89d 100644 --- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/PetApi.java @@ -24,13 +24,14 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * @@ -121,7 +122,7 @@ public interface PetApi { @POST @Path("/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) - Uni updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false) String name, @Multipart(value = "status", required = false) String status) throws ApiException, ProcessingException; + Uni updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name") String name, @FormParam("status") String status) throws ApiException, ProcessingException; /** * uploads an image @@ -133,5 +134,5 @@ public interface PetApi { @Path("/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - Uni uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException; + Uni uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata") String additionalMetadata, @FormParam("file") File _fileDetail) throws ApiException, ProcessingException; } diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java index de22bb71fd2e..9445f8d0eb30 100644 --- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/StoreApi.java @@ -22,13 +22,14 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java index 1fc96630b011..be73f46205ea 100644 --- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/api/UserApi.java @@ -23,13 +23,14 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java index 764ced64f49a..0e62476a83d8 100644 --- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -191,7 +191,7 @@ public void uploadFileTest() { // TODO: test validations Long petId = null; String additionalMetadata = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null; + File _file = null; //Uni response = api.uploadFile(petId, additionalMetadata, _file); //Assertions.assertNotNull(response); diff --git a/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml b/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml index cc21c05b3882..11c5a71d9d66 100644 --- a/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml +++ b/samples/client/petstore/java/microprofile-rest-client-outer-enum/pom.xml @@ -10,7 +10,7 @@ src/main/java - org.jboss.jandex + io.smallrye jandex-maven-plugin ${jandex.maven.plugin.version} @@ -90,11 +90,7 @@ ${smallrye.config.version} test - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - + jakarta.json.bind jakarta.json.bind-api @@ -156,7 +152,6 @@ 9.2.9.v20150224 5.10.2 1.5.13 - 3.2.7 2.17.1 1.2.2 1.3.5 @@ -167,11 +162,10 @@ 2.0 1.2.1 1.3.5 - 3.2.6 2.2.11 2.2.11 5.2.2.Final - 1.1.0 + 3.2.7 2.6 1.9.1 diff --git a/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java index 247b26ac6c1f..db420a065cb6 100644 --- a/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-outer-enum/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -23,12 +23,13 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * Petstore API * diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml index 3e6d548f51ae..6006e0439c1d 100644 --- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml +++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/pom.xml @@ -10,7 +10,7 @@ src/main/java - org.jboss.jandex + io.smallrye jandex-maven-plugin ${jandex.maven.plugin.version} @@ -90,11 +90,7 @@ test - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - + jakarta.json.bind jakarta.json.bind-api @@ -171,7 +167,7 @@ 3.0.2 3.0.2 7.0.4.Final - 1.1.0 + 3.2.7 2.6 1.9.1 diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java index 55c25f97f820..00f766ca51fd 100644 --- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java @@ -24,12 +24,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * @@ -218,8 +219,8 @@ public GetPetByIdRequest petId(Long petId) { public class UpdatePetWithFormRequest { private @PathParam("petId") Long petId; - private @Multipart(value = "name", required = false) String name; - private @Multipart(value = "status", required = false) String status; + private @FormParam("name") String name; + private @FormParam("status") String status; private UpdatePetWithFormRequest() { } @@ -271,8 +272,8 @@ public UpdatePetWithFormRequest status(String status) { public class UploadFileRequest { private @PathParam("petId") Long petId; - private @Multipart(value = "additionalMetadata", required = false) String additionalMetadata; - private @Multipart(value = "file" , required = false) Attachment _fileDetail; + private @FormParam("additionalMetadata") String additionalMetadata; + private @FormParam("file") File _fileDetail; private UploadFileRequest() { } @@ -304,7 +305,7 @@ public UploadFileRequest additionalMetadata(String additionalMetadata) { * @param _fileDetail file to upload (optional) * @return UploadFileRequest */ - public UploadFileRequest _fileDetail( Attachment _fileDetail) { + public UploadFileRequest _fileDetail( File _fileDetail) { this._fileDetail = _fileDetail; return this; } diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java index d95b73db2091..f18f3fb6ba43 100644 --- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/StoreApi.java @@ -22,12 +22,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java index a45d07d34581..def887a2c33d 100644 --- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java @@ -23,12 +23,13 @@ import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/test/java/org/openapitools/client/api/PetApiTest.java index 797c05009b01..c38211f41b24 100644 --- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -188,7 +188,7 @@ public void uploadFileTest() { // TODO: test validations Long petId = null; String additionalMetadata = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null; + File _file = null; //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file); //Assertions.assertNotNull(response); diff --git a/samples/client/petstore/java/microprofile-rest-client/pom.xml b/samples/client/petstore/java/microprofile-rest-client/pom.xml index 59af12cd31c9..2cd477a0ec32 100644 --- a/samples/client/petstore/java/microprofile-rest-client/pom.xml +++ b/samples/client/petstore/java/microprofile-rest-client/pom.xml @@ -10,7 +10,7 @@ src/main/java - org.jboss.jandex + io.smallrye jandex-maven-plugin ${jandex.maven.plugin.version} @@ -90,11 +90,7 @@ ${smallrye.config.version} test - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - + jakarta.json.bind jakarta.json.bind-api @@ -156,7 +152,6 @@ 9.2.9.v20150224 5.10.2 1.5.13 - 3.2.7 2.17.1 1.2.2 1.3.5 @@ -167,11 +162,10 @@ 2.0 1.2.1 1.3.5 - 3.2.6 2.2.11 2.2.11 5.2.2.Final - 1.1.0 + 3.2.7 2.6 1.9.1 diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index a15c245c8494..03905c5d23ff 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -22,12 +22,13 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java index 1ca1a836550c..fc120b558053 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -22,12 +22,13 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java index 411aebd5d178..cac496f5c160 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java @@ -35,12 +35,13 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * @@ -153,7 +154,7 @@ public interface FakeApi { @POST @Consumes({ "application/x-www-form-urlencoded" }) - void testEndpointParameters(@Multipart(value = "number") BigDecimal number, @Multipart(value = "double") Double _double, @Multipart(value = "pattern_without_delimiter") String patternWithoutDelimiter, @Multipart(value = "byte") byte[] _byte, @Multipart(value = "integer", required = false) Integer integer, @Multipart(value = "int32", required = false) Integer int32, @Multipart(value = "int64", required = false) Long int64, @Multipart(value = "float", required = false) Float _float, @Multipart(value = "string", required = false) String string, @Multipart(value = "binary" , required = false) Attachment binaryDetail, @Multipart(value = "date", required = false) Date date, @Multipart(value = "dateTime", required = false) Date dateTime, @Multipart(value = "password", required = false) String password, @Multipart(value = "callback", required = false) String paramCallback) throws ApiException, ProcessingException; + void testEndpointParameters(@FormParam("number") BigDecimal number, @FormParam("double") Double _double, @FormParam("pattern_without_delimiter") String patternWithoutDelimiter, @FormParam("byte") byte[] _byte, @FormParam("integer") Integer integer, @FormParam("int32") Integer int32, @FormParam("int64") Long int64, @FormParam("float") Float _float, @FormParam("string") String string, @FormParam("binary") File binaryDetail, @FormParam("date") Date date, @FormParam("dateTime") Date dateTime, @FormParam("password") String password, @FormParam("callback") String paramCallback) throws ApiException, ProcessingException; /** * To test enum parameters @@ -164,7 +165,7 @@ public interface FakeApi { @GET @Consumes({ "application/x-www-form-urlencoded" }) - void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Multipart(value = "enum_form_string", required = false) String enumFormString) throws ApiException, ProcessingException; + void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List enumQueryModelArray, @FormParam("enum_form_string_array") List enumFormStringArray, @FormParam("enum_form_string") String enumFormString) throws ApiException, ProcessingException; /** * Fake endpoint to test group parameters (optional) @@ -207,7 +208,7 @@ public interface FakeApi { @GET @Path("/jsonFormData") @Consumes({ "application/x-www-form-urlencoded" }) - void testJsonFormData(@Multipart(value = "param") String param, @Multipart(value = "param2") String param2) throws ApiException, ProcessingException; + void testJsonFormData(@FormParam("param") String param, @FormParam("param2") String param2) throws ApiException, ProcessingException; /** * test nullable parent property diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index ec882fa3ce56..e04639dbd461 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -22,12 +22,13 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java index f5ce26c6765a..68c4cfa4c167 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/PetApi.java @@ -25,12 +25,13 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * @@ -119,7 +120,7 @@ public interface PetApi { @POST @Path("/pet/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) - void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false) String name, @Multipart(value = "status", required = false) String status) throws ApiException, ProcessingException; + void updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name") String name, @FormParam("status") String status) throws ApiException, ProcessingException; /** * uploads an image @@ -131,7 +132,7 @@ public interface PetApi { @Path("/pet/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException; + ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata") String additionalMetadata, @FormParam("file") File _fileDetail) throws ApiException, ProcessingException; /** * uploads an image (required) @@ -143,5 +144,5 @@ public interface PetApi { @Path("/fake/{petId}/uploadImageWithRequiredFile") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId, @Multipart(value = "requiredFile" ) Attachment requiredFileDetail, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata) throws ApiException, ProcessingException; + ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId, @FormParam("requiredFile") File requiredFileDetail, @FormParam("additionalMetadata") String additionalMetadata) throws ApiException, ProcessingException; } diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java index d63a429c9e96..fcf70d5fadd6 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/StoreApi.java @@ -22,12 +22,13 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java index d1088c95cffb..31c641d61b68 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/UserApi.java @@ -23,12 +23,13 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/FakeApiTest.java index d25f42399053..0e61b357a4c8 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/FakeApiTest.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -201,7 +201,7 @@ public void testAdditionalPropertiesReferenceTest() { @Test public void testBodyWithBinaryTest() { // TODO: test validations - org.apache.cxf.jaxrs.ext.multipart.Attachment body = null; + File body = null; //api.testBodyWithBinary(body); //Assertions.assertNotNull(response); @@ -275,7 +275,7 @@ public void testEndpointParametersTest() { Long int64 = null; Float _float = null; String string = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment binary = null; + File binary = null; Date date = null; Date dateTime = null; String password = null; diff --git a/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/PetApiTest.java index 40a4b434dc6c..74b58c73ec89 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/PetApiTest.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/test/java/org/openapitools/client/api/PetApiTest.java @@ -192,7 +192,7 @@ public void uploadFileTest() { // TODO: test validations Long petId = null; String additionalMetadata = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null; + File _file = null; //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file); //Assertions.assertNotNull(response); @@ -211,7 +211,7 @@ public void uploadFileTest() { public void uploadFileWithRequiredFileTest() { // TODO: test validations Long petId = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment requiredFile = null; + File requiredFile = null; String additionalMetadata = null; //ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); //Assertions.assertNotNull(response); diff --git a/samples/server/petstore/java-microprofile/pom.xml b/samples/server/petstore/java-microprofile/pom.xml index 550d81ab8233..2109c7d4e8b8 100644 --- a/samples/server/petstore/java-microprofile/pom.xml +++ b/samples/server/petstore/java-microprofile/pom.xml @@ -10,7 +10,7 @@ src/main/java - org.jboss.jandex + io.smallrye jandex-maven-plugin ${jandex.maven.plugin.version} @@ -90,11 +90,7 @@ ${smallrye.config.version} test - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.rt.rs.extension.providers.version} - + com.fasterxml.jackson.core @@ -152,7 +148,6 @@ 9.2.9.v20150224 5.10.2 1.5.13 - 3.2.7 2.17.1 2.17.1 1.2.2 @@ -164,11 +159,10 @@ 2.0 1.2.1 1.3.5 - 3.2.6 2.2.11 2.2.11 5.2.2.Final - 1.1.0 + 3.2.7 2.6 1.9.1 1.10.0 diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java index 2ca0851ef231..e71070a52956 100644 --- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java +++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/PetApi.java @@ -24,13 +24,14 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * @@ -120,7 +121,7 @@ public interface PetApi { @POST @Path("/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) - Uni updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false) String name, @Multipart(value = "status", required = false) String status) throws ApiException, ProcessingException; + Uni updatePetWithForm(@PathParam("petId") Long petId, @FormParam("name") String name, @FormParam("status") String status) throws ApiException, ProcessingException; /** * uploads an image @@ -132,5 +133,5 @@ public interface PetApi { @Path("/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) - Uni uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false) String additionalMetadata, @Multipart(value = "file" , required = false) Attachment _fileDetail) throws ApiException, ProcessingException; + Uni uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata") String additionalMetadata, @FormParam("file") File _fileDetail) throws ApiException, ProcessingException; } diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java index 2dea0b817a57..7768d16e8d5e 100644 --- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java +++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/StoreApi.java @@ -22,13 +22,14 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java index ab673f1773f5..c14791575cf4 100644 --- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java +++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/api/UserApi.java @@ -23,13 +23,14 @@ import javax.ws.rs.*; import javax.ws.rs.core.Response; import javax.ws.rs.core.MediaType; -import org.apache.cxf.jaxrs.ext.multipart.*; + import io.smallrye.mutiny.Uni; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + /** * OpenAPI Petstore * diff --git a/samples/server/petstore/java-microprofile/src/test/java/org/openapitools/server/api/PetApiTest.java b/samples/server/petstore/java-microprofile/src/test/java/org/openapitools/server/api/PetApiTest.java index 0cd50290f230..a81bf2c9663e 100644 --- a/samples/server/petstore/java-microprofile/src/test/java/org/openapitools/server/api/PetApiTest.java +++ b/samples/server/petstore/java-microprofile/src/test/java/org/openapitools/server/api/PetApiTest.java @@ -191,7 +191,7 @@ public void uploadFileTest() { // TODO: test validations Long petId = null; String additionalMetadata = null; - org.apache.cxf.jaxrs.ext.multipart.Attachment _file = null; + File _file = null; //Uni response = api.uploadFile(petId, additionalMetadata, _file); //Assertions.assertNotNull(response);