From 61bee7bd77d3dd7aeaa547850a1a49a2f33c8e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Marti=C5=A1ka?= Date: Mon, 3 Jan 2022 11:37:08 +0100 Subject: [PATCH] Move to Jakarta namespace --- .../io/smallrye/metrics/MetricProducer.java | 8 +++--- .../io/smallrye/metrics/MetricRegistries.java | 8 +++--- .../smallrye/metrics/MetricsRegistryImpl.java | 4 +-- .../metrics/MetricsRequestHandler.java | 2 +- .../metrics/SmallRyeMetricsLogging.java | 4 +-- .../metrics/SmallRyeMetricsMessages.java | 5 ++-- .../elementdesc/adapter/cdi/CDIBeanInfo.java | 2 +- .../metrics/exporters/JsonExporter.java | 10 +++---- .../exporters/JsonMetadataExporter.java | 10 +++---- .../metrics/exporters/JsonProviderHolder.java | 2 +- .../exporters/OpenMetricsExporter.java | 2 ++ .../ConcurrentGaugeInterceptor.java | 14 +++++----- .../interceptors/CountedInterceptor.java | 14 +++++----- .../GaugeRegistrationInterceptor.java | 10 +++---- .../interceptors/MeteredInterceptor.java | 14 +++++----- .../metrics/interceptors/MetricName.java | 4 +-- .../interceptors/MetricNameFactory.java | 6 ++--- .../metrics/interceptors/MetricResolver.java | 2 +- .../metrics/interceptors/MetricsBinding.java | 2 +- .../metrics/interceptors/SeMetricName.java | 10 +++---- .../interceptors/SimplyTimedInterceptor.java | 14 +++++----- .../interceptors/TimedInterceptor.java | 14 +++++----- .../metrics/jaxrs/JaxRsMetricsFilter.java | 12 ++++----- .../jaxrs/JaxRsMetricsServletFilter.java | 16 ++++++------ .../metrics/setup/AnnotatedDecorator.java | 2 +- .../metrics/setup/AnnotatedTypeDecorator.java | 8 +++--- .../setup/MetricCdiInjectionExtension.java | 26 +++++++++---------- ...> jakarta.enterprise.inject.spi.Extension} | 0 .../exporters/ExportersMetricScalingTest.java | 4 +-- .../metrics/exporters/JsonExporterTest.java | 4 +-- .../exporters/JsonMetadataExporterTest.java | 6 ++--- pom.xml | 17 +++++++----- testsuite/api-tck/pom.xml | 5 ++++ .../metrics/testsuite/MetricsInitializer.java | 6 ++--- .../smallrye/metrics/test/HelloService.java | 2 +- .../smallrye/metrics/test/MetricsSummary.java | 4 +-- .../GaugeInDependentScopedBeanTest.java | 4 +-- .../MetricsInDependentScopedBeanTest.java | 4 +-- ...alization_ConcurrentGauge_Method_Test.java | 2 +- ...nitialization_Counter_ClassLevel_Test.java | 2 +- ...itialization_Counter_Constructor_Test.java | 2 +- ...ialization_Counter_Method_Reused_Test.java | 4 +-- .../Initialization_Counter_Method_Test.java | 6 ++--- .../Initialization_Gauge_Method_Test.java | 4 +-- .../Initialization_Injection_Test.java | 2 +- .../Initialization_Meter_Method_Test.java | 2 +- ...nitialization_SimpleTimer_Method_Test.java | 2 +- .../Initialization_Timer_Method_Test.java | 2 +- .../NonReusableMetricInjectionBean.java | 2 +- .../NonReusableMetricInjectionTest.java | 4 +-- .../registry/AllMetricsOfGivenTypeTest.java | 2 +- .../registry/MetricRegistryInjectionTest.java | 2 +- .../ReuseMetricWithDifferingTagsTest.java | 2 +- .../StereotypeCountedClassTest.java | 2 +- .../test/stereotype/stereotypes/CountMe.java | 2 +- testsuite/optional-tck/pom.xml | 4 +-- .../JaxRsMetricsActivatingProcessor.java | 6 ++--- .../tck/optional/MetricsHttpServlet.java | 10 +++---- .../META-INF/jboss-deployment-structure.xml | 4 --- testsuite/rest-tck/pom.xml | 4 +-- .../metrics/tck/rest/ArchiveProcessor.java | 20 +++++--------- .../metrics/tck/rest/MetricsHttpServlet.java | 10 +++---- .../tck/rest/SmallRyeBeanArchiveHandler.java | 2 +- 63 files changed, 192 insertions(+), 193 deletions(-) rename implementation/src/main/resources/META-INF/services/{javax.enterprise.inject.spi.Extension => jakarta.enterprise.inject.spi.Extension} (100%) diff --git a/implementation/src/main/java/io/smallrye/metrics/MetricProducer.java b/implementation/src/main/java/io/smallrye/metrics/MetricProducer.java index 057b62ff..5bc73665 100644 --- a/implementation/src/main/java/io/smallrye/metrics/MetricProducer.java +++ b/implementation/src/main/java/io/smallrye/metrics/MetricProducer.java @@ -19,10 +19,10 @@ import java.util.SortedMap; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.ConcurrentGauge; import org.eclipse.microprofile.metrics.Counter; diff --git a/implementation/src/main/java/io/smallrye/metrics/MetricRegistries.java b/implementation/src/main/java/io/smallrye/metrics/MetricRegistries.java index 3afa5386..c1ace319 100644 --- a/implementation/src/main/java/io/smallrye/metrics/MetricRegistries.java +++ b/implementation/src/main/java/io/smallrye/metrics/MetricRegistries.java @@ -19,10 +19,10 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.Produces; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.annotation.RegistryType; diff --git a/implementation/src/main/java/io/smallrye/metrics/MetricsRegistryImpl.java b/implementation/src/main/java/io/smallrye/metrics/MetricsRegistryImpl.java index 978e6876..619935c4 100644 --- a/implementation/src/main/java/io/smallrye/metrics/MetricsRegistryImpl.java +++ b/implementation/src/main/java/io/smallrye/metrics/MetricsRegistryImpl.java @@ -29,8 +29,8 @@ import java.util.function.Function; import java.util.function.Supplier; -import javax.enterprise.inject.Vetoed; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.spi.InjectionPoint; import org.eclipse.microprofile.metrics.ConcurrentGauge; import org.eclipse.microprofile.metrics.Counter; diff --git a/implementation/src/main/java/io/smallrye/metrics/MetricsRequestHandler.java b/implementation/src/main/java/io/smallrye/metrics/MetricsRequestHandler.java index 1f6a3373..a5cbf78e 100644 --- a/implementation/src/main/java/io/smallrye/metrics/MetricsRequestHandler.java +++ b/implementation/src/main/java/io/smallrye/metrics/MetricsRequestHandler.java @@ -25,7 +25,7 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.metrics.Metric; import org.eclipse.microprofile.metrics.MetricID; diff --git a/implementation/src/main/java/io/smallrye/metrics/SmallRyeMetricsLogging.java b/implementation/src/main/java/io/smallrye/metrics/SmallRyeMetricsLogging.java index 0d83f85e..608f661a 100644 --- a/implementation/src/main/java/io/smallrye/metrics/SmallRyeMetricsLogging.java +++ b/implementation/src/main/java/io/smallrye/metrics/SmallRyeMetricsLogging.java @@ -1,7 +1,7 @@ package io.smallrye.metrics; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedMethod; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricType; diff --git a/implementation/src/main/java/io/smallrye/metrics/SmallRyeMetricsMessages.java b/implementation/src/main/java/io/smallrye/metrics/SmallRyeMetricsMessages.java index 157bbe4a..6f3d9b7b 100644 --- a/implementation/src/main/java/io/smallrye/metrics/SmallRyeMetricsMessages.java +++ b/implementation/src/main/java/io/smallrye/metrics/SmallRyeMetricsMessages.java @@ -19,10 +19,11 @@ import java.lang.reflect.Member; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.InjectionPoint; import javax.management.MalformedObjectNameException; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.InjectionPoint; + import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricType; import org.jboss.logging.Messages; diff --git a/implementation/src/main/java/io/smallrye/metrics/elementdesc/adapter/cdi/CDIBeanInfo.java b/implementation/src/main/java/io/smallrye/metrics/elementdesc/adapter/cdi/CDIBeanInfo.java index 4a0d6e40..0b30e8a7 100644 --- a/implementation/src/main/java/io/smallrye/metrics/elementdesc/adapter/cdi/CDIBeanInfo.java +++ b/implementation/src/main/java/io/smallrye/metrics/elementdesc/adapter/cdi/CDIBeanInfo.java @@ -20,7 +20,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; -import javax.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.Stereotype; import io.smallrye.metrics.elementdesc.AnnotationInfo; import io.smallrye.metrics.elementdesc.BeanInfo; diff --git a/implementation/src/main/java/io/smallrye/metrics/exporters/JsonExporter.java b/implementation/src/main/java/io/smallrye/metrics/exporters/JsonExporter.java index 301c913f..7dc91342 100644 --- a/implementation/src/main/java/io/smallrye/metrics/exporters/JsonExporter.java +++ b/implementation/src/main/java/io/smallrye/metrics/exporters/JsonExporter.java @@ -25,11 +25,11 @@ import java.util.TreeMap; import java.util.stream.Collectors; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; -import javax.json.JsonWriter; -import javax.json.stream.JsonGenerator; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; +import jakarta.json.JsonWriter; +import jakarta.json.stream.JsonGenerator; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/implementation/src/main/java/io/smallrye/metrics/exporters/JsonMetadataExporter.java b/implementation/src/main/java/io/smallrye/metrics/exporters/JsonMetadataExporter.java index 2fe4604c..ef77e4c3 100644 --- a/implementation/src/main/java/io/smallrye/metrics/exporters/JsonMetadataExporter.java +++ b/implementation/src/main/java/io/smallrye/metrics/exporters/JsonMetadataExporter.java @@ -25,11 +25,11 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonWriter; -import javax.json.stream.JsonGenerator; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonWriter; +import jakarta.json.stream.JsonGenerator; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; diff --git a/implementation/src/main/java/io/smallrye/metrics/exporters/JsonProviderHolder.java b/implementation/src/main/java/io/smallrye/metrics/exporters/JsonProviderHolder.java index 4f58f178..9da4bc99 100644 --- a/implementation/src/main/java/io/smallrye/metrics/exporters/JsonProviderHolder.java +++ b/implementation/src/main/java/io/smallrye/metrics/exporters/JsonProviderHolder.java @@ -17,7 +17,7 @@ package io.smallrye.metrics.exporters; -import javax.json.spi.JsonProvider; +import jakarta.json.spi.JsonProvider; class JsonProviderHolder { diff --git a/implementation/src/main/java/io/smallrye/metrics/exporters/OpenMetricsExporter.java b/implementation/src/main/java/io/smallrye/metrics/exporters/OpenMetricsExporter.java index c489170e..7c1b89cd 100644 --- a/implementation/src/main/java/io/smallrye/metrics/exporters/OpenMetricsExporter.java +++ b/implementation/src/main/java/io/smallrye/metrics/exporters/OpenMetricsExporter.java @@ -18,6 +18,7 @@ package io.smallrye.metrics.exporters; import java.time.Duration; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -91,6 +92,7 @@ public OpenMetricsExporter() { // MP Config implementation is probably not available. Resort to default configuration. usePrefixForScope = true; writeHelpLine = true; + globalTags = Collections.emptyMap(); } } diff --git a/implementation/src/main/java/io/smallrye/metrics/interceptors/ConcurrentGaugeInterceptor.java b/implementation/src/main/java/io/smallrye/metrics/interceptors/ConcurrentGaugeInterceptor.java index ec060e4a..d9c59163 100644 --- a/implementation/src/main/java/io/smallrye/metrics/interceptors/ConcurrentGaugeInterceptor.java +++ b/implementation/src/main/java/io/smallrye/metrics/interceptors/ConcurrentGaugeInterceptor.java @@ -21,13 +21,13 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.AroundTimeout; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.AroundTimeout; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/implementation/src/main/java/io/smallrye/metrics/interceptors/CountedInterceptor.java b/implementation/src/main/java/io/smallrye/metrics/interceptors/CountedInterceptor.java index 42725f72..d9a7119d 100644 --- a/implementation/src/main/java/io/smallrye/metrics/interceptors/CountedInterceptor.java +++ b/implementation/src/main/java/io/smallrye/metrics/interceptors/CountedInterceptor.java @@ -19,13 +19,13 @@ import java.lang.reflect.Member; import java.util.Set; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.AroundTimeout; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.AroundTimeout; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.MetricID; diff --git a/implementation/src/main/java/io/smallrye/metrics/interceptors/GaugeRegistrationInterceptor.java b/implementation/src/main/java/io/smallrye/metrics/interceptors/GaugeRegistrationInterceptor.java index 17587211..b8fca3a4 100644 --- a/implementation/src/main/java/io/smallrye/metrics/interceptors/GaugeRegistrationInterceptor.java +++ b/implementation/src/main/java/io/smallrye/metrics/interceptors/GaugeRegistrationInterceptor.java @@ -20,11 +20,11 @@ import java.lang.reflect.Member; import java.lang.reflect.Method; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundConstruct; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.eclipse.microprofile.metrics.Metadata; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/implementation/src/main/java/io/smallrye/metrics/interceptors/MeteredInterceptor.java b/implementation/src/main/java/io/smallrye/metrics/interceptors/MeteredInterceptor.java index 1fd29f0a..84637017 100644 --- a/implementation/src/main/java/io/smallrye/metrics/interceptors/MeteredInterceptor.java +++ b/implementation/src/main/java/io/smallrye/metrics/interceptors/MeteredInterceptor.java @@ -21,13 +21,13 @@ import java.lang.reflect.Member; import java.util.Set; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.AroundTimeout; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.AroundTimeout; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.eclipse.microprofile.metrics.Meter; import org.eclipse.microprofile.metrics.MetricID; diff --git a/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricName.java b/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricName.java index fa8ca88e..d0b5868e 100644 --- a/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricName.java +++ b/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricName.java @@ -15,8 +15,8 @@ */ package io.smallrye.metrics.interceptors; -import javax.enterprise.inject.spi.AnnotatedMember; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.AnnotatedMember; +import jakarta.enterprise.inject.spi.InjectionPoint; public interface MetricName { diff --git a/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricNameFactory.java b/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricNameFactory.java index 95d6880a..69a02aec 100644 --- a/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricNameFactory.java +++ b/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricNameFactory.java @@ -17,9 +17,9 @@ import java.util.Collections; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.BeanManager; @ApplicationScoped public class MetricNameFactory { diff --git a/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricResolver.java b/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricResolver.java index 63a290f1..2c3ed244 100644 --- a/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricResolver.java +++ b/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricResolver.java @@ -19,7 +19,7 @@ import java.lang.annotation.Annotation; import java.util.Collections; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.Tag; diff --git a/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricsBinding.java b/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricsBinding.java index 30ec1885..b3be98aa 100644 --- a/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricsBinding.java +++ b/implementation/src/main/java/io/smallrye/metrics/interceptors/MetricsBinding.java @@ -20,7 +20,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.interceptor.InterceptorBinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Target({ ElementType.TYPE }) diff --git a/implementation/src/main/java/io/smallrye/metrics/interceptors/SeMetricName.java b/implementation/src/main/java/io/smallrye/metrics/interceptors/SeMetricName.java index 25d8774c..2682bb80 100644 --- a/implementation/src/main/java/io/smallrye/metrics/interceptors/SeMetricName.java +++ b/implementation/src/main/java/io/smallrye/metrics/interceptors/SeMetricName.java @@ -20,11 +20,11 @@ import java.lang.reflect.Method; import java.util.Set; -import javax.enterprise.inject.Vetoed; -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.AnnotatedMember; -import javax.enterprise.inject.spi.AnnotatedParameter; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.AnnotatedMember; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.InjectionPoint; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.annotation.Metric; diff --git a/implementation/src/main/java/io/smallrye/metrics/interceptors/SimplyTimedInterceptor.java b/implementation/src/main/java/io/smallrye/metrics/interceptors/SimplyTimedInterceptor.java index 51b6f6cf..92eddc1d 100644 --- a/implementation/src/main/java/io/smallrye/metrics/interceptors/SimplyTimedInterceptor.java +++ b/implementation/src/main/java/io/smallrye/metrics/interceptors/SimplyTimedInterceptor.java @@ -23,13 +23,13 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.AroundTimeout; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.AroundTimeout; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/implementation/src/main/java/io/smallrye/metrics/interceptors/TimedInterceptor.java b/implementation/src/main/java/io/smallrye/metrics/interceptors/TimedInterceptor.java index 116f64be..e967b311 100644 --- a/implementation/src/main/java/io/smallrye/metrics/interceptors/TimedInterceptor.java +++ b/implementation/src/main/java/io/smallrye/metrics/interceptors/TimedInterceptor.java @@ -23,13 +23,13 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.AroundTimeout; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundConstruct; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.AroundTimeout; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/implementation/src/main/java/io/smallrye/metrics/jaxrs/JaxRsMetricsFilter.java b/implementation/src/main/java/io/smallrye/metrics/jaxrs/JaxRsMetricsFilter.java index 2e5bcea4..82db8009 100644 --- a/implementation/src/main/java/io/smallrye/metrics/jaxrs/JaxRsMetricsFilter.java +++ b/implementation/src/main/java/io/smallrye/metrics/jaxrs/JaxRsMetricsFilter.java @@ -22,12 +22,12 @@ import java.util.Arrays; import java.util.stream.Collectors; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.Tag; diff --git a/implementation/src/main/java/io/smallrye/metrics/jaxrs/JaxRsMetricsServletFilter.java b/implementation/src/main/java/io/smallrye/metrics/jaxrs/JaxRsMetricsServletFilter.java index 4a2b06bf..091d7d03 100644 --- a/implementation/src/main/java/io/smallrye/metrics/jaxrs/JaxRsMetricsServletFilter.java +++ b/implementation/src/main/java/io/smallrye/metrics/jaxrs/JaxRsMetricsServletFilter.java @@ -20,14 +20,14 @@ import java.io.IOException; import java.time.Duration; -import javax.servlet.AsyncEvent; -import javax.servlet.AsyncListener; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.AsyncEvent; +import jakarta.servlet.AsyncListener; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.eclipse.microprofile.metrics.Metadata; import org.eclipse.microprofile.metrics.MetricID; diff --git a/implementation/src/main/java/io/smallrye/metrics/setup/AnnotatedDecorator.java b/implementation/src/main/java/io/smallrye/metrics/setup/AnnotatedDecorator.java index 0ae84c65..b886d0ce 100644 --- a/implementation/src/main/java/io/smallrye/metrics/setup/AnnotatedDecorator.java +++ b/implementation/src/main/java/io/smallrye/metrics/setup/AnnotatedDecorator.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.Annotated; /* package-private */ class AnnotatedDecorator implements Annotated { diff --git a/implementation/src/main/java/io/smallrye/metrics/setup/AnnotatedTypeDecorator.java b/implementation/src/main/java/io/smallrye/metrics/setup/AnnotatedTypeDecorator.java index 230c1207..9b1c1148 100644 --- a/implementation/src/main/java/io/smallrye/metrics/setup/AnnotatedTypeDecorator.java +++ b/implementation/src/main/java/io/smallrye/metrics/setup/AnnotatedTypeDecorator.java @@ -20,10 +20,10 @@ import java.util.HashSet; import java.util.Set; -import javax.enterprise.inject.spi.AnnotatedConstructor; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.AnnotatedConstructor; +import jakarta.enterprise.inject.spi.AnnotatedField; +import jakarta.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.AnnotatedType; /* package-private */ final class AnnotatedTypeDecorator extends AnnotatedDecorator implements AnnotatedType { diff --git a/implementation/src/main/java/io/smallrye/metrics/setup/MetricCdiInjectionExtension.java b/implementation/src/main/java/io/smallrye/metrics/setup/MetricCdiInjectionExtension.java index f6367320..597d424c 100644 --- a/implementation/src/main/java/io/smallrye/metrics/setup/MetricCdiInjectionExtension.java +++ b/implementation/src/main/java/io/smallrye/metrics/setup/MetricCdiInjectionExtension.java @@ -30,19 +30,19 @@ import java.util.Optional; import java.util.Properties; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.AfterDeploymentValidation; -import javax.enterprise.inject.spi.AnnotatedMember; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.BeforeBeanDiscovery; -import javax.enterprise.inject.spi.BeforeShutdown; -import javax.enterprise.inject.spi.Extension; -import javax.enterprise.inject.spi.ProcessAnnotatedType; -import javax.enterprise.inject.spi.ProcessManagedBean; -import javax.enterprise.inject.spi.WithAnnotations; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterDeploymentValidation; +import jakarta.enterprise.inject.spi.AnnotatedMember; +import jakarta.enterprise.inject.spi.AnnotatedMethod; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeforeBeanDiscovery; +import jakarta.enterprise.inject.spi.BeforeShutdown; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.ProcessAnnotatedType; +import jakarta.enterprise.inject.spi.ProcessManagedBean; +import jakarta.enterprise.inject.spi.WithAnnotations; +import jakarta.enterprise.util.AnnotationLiteral; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/implementation/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/implementation/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from implementation/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension rename to implementation/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension diff --git a/implementation/src/test/java/io/smallrye/metrics/exporters/ExportersMetricScalingTest.java b/implementation/src/test/java/io/smallrye/metrics/exporters/ExportersMetricScalingTest.java index 631ccf48..1f0ae437 100644 --- a/implementation/src/test/java/io/smallrye/metrics/exporters/ExportersMetricScalingTest.java +++ b/implementation/src/test/java/io/smallrye/metrics/exporters/ExportersMetricScalingTest.java @@ -25,8 +25,8 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.Gauge; diff --git a/implementation/src/test/java/io/smallrye/metrics/exporters/JsonExporterTest.java b/implementation/src/test/java/io/smallrye/metrics/exporters/JsonExporterTest.java index 0ac32c64..4b483e27 100644 --- a/implementation/src/test/java/io/smallrye/metrics/exporters/JsonExporterTest.java +++ b/implementation/src/test/java/io/smallrye/metrics/exporters/JsonExporterTest.java @@ -25,8 +25,8 @@ import java.util.Arrays; import java.util.List; -import javax.json.Json; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonObject; import org.eclipse.microprofile.metrics.ConcurrentGauge; import org.eclipse.microprofile.metrics.Counter; diff --git a/implementation/src/test/java/io/smallrye/metrics/exporters/JsonMetadataExporterTest.java b/implementation/src/test/java/io/smallrye/metrics/exporters/JsonMetadataExporterTest.java index 9f415bb2..5c49fc39 100644 --- a/implementation/src/test/java/io/smallrye/metrics/exporters/JsonMetadataExporterTest.java +++ b/implementation/src/test/java/io/smallrye/metrics/exporters/JsonMetadataExporterTest.java @@ -21,9 +21,9 @@ import java.io.StringReader; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import org.eclipse.microprofile.metrics.MetricFilter; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/pom.xml b/pom.xml index c366fed6..4be6085e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,8 +21,8 @@ io.smallrye - smallrye-parent - 26 + smallrye-jakarta-parent + 34 smallrye-metrics-parent @@ -33,13 +33,16 @@ http://smallrye.io - 2.0 - 3.0 + 3.0.1 + 4.0 - 2.0.2 - 1.5.0 + 3.0.0-RC1 + 1.8.0 - 4.0.4 + 5.0.0 + + + 26.0.0.Final ${project.basedir}/../coverage/target/site/jacoco-aggregate/jacoco.xml diff --git a/testsuite/api-tck/pom.xml b/testsuite/api-tck/pom.xml index 8721bd5a..df4fb146 100644 --- a/testsuite/api-tck/pom.xml +++ b/testsuite/api-tck/pom.xml @@ -70,6 +70,11 @@ org.jboss.arquillian.container arquillian-weld-embedded + + org.hamcrest + hamcrest-all + 1.3 + diff --git a/testsuite/common/src/main/java/io/smallrye/metrics/testsuite/MetricsInitializer.java b/testsuite/common/src/main/java/io/smallrye/metrics/testsuite/MetricsInitializer.java index 59e38ef4..b43644ce 100644 --- a/testsuite/common/src/main/java/io/smallrye/metrics/testsuite/MetricsInitializer.java +++ b/testsuite/common/src/main/java/io/smallrye/metrics/testsuite/MetricsInitializer.java @@ -17,9 +17,9 @@ import java.io.IOException; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Initialized; -import javax.enterprise.event.Observes; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Initialized; +import jakarta.enterprise.event.Observes; import io.smallrye.metrics.setup.JmxRegistrar; diff --git a/testsuite/extra/src/main/java/io/smallrye/metrics/test/HelloService.java b/testsuite/extra/src/main/java/io/smallrye/metrics/test/HelloService.java index 251c2cc7..cf1ce84b 100644 --- a/testsuite/extra/src/main/java/io/smallrye/metrics/test/HelloService.java +++ b/testsuite/extra/src/main/java/io/smallrye/metrics/test/HelloService.java @@ -15,7 +15,7 @@ */ package io.smallrye.metrics.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.metrics.MetricUnits; import org.eclipse.microprofile.metrics.annotation.Counted; diff --git a/testsuite/extra/src/main/java/io/smallrye/metrics/test/MetricsSummary.java b/testsuite/extra/src/main/java/io/smallrye/metrics/test/MetricsSummary.java index 30037283..53a03e9a 100644 --- a/testsuite/extra/src/main/java/io/smallrye/metrics/test/MetricsSummary.java +++ b/testsuite/extra/src/main/java/io/smallrye/metrics/test/MetricsSummary.java @@ -15,8 +15,8 @@ */ package io.smallrye.metrics.test; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricRegistry; import org.eclipse.microprofile.metrics.annotation.RegistryType; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/dependent/GaugeInDependentScopedBeanTest.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/dependent/GaugeInDependentScopedBeanTest.java index e9b1c2e8..d334ab7f 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/dependent/GaugeInDependentScopedBeanTest.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/dependent/GaugeInDependentScopedBeanTest.java @@ -16,8 +16,8 @@ package io.smallrye.metrics.test.dependent; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricFilter; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/dependent/MetricsInDependentScopedBeanTest.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/dependent/MetricsInDependentScopedBeanTest.java index 3cc12d22..b61692df 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/dependent/MetricsInDependentScopedBeanTest.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/dependent/MetricsInDependentScopedBeanTest.java @@ -18,8 +18,8 @@ import static org.junit.Assert.assertEquals; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricFilter; import org.eclipse.microprofile.metrics.MetricID; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_ConcurrentGauge_Method_Test.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_ConcurrentGauge_Method_Test.java index 9de1d186..b5d07630 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_ConcurrentGauge_Method_Test.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_ConcurrentGauge_Method_Test.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_ClassLevel_Test.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_ClassLevel_Test.java index 6e9e1307..c791307e 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_ClassLevel_Test.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_ClassLevel_Test.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Constructor_Test.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Constructor_Test.java index 436ab213..6e615da9 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Constructor_Test.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Constructor_Test.java @@ -3,7 +3,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.MetricID; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Method_Reused_Test.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Method_Reused_Test.java index 72d29122..46e81de0 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Method_Reused_Test.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Method_Reused_Test.java @@ -3,8 +3,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import javax.annotation.security.PermitAll; -import javax.inject.Inject; +import jakarta.annotation.security.PermitAll; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Method_Test.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Method_Test.java index b3d16c2d..6a0f521b 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Method_Test.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Counter_Method_Test.java @@ -2,9 +2,9 @@ import static org.junit.Assert.assertTrue; -import javax.annotation.security.PermitAll; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.security.PermitAll; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Gauge_Method_Test.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Gauge_Method_Test.java index 811ed082..dc33d99d 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Gauge_Method_Test.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Gauge_Method_Test.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertTrue; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Injection_Test.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Injection_Test.java index c2de21c0..c7661c86 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Injection_Test.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Injection_Test.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Histogram; import org.eclipse.microprofile.metrics.MetricID; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Meter_Method_Test.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Meter_Method_Test.java index c87335b7..8f5f1a0a 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Meter_Method_Test.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Meter_Method_Test.java @@ -3,7 +3,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_SimpleTimer_Method_Test.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_SimpleTimer_Method_Test.java index 1868d8db..cb037dab 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_SimpleTimer_Method_Test.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_SimpleTimer_Method_Test.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Timer_Method_Test.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Timer_Method_Test.java index c2761f5c..a812392b 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Timer_Method_Test.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/initialization/Initialization_Timer_Method_Test.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/inject/NonReusableMetricInjectionBean.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/inject/NonReusableMetricInjectionBean.java index b1263157..b157d28a 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/inject/NonReusableMetricInjectionBean.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/inject/NonReusableMetricInjectionBean.java @@ -17,7 +17,7 @@ package io.smallrye.metrics.test.inject; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Counter; import org.eclipse.microprofile.metrics.annotation.Counted; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/inject/NonReusableMetricInjectionTest.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/inject/NonReusableMetricInjectionTest.java index 83a84bb5..b3dcb042 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/inject/NonReusableMetricInjectionTest.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/inject/NonReusableMetricInjectionTest.java @@ -17,8 +17,8 @@ package io.smallrye.metrics.test.inject; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/registry/AllMetricsOfGivenTypeTest.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/registry/AllMetricsOfGivenTypeTest.java index 01ce8eff..df124d94 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/registry/AllMetricsOfGivenTypeTest.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/registry/AllMetricsOfGivenTypeTest.java @@ -21,7 +21,7 @@ import java.util.SortedMap; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.Timer; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/registry/MetricRegistryInjectionTest.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/registry/MetricRegistryInjectionTest.java index bc26e2a2..f4fb2718 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/registry/MetricRegistryInjectionTest.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/registry/MetricRegistryInjectionTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.Counting; import org.eclipse.microprofile.metrics.Metric; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/reusability/ReuseMetricWithDifferingTagsTest.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/reusability/ReuseMetricWithDifferingTagsTest.java index 71ccdfef..4c6e9ca7 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/reusability/ReuseMetricWithDifferingTagsTest.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/reusability/ReuseMetricWithDifferingTagsTest.java @@ -17,7 +17,7 @@ package io.smallrye.metrics.test.reusability; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/stereotype/StereotypeCountedClassTest.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/stereotype/StereotypeCountedClassTest.java index 68edba48..cddc3b76 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/stereotype/StereotypeCountedClassTest.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/stereotype/StereotypeCountedClassTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.microprofile.metrics.MetricID; import org.eclipse.microprofile.metrics.MetricRegistry; diff --git a/testsuite/extra/src/test/java/io/smallrye/metrics/test/stereotype/stereotypes/CountMe.java b/testsuite/extra/src/test/java/io/smallrye/metrics/test/stereotype/stereotypes/CountMe.java index 34dc3ca8..9cac55c7 100644 --- a/testsuite/extra/src/test/java/io/smallrye/metrics/test/stereotype/stereotypes/CountMe.java +++ b/testsuite/extra/src/test/java/io/smallrye/metrics/test/stereotype/stereotypes/CountMe.java @@ -22,7 +22,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.Stereotype; import org.eclipse.microprofile.metrics.annotation.Counted; diff --git a/testsuite/optional-tck/pom.xml b/testsuite/optional-tck/pom.xml index c8e246f7..ac51e825 100644 --- a/testsuite/optional-tck/pom.xml +++ b/testsuite/optional-tck/pom.xml @@ -108,7 +108,7 @@ - ${project.build.directory}/wildfly-${version.wildfly} + ${project.build.directory}/wildfly-preview-${version.wildfly} tier=integration @@ -134,7 +134,7 @@ org.wildfly - wildfly-dist + wildfly-preview-dist ${version.wildfly} zip false diff --git a/testsuite/optional-tck/src/test/java/io/smallrye/metrics/tck/optional/JaxRsMetricsActivatingProcessor.java b/testsuite/optional-tck/src/test/java/io/smallrye/metrics/tck/optional/JaxRsMetricsActivatingProcessor.java index 8fbcef33..c8d915d3 100644 --- a/testsuite/optional-tck/src/test/java/io/smallrye/metrics/tck/optional/JaxRsMetricsActivatingProcessor.java +++ b/testsuite/optional-tck/src/test/java/io/smallrye/metrics/tck/optional/JaxRsMetricsActivatingProcessor.java @@ -19,7 +19,7 @@ import java.io.File; -import javax.ws.rs.ext.Providers; +import jakarta.ws.rs.ext.Providers; import org.jboss.arquillian.container.test.spi.TestDeployment; import org.jboss.arquillian.container.test.spi.client.deployment.ProtocolArchiveProcessor; @@ -37,11 +37,11 @@ public void process(TestDeployment testDeployment, Archive archive) { WebArchive war = (WebArchive) archive; String[] deps = { - "io.smallrye:smallrye-config", + // "io.smallrye:smallrye-config", "io.smallrye:smallrye-metrics", "io.smallrye:smallrye-metrics-testsuite-common", "org.eclipse.microprofile.metrics:microprofile-metrics-api", - "org.eclipse.microprofile.config:microprofile-config-api" + // "org.eclipse.microprofile.config:microprofile-config-api" }; File[] dependencies = Maven.resolver().loadPomFromFile(new File("pom.xml")).resolve(deps).withTransitivity().asFile(); war.addAsLibraries(dependencies); diff --git a/testsuite/optional-tck/src/test/java/io/smallrye/metrics/tck/optional/MetricsHttpServlet.java b/testsuite/optional-tck/src/test/java/io/smallrye/metrics/tck/optional/MetricsHttpServlet.java index 93536df0..5c20c882 100644 --- a/testsuite/optional-tck/src/test/java/io/smallrye/metrics/tck/optional/MetricsHttpServlet.java +++ b/testsuite/optional-tck/src/test/java/io/smallrye/metrics/tck/optional/MetricsHttpServlet.java @@ -20,11 +20,11 @@ import java.util.Collections; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.smallrye.metrics.MetricsRequestHandler; diff --git a/testsuite/optional-tck/src/test/resources/META-INF/jboss-deployment-structure.xml b/testsuite/optional-tck/src/test/resources/META-INF/jboss-deployment-structure.xml index 3c92c89b..ad6ac188 100644 --- a/testsuite/optional-tck/src/test/resources/META-INF/jboss-deployment-structure.xml +++ b/testsuite/optional-tck/src/test/resources/META-INF/jboss-deployment-structure.xml @@ -19,12 +19,8 @@ - - - diff --git a/testsuite/rest-tck/pom.xml b/testsuite/rest-tck/pom.xml index 6c265517..ad41f7f0 100644 --- a/testsuite/rest-tck/pom.xml +++ b/testsuite/rest-tck/pom.xml @@ -102,7 +102,7 @@ ${project.build.testOutputDirectory}/logging.properties - ${project.build.directory}/wildfly-servlet-${version.wildfly} + ${project.build.directory}/wildfly-preview-${version.wildfly} @@ -120,7 +120,7 @@ org.wildfly - wildfly-servlet-dist + wildfly-preview-dist ${version.wildfly} zip false diff --git a/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/ArchiveProcessor.java b/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/ArchiveProcessor.java index 5b079865..5c7b0927 100644 --- a/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/ArchiveProcessor.java +++ b/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/ArchiveProcessor.java @@ -17,19 +17,11 @@ import java.io.File; -import javax.enterprise.inject.spi.Extension; - -import org.eclipse.microprofile.config.spi.ConfigProviderResolver; import org.jboss.arquillian.container.test.spi.TestDeployment; import org.jboss.arquillian.container.test.spi.client.deployment.ProtocolArchiveProcessor; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.resolver.api.maven.Maven; -import org.jboss.weld.environment.deployment.discovery.BeanArchiveHandler; - -import io.smallrye.config.SmallRyeConfigProviderResolver; -import io.smallrye.config.inject.ConfigExtension; -import io.smallrye.metrics.testsuite.MetricsInitializer; /** * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com @@ -46,19 +38,19 @@ public void process(TestDeployment testDeployment, Archive protocolArchive) { "io.smallrye:smallrye-metrics", "io.smallrye:smallrye-metrics-testsuite-common", "org.eclipse.microprofile.metrics:microprofile-metrics-api", - "org.jboss.weld.servlet:weld-servlet-core" + // "org.jboss.weld.servlet:weld-servlet-core" }; File[] dependencies = Maven.resolver().loadPomFromFile(new File("pom.xml")).resolve(deps).withTransitivity().asFile(); war.addAsLibraries(dependencies); - war.addClass(SmallRyeBeanArchiveHandler.class); + // war.addClass(SmallRyeBeanArchiveHandler.class); war.addClass(MetricsHttpServlet.class); - war.addClass(MetricsInitializer.class); + // war.addClass(MetricsInitializer.class); war.addAsResource("io/smallrye/metrics/base-metrics.properties", "/io/smallrye/metrics/base-metrics.properties"); - war.addAsServiceProvider(BeanArchiveHandler.class, SmallRyeBeanArchiveHandler.class); - war.addAsServiceProvider(Extension.class, ConfigExtension.class); - war.addAsServiceProvider(ConfigProviderResolver.class, SmallRyeConfigProviderResolver.class); + // war.addAsServiceProvider(BeanArchiveHandler.class, SmallRyeBeanArchiveHandler.class); + // war.addAsServiceProvider(Extension.class, ConfigExtension.class); + // war.addAsServiceProvider(ConfigProviderResolver.class, SmallRyeConfigProviderResolver.class); } } diff --git a/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/MetricsHttpServlet.java b/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/MetricsHttpServlet.java index 353f65f7..4fb307c7 100644 --- a/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/MetricsHttpServlet.java +++ b/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/MetricsHttpServlet.java @@ -20,11 +20,11 @@ import java.util.Collections; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.inject.Inject; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import io.smallrye.metrics.MetricsRequestHandler; diff --git a/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/SmallRyeBeanArchiveHandler.java b/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/SmallRyeBeanArchiveHandler.java index 9abe1ad8..1a707caa 100644 --- a/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/SmallRyeBeanArchiveHandler.java +++ b/testsuite/rest-tck/src/test/java/io/smallrye/metrics/tck/rest/SmallRyeBeanArchiveHandler.java @@ -21,7 +21,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.jboss.weld.environment.deployment.discovery.BeanArchiveBuilder; import org.jboss.weld.environment.deployment.discovery.BeanArchiveHandler;