Move to Jakarta namespace

smallrye · Jan 5, 2022 · 61bee7b · 61bee7b
1 parent 8287403
commit 61bee7b
Show file tree

Hide file tree

Showing 63 changed files with 192 additions and 193 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ementation/src/main/java/io/smallrye/metrics/interceptors/ConcurrentGaugeInterceptor.java b/...ementation/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
@@ -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/...entation/src/main/java/io/smallrye/metrics/interceptors/GaugeRegistrationInterceptor.java b/...entation/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<X> extends AnnotatedDecorator implements AnnotatedType<X> {