OWB-1448 Fix Issue with Cdi annotation and alternatives

Author: jgallimore

webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java

@@ -108,13 +108,16 @@
 import javax.enterprise.inject.spi.ObserverMethod;
 import javax.enterprise.inject.spi.Producer;
 
+import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
 import java.security.PrivilegedActionException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -1707,6 +1710,35 @@ protected void deployFromXML(ScannerService scanner)
         }
 
         logger.fine("Deploying configurations from XML has ended successfully.");
+
+        try
+        {
+            final URL url = new URL("openwebbeans", null, 0, "cdi-standalone", new URLStreamHandler()
+            {
+                @Override
+                protected URLConnection openConnection(URL u) throws IOException
+                {
+                    return null;
+                }
+            });
+
+            final BeanArchiveInformation beanArchiveInformation = beanArchiveService.getBeanArchiveInformation(url);
+            if (beanArchiveInformation != null)
+            {
+                configureDecorators(url, beanArchiveInformation.getDecorators());
+                configureInterceptors(url, beanArchiveInformation.getInterceptors());
+                configureAlternatives(url, beanArchiveInformation.getAlternativeClasses(), false);
+                configureAlternatives(url, beanArchiveInformation.getAlternativeStereotypes(), true);
+                configureAllowProxying(url, beanArchiveInformation.getAllowProxyingClasses());
+            }
+
+            logger.fine("Deploying embedded configurations has ended successfully.");
+        }
+        catch (Exception e)
+        {
+            logger.info("Error occurred: " + e.getMessage());
+            e.printStackTrace();
+        }
     }
 
     private void configureAlternatives(URL bdaLocation, List<String> alternatives, boolean isStereotype)

webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/features/AlternativeTest.java

@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openwebbeans.junit5.features;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Alternative;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+import org.apache.openwebbeans.junit5.Cdi;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Cdi(disableDiscovery = true, classes = {
+        AlternativeTest.Service.class, AlternativeTest.Provider.class, AlternativeTest.DefaultProvider.class, AlternativeTest.AlternativeProvider.class
+}, alternatives = AlternativeTest.AlternativeProvider.class)
+public class AlternativeTest
+{
+    @Inject
+    private Service service;
+
+    @Test
+    void test1()
+    {
+        assertEquals("alternative", service.run());
+    }
+
+    public interface Provider
+    {
+        String provide();
+    }
+
+    @Alternative
+    public static class AlternativeProvider implements Provider
+    {
+        @Override
+        public String provide()
+        {
+            return "alternative";
+        }
+    }
+
+    @Default
+    public static class DefaultProvider implements Provider
+    {
+        @Override
+        public String provide()
+        {
+            return "default";
+        }
+    }
+
+    @ApplicationScoped
+    public static class Service
+    {
+
+        @Inject
+        private Provider provider;
+
+        public String run()
+        {
+            return provider.provide();
+        }
+
+    }
+}

webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/features/InterceptorTest.java

@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openwebbeans.junit5.features;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.NormalScope;
+import javax.enterprise.inject.Alternative;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InterceptorBinding;
+import javax.interceptor.InvocationContext;
+import org.apache.openwebbeans.junit5.Cdi;
+import org.junit.jupiter.api.Test;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Cdi(disableDiscovery = true, classes = {
+        InterceptorTest.Service.class, InterceptorTest.MyInterceptor.class, InterceptorTest.Wrap.class
+}, interceptors = InterceptorTest.MyInterceptor.class)
+public class InterceptorTest
+{
+    @Inject
+    private Service service;
+
+    @Test
+    void test1()
+    {
+        assertEquals("Intercepted Hello World", service.run());
+    }
+
+    @Target({ElementType.TYPE, ElementType.METHOD})
+    @Retention(RetentionPolicy.RUNTIME)
+    @InterceptorBinding
+    public @interface Wrap {
+
+    }
+
+    @Interceptor
+    @Wrap
+    public static class MyInterceptor {
+        @AroundInvoke
+        public Object restrictAccessBasedOnTime(InvocationContext ctx) throws Exception {
+            final Object result = ctx.proceed();
+            if (result instanceof String) {
+                return "Intercepted " + result;
+            } else {
+                return result;
+            }
+        }
+    }
+
+    @ApplicationScoped
+    public static class Service
+    {
+        @Wrap
+        public String run()
+        {
+            return "Hello World";
+        }
+    }
+}

webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/parameter/ParameterResolutionTest.java

@@ -34,7 +34,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
-@Cdi(classes = MyService.class)
+@Cdi(classes = MyService.class, disableDiscovery = true)
 class ParameterResolutionTest
 {
     @Inject MyService service;

webbeans-junit5/src/test/java/org/apache/openwebbeans/junit5/perclass/PerMethodTest.java

@@ -180,7 +180,7 @@ public Property[] properties()
                                         @Override
                                         public boolean disableDiscovery()
                                         {
-                                            return false;
+                                            return true;
                                         }
 
                                         @Override