svn commit: r1802390 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/index/inventory/ test/java/org/apache/jackrabbit/oak/plugins/index/inventory/

[ch...@apache.org]

Author: chetanm
Date: Wed Jul 19 13:13:56 2017
New Revision: 1802390

URL: http://svn.apache.org/viewvc?rev=1802390&view=rev
Log:
OAK-6473 - Use JsonSerializer instead of custom json logic in IndexDefinitionPrinter

Removed:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/NodeStateJsonUtils.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/inventory/NodeStateJsonUtilsTest.java
Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexDefinitionPrinter.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexDefinitionPrinterTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexDefinitionPrinter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexDefinitionPrinter.java?rev=1802390&r1=1802389&r2=1802390&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexDefinitionPrinter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexDefinitionPrinter.java Wed Jul 19 13:13:56 2017
@@ -29,7 +29,8 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
-import org.apache.jackrabbit.oak.commons.json.JsopWriter;
+import org.apache.jackrabbit.oak.json.BlobSerializer;
+import org.apache.jackrabbit.oak.json.JsonSerializer;
 import org.apache.jackrabbit.oak.plugins.index.IndexPathService;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
@@ -62,15 +63,20 @@ public class IndexDefinitionPrinter impl
     public void print(PrintWriter printWriter, Format format, boolean isZip) {
         if (format == Format.JSON) {
             NodeState root = nodeStore.getRoot();
-            JsopWriter json = new JsopBuilder();
+            JsopBuilder json = new JsopBuilder();
             json.object();
             for (String indexPath : indexPathService.getIndexPaths()) {
                 json.key(indexPath);
                 NodeState idxState = NodeStateUtils.getNode(root, indexPath);
-                NodeStateJsonUtils.copyAsJson(json, idxState, false);
+                createSerializer(json).serialize(idxState);
             }
             json.endObject();
             printWriter.print(JsopBuilder.prettyPrint(json.toString()));
         }
     }
+
+    private JsonSerializer createSerializer(JsopBuilder json) {
+        String excludeHiddenFilter = "{\"properties\":[\"*\", \"-:*\"],\"nodes\":[\"*\", \"-:*\"]}";
+        return new JsonSerializer(json, excludeHiddenFilter, new BlobSerializer());
+    }
 }

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexDefinitionPrinterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexDefinitionPrinterTest.java?rev=1802390&r1=1802389&r2=1802390&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexDefinitionPrinterTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexDefinitionPrinterTest.java Wed Jul 19 13:13:56 2017
@@ -25,15 +25,17 @@ import java.io.StringWriter;
 import com.google.common.collect.Lists;
 import org.apache.felix.inventory.Format;
 import org.apache.jackrabbit.oak.plugins.index.IndexPathService;
-import org.apache.jackrabbit.oak.plugins.index.inventory.IndexDefinitionPrinter;
 import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 import org.junit.Test;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -46,7 +48,10 @@ public class IndexDefinitionPrinterTest
     public void printer() throws Exception{
         NodeBuilder builder = store.getRoot().builder();
         builder.child("a").setProperty("foo", "bar");
+        builder.child("a").setProperty(":foo", "bar");
         builder.child("b").child("c").setProperty("foo", "bar");
+        builder.child("b").child("c").setProperty(":foo", "bar");
+        builder.child("b").child(":d").setProperty("foo", "bar");
 
         store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
 
@@ -59,9 +64,13 @@ public class IndexDefinitionPrinterTest
         pw.flush();
 
         String json = sw.toString();
-
         //If there is any error in rendered json
         //exception would fail the test
-        JSONValue.parseWithException(json);
+        JSONObject o = (JSONObject) JSONValue.parseWithException(json);
+        assertNull(o.get(":d"));
+
+        JSONObject a = (JSONObject) o.get("/a");
+        assertNull(a.get(":foo"));
+        assertNotNull(a.get("foo"));
     }
 }
\ No newline at end of file