Updated to Quarkus 3 (#190)

Author: hbelmiro

README.md

@@ -10,6 +10,8 @@
 
 > **⚠️** This is the instructions for the latest SNAPSHOT version (main branch). Please, see the [latest **released** documentation](https://github.com/quarkiverse/quarkus-openapi-generator/blob/1.0.1/README.md) if you are looking for instructions.
 
+> **⚠️** Version 2.x.x of this extension (`main` branch) supports Quarkus 3, and version 1.x.x (`quarkus2` branch) supports Quarkus 2.
+
 Quarkus' extension for generation of [Rest Clients](https://quarkus.io/guides/rest-client) based on OpenAPI specification files.
 
 This extension is based on the [OpenAPI Generator Tool](https://openapi-generator.tech/). Please consider donation to help them maintain the
@@ -19,12 +21,13 @@ project: https://opencollective.com/openapi_generator/donate
 
 Add the following dependency to your project's `pom.xml` file:
 
-```xml
+> **⚠️** Version 2.x.x of this extension supports Quarkus 3, and version 1.x.x supports Quarkus 2. 
 
+```xml
 <dependency>
   <groupId>io.quarkiverse.openapi.generator</groupId>
   <artifactId>quarkus-openapi-generator</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -94,11 +97,11 @@ Run `mvn compile` to generate your classes in `target/generated-sources/open-api
 You can reference the generated code in your project, for example:
 
 ```java
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.acme.openapi.api.PetApi;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
@@ -439,9 +442,9 @@ import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
 
 @Path("")
 @RegisterRestClient(configKey="simple-openapi_json")
@@ -493,7 +496,7 @@ You need to add the following additional dependency to your `pom.xml`:
 
 For any multipart/form-data operation a model for the request body will be generated. Each part of the multipart is a field in this model that is annotated with the following annotations:
 
-- `javax.ws.rs.FormParam`, where the value parameter denotes the part name,
+- `jakarta.ws.rs.FormParam`, where the value parameter denotes the part name,
 - `org.jboss.resteasy.annotations.providers.multipart.PartType`, where the parameter is the jax-rs MediaType of the part (see below for details),
 - and, if the part contains a file, `org.jboss.resteasy.annotations.providers.multipart.PartFilename`, with a generated default parameter that will be passed as the fileName sub-header in the
   Content-Disposition header of the part.
@@ -602,9 +605,9 @@ import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
 
 @Path("")
 @RegisterRestClient(configKey="simple-openapi_json")

deployment/pom.xml

@@ -66,7 +66,7 @@
           <artifactId>checker-qual</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>javax.validation</groupId>
+          <groupId>jakarta.validation</groupId>
           <artifactId>validation-api</artifactId>
         </exclusion>
         <exclusion>

deployment/src/main/resources/templates/api.qute

@@ -18,10 +18,10 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import io.quarkiverse.openapi.generator.annotations.GeneratedClass;
 import io.quarkiverse.openapi.generator.annotations.GeneratedMethod;

deployment/src/main/resources/templates/auth/compositeAuthenticationProvider.qute

@@ -1,8 +1,8 @@
 package {apiPackage}.auth;
 
-import javax.inject.Inject;
-import javax.annotation.PostConstruct;
-import javax.ws.rs.Priorities;
+import jakarta.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.ws.rs.Priorities;
 
 import io.quarkus.arc.Priority;
 

deployment/src/main/resources/templates/auth/headersFactory.qute

@@ -1,7 +1,7 @@
 package {apiPackage}.auth;
 
-import javax.inject.Inject;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import io.quarkiverse.openapi.generator.OpenApiGeneratorConfig;
 import io.quarkiverse.openapi.generator.providers.AbstractAuthenticationPropagationHeadersFactory;

deployment/src/main/resources/templates/model.qute

@@ -10,8 +10,8 @@ import java.io.Serializable;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 {#if useBeanValidation}
 
-import javax.validation.constraints.*;
-import javax.validation.Valid;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 {/if}
 {#for m in models}
 {#if m.model.isEnum}{#include enumOuterClass.qute e=m.model/}

deployment/src/main/resources/templates/pojo.qute

@@ -1,11 +1,11 @@
 {#if withXml}
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
 {#else}
 import java.lang.reflect.Type;
 

integration-tests/generation-tests/src/test/java/io/quarkiverse/openapi/generator/it/PetStoreTest.java

@@ -4,7 +4,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.acme.petstore.api.PetApi;
 import org.acme.petstore.model.Pet;

integration-tests/multipart-request/src/test/java/io/quarkiverse/openapi/generator/it/multipart/request/MultipartTest.java

@@ -14,8 +14,8 @@
 import java.util.Base64;
 import java.util.UUID;
 
-import javax.inject.Inject;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.MediaType;
 
 import org.acme.openapi.multipart.api.UserProfileDataApi;
 import org.acme.openapi.multipart.api.UserProfileDataApi.PostUserProfileDataMultipartForm;

integration-tests/register-provider/src/main/java/org/acme/openapi/weather/api/provider/CountProvider.java

@@ -5,8 +5,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;