From a32fb2cf17ff40d5ccfd5253545128635b3457a8 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:17:25 -0500 Subject: [PATCH 1/2] NO-ISSUE: Upgrade WireMock; Add Jboss RestEasy Multipart to IT Signed-off-by: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> --- client/integration-tests/beanparam/pom.xml | 4 +-- .../change-custom-template-directory/pom.xml | 4 +-- .../change-directory/pom.xml | 4 +-- .../cookie-authentication/pom.xml | 4 +-- .../integration-tests/enum-property/pom.xml | 4 +-- .../generator/it/EnumPropertyTest.java | 4 +-- .../integration-tests/enum-unexpected/pom.xml | 4 +-- .../generator/it/EnumUnexpectedTest.java | 9 ++--- .../generation-tests/pom.xml | 4 +-- .../multipart-request/pom.xml | 4 +-- .../open-api-normalizer/pom.xml | 4 +-- client/integration-tests/polymorphism/pom.xml | 4 +-- .../generator/it/PolymorphismTest.java | 4 +-- client/integration-tests/pom.xml | 10 ++++-- client/integration-tests/security/pom.xml | 4 +-- .../integration-tests/skip-validation/pom.xml | 4 +-- client/integration-tests/type-mapping/pom.xml | 4 +-- client/test-utils/pom.xml | 4 +-- pom.xml | 35 ++++++++++++++++--- 19 files changed, 70 insertions(+), 48 deletions(-) diff --git a/client/integration-tests/beanparam/pom.xml b/client/integration-tests/beanparam/pom.xml index a73d12a8a..0fdc3388c 100644 --- a/client/integration-tests/beanparam/pom.xml +++ b/client/integration-tests/beanparam/pom.xml @@ -27,8 +27,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/change-custom-template-directory/pom.xml b/client/integration-tests/change-custom-template-directory/pom.xml index 9532fb2bc..2d003df7a 100644 --- a/client/integration-tests/change-custom-template-directory/pom.xml +++ b/client/integration-tests/change-custom-template-directory/pom.xml @@ -20,8 +20,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/change-directory/pom.xml b/client/integration-tests/change-directory/pom.xml index 49bfa265e..dd5307f9d 100644 --- a/client/integration-tests/change-directory/pom.xml +++ b/client/integration-tests/change-directory/pom.xml @@ -20,8 +20,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/cookie-authentication/pom.xml b/client/integration-tests/cookie-authentication/pom.xml index f5a5a9831..fa51e768e 100644 --- a/client/integration-tests/cookie-authentication/pom.xml +++ b/client/integration-tests/cookie-authentication/pom.xml @@ -28,8 +28,8 @@ - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/enum-property/pom.xml b/client/integration-tests/enum-property/pom.xml index d96a13f83..59f3c2769 100644 --- a/client/integration-tests/enum-property/pom.xml +++ b/client/integration-tests/enum-property/pom.xml @@ -27,8 +27,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/enum-property/src/test/java/io/quarkiverse/openapi/generator/it/EnumPropertyTest.java b/client/integration-tests/enum-property/src/test/java/io/quarkiverse/openapi/generator/it/EnumPropertyTest.java index b3f79f406..38a70da7a 100644 --- a/client/integration-tests/enum-property/src/test/java/io/quarkiverse/openapi/generator/it/EnumPropertyTest.java +++ b/client/integration-tests/enum-property/src/test/java/io/quarkiverse/openapi/generator/it/EnumPropertyTest.java @@ -20,7 +20,6 @@ import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; -import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; @@ -67,8 +66,7 @@ public Map start() { } private void configureWiremockServer() { - var wireMockConfiguration = WireMockConfiguration.wireMockConfig() - .extensions(new ResponseTemplateTransformer(false)).dynamicPort(); + var wireMockConfiguration = WireMockConfiguration.wireMockConfig().dynamicPort(); wireMockServer = new WireMockServer(wireMockConfiguration); wireMockServer.start(); diff --git a/client/integration-tests/enum-unexpected/pom.xml b/client/integration-tests/enum-unexpected/pom.xml index 9d3aea7c4..fdfb0b59b 100644 --- a/client/integration-tests/enum-unexpected/pom.xml +++ b/client/integration-tests/enum-unexpected/pom.xml @@ -27,8 +27,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/enum-unexpected/src/test/java/io/quarkiverse/openapi/generator/it/EnumUnexpectedTest.java b/client/integration-tests/enum-unexpected/src/test/java/io/quarkiverse/openapi/generator/it/EnumUnexpectedTest.java index 1a0225723..e72f2c830 100644 --- a/client/integration-tests/enum-unexpected/src/test/java/io/quarkiverse/openapi/generator/it/EnumUnexpectedTest.java +++ b/client/integration-tests/enum-unexpected/src/test/java/io/quarkiverse/openapi/generator/it/EnumUnexpectedTest.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.exc.ValueInstantiationException; import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; -import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; @@ -35,6 +34,8 @@ class EnumUnexpectedTest { @RestClient @Inject org.openapi.quarkus.with_enum_unexpected_yaml.api.DefaultApi api; + @Inject + ObjectMapper objectMapper; @Test void apiIsBeingGenerated() { @@ -45,9 +46,6 @@ void apiIsBeingGenerated() { .isEqualTo(org.openapi.quarkus.with_enum_unexpected_yaml.model.Echo.MsgTypeEnum.UNEXPECTED); } - @Inject - ObjectMapper objectMapper; - @Test void when_additional_enum_type_unexpected_member_is_true_should_have_extra_member() { AssertionsForClassTypes.assertThat(org.openapi.quarkus.with_enum_unexpected_yaml.model.Echo.MsgTypeEnum.class) @@ -89,8 +87,7 @@ public Map start() { } private void configureWiremockServer() { - var wireMockConfiguration = WireMockConfiguration.wireMockConfig() - .extensions(new ResponseTemplateTransformer(false)).dynamicPort(); + var wireMockConfiguration = WireMockConfiguration.wireMockConfig().dynamicPort(); wireMockServer = new WireMockServer(wireMockConfiguration); wireMockServer.start(); diff --git a/client/integration-tests/generation-tests/pom.xml b/client/integration-tests/generation-tests/pom.xml index e845744ce..38a025766 100644 --- a/client/integration-tests/generation-tests/pom.xml +++ b/client/integration-tests/generation-tests/pom.xml @@ -25,8 +25,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/multipart-request/pom.xml b/client/integration-tests/multipart-request/pom.xml index 56283cfe0..c44cd400a 100644 --- a/client/integration-tests/multipart-request/pom.xml +++ b/client/integration-tests/multipart-request/pom.xml @@ -21,8 +21,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/open-api-normalizer/pom.xml b/client/integration-tests/open-api-normalizer/pom.xml index a8272f284..90387486d 100644 --- a/client/integration-tests/open-api-normalizer/pom.xml +++ b/client/integration-tests/open-api-normalizer/pom.xml @@ -26,8 +26,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/polymorphism/pom.xml b/client/integration-tests/polymorphism/pom.xml index 780db7791..668240bb5 100644 --- a/client/integration-tests/polymorphism/pom.xml +++ b/client/integration-tests/polymorphism/pom.xml @@ -21,8 +21,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/polymorphism/src/test/java/io/quarkiverse/openapi/generator/it/PolymorphismTest.java b/client/integration-tests/polymorphism/src/test/java/io/quarkiverse/openapi/generator/it/PolymorphismTest.java index fc527cd23..edc8c50de 100644 --- a/client/integration-tests/polymorphism/src/test/java/io/quarkiverse/openapi/generator/it/PolymorphismTest.java +++ b/client/integration-tests/polymorphism/src/test/java/io/quarkiverse/openapi/generator/it/PolymorphismTest.java @@ -15,7 +15,6 @@ import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; -import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; @@ -52,8 +51,7 @@ public Map start() { } private void configureWiremockServer() { - var wireMockConfiguration = WireMockConfiguration.wireMockConfig() - .extensions(new ResponseTemplateTransformer(false)).dynamicPort(); + var wireMockConfiguration = WireMockConfiguration.wireMockConfig().dynamicPort(); wireMockServer = new WireMockServer(wireMockConfiguration); wireMockServer.start(); diff --git a/client/integration-tests/pom.xml b/client/integration-tests/pom.xml index 5af185407..db367b2e5 100644 --- a/client/integration-tests/pom.xml +++ b/client/integration-tests/pom.xml @@ -46,9 +46,9 @@ - com.github.tomakehurst - wiremock-jre8 - ${version.com.github.tomakehurst} + org.wiremock + wiremock + ${version.org.wiremock} test @@ -74,6 +74,10 @@ io.quarkus quarkus-resteasy-client-jackson + + org.jboss.resteasy + resteasy-multipart-provider + diff --git a/client/integration-tests/security/pom.xml b/client/integration-tests/security/pom.xml index 26ce6f3fd..6d0ca52da 100644 --- a/client/integration-tests/security/pom.xml +++ b/client/integration-tests/security/pom.xml @@ -26,8 +26,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/skip-validation/pom.xml b/client/integration-tests/skip-validation/pom.xml index 8cedef1bf..0e4d4e8a9 100644 --- a/client/integration-tests/skip-validation/pom.xml +++ b/client/integration-tests/skip-validation/pom.xml @@ -22,8 +22,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/integration-tests/type-mapping/pom.xml b/client/integration-tests/type-mapping/pom.xml index 78c5b6372..7fd3339a7 100644 --- a/client/integration-tests/type-mapping/pom.xml +++ b/client/integration-tests/type-mapping/pom.xml @@ -21,8 +21,8 @@ test - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock test diff --git a/client/test-utils/pom.xml b/client/test-utils/pom.xml index 354e59fa5..b9f2adf7e 100644 --- a/client/test-utils/pom.xml +++ b/client/test-utils/pom.xml @@ -22,8 +22,8 @@ compile - com.github.tomakehurst - wiremock-jre8 + org.wiremock + wiremock io.quarkus diff --git a/pom.xml b/pom.xml index 399616b82..cbe39367e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ quarkus-openapi-generator-parent 3.0.0-SNAPSHOT pom - Quarkus - Openapi Generator - Parent + Quarkus - Openapi Generator - Parent< client server @@ -31,7 +31,32 @@ 3.26.2 3.26.3 4.1.1 - 2.35.2 + 3.9.2 + + + + /name> + + client + server + + + :git:git@github.com:quarkiverse/quarkus-openapi-generator.git + scm:git:git@github.com:quarkiverse/quarkus-openapi-generator.git + https://github.com/quarkiverse/quarkus-openapi-generator + HEAD + + + 3.8.1 + 17 + UTF-8 + UTF-8 + 3.17.2 + 1.1.1.Final + 3.26.2 + 3.26.3 + 4.1.1 + 3.9.2 @@ -63,9 +88,9 @@ ${apicurio.version} - com.github.tomakehurst - wiremock-jre8 - ${version.com.github.tomakehurst} + org.wiremock + wiremock + ${version.org.wiremock} From 6225ad23f94b095567ea364c8671e842c4f49668 Mon Sep 17 00:00:00 2001 From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:56:20 -0500 Subject: [PATCH 2/2] Remove leftovers Signed-off-by: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> --- pom.xml | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index cbe39367e..39d1acba8 100644 --- a/pom.xml +++ b/pom.xml @@ -10,32 +10,7 @@ quarkus-openapi-generator-parent 3.0.0-SNAPSHOT pom - Quarkus - Openapi Generator - Parent< - - client - server - - - :git:git@github.com:quarkiverse/quarkus-openapi-generator.git - scm:git:git@github.com:quarkiverse/quarkus-openapi-generator.git - https://github.com/quarkiverse/quarkus-openapi-generator - HEAD - - - 3.8.1 - 17 - UTF-8 - UTF-8 - 3.17.2 - 1.1.1.Final - 3.26.2 - 3.26.3 - 4.1.1 - 3.9.2 - - - - /name> + Quarkus - Openapi Generator - Parent client server