WELD-1794 Probe - additional bean archives should have the lowest

priority when sorting
weld · Jan 22, 2015 · 1b99ac5 · 1b99ac5
1 parent 5787844
commit 1b99ac5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/probe/core/src/main/java/org/jboss/weld/probe/JsonObjects.java b/probe/core/src/main/java/org/jboss/weld/probe/JsonObjects.java
@@ -17,6 +17,7 @@
 package org.jboss.weld.probe;
 
 import static org.jboss.weld.probe.Strings.ACCESSIBLE_BDAS;
+import static org.jboss.weld.probe.Strings.ADDITIONAL_BDA_SUFFIX;
 import static org.jboss.weld.probe.Strings.ALTERNATIVES;
 import static org.jboss.weld.probe.Strings.ANNOTATED_METHOD;
 import static org.jboss.weld.probe.Strings.AS_STRING;
@@ -120,8 +121,11 @@ final class JsonObjects {
 
     private static final Comparator<BeanDeploymentArchive> bdaComparator = new Comparator<BeanDeploymentArchive>() {
         @Override
-        public int compare(BeanDeploymentArchive o1, BeanDeploymentArchive o2) {
-            return o1.getId().compareTo(o2.getId());
+        public int compare(BeanDeploymentArchive bda1, BeanDeploymentArchive bda2) {
+            // Additional bean archive should have the lowest priority when sorting
+            // This suffix is supported by WildFly and Weld Servlet
+            int result = Boolean.compare(bda1.getId().endsWith(ADDITIONAL_BDA_SUFFIX), bda2.getId().endsWith(ADDITIONAL_BDA_SUFFIX));
+            return result == 0 ? bda1.getId().compareTo(bda2.getId()) : result;
         }
     };
 

diff --git a/probe/core/src/main/java/org/jboss/weld/probe/Strings.java b/probe/core/src/main/java/org/jboss/weld/probe/Strings.java
@@ -118,6 +118,8 @@ final class Strings {
     static final String RESOURCE_PARAM_START = "{";
     static final String RESOURCE_PARAM_END = "}";
 
+    static final String ADDITIONAL_BDA_SUFFIX = ".additionalClasses";
+
     private Strings() {
     }