WELD-2319 enhance beans.xml information in Probe.

weld · Feb 2, 2017 · 9b82759 · 9b82759
1 parent d6f05d6
commit 9b82759
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/probe/core/src/main/client/probe.html b/probe/core/src/main/client/probe.html
@@ -213,7 +213,11 @@ <h1>Bean Archives</h1>
             <col width="3%">
             <col width="5%">
             <col width="11%">
-            <col width="59%">
+            <col width="44%">
+            <col width="5%">
+            <col width="15%">
+            <col width="2%">
+            <col width="2%">
             <col width="18%">
             <tr>
                 <th>Index</th>
@@ -236,6 +240,10 @@ <h1>Bean Archives</h1>
                 <th>Beans {{tip "The number does not include inteceptors, decorators and built-in beans"}}</th>
                 <th>Identifier</th>
                 <th>Bean Discovery Mode</th>
+                <th>Beans Xml URL</th>
+                <th>Beans Xml version</th>
+                <th>Trimmed</th>
+                <th>Scanning Info</th>
             </tr>
             {{#each visibleBdas}}
             <tr>
@@ -251,6 +259,10 @@ <h1>Bean Archives</h1>
                     {{detailIcon}} {{#link-to 'beanArchive' id}}{{bdaId}}{{/link-to}}
                 </td>
                 <td>{{beanDiscoveryMode}}</td>
+                <td>{{beansXmlUrl}}</td>
+                <td>{{beansXmlVersion}}</td>
+                <td>{{beansXmlTrimmed}}</td>
+                <td>{{beansXmlScanning}}</td>
             </tr>
             {{/each}}
         </table>

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
@@ -27,6 +27,10 @@
 import static org.jboss.weld.probe.Strings.BEANS;
 import static org.jboss.weld.probe.Strings.BEAN_CLASS;
 import static org.jboss.weld.probe.Strings.BEAN_DISCOVERY_MODE;
+import static org.jboss.weld.probe.Strings.BEANS_XML_SCANNING;
+import static org.jboss.weld.probe.Strings.BEANS_XML_TRIMMED;
+import static org.jboss.weld.probe.Strings.BEANS_XML_URL;
+import static org.jboss.weld.probe.Strings.BEANS_XML_VERSION;
 import static org.jboss.weld.probe.Strings.BINDINGS;
 import static org.jboss.weld.probe.Strings.BOOSTRAP_STATS;
 import static org.jboss.weld.probe.Strings.CHILDREN;
@@ -53,6 +57,7 @@
 import static org.jboss.weld.probe.Strings.DESCRIPTION;
 import static org.jboss.weld.probe.Strings.DISPOSAL_METHOD;
 import static org.jboss.weld.probe.Strings.EJB_NAME;
+import static org.jboss.weld.probe.Strings.EMPTY;
 import static org.jboss.weld.probe.Strings.ENABLEMENT;
 import static org.jboss.weld.probe.Strings.EVENT_INFO;
 import static org.jboss.weld.probe.Strings.FIRED;
@@ -154,8 +159,8 @@
 import org.jboss.weld.config.ConfigurationKey;
 import org.jboss.weld.config.Description;
 import org.jboss.weld.config.WeldConfiguration;
-import org.jboss.weld.contexts.AbstractConversationContext;
 import org.jboss.weld.context.ManagedConversation;
+import org.jboss.weld.contexts.AbstractConversationContext;
 import org.jboss.weld.event.ContainerLifecycleEventObserverMethod;
 import org.jboss.weld.event.ObserverMethodImpl;
 import org.jboss.weld.exceptions.UnsupportedOperationException;
@@ -225,6 +230,14 @@ static String createDeploymentJson(BeanManagerImpl beanManager, Probe probe) {
             for (Class<?> interceptor : Components.getSortedProbeComponetCandidates(enablement.getInterceptors())) {
                 interceptors.add(decorateProbeComponent(interceptor, createSimpleBeanJson(findEnabledBean(interceptor, BeanKind.INTERCEPTOR, probe), probe)));
             }
+
+            if (beansXml != null) {
+                bdaBuilder.add(BEANS_XML_URL, beansXml.getUrl() != null ? beansXml.getUrl().toString() : EMPTY);
+                bdaBuilder.add(BEANS_XML_VERSION, beansXml.getVersion() != null ? beansXml.getVersion().toString() : EMPTY);
+                bdaBuilder.add(BEANS_XML_TRIMMED, beansXml.isTrimmed());
+                bdaBuilder.add(BEANS_XML_SCANNING, beansXml.getScanning() != null ? beansXml.getScanning().toString() : EMPTY);
+            }
+
             enablementBuilder.add(INTERCEPTORS, interceptors);
             JsonArrayBuilder decorators = Json.arrayBuilder();
             for (Class<?> decorator : enablement.getDecorators()) {

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
@@ -30,6 +30,10 @@ public final class Strings {
     public static final String BDA_ID = "bdaId";
     public static final String BDA = "bda";
     public static final String BEAN_DISCOVERY_MODE = "beanDiscoveryMode";
+    public static final String BEANS_XML_SCANNING = "beansXmlScanning";
+    public static final String BEANS_XML_TRIMMED = "beansXmlTrimmed";
+    public static final String BEANS_XML_URL = "beansXmlUrl";
+    public static final String BEANS_XML_VERSION = "beansXmlVersion";
     public static final String BDAS = "bdas";
     public static final String CONFIGURATION = "configuration";
     public static final String SCOPE = "scope";