You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2013/02/09 21:28:55 UTC

[2/2] git commit: DELTASPIKE-312 remove GlobalAlternatives handling for OWB and fix tests

Updated Branches:
  refs/heads/master 184c7193d -> c2d25218b


DELTASPIKE-312 remove GlobalAlternatives handling for OWB and fix tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/c2d25218
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/c2d25218
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/c2d25218

Branch: refs/heads/master
Commit: c2d25218b429e6041c3652025788701e795db22e
Parents: 950225e
Author: Mark Struberg <st...@apache.org>
Authored: Sat Feb 9 21:27:10 2013 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Sat Feb 9 21:27:10 2013 +0100

----------------------------------------------------------------------
 .../impl/exclude/extension/ExcludeExtension.java   |   92 +--------------
 .../alternative/global/GlobalAlternativeTest.java  |   18 ++-
 .../core/api/alternative/global/SubBaseBean1.java  |    2 -
 .../core/api/alternative/global/SubBaseBean2.java  |    2 -
 4 files changed, 18 insertions(+), 96 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c2d25218/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index e76a257..f0a7959 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -59,7 +59,7 @@ public class ExcludeExtension implements Extension, Deactivatable
 {
     private static final Logger LOG = Logger.getLogger(ExcludeExtension.class.getName());
 
-    private static Boolean isOwbDetected = false;
+    private static Boolean isWeldDetected = false;
 
     private boolean isActivated = true;
     private boolean isGlobalAlternativeActivated = true;
@@ -77,7 +77,7 @@ public class ExcludeExtension implements Extension, Deactivatable
         isCustomProjectStageBeanFilterActivated =
                 ClassDeactivationUtils.isActivated(CustomProjectStageBeanFilter.class);
 
-        isOwbDetected = isOpenWebBeans();
+        isWeldDetected = isWeld();
     }
 
     /**
@@ -100,11 +100,7 @@ public class ExcludeExtension implements Extension, Deactivatable
         //we need to do it before the exclude logic to keep the @Exclude support for global alternatives
         if (isGlobalAlternativeActivated)
         {
-            if (isOwbDetected)
-            {
-                activateGlobalAlternativesOwb(processAnnotatedType, beanManager);
-            }
-            else
+            if (isWeldDetected)
             {
                 activateGlobalAlternativesWeld(processAnnotatedType, beanManager);
             }
@@ -239,84 +235,6 @@ public class ExcludeExtension implements Extension, Deactivatable
         }
     }
 
-    //see OWB-643
-    //just #veto the original implementation and remove @Alternative from the ProcessAnnotatedType of
-    // the configured alternative doesn't work with OWB (due to OWB-643)
-    private void activateGlobalAlternativesOwb(ProcessAnnotatedType processAnnotatedType,
-        BeanManager beanManager)
-    {
-        //the current bean is the bean with a potential global alternative
-        Class<Object> currentBean = processAnnotatedType.getAnnotatedType().getJavaClass();
-
-        if (currentBean.isInterface())
-        {
-            return;
-        }
-
-        Set<Class> beanBaseTypes = resolveBeanTypes(currentBean);
-
-        boolean isAlternativeBeanImplementation = currentBean.isAnnotationPresent(Alternative.class);
-
-        List<Annotation> qualifiersOfCurrentBean =
-            resolveQualifiers(processAnnotatedType.getAnnotatedType().getAnnotations(), beanManager);
-
-        String configuredBeanName;
-        List<Annotation> qualifiersOfConfiguredBean;
-        Class<Object> alternativeBeanClass;
-        Set<Annotation> alternativeBeanAnnotations;
-
-        for (Class currentType : beanBaseTypes)
-        {
-            alternativeBeanAnnotations = new HashSet<Annotation>();
-
-            configuredBeanName = ConfigResolver.getPropertyValue(currentType.getName());
-            if (configuredBeanName != null && configuredBeanName.length() > 0)
-            {
-                alternativeBeanClass = ClassUtils.tryToLoadClassForName(configuredBeanName);
-
-                if (alternativeBeanClass == null)
-                {
-                    throw new IllegalStateException("Can't find class " + configuredBeanName + " which is configured" +
-                            " for " + currentType.getName());
-                }
-                alternativeBeanAnnotations.addAll(Arrays.asList(alternativeBeanClass.getAnnotations()));
-                qualifiersOfConfiguredBean = resolveQualifiers(alternativeBeanAnnotations, beanManager);
-            }
-            else
-            {
-                continue;
-            }
-
-            //current bean is annotated with @Alternative and of the same type as the configured bean
-            if (isAlternativeBeanImplementation && alternativeBeanClass.equals(currentBean))
-            {
-                if (doQualifiersMatch(qualifiersOfCurrentBean, qualifiersOfConfiguredBean))
-                {
-                    //veto if the current annotated-type is a global alternative - it replaced the original type already
-                    processAnnotatedType.veto();
-                    break;
-                }
-            }
-            else
-            {
-                if (!alternativeBeanClass.isAnnotationPresent(Alternative.class))
-                {
-                    continue;
-                }
-
-                if (doQualifiersMatch(qualifiersOfCurrentBean, qualifiersOfConfiguredBean))
-                {
-                    AnnotatedTypeBuilder<Object> annotatedTypeBuilder
-                        = new AnnotatedTypeBuilder<Object>().readFromType(alternativeBeanClass);
-
-                    //just to avoid issues with switching between app-servers,...
-                    annotatedTypeBuilder.removeFromClass(Alternative.class);
-                    processAnnotatedType.setAnnotatedType(annotatedTypeBuilder.create());
-                }
-            }
-        }
-    }
-
     private boolean doQualifiersMatch(List<Annotation> qualifiersOfCurrentBean,
                                       List<Annotation> qualifiersOfConfiguredBean)
     {
@@ -524,13 +442,13 @@ public class ExcludeExtension implements Extension, Deactivatable
                 processAnnotatedType.getAnnotatedType().getJavaClass());
     }
 
-    private boolean isOpenWebBeans()
+    private boolean isWeld()
     {
         IllegalStateException runtimeException = new IllegalStateException();
 
         for (StackTraceElement element : runtimeException.getStackTrace())
         {
-            if (element.toString().contains("org.apache.webbeans."))
+            if (element.toString().contains("org.jboss.weld"))
             {
                 return true;
             }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c2d25218/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
index 287fae2..60ca097 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
@@ -31,7 +31,9 @@ import org.apache.deltaspike.test.util.ArchiveUtils;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.Asset;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
@@ -40,7 +42,6 @@ import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 import javax.inject.Inject;
-import java.util.List;
 
 /**
  * Tests for @Alternative across BDAs
@@ -67,6 +68,14 @@ public class GlobalAlternativeTest
     @Deployment
     public static WebArchive deploy()
     {
+        Asset beansXml = new StringAsset(
+                "<beans><alternatives>" +
+                        "<class>" + BaseInterface1AlternativeImplementation.class.getName() + "</class>" +
+                        "<class>" + SubBaseBean2.class.getName() + "</class>" +
+                        "<class>" + AlternativeBaseBeanB.class.getName() + "</class>" +
+                        "</alternatives></beans>"
+        );
+
         JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "excludeIntegrationTest.jar")
                 .addPackage(GlobalAlternativeTest.class.getPackage())
                 .addPackage(QualifierA.class.getPackage())
@@ -75,7 +84,7 @@ public class GlobalAlternativeTest
         return ShrinkWrap.create(WebArchive.class, "globalAlternative.war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive(new String[]{"META-INF.config"}))
                 .addAsLibraries(testJar)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsWebInfResource(beansXml, "beans.xml");
     }
 
     /**
@@ -84,10 +93,9 @@ public class GlobalAlternativeTest
     @Test
     public void alternativeImplementationWithClassAsBaseType()
     {
-        List<BaseBean1> testBeans = BeanProvider.getContextualReferences(BaseBean1.class, true);
+        BaseBean1 testBean = BeanProvider.getContextualReference(BaseBean1.class);
 
-        Assert.assertEquals(1, testBeans.size());
-        Assert.assertEquals(SubBaseBean2.class.getName(), testBeans.get(0).getClass().getName());
+        Assert.assertEquals(SubBaseBean2.class.getName(), testBean.getClass().getName());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c2d25218/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean1.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean1.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean1.java
index b6c9048..4156b25 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean1.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean1.java
@@ -21,8 +21,6 @@ package org.apache.deltaspike.test.core.api.alternative.global;
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Alternative;
 
-/**
- */
 @Alternative
 @Dependent
 public class SubBaseBean1 extends BaseBean1

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/c2d25218/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean2.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean2.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean2.java
index 7d5ca99..05e1c1a 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean2.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/SubBaseBean2.java
@@ -21,8 +21,6 @@ package org.apache.deltaspike.test.core.api.alternative.global;
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Alternative;
 
-/**
- */
 @Alternative
 @Dependent
 public class SubBaseBean2 extends SubBaseBean1