svn commit: r1327775 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java

[ry...@apache.org]

Author: ryan
Date: Thu Apr 19 01:46:16 2012
New Revision: 1327775

URL: http://svn.apache.org/viewvc?rev=1327775&view=rev
Log:
SOLR-3330: add option to include the original 'ref' nodes

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java?rev=1327775&r1=1327774&r2=1327775&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java Thu Apr 19 01:46:16 2012
@@ -87,7 +87,8 @@ public class SolrInfoMBeanHandler extend
       cats = normalize(cats);
       
       // Only the changes
-      rsp.add("solr-mbeans", getDiff(ref,cats));
+      boolean showAll = req.getParams().getBool("all", false);
+      rsp.add("solr-mbeans", getDiff(ref,cats, showAll));
     }
     else {
       rsp.add("solr-mbeans", cats);
@@ -162,7 +163,11 @@ public class SolrInfoMBeanHandler extend
     return cats;
   }
 
-  protected NamedList<NamedList<NamedList<Object>>> getDiff(NamedList<NamedList<NamedList<Object>>> ref, NamedList<NamedList<NamedList<Object>>> now) {
+  protected NamedList<NamedList<NamedList<Object>>> getDiff(
+      NamedList<NamedList<NamedList<Object>>> ref, 
+      NamedList<NamedList<NamedList<Object>>> now,
+      boolean includeAll ) {
+    
     NamedList<NamedList<NamedList<Object>>> changed = new NamedList<NamedList<NamedList<Object>>>();
     
     // Cycle through each category
@@ -192,13 +197,21 @@ public class SolrInfoMBeanHandler extend
 //              System.out.println( "NOW: " + now_txt );
               
               // Calculate the differences
-              cat.add(name, diffNamedList(ref_bean,now_bean));
+              NamedList diff = diffNamedList(ref_bean,now_bean);
+              diff.add( "_changed_", true ); // flag the changed thing
+              cat.add(name, diff);
+            }
+            else if(includeAll) {
+              cat.add(name, ref_bean);
             }
           }
           if(cat.size()>0) {
             changed.add(category, cat);
           }
         }
+        else if(includeAll) {
+          changed.add(category, ref_cat);
+        }
       }
     }
     return changed;