Adjust ArC code to CDI 4.0.1

(cherry picked from commit c16cfd1)
gsmet · Sep 28, 2022 · 2bc4516 · 2bc4516
1 parent 3bd74c5
commit 2bc4516
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceHandle.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/InstanceHandle.java
@@ -2,6 +2,7 @@
 
 import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.context.spi.AlterableContext;
+import jakarta.enterprise.inject.Instance;
 
 /**
  * Represents an instance handle.
@@ -10,7 +11,7 @@
  *
  * @param <T>
  */
-public interface InstanceHandle<T> extends AutoCloseable {
+public interface InstanceHandle<T> extends AutoCloseable, Instance.Handle<T> {
 
     /**
      *

diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcCDIProvider.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/ArcCDIProvider.java
@@ -71,6 +71,16 @@ public void destroy(Object instance) {
             this.instanceDelegate.destroy(instance);
         }
 
+        @Override
+        public Handle<Object> getHandle() {
+            return this.instanceDelegate.getHandle();
+        }
+
+        @Override
+        public Iterable<? extends Handle<Object>> handles() {
+            return this.instanceDelegate.handles();
+        }
+
         @Override
         public Iterator<Object> iterator() {
             return instanceDelegate.iterator();

diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/BeanManagerImpl.java
@@ -3,7 +3,6 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -31,7 +30,6 @@
 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;
@@ -117,14 +115,6 @@ public void validate(InjectionPoint injectionPoint) {
         throw new UnsupportedOperationException();
     }
 
-    // Deprecated method which can be safely removed once we use CDI 4.0+
-    @Deprecated
-    public void fireEvent(Object event, Annotation... qualifiers) {
-        Set<Annotation> eventQualifiers = new HashSet<>();
-        Collections.addAll(eventQualifiers, qualifiers);
-        new EventImpl<Object>(event.getClass(), eventQualifiers).fire(event);
-    }
-
     @Override
     public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, Annotation... qualifiers) {
         Type eventType = Types.getCanonicalType(event.getClass());
@@ -238,12 +228,6 @@ public <T> AnnotatedType<T> createAnnotatedType(Class<T> type) {
         throw new UnsupportedOperationException();
     }
 
-    // Deprecated method which can be safely removed once we use CDI 4.0+
-    @Deprecated
-    public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public <T> InjectionTargetFactory<T> getInjectionTargetFactory(AnnotatedType<T> annotatedType) {
         throw new UnsupportedOperationException();