Update optional CDI usage to 3.0 (Jakarta EE 9)

eclipse-ee4j · May 21, 2020 · 89fc744 · 89fc744
1 parent a899d73
commit 89fc744
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 62 deletions.
diff --git a/pom.xml b/pom.xml
@@ -62,14 +62,14 @@
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>2.0.2</version>
+            <version>3.0.0-M2</version>
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
-            <artifactId>weld-se</artifactId>
-            <version>2.4.3.Final</version>
+            <artifactId>weld-se-core</artifactId>
+            <version>4.0.0.Alpha1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -383,8 +383,8 @@
                                     <Export-Package>org.eclipse.yasson;version=${project.version}</Export-Package>
                                     <Private-Package>org.eclipse.yasson.*;version=${project.version}</Private-Package>
                                     <Import-Package>
-                                        javax.enterprise.context.spi;version=!;resolution:="optional",
-                                        javax.enterprise.inject.spi;version=!;resolution:="optional",
+                                        jakarta.enterprise.context.spi;version=!;resolution:="optional",
+                                        jakarta.enterprise.inject.spi;version=!;resolution:="optional",
                                         javax.naming;resolution:="optional",
                                         java.beans;resolution:="optional",
                                         *

diff --git a/src/main/java/org/eclipse/yasson/internal/components/BeanManagerInstanceCreator.java b/src/main/java/org/eclipse/yasson/internal/components/BeanManagerInstanceCreator.java
@@ -16,13 +16,12 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
 import jakarta.json.bind.JsonbException;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-
 import org.eclipse.yasson.internal.JsonBinding;
 import org.eclipse.yasson.internal.properties.MessageKeys;
 import org.eclipse.yasson.internal.properties.Messages;

diff --git a/...ain/java/org/eclipse/yasson/internal/components/JsonbComponentInstanceCreatorFactory.java b/...ain/java/org/eclipse/yasson/internal/components/JsonbComponentInstanceCreatorFactory.java
@@ -45,7 +45,7 @@ private JsonbComponentInstanceCreatorFactory() {
      * Initial context class.
      */
     public static final String INITIAL_CONTEXT_CLASS = "javax.naming.InitialContext";
-    private static final String CDI_SPI_CLASS = "javax.enterprise.inject.spi.CDI";
+    private static final String CDI_SPI_CLASS = "jakarta.enterprise.inject.spi.CDI";
 
     /**
      * First check a CDI provider, if available use those.

diff --git a/src/test/java/org/eclipse/yasson/internal/cdi/CalledMethods.java b/src/test/java/org/eclipse/yasson/internal/cdi/CalledMethods.java
@@ -12,8 +12,8 @@
 
 package org.eclipse.yasson.internal.cdi;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/src/test/java/org/eclipse/yasson/internal/cdi/CdiDependentAdapter.java b/src/test/java/org/eclipse/yasson/internal/cdi/CdiDependentAdapter.java
@@ -12,8 +12,8 @@
 
 package org.eclipse.yasson.internal.cdi;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import jakarta.json.bind.adapter.JsonbAdapter;
 
 /**

diff --git a/src/test/java/org/eclipse/yasson/internal/cdi/CdiInjectionTest.java b/src/test/java/org/eclipse/yasson/internal/cdi/CdiInjectionTest.java
@@ -17,9 +17,9 @@
 
 import org.eclipse.yasson.internal.components.JsonbComponentInstanceCreatorFactory;
 
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.CDI;
 import jakarta.json.bind.Jsonb;
 import jakarta.json.bind.JsonbBuilder;
 import jakarta.json.bind.JsonbConfig;

diff --git a/src/test/java/org/eclipse/yasson/internal/cdi/CdiTestService.java b/src/test/java/org/eclipse/yasson/internal/cdi/CdiTestService.java
@@ -12,10 +12,10 @@
 
 package org.eclipse.yasson.internal.cdi;
 
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
 
 /**
  * CDI test service

diff --git a/src/test/java/org/eclipse/yasson/internal/cdi/Hello1.java b/src/test/java/org/eclipse/yasson/internal/cdi/Hello1.java
@@ -12,8 +12,8 @@
 
 package org.eclipse.yasson.internal.cdi;
 
-import javax.enterprise.inject.Default;
-import javax.inject.Qualifier;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/src/test/java/org/eclipse/yasson/internal/cdi/Hello2.java b/src/test/java/org/eclipse/yasson/internal/cdi/Hello2.java
@@ -12,8 +12,8 @@
 
 package org.eclipse.yasson.internal.cdi;
 
-import javax.enterprise.inject.Default;
-import javax.inject.Qualifier;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/src/test/java/org/eclipse/yasson/internal/cdi/HelloService1.java b/src/test/java/org/eclipse/yasson/internal/cdi/HelloService1.java
@@ -12,10 +12,10 @@
 
 package org.eclipse.yasson.internal.cdi;
 
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
 
 /**
  * @author Roman Grigoriadi

diff --git a/src/test/java/org/eclipse/yasson/internal/cdi/HelloService2.java b/src/test/java/org/eclipse/yasson/internal/cdi/HelloService2.java
@@ -12,10 +12,10 @@
 
 package org.eclipse.yasson.internal.cdi;
 
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
 
 /**
  * Dependant scoped bean, should be destroyed with its wrapper bean.

diff --git a/src/test/java/org/eclipse/yasson/internal/cdi/JndiBeanManager.java b/src/test/java/org/eclipse/yasson/internal/cdi/JndiBeanManager.java
@@ -12,31 +12,31 @@
 
 package org.eclipse.yasson.internal.cdi;
 
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanAttributes;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Decorator;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.InjectionTargetFactory;
-import javax.enterprise.inject.spi.InterceptionFactory;
-import javax.enterprise.inject.spi.InterceptionType;
-import javax.enterprise.inject.spi.Interceptor;
-import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.spi.ProducerFactory;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Decorator;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.InjectionTargetFactory;
+import jakarta.enterprise.inject.spi.InterceptionFactory;
+import jakarta.enterprise.inject.spi.InterceptionType;
+import jakarta.enterprise.inject.spi.Interceptor;
+import jakarta.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.inject.spi.ProducerFactory;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.List;

diff --git a/src/test/java/org/eclipse/yasson/internal/cdi/MockInjectionTarget.java b/src/test/java/org/eclipse/yasson/internal/cdi/MockInjectionTarget.java
@@ -12,9 +12,9 @@
 
 package org.eclipse.yasson.internal.cdi;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
 import jakarta.json.bind.adapter.JsonbAdapter;
 import java.util.Set;