Author: chetanm
Date: Thu Jul 20 05:38:21 2017
New Revision: 1802449
URL: http://svn.apache.org/viewvc?rev=1802449&view=rev
Log:
OAK-6473 - Use JsonSerializer instead of custom json logic in
IndexDefinitionPrinter
Omit only hidden nodes. Hidden properties would be emitted
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=1802449&r1=1802448&r2=1802449&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
Thu Jul 20 05:38:21 2017
@@ -76,7 +76,7 @@ public class IndexDefinitionPrinter impl
}
private JsonSerializer createSerializer(JsopBuilder json) {
- String excludeHiddenFilter = "{\"properties\":[\"*\",
\"-:*\"],\"nodes\":[\"*\", \"-:*\"]}";
+ String excludeHiddenFilter = "{\"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=1802449&r1=1802448&r2=1802449&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
Thu Jul 20 05:38:21 2017
@@ -49,6 +49,7 @@ public class IndexDefinitionPrinterTest
NodeBuilder builder = store.getRoot().builder();
builder.child("a").setProperty("foo", "bar");
builder.child("a").setProperty(":foo", "bar");
+ builder.child("a").setProperty(":childOrder", "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");
@@ -70,7 +71,7 @@ public class IndexDefinitionPrinterTest
assertNull(o.get(":d"));
JSONObject a = (JSONObject) o.get("/a");
- assertNull(a.get(":foo"));
assertNotNull(a.get("foo"));
+ assertNotNull(a.get(":childOrder"));
}
}
\ No newline at end of file
