Author: chetanm
Date: Tue Jul 25 06:59:09 2017
New Revision: 1802886
URL: http://svn.apache.org/viewvc?rev=1802886&view=rev
Log:
OAK-6473 - Use JsonSerializer instead of custom json logic in
IndexDefinitionPrinter
Exclude :childOrder
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=1802886&r1=1802885&r2=1802886&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
Tue Jul 25 06:59:09 2017
@@ -76,7 +76,7 @@ public class IndexDefinitionPrinter impl
}
private JsonSerializer createSerializer(JsopBuilder json) {
- String excludeHiddenFilter = "{\"nodes\":[\"*\", \"-:*\"]}";
+ String excludeHiddenFilter = "{\"properties\":[\"*\",
\"-:childOrder\"],\"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=1802886&r1=1802885&r2=1802886&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
Tue Jul 25 06:59:09 2017
@@ -72,6 +72,8 @@ public class IndexDefinitionPrinterTest
JSONObject a = (JSONObject) o.get("/a");
assertNotNull(a.get("foo"));
- assertNotNull(a.get(":childOrder"));
+ //Hidden props other than :childOrder should be present
+ assertNotNull(a.get(":foo"));
+ assertNull(a.get(":childOrder"));
}
}
\ No newline at end of file
