diff --git a/core/pom.xml b/core/pom.xml index 4beb62a68..55d45bdc5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ io.smallrye smallrye-open-api-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-core diff --git a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/JAXBElementDto.java b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/JAXBElementDto.java index 8b5b9894f..b7354a890 100644 --- a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/JAXBElementDto.java +++ b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/JAXBElementDto.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlType; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestContainer.java b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestContainer.java index ad2a25e02..0c4c09cbc 100644 --- a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestContainer.java +++ b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestContainer.java @@ -4,20 +4,20 @@ import java.util.List; import java.util.Map; -import javax.validation.constraints.DecimalMax; -import javax.validation.constraints.DecimalMin; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Negative; -import javax.validation.constraints.NegativeOrZero; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; -import javax.validation.constraints.PositiveOrZero; -import javax.validation.constraints.Size; -import javax.validation.groups.Default; +import jakarta.validation.constraints.DecimalMax; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Negative; +import jakarta.validation.constraints.NegativeOrZero; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; +import jakarta.validation.constraints.PositiveOrZero; +import jakarta.validation.constraints.Size; +import jakarta.validation.groups.Default; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/Dog.java b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/Dog.java index 5feceba88..769917bdb 100644 --- a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/Dog.java +++ b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/Dog.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner.dataobject; -import javax.json.bind.annotation.JsonbProperty; +import jakarta.json.bind.annotation.JsonbProperty; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/JaxbCustomPropertyOrder.java b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/JaxbCustomPropertyOrder.java index cae390de8..64a1fb226 100644 --- a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/JaxbCustomPropertyOrder.java +++ b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/JaxbCustomPropertyOrder.java @@ -1,8 +1,8 @@ package test.io.smallrye.openapi.runtime.scanner.dataobject; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; @XmlType(propOrder = { "theName", "comment2ActuallyFirst", "comment", "name2" }) public class JaxbCustomPropertyOrder { diff --git a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/MySchema.java b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/MySchema.java index ef76d182c..a41f95e68 100644 --- a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/MySchema.java +++ b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/MySchema.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner.dataobject; -import javax.json.bind.annotation.JsonbPropertyOrder; +import jakarta.json.bind.annotation.JsonbPropertyOrder; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypeFieldOnly.java b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypeFieldOnly.java index bfb345df0..9d95d8b18 100644 --- a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypeFieldOnly.java +++ b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypeFieldOnly.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner.dataobject; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; @XmlAccessorType(value = XmlAccessType.FIELD) public class XmlAccessTypeFieldOnly { diff --git a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypePropertyOnly.java b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypePropertyOnly.java index 5a5cb5655..74372fe24 100644 --- a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypePropertyOnly.java +++ b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypePropertyOnly.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner.dataobject; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; @XmlAccessorType(value = XmlAccessType.PROPERTY) public class XmlAccessTypePropertyOnly { diff --git a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypePublicMember.java b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypePublicMember.java index c793e8027..54fa9e579 100644 --- a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypePublicMember.java +++ b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlAccessTypePublicMember.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner.dataobject; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; @XmlAccessorType(value = XmlAccessType.PUBLIC_MEMBER) public class XmlAccessTypePublicMember { diff --git a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlTransientClass.java b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlTransientClass.java index 7452d3aae..76149bbba 100644 --- a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlTransientClass.java +++ b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlTransientClass.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner.dataobject; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; @XmlTransient public class XmlTransientClass { diff --git a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlTransientField.java b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlTransientField.java index 3f4ab7e04..491e38c17 100644 --- a/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlTransientField.java +++ b/core/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/XmlTransientField.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner.dataobject; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; public class XmlTransientField { diff --git a/extension-jaxrs/pom.xml b/extension-jaxrs/pom.xml index d6c60f5c7..571f03c88 100644 --- a/extension-jaxrs/pom.xml +++ b/extension-jaxrs/pom.xml @@ -5,7 +5,7 @@ io.smallrye smallrye-open-api-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-jaxrs @@ -111,7 +111,7 @@ org.apache.maven.plugins maven-surefire-plugin - + 3.0.0-M5 diff --git a/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/ConfigSchemaTest.java b/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/ConfigSchemaTest.java index e8c58cdcc..7c5d78f72 100644 --- a/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/ConfigSchemaTest.java +++ b/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/ConfigSchemaTest.java @@ -2,7 +2,7 @@ import java.io.IOException; -import javax.json.Json; +import jakarta.json.Json; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/JaxRsAnnotationScannerTest.java b/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/JaxRsAnnotationScannerTest.java index bb590ff2c..f24677367 100644 --- a/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/JaxRsAnnotationScannerTest.java +++ b/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/JaxRsAnnotationScannerTest.java @@ -5,12 +5,12 @@ import java.util.HashMap; import java.util.UUID; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.OASConfig; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; diff --git a/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/util/JandexUtilTests.java b/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/util/JandexUtilTests.java index 6dc35d1c1..17b3d0cc2 100644 --- a/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/util/JandexUtilTests.java +++ b/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/util/JandexUtilTests.java @@ -4,7 +4,7 @@ import java.util.Arrays; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/AllTheParamsTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/AllTheParamsTestResource.java index d7c2116e1..90d1d23e9 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/AllTheParamsTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/AllTheParamsTestResource.java @@ -2,20 +2,20 @@ import java.util.concurrent.CompletionStage; -import javax.validation.constraints.NotNull; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.MatrixParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.MatrixParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.Explode; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseGenericResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseGenericResource.java index 76a56ba36..ec7699146 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseGenericResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseGenericResource.java @@ -2,9 +2,9 @@ import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; public class BaseGenericResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseModel.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseModel.java index 9d5a17462..dab61f08b 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseModel.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseModel.java @@ -3,7 +3,7 @@ import java.util.Date; import java.util.UUID; -import javax.json.bind.annotation.JsonbDateFormat; +import jakarta.json.bind.annotation.JsonbDateFormat; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseResource.java index a4c491f72..68deb902b 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseResource.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public abstract class BaseResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseResource2.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseResource2.java index a6a71b02b..3c61ec1fd 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseResource2.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BaseResource2.java @@ -2,9 +2,9 @@ import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamAddon.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamAddon.java index ff9594b3c..d31bb222d 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamAddon.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamAddon.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.HeaderParam; +import jakarta.ws.rs.HeaderParam; public interface BeanParamAddon { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamBase.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamBase.java index ba1a269a2..4b3f474ea 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamBase.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamBase.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; public class BeanParamBase implements BeanParamAddon { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamImpl.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamImpl.java index 0d19837d5..9a2f0f46a 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamImpl.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamImpl.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.CookieParam; +import jakarta.ws.rs.CookieParam; public class BeanParamImpl extends BeanParamBase implements BeanParamAddon { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamMultipartFormInheritanceResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamMultipartFormInheritanceResource.java index a9b66d92c..76ddaca0b 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamMultipartFormInheritanceResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/BeanParamMultipartFormInheritanceResource.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.annotations.providers.multipart.MultipartForm; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/CharSequenceArrayParamTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/CharSequenceArrayParamTestResource.java index a82664699..bb36b389e 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/CharSequenceArrayParamTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/CharSequenceArrayParamTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/CommonTargetMethodParameterResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/CommonTargetMethodParameterResource.java index 0f56cb7b5..e4ad17b1e 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/CommonTargetMethodParameterResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/CommonTargetMethodParameterResource.java @@ -1,11 +1,11 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Conversation.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Conversation.java index 3c285b032..ec5c3017a 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Conversation.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Conversation.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; public interface Conversation { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DefaultEnumTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DefaultEnumTestResource.java index ceb2e345b..975cd4899 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DefaultEnumTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DefaultEnumTestResource.java @@ -2,13 +2,13 @@ import java.util.Optional; -import javax.validation.constraints.Size; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.Size; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorFullDeclaredInResponseTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorFullDeclaredInResponseTestResource.java index e3f448d7a..8b86b7dd6 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorFullDeclaredInResponseTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorFullDeclaredInResponseTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingEmptyMappingTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingEmptyMappingTestResource.java index 2c3ccce6b..354bcd4ac 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingEmptyMappingTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingEmptyMappingTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoKeyTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoKeyTestResource.java index df0aeb609..ac752bd29 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoKeyTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoKeyTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoPropertyNameTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoPropertyNameTestResource.java index c838db86d..ec2f8621a 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoPropertyNameTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoPropertyNameTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoSchemaTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoSchemaTestResource.java index 1fafe393f..480af98e4 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoSchemaTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorMappingNoSchemaTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorNoMappingTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorNoMappingTestResource.java index b1316c7db..4e5c567cd 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorNoMappingTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/DiscriminatorNoMappingTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/EnumQueryParamTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/EnumQueryParamTestResource.java index cf27a77c0..fca44deb5 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/EnumQueryParamTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/EnumQueryParamTestResource.java @@ -1,11 +1,11 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.ExternalDocumentation; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExampleResource1.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExampleResource1.java index 835ea3d06..9bac5da75 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExampleResource1.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExampleResource1.java @@ -2,7 +2,7 @@ import java.time.LocalDate; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path(value = "/hi") public class ExampleResource1 extends GenericResource implements Greetable { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExampleResource2.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExampleResource2.java index b6bfda14f..43af26899 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExampleResource2.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExampleResource2.java @@ -2,10 +2,10 @@ import java.time.LocalDate; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; import org.eclipse.microprofile.openapi.annotations.enums.ParameterStyle; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExceptionHandler1.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExceptionHandler1.java index 32dec0643..cfed63fa0 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExceptionHandler1.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExceptionHandler1.java @@ -1,9 +1,9 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExceptionHandler2.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExceptionHandler2.java index 10bde340f..d43a44775 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExceptionHandler2.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExceptionHandler2.java @@ -1,9 +1,9 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionParsingTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionParsingTestResource.java index 23fc44d15..ef7757566 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionParsingTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionParsingTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.callbacks.Callback; import org.eclipse.microprofile.openapi.annotations.callbacks.CallbackOperation; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionParsingTestResource1.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionParsingTestResource1.java index 705df8d72..1df2002bf 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionParsingTestResource1.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionParsingTestResource1.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.callbacks.Callback; import org.eclipse.microprofile.openapi.annotations.callbacks.CallbackOperation; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionPlacementTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionPlacementTestResource.java index e269baffb..8de3f1669 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionPlacementTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ExtensionPlacementTestResource.java @@ -1,11 +1,11 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource.java index 8cc9dd2e4..d61ecff70 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource.java @@ -2,13 +2,13 @@ import java.util.Set; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(value = "/fruits") @Produces(value = MediaType.APPLICATION_JSON) diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource2.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource2.java index 45617f29d..0dadc94e9 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource2.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource2.java @@ -1,11 +1,11 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource3.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource3.java index b1d9e2dc2..3360daf11 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource3.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/FruitResource3.java @@ -1,9 +1,9 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(value = "/fruits") public class FruitResource3 { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/GenericResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/GenericResource.java index 1c0c54dac..b82e59482 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/GenericResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/GenericResource.java @@ -1,9 +1,9 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; public class GenericResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/GreetResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/GreetResource.java index efa180518..33c0d9745 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/GreetResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/GreetResource.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.json.JsonObject; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.json.JsonObject; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Greetable.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Greetable.java index d2dbdee7b..1b64de635 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Greetable.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Greetable.java @@ -2,15 +2,15 @@ import java.time.LocalDate; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/IgnoredMpOpenApiHeaderArgsTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/IgnoredMpOpenApiHeaderArgsTestResource.java index 4e38e9d23..2c1e440da 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/IgnoredMpOpenApiHeaderArgsTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/IgnoredMpOpenApiHeaderArgsTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(value = "ignored-headers") public class IgnoredMpOpenApiHeaderArgsTestResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ImmutableEntity.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ImmutableEntity.java index a8a1be9fc..30f44a2fb 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ImmutableEntity.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ImmutableEntity.java @@ -3,9 +3,9 @@ import java.time.Instant; import java.util.UUID; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/IntegerStringUUIDResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/IntegerStringUUIDResource.java index 2b1281bdc..d610b215a 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/IntegerStringUUIDResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/IntegerStringUUIDResource.java @@ -2,12 +2,12 @@ import java.util.UUID; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(value = "/integer-string") @Consumes(value = MediaType.APPLICATION_JSON) diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/KingCrimson.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/KingCrimson.java index 08b4bc1bb..3f395eea3 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/KingCrimson.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/KingCrimson.java @@ -2,7 +2,7 @@ import java.util.Date; -import javax.json.bind.annotation.JsonbDateFormat; +import jakarta.json.bind.annotation.JsonbDateFormat; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/KingCrimsonResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/KingCrimsonResource.java index 881be45e8..ce6f13e4f 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/KingCrimsonResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/KingCrimsonResource.java @@ -3,16 +3,16 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Lizard.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Lizard.java index 29d58520d..5ad7a4270 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Lizard.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Lizard.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.json.bind.annotation.JsonbPropertyOrder; +import jakarta.json.bind.annotation.JsonbPropertyOrder; @JsonbPropertyOrder(value = { "type", "lovesRocks" }) public class Lizard extends AbstractPet { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MagmaResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MagmaResource.java index 479b3b67a..d3ec619d8 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MagmaResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MagmaResource.java @@ -2,16 +2,16 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MainTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MainTestResource.java index ed585c5ef..6343cba9b 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MainTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MainTestResource.java @@ -2,12 +2,12 @@ import java.time.LocalDateTime; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.MatrixParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.MatrixParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; import org.eclipse.microprofile.openapi.annotations.enums.ParameterStyle; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnMethodAndFieldArgsTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnMethodAndFieldArgsTestResource.java index d8b88762d..f5d1a91fc 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnMethodAndFieldArgsTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnMethodAndFieldArgsTestResource.java @@ -1,14 +1,14 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.validation.constraints.Max; -import javax.validation.constraints.Size; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.MatrixParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Size; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.MatrixParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; import org.eclipse.microprofile.openapi.annotations.enums.ParameterStyle; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnResourceMethodArgsTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnResourceMethodArgsTestResource.java index d85cac433..742e655bc 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnResourceMethodArgsTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnResourceMethodArgsTestResource.java @@ -1,14 +1,14 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.MatrixParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.MatrixParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(value = "/matrix-params-on-resource-method-args/{id}") @SuppressWarnings(value = "unused") diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnResourceMethodCustomNameTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnResourceMethodCustomNameTestResource.java index d01aea849..633abfd62 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnResourceMethodCustomNameTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MatrixParamsOnResourceMethodCustomNameTestResource.java @@ -1,13 +1,13 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.validation.constraints.Size; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.MatrixParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.Size; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.MatrixParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; import org.eclipse.microprofile.openapi.annotations.enums.ParameterStyle; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MethodTargetParametersResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MethodTargetParametersResource.java index f3494001c..e0bcec925 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MethodTargetParametersResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MethodTargetParametersResource.java @@ -5,12 +5,12 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultiProduceConsumeResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultiProduceConsumeResource.java index 07051b40a..fd716426b 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultiProduceConsumeResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultiProduceConsumeResource.java @@ -1,11 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - +import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/multi-produce-consume") public class MultiProduceConsumeResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormTestResource.java index 9527838c9..5cfaaf1d9 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormTestResource.java @@ -4,15 +4,15 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormUploadIconForm.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormUploadIconForm.java index 319d393c6..93e3489da 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormUploadIconForm.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormUploadIconForm.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; public class MultipartFormUploadIconForm extends MultipartFormVerify { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormVerify.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormVerify.java index e863bec7d..11e0c7fb2 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormVerify.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipartFormVerify.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; public class MultipartFormVerify { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipleContentTypesWithFormParamsTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipleContentTypesWithFormParamsTestResource.java index 71520632b..8e068f96d 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipleContentTypesWithFormParamsTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MultipleContentTypesWithFormParamsTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MutableEntity.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MutableEntity.java index d2c7263d0..83390a31d 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MutableEntity.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/MutableEntity.java @@ -3,8 +3,8 @@ import java.time.Instant; import java.util.UUID; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/NoRolesResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/NoRolesResource.java index 0ab123340..30c4c468a 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/NoRolesResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/NoRolesResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; @Path(value = "/v1") @SuppressWarnings(value = "unused") diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/OpenAPIConfig.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/OpenAPIConfig.java index 39a231ae7..e367c0c7f 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/OpenAPIConfig.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/OpenAPIConfig.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.eclipse.microprofile.openapi.annotations.Components; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/OptionalParamTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/OptionalParamTestResource.java index 692e59ee9..ce5487aa1 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/OptionalParamTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/OptionalParamTestResource.java @@ -4,18 +4,18 @@ import java.util.OptionalDouble; import java.util.OptionalLong; -import javax.validation.constraints.NotNull; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParamNameOverrideTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParamNameOverrideTestResource.java index b6f7ceb02..160b0db50 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParamNameOverrideTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParamNameOverrideTestResource.java @@ -1,13 +1,13 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.CookieParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; import org.eclipse.microprofile.openapi.annotations.enums.ParameterStyle; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterInBeanFromFieldTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterInBeanFromFieldTestResource.java index d2ccf177f..c1686e720 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterInBeanFromFieldTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterInBeanFromFieldTestResource.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.BeanParam; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(value = "/parameter-in-bean-from-field/{id}") public class ParameterInBeanFromFieldTestResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterInBeanFromSetterTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterInBeanFromSetterTestResource.java index 13e6a3761..358e8d2f5 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterInBeanFromSetterTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterInBeanFromSetterTestResource.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.BeanParam; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(value = "/parameter-in-bean-from-setter/{id}/{id2}") @SuppressWarnings(value = "unused") diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterOnMethodTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterOnMethodTestResource.java index 15854d66c..a80fc6408 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterOnMethodTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterOnMethodTestResource.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterRefTestApplication.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterRefTestApplication.java index 336b8a618..42496faac 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterRefTestApplication.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterRefTestApplication.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.eclipse.microprofile.openapi.annotations.Components; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterRefTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterRefTestResource.java index 33a83ffa6..82bed3c30 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterRefTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParameterRefTestResource.java @@ -1,8 +1,8 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; import org.eclipse.microprofile.openapi.annotations.enums.ParameterStyle; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParametersInConstructorTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParametersInConstructorTestResource.java index e1e96286b..19fcbe149 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParametersInConstructorTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ParametersInConstructorTestResource.java @@ -1,14 +1,14 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.validation.constraints.NotNull; -import javax.ws.rs.BeanParam; -import javax.ws.rs.CookieParam; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathParamTemplateRegexTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathParamTemplateRegexTestResource.java index 04327df47..bf63cef78 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathParamTemplateRegexTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathParamTemplateRegexTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(value = "/template") public class PathParamTemplateRegexTestResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathParamWithFormParamsTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathParamWithFormParamsTestResource.java index bbc41d724..4765288b7 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathParamWithFormParamsTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathParamWithFormParamsTestResource.java @@ -1,15 +1,15 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(value = "/path-param-with-form-params/{id}") @SuppressWarnings(value = "unused") diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathSegmentMatrixTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathSegmentMatrixTestResource.java index f314c3d62..ef77ebe27 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathSegmentMatrixTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PathSegmentMatrixTestResource.java @@ -1,11 +1,11 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.PathSegment; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.PathSegment; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; import org.eclipse.microprofile.openapi.annotations.enums.ParameterStyle; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Pet.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Pet.java index 9b73aee54..f3cba3ea0 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Pet.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Pet.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.json.JsonString; +import jakarta.json.JsonString; public class Pet { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Policy437.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Policy437.java index 0524d3c88..cd193c0fc 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Policy437.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Policy437.java @@ -5,10 +5,10 @@ import java.util.Optional; import java.util.UUID; -import javax.json.bind.annotation.JsonbTransient; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.json.bind.annotation.JsonbTransient; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Policy437Resource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Policy437Resource.java index aac760570..03435074a 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Policy437Resource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Policy437Resource.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path(value = "/") public class Policy437Resource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArrayParameterTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArrayParameterTestResource.java index 63781d6da..b8cb3af37 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArrayParameterTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArrayParameterTestResource.java @@ -1,9 +1,9 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArrayPolymorphismTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArrayPolymorphismTestResource.java index f36be135f..f67a3d1da 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArrayPolymorphismTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArrayPolymorphismTestResource.java @@ -1,9 +1,9 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArraySchemaTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArraySchemaTestResource.java index d5dabf4ab..872e5d50e 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArraySchemaTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/PrimitiveArraySchemaTestResource.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RecursiveLocatorResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RecursiveLocatorResource.java index 3976e533a..56be634a0 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RecursiveLocatorResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RecursiveLocatorResource.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path(value = "/recursion") @SuppressWarnings(value = "unused") diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ReferenceResponseTestApp.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ReferenceResponseTestApp.java index 14f4879c3..bb75aaaf3 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ReferenceResponseTestApp.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ReferenceResponseTestApp.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.eclipse.microprofile.openapi.annotations.Components; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ReferenceResponseTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ReferenceResponseTestResource.java index 5f0c5acc2..698aae78c 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ReferenceResponseTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ReferenceResponseTestResource.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.json.JsonObject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.json.JsonObject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResidentsResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResidentsResource.java index ffe5ead6b..8a1e0bac9 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResidentsResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResidentsResource.java @@ -2,16 +2,16 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResourcePathParamTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResourcePathParamTestResource.java index 465660f96..1aae49077 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResourcePathParamTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResourcePathParamTestResource.java @@ -1,11 +1,11 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(value = "/parameter-on-field/{id}") public class ResourcePathParamTestResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationEnabledByIncompleteApiResponseTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationEnabledByIncompleteApiResponseTestResource.java index eea9ea0ec..cc30524bc 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationEnabledByIncompleteApiResponseTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationEnabledByIncompleteApiResponseTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedByApiResourcesAnnotationTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedByApiResourcesAnnotationTestResource.java index 460fbf928..efecd5387 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedByApiResourcesAnnotationTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedByApiResourcesAnnotationTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedByStatusOmissionTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedByStatusOmissionTestResource.java index 084235bfd..362177d91 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedByStatusOmissionTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedByStatusOmissionTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedBySuppliedDefaultApiResourceTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedBySuppliedDefaultApiResourceTestResource.java index b02852f10..28055a233 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedBySuppliedDefaultApiResourceTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseGenerationSuppressedBySuppliedDefaultApiResourceTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseMultipartGenerationTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseMultipartGenerationTestResource.java index 35933313b..ee2937201 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseMultipartGenerationTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseMultipartGenerationTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseTypeUnindexedTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseTypeUnindexedTestResource.java index 6f4b83738..9bdaee146 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseTypeUnindexedTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResponseTypeUnindexedTestResource.java @@ -1,9 +1,9 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(value = "/unindexed") public class ResponseTypeUnindexedTestResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyFieldsAndSettersTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyFieldsAndSettersTestResource.java index 2dd500e9b..9dcae986e 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyFieldsAndSettersTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyFieldsAndSettersTestResource.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactiveAllTheParamsTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactiveAllTheParamsTestResource.java index 4bcde9f99..c3180e797 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactiveAllTheParamsTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactiveAllTheParamsTestResource.java @@ -2,15 +2,15 @@ import java.util.concurrent.CompletionStage; -import javax.validation.constraints.NotNull; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.Explode; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactivePathParamOmittedTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactivePathParamOmittedTestResource.java index b884ec1c2..4964d022e 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactivePathParamOmittedTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactivePathParamOmittedTestResource.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.validation.constraints.Min; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Request; +import jakarta.validation.constraints.Min; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Request; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.jboss.resteasy.reactive.RestPath; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactivePathParamOmittedTestResource2.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactivePathParamOmittedTestResource2.java index 059c702d3..2eb8fce74 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactivePathParamOmittedTestResource2.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RestEasyReactivePathParamOmittedTestResource2.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Path(value = "/movies") public class RestEasyReactivePathParamOmittedTestResource2 { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartFormDataInputTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartFormDataInputTestResource.java index e112cfaeb..c57a2eda0 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartFormDataInputTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartFormDataInputTestResource.java @@ -1,9 +1,9 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartFormDataMapTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartFormDataMapTestResource.java index d2fcc972e..e6d0276e2 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartFormDataMapTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartFormDataMapTestResource.java @@ -2,10 +2,10 @@ import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; @Path(value = "multipart-form-data-map") public class ResteasyMultipartFormDataMapTestResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartInputTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartInputTestResource.java index 4930cd7ed..ce5f4cffe 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartInputTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartInputTestResource.java @@ -1,8 +1,8 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartMixedListTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartMixedListTestResource.java index 058313bea..155ff7797 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartMixedListTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartMixedListTestResource.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; @Path(value = "multipart-mixed-array") public class ResteasyMultipartMixedListTestResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartRelatedInputTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartRelatedInputTestResource.java index 299674aa5..e61cf3c84 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartRelatedInputTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyMultipartRelatedInputTestResource.java @@ -1,8 +1,8 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody; import org.jboss.resteasy.plugins.providers.multipart.MultipartRelatedInput; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyReactiveExceptionMapper.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyReactiveExceptionMapper.java index ea033bb19..0e28a923a 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyReactiveExceptionMapper.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/ResteasyReactiveExceptionMapper.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; // Mimic org.jboss.resteasy.reactive.server.spi.ResteasyReactiveExceptionMapper diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedApp.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedApp.java index 0d6457802..8099b19fd 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedApp.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedApp.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.eclipse.microprofile.openapi.annotations.Components; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedResource1.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedResource1.java index cec16744f..c776930ff 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedResource1.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedResource1.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.annotation.security.DenyAll; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.annotation.security.DenyAll; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; @Path(value = "/v1") @RolesAllowed(value = "admin") diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedResource2.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedResource2.java index 3aa717b6f..0e7c6c33c 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedResource2.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesAllowedResource2.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; @Path(value = "/v2") @SuppressWarnings(value = "unused") diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesDeclaredResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesDeclaredResource.java index 1c60ff61d..5b3021ad4 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesDeclaredResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesDeclaredResource.java @@ -1,11 +1,11 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.annotation.security.DeclareRoles; -import javax.annotation.security.RolesAllowed; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.annotation.security.DeclareRoles; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; @Path(value = "/v1") @SuppressWarnings(value = "unused") diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesNotAllowedApp.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesNotAllowedApp.java index 72d16ae9d..46d16a455 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesNotAllowedApp.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/RolesNotAllowedApp.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.eclipse.microprofile.openapi.annotations.Components; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/SchemaImplementationTypeResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/SchemaImplementationTypeResource.java index 34ac8b54f..d22f66476 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/SchemaImplementationTypeResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/SchemaImplementationTypeResource.java @@ -2,11 +2,11 @@ import java.net.URI; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Sub1TestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Sub1TestResource.java index 117038b29..08afa2e51 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Sub1TestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Sub1TestResource.java @@ -2,13 +2,13 @@ import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PATCH; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; @SuppressWarnings(value = "unused") public class Sub1TestResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Sub2TestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Sub2TestResource.java index 211830a8e..7e105ea9a 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Sub2TestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/Sub2TestResource.java @@ -1,8 +1,8 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @SuppressWarnings(value = "unused") public class Sub2TestResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource.java index 6a0933bfd..05f0e8808 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; @Path(value = "/resources") public class TestResource { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource2.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource2.java index 3f1ac0ffd..4b42f31c3 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource2.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource2.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource3.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource3.java index 2916a33c6..ad3d8bf56 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource3.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TestResource3.java @@ -2,12 +2,12 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TimeTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TimeTestResource.java index 2afee0ff9..34e45967d 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TimeTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TimeTestResource.java @@ -5,12 +5,12 @@ import java.time.ZoneId; import java.time.ZoneOffset; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TypeVariableResponseTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TypeVariableResponseTestResource.java index 7f3f612c4..d4dfa4e4b 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TypeVariableResponseTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/TypeVariableResponseTestResource.java @@ -2,9 +2,9 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path(value = "/variable-types") @SuppressWarnings(value = "unused") diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/UUIDQueryParamTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/UUIDQueryParamTestResource.java index 5dc0b4dc9..30a804a9c 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/UUIDQueryParamTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/UUIDQueryParamTestResource.java @@ -2,13 +2,13 @@ import java.util.UUID; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/UndeclaredFlowsNoRolesAllowedApp.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/UndeclaredFlowsNoRolesAllowedApp.java index 0b7dc458e..996ef204c 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/UndeclaredFlowsNoRolesAllowedApp.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/UndeclaredFlowsNoRolesAllowedApp.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; import org.eclipse.microprofile.openapi.annotations.enums.SecuritySchemeType; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidAsyncResponseGenerationTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidAsyncResponseGenerationTestResource.java index 021b7e377..7d391b2c2 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidAsyncResponseGenerationTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidAsyncResponseGenerationTestResource.java @@ -1,14 +1,14 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.container.Suspended; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidNonPostResponseGenerationTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidNonPostResponseGenerationTestResource.java index 54957e679..63dc643b5 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidNonPostResponseGenerationTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidNonPostResponseGenerationTestResource.java @@ -1,11 +1,11 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidPostResponseGenerationTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidPostResponseGenerationTestResource.java index fa9a0e335..b95ba0df7 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidPostResponseGenerationTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/VoidPostResponseGenerationTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestResource.java index 38f0b5316..0900504b3 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner.dataobject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.tags.Tag; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestResourceEntity.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestResourceEntity.java index 32d501db3..8bd69c6a8 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestResourceEntity.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BVTestResourceEntity.java @@ -4,11 +4,11 @@ import java.util.List; import java.util.Map; -import javax.json.bind.annotation.JsonbProperty; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.json.bind.annotation.JsonbProperty; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BaseUser.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BaseUser.java index eeb765294..08fb913fb 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BaseUser.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/BaseUser.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner.dataobject; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; public abstract class BaseUser { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/User.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/User.java index 725bac59d..aed3a131d 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/User.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/dataobject/User.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner.dataobject; -import javax.validation.constraints.Max; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Positive; public interface User { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/FieldNameOverride.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/FieldNameOverride.java index 352a4018c..6779a8f64 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/FieldNameOverride.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/FieldNameOverride.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner.entities; -import javax.json.bind.annotation.JsonbProperty; +import jakarta.json.bind.annotation.JsonbProperty; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JaxbGreeting.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JaxbGreeting.java index af5f8eafe..4e44b6dc9 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JaxbGreeting.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JaxbGreeting.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner.entities; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class JaxbGreeting { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JaxbWithNameGreeting.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JaxbWithNameGreeting.java index 735798537..ef3ae197e 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JaxbWithNameGreeting.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JaxbWithNameGreeting.java @@ -2,10 +2,10 @@ import java.util.List; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "MyGreeting") public class JaxbWithNameGreeting { diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JsonbTransientOnFieldExample.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JsonbTransientOnFieldExample.java index 4e03ff4cc..f1f2f60f7 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JsonbTransientOnFieldExample.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/entities/JsonbTransientOnFieldExample.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner.entities; -import javax.json.bind.annotation.JsonbTransient; +import jakarta.json.bind.annotation.JsonbTransient; /** * @author Michael Edgar {@literal } diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/DefaultContentTypeResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/DefaultContentTypeResource.java index e9d6d2c5a..46f8c4ebb 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/DefaultContentTypeResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/DefaultContentTypeResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import test.io.smallrye.openapi.runtime.scanner.entities.Greeting; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/EmptySecurityRequirementsResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/EmptySecurityRequirementsResource.java index b1deb12ed..a9cbd8ab2 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/EmptySecurityRequirementsResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/EmptySecurityRequirementsResource.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirements; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/FooResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/FooResource.java index 9c16b3197..34e50adea 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/FooResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/FooResource.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @SuppressWarnings("unused") @Path("foo") diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingDeleteResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingDeleteResource.java index 0e46691d2..08f23a60c 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingDeleteResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingDeleteResource.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingGetResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingGetResource.java index 10b3c71ec..a25505a32 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingGetResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingGetResource.java @@ -4,14 +4,14 @@ import java.util.List; import java.util.Optional; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingOperationResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingOperationResource.java index 3d996c402..276fe813d 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingOperationResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingOperationResource.java @@ -3,12 +3,12 @@ import java.util.Arrays; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPostResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPostResource.java index f31dca911..94a3d41dd 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPostResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPostResource.java @@ -1,11 +1,11 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPutResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPutResource.java index f8a8f76bf..a298a621d 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPutResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPutResource.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/HiddenOperationResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/HiddenOperationResource.java index f2993a74a..2403ca60b 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/HiddenOperationResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/HiddenOperationResource.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.Operation; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/JaxbGreetingGetResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/JaxbGreetingGetResource.java index 5e98a1e7a..c417ef6f5 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/JaxbGreetingGetResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/JaxbGreetingGetResource.java @@ -1,11 +1,11 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import test.io.smallrye.openapi.runtime.scanner.entities.Greeting; import test.io.smallrye.openapi.runtime.scanner.entities.JaxbGreeting; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/NestedSchemaOnParameterResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/NestedSchemaOnParameterResource.java index 89508128b..cf6caa8a6 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/NestedSchemaOnParameterResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/NestedSchemaOnParameterResource.java @@ -3,12 +3,12 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.Dependent; -import javax.json.bind.annotation.JsonbProperty; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.Dependent; +import jakarta.json.bind.annotation.JsonbProperty; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.enums.ParameterIn; import org.eclipse.microprofile.openapi.annotations.media.Content; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/PackageInfoTestApplication.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/PackageInfoTestApplication.java index 92726ec8e..a5a14b8f6 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/PackageInfoTestApplication.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/PackageInfoTestApplication.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; import org.eclipse.microprofile.openapi.annotations.info.Info; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/ParameterResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/ParameterResource.java index a308872d8..eb0b6337e 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/ParameterResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/ParameterResource.java @@ -1,10 +1,10 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.DELETE; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/RequestBodyTestApplication.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/RequestBodyTestApplication.java index 2e76bef4d..a7f4e979f 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/RequestBodyTestApplication.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/RequestBodyTestApplication.java @@ -2,11 +2,11 @@ import java.util.UUID; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Components; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestApp.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestApp.java index 53da223cf..32c92ef16 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestApp.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestApp.java @@ -1,7 +1,7 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition; import org.eclipse.microprofile.openapi.annotations.info.Info; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestResource1.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestResource1.java index cd3e4743c..18c2e2e79 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestResource1.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestResource1.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PATCH; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.tags.Tag; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestResource2.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestResource2.java index 9b02cc2ac..a710459a7 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestResource2.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/TagTestResource2.java @@ -1,12 +1,12 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PATCH; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.ExternalDocumentation; import org.eclipse.microprofile.openapi.annotations.tags.Tag; diff --git a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/VisibleOperationResource.java b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/VisibleOperationResource.java index 3eb764a4f..83a3c238e 100644 --- a/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/VisibleOperationResource.java +++ b/extension-jaxrs/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/VisibleOperationResource.java @@ -1,9 +1,9 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; diff --git a/extension-spring/pom.xml b/extension-spring/pom.xml index ff3cd9bdb..9781083cb 100644 --- a/extension-spring/pom.xml +++ b/extension-spring/pom.xml @@ -5,7 +5,7 @@ io.smallrye smallrye-open-api-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-spring diff --git a/extension-vertx/pom.xml b/extension-vertx/pom.xml index 8139c3a5c..714d8032b 100644 --- a/extension-vertx/pom.xml +++ b/extension-vertx/pom.xml @@ -5,7 +5,7 @@ io.smallrye smallrye-open-api-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-vertx diff --git a/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingDeleteRoute.java b/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingDeleteRoute.java index 877934160..efdab4144 100644 --- a/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingDeleteRoute.java +++ b/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingDeleteRoute.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import io.quarkus.vertx.web.Param; import io.quarkus.vertx.web.Route; diff --git a/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingGetRoute.java b/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingGetRoute.java index f416172cf..f4f1beec1 100644 --- a/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingGetRoute.java +++ b/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingGetRoute.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPostRoute.java b/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPostRoute.java index 662954f6e..9b8311cfc 100644 --- a/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPostRoute.java +++ b/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPostRoute.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPutRoute.java b/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPutRoute.java index 7228fa7ca..e02892541 100644 --- a/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPutRoute.java +++ b/extension-vertx/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingPutRoute.java @@ -1,6 +1,6 @@ package test.io.smallrye.openapi.runtime.scanner.resources; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; diff --git a/implementation/pom.xml b/implementation/pom.xml index d84384a0a..daf12e99f 100644 --- a/implementation/pom.xml +++ b/implementation/pom.xml @@ -5,7 +5,7 @@ io.smallrye smallrye-open-api-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api diff --git a/pom.xml b/pom.xml index 0d1d12732..52e899b61 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ io.smallrye - smallrye-parent + smallrye-jakarta-parent 34 smallrye-open-api-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT pom SmallRye: OpenAPI Parent @@ -19,23 +19,23 @@ 3.3.0 2.13.1 - 2.0 - 2.8.2 - 2.0.1-RC1 + 3.0 + 3.0.0-RC1 + 3.0 1.3 2.0.0.0 1.5.0 3.2.0 1.12.1 - arquillian-jetty-embedded-9 - 1.0.0.CR3 - 9.3.30.v20211001 - 4.7.5.Final + arquillian-jetty-embedded-11 + 1.0.0.CR4 + 11.0.7 + 6.0.0.Final - org.jboss.resteasy - resteasy-client-microprofile - 4.7.5.Final + org.jboss.resteasy.microprofile + microprofile-rest-client + 2.0.0.Beta1 2.7.0.Final + --pinentry-mode diff --git a/release/pom.xml b/release/pom.xml index d6d584971..df0f19333 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -5,7 +5,7 @@ io.smallrye smallrye-open-api-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-release diff --git a/testsuite/extra/pom.xml b/testsuite/extra/pom.xml index 8df706a66..f592df95b 100644 --- a/testsuite/extra/pom.xml +++ b/testsuite/extra/pom.xml @@ -3,7 +3,7 @@ io.smallrye smallrye-open-api-testsuite - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT ../ diff --git a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/apppath/ApplicationPathApp.java b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/apppath/ApplicationPathApp.java index a7b6d65b8..7fb15a9fc 100644 --- a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/apppath/ApplicationPathApp.java +++ b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/apppath/ApplicationPathApp.java @@ -16,8 +16,8 @@ package io.smallrye.openapi.tck.extra.apppath; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/restapi/v1") public class ApplicationPathApp extends Application { diff --git a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/apppath/ApplicationPathResource.java b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/apppath/ApplicationPathResource.java index 81a018a4c..08cfe4fb2 100644 --- a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/apppath/ApplicationPathResource.java +++ b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/apppath/ApplicationPathResource.java @@ -19,11 +19,11 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.PathParam; /** * @author eric.wittmann@gmail.com diff --git a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/complex/ComplexResource.java b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/complex/ComplexResource.java index 9e30ca680..b5137b344 100644 --- a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/complex/ComplexResource.java +++ b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/complex/ComplexResource.java @@ -20,9 +20,9 @@ import java.util.Collection; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com diff --git a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/extensions/ExtensionResource.java b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/extensions/ExtensionResource.java index 76f938a25..85fe8d9f2 100644 --- a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/extensions/ExtensionResource.java +++ b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/extensions/ExtensionResource.java @@ -16,7 +16,7 @@ package io.smallrye.openapi.tck.extra.extensions; -import javax.ws.rs.*; +import jakarta.ws.rs.*; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.extensions.Extensions; diff --git a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/jaxrs/WidgetResource.java b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/jaxrs/WidgetResource.java index 2c91b405b..9a3f46d58 100644 --- a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/jaxrs/WidgetResource.java +++ b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/jaxrs/WidgetResource.java @@ -19,12 +19,12 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; /** * @author eric.wittmann@gmail.com diff --git a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/jsonignoreproperties/JsonIgnorePropertiesResource.java b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/jsonignoreproperties/JsonIgnorePropertiesResource.java index 69a3bcad6..9b067a11c 100644 --- a/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/jsonignoreproperties/JsonIgnorePropertiesResource.java +++ b/testsuite/extra/src/test/java/io/smallrye/openapi/tck/extra/jsonignoreproperties/JsonIgnorePropertiesResource.java @@ -16,9 +16,9 @@ package io.smallrye.openapi.tck.extra.jsonignoreproperties; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody; diff --git a/testsuite/extra/src/test/java/test/io/smallrye/openapi/tck/ExtraSuiteTestBase.java b/testsuite/extra/src/test/java/test/io/smallrye/openapi/tck/ExtraSuiteTestBase.java index f40a9c2cd..d55a3230f 100644 --- a/testsuite/extra/src/test/java/test/io/smallrye/openapi/tck/ExtraSuiteTestBase.java +++ b/testsuite/extra/src/test/java/test/io/smallrye/openapi/tck/ExtraSuiteTestBase.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.models.OpenAPI; import org.eclipse.microprofile.openapi.tck.utils.YamlToJsonFilter; diff --git a/testsuite/pom.xml b/testsuite/pom.xml index a91fc89ed..dc6a38887 100644 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -20,7 +20,7 @@ io.smallrye smallrye-open-api-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-testsuite diff --git a/testsuite/tck/pom.xml b/testsuite/tck/pom.xml index 0809c69d3..58bd07536 100644 --- a/testsuite/tck/pom.xml +++ b/testsuite/tck/pom.xml @@ -20,7 +20,7 @@ io.smallrye smallrye-open-api-testsuite - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-testsuite-tck diff --git a/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiApplication.java b/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiApplication.java index c2819f255..79e5aea6b 100644 --- a/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiApplication.java +++ b/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiApplication.java @@ -1,7 +1,7 @@ package io.smallrye.openapi.tck; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; /** * RESTEasy Servlet initializer requires a REST Application to start. Some TCKs don't have an Application class, so we diff --git a/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiEndpoint.java b/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiEndpoint.java index 957874e3d..606d268e4 100644 --- a/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiEndpoint.java +++ b/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiEndpoint.java @@ -3,19 +3,19 @@ import static io.smallrye.openapi.runtime.io.Format.JSON; import static io.smallrye.openapi.runtime.io.Format.YAML; import static io.smallrye.openapi.runtime.io.OpenApiSerializer.serialize; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static java.nio.charset.StandardCharsets.UTF_8; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import java.util.stream.Stream; -import javax.annotation.PostConstruct; -import javax.servlet.ServletContext; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.ServletContext; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.models.OpenAPI; diff --git a/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiRegistration.java b/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiRegistration.java index 8ff63cadf..ee2a0fefe 100644 --- a/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiRegistration.java +++ b/testsuite/tck/src/test/java/io/smallrye/openapi/tck/OpenApiRegistration.java @@ -8,11 +8,11 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/testsuite/tck/src/test/java/io/smallrye/openapi/tck/TestApplication.java b/testsuite/tck/src/test/java/io/smallrye/openapi/tck/TestApplication.java index 40149b342..a804362b3 100644 --- a/testsuite/tck/src/test/java/io/smallrye/openapi/tck/TestApplication.java +++ b/testsuite/tck/src/test/java/io/smallrye/openapi/tck/TestApplication.java @@ -1,18 +1,18 @@ package io.smallrye.openapi.tck; -import static javax.ws.rs.core.MediaType.TEXT_PLAIN; +import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; import java.net.HttpURLConnection; import java.net.URL; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; diff --git a/tools/maven-plugin/pom.xml b/tools/maven-plugin/pom.xml index b59710cec..8c34a2c38 100644 --- a/tools/maven-plugin/pom.xml +++ b/tools/maven-plugin/pom.xml @@ -4,7 +4,7 @@ io.smallrye smallrye-open-api-tools - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-maven-plugin maven-plugin diff --git a/tools/pom.xml b/tools/pom.xml index ef688e0f5..9e27217de 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -4,7 +4,7 @@ io.smallrye smallrye-open-api-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-tools diff --git a/ui/open-api-ui-forms/pom.xml b/ui/open-api-ui-forms/pom.xml index 5f28ab74d..49504625a 100644 --- a/ui/open-api-ui-forms/pom.xml +++ b/ui/open-api-ui-forms/pom.xml @@ -5,7 +5,7 @@ io.smallrye smallrye-open-api-ui-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-ui-forms diff --git a/ui/open-api-ui/pom.xml b/ui/open-api-ui/pom.xml index 85aaa541b..3e9d7cb1a 100644 --- a/ui/open-api-ui/pom.xml +++ b/ui/open-api-ui/pom.xml @@ -5,7 +5,7 @@ io.smallrye smallrye-open-api-ui-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-ui diff --git a/ui/pom.xml b/ui/pom.xml index 89230bd5c..ccb1dbca4 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -5,7 +5,7 @@ io.smallrye smallrye-open-api-parent - 2.1.18-SNAPSHOT + 3.0.0-SNAPSHOT smallrye-open-api-ui-parent