[WFLY-11381] Refactoring WeldInterceptorBindingsService to use non de…

…precated ServiceBuilder methods.

weld/subsystem/src/main/java/org/jboss/as/weld/deployment/processors/WeldComponentIntegrationProcessor.java

@@ -27,6 +27,7 @@
 import java.util.HashSet;
 import java.util.ServiceLoader;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import javax.enterprise.inject.spi.InterceptionType;
@@ -250,11 +251,12 @@ protected void run(Object instance) {
     }
 
     private static ServiceName addWeldInterceptorBindingService(final ServiceTarget target, final ComponentConfiguration configuration, final Class<?> componentClass, final String beanName, final ServiceName weldServiceName, final ServiceName weldStartService, final String beanDeploymentArchiveId, final ComponentInterceptorSupport componentInterceptorSupport) {
-        final WeldInterceptorBindingsService weldInterceptorBindingsService = new WeldInterceptorBindingsService(beanDeploymentArchiveId, beanName, componentClass, componentInterceptorSupport);
         ServiceName bindingServiceName = configuration.getComponentDescription().getServiceName().append(WeldInterceptorBindingsService.SERVICE_NAME);
-        final ServiceBuilder sb = target.addService(bindingServiceName, weldInterceptorBindingsService);
-        sb.addDependency(weldServiceName, WeldBootstrapService.class, weldInterceptorBindingsService.getWeldContainer());
+        final ServiceBuilder<?> sb = target.addService(bindingServiceName);
+        final Consumer<InterceptorBindings> interceptorBindingsConsumer = sb.provides(bindingServiceName);
+        final Supplier<WeldBootstrapService> weldContainerSupplier = sb.requires(weldServiceName);
         sb.requires(weldStartService);
+        sb.setInstance(new WeldInterceptorBindingsService(interceptorBindingsConsumer, weldContainerSupplier, beanDeploymentArchiveId, beanName, componentClass, componentInterceptorSupport));
         sb.install();
         return bindingServiceName;
     }

weld/subsystem/src/main/java/org/jboss/as/weld/ejb/WeldInterceptorBindingsService.java

@@ -1,13 +1,19 @@
 package org.jboss.as.weld.ejb;
 
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
 import org.jboss.as.weld.WeldBootstrapService;
 import org.jboss.as.weld.spi.ComponentInterceptorSupport;
-import org.jboss.msc.service.Service;
+import org.jboss.msc.Service;
 import org.jboss.msc.service.ServiceName;
 import org.jboss.msc.service.StartContext;
 import org.jboss.msc.service.StartException;
 import org.jboss.msc.service.StopContext;
-import org.jboss.msc.value.InjectedValue;
 import org.jboss.weld.annotated.enhanced.EnhancedAnnotatedType;
 import org.jboss.weld.annotated.slim.SlimAnnotatedType;
 import org.jboss.weld.bean.interceptor.InterceptorBindingsAdapter;
@@ -17,39 +23,54 @@
 import org.jboss.weld.manager.BeanManagerImpl;
 import org.jboss.weld.resources.ClassTransformer;
 
+import javax.enterprise.inject.spi.InterceptionType;
+import javax.enterprise.inject.spi.Interceptor;
+
 /**
  * @author Stuart Douglas
  * @author Jozef Hartinger
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
  */
-public class WeldInterceptorBindingsService implements Service<InterceptorBindings> {
+public class WeldInterceptorBindingsService implements Service {
 
-    private volatile InterceptorBindings interceptorBindings;
-    private final InjectedValue<WeldBootstrapService> weldContainer = new InjectedValue<WeldBootstrapService>();
+    private final Consumer<InterceptorBindings> interceptorBindingsConsumer;
+    private final Supplier<WeldBootstrapService> weldContainerSupplier;
     private final String beanArchiveId;
     private final String ejbName;
     private final Class<?> componentClass;
     private final ComponentInterceptorSupport interceptorSupport;
 
     public static final ServiceName SERVICE_NAME = ServiceName.of("WeldInterceptorBindingsService");
 
-    public WeldInterceptorBindingsService(String beanArchiveId, String ejbName, Class<?> componentClass, ComponentInterceptorSupport componentInterceptorSupport) {
+    public WeldInterceptorBindingsService(final Consumer<InterceptorBindings> interceptorBindingsConsumer,
+                                          final Supplier<WeldBootstrapService> weldContainerSupplier,
+                                          final String beanArchiveId, final String ejbName, final Class<?> componentClass,
+                                          final ComponentInterceptorSupport componentInterceptorSupport) {
+        this.interceptorBindingsConsumer = interceptorBindingsConsumer;
+        this.weldContainerSupplier = weldContainerSupplier;
         this.beanArchiveId = beanArchiveId;
         this.ejbName = ejbName;
         this.componentClass = componentClass;
         this.interceptorSupport = componentInterceptorSupport;
     }
 
     @Override
-    public void start(StartContext startContext) throws StartException {
-        BeanManagerImpl beanManager = this.weldContainer.getValue().getBeanManager(beanArchiveId);
+    public void start(final StartContext startContext) throws StartException {
+        BeanManagerImpl beanManager = weldContainerSupplier.get().getBeanManager(beanArchiveId);
         //this is not always called with the deployments TCCL set
         //which causes weld to blow up
-        interceptorBindings = getInterceptorBindings(this.ejbName, beanManager);
+        interceptorBindingsConsumer.accept(getInterceptorBindings(this.ejbName, beanManager));
     }
 
-    protected InterceptorBindings getInterceptorBindings(String ejbName, final BeanManagerImpl manager) {
+    @Override
+    public void stop(final StopContext stopContext) {
+        interceptorBindingsConsumer.accept(null);
+    }
+
+    private InterceptorBindings getInterceptorBindings(final String ejbName, final BeanManagerImpl manager) {
+        InterceptorBindings retVal = null;
         if (ejbName != null) {
-            return interceptorSupport.getInterceptorBindings(ejbName, manager);
+            retVal = interceptorSupport.getInterceptorBindings(ejbName, manager);
         } else {
             // This is a managed bean
             SlimAnnotatedType<?> type = (SlimAnnotatedType<?>) manager.createAnnotatedType(componentClass);
@@ -59,24 +80,29 @@ protected InterceptorBindings getInterceptorBindings(String ejbName, final BeanM
             }
             InterceptionModel model = manager.getInterceptorModelRegistry().get(type);
             if (model != null) {
-                return new InterceptorBindingsAdapter(manager.getInterceptorModelRegistry().get(type));
+                retVal = new InterceptorBindingsAdapter(manager.getInterceptorModelRegistry().get(type));
             }
         }
-        return null;
+        return retVal != null ? retVal : NullInterceptorBindings.INSTANCE;
     }
 
+    private static final class NullInterceptorBindings implements InterceptorBindings {
+        private static final InterceptorBindings INSTANCE = new NullInterceptorBindings();
 
-    @Override
-    public void stop(StopContext stopContext) {
-        this.interceptorBindings = null;
-    }
+        @Override
+        public Collection<Interceptor<?>> getAllInterceptors() {
+            return Collections.emptyList();
+        }
 
-    @Override
-    public InterceptorBindings getValue() throws IllegalStateException, IllegalArgumentException {
-        return interceptorBindings;
-    }
+        @Override
+        public List<Interceptor<?>> getMethodInterceptors(final InterceptionType interceptionType, final Method method) {
+            return Collections.emptyList();
+        }
 
-    public InjectedValue<WeldBootstrapService> getWeldContainer() {
-        return weldContainer;
+        @Override
+        public List<Interceptor<?>> getLifecycleInterceptors(final InterceptionType interceptionType) {
+            return Collections.emptyList();
+        }
     }
+
 }