svn commit: r1780538 - in /jackrabbit/oak/trunk/oak-lucene/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java

[tommaso]

Author: tommaso
Date: Fri Jan 27 11:06:17 2017
New Revision: 1780538

URL: http://svn.apache.org/viewvc?rev=1780538&view=rev
Log:
OAK-5533 - persisted facet config should be visible to avoid loosing it in 
subsequent indexing runs

Modified:
    
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java
    
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java?rev=1780538&r1=1780537&r2=1780538&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/NodeStateFacetsConfig.java
 Fri Jan 27 11:06:17 2017
@@ -19,6 +19,7 @@
 package org.apache.jackrabbit.oak.plugins.index.lucene.util;
 
 import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.lucene.facet.FacetsConfig;
 
@@ -32,7 +33,7 @@ class NodeStateFacetsConfig extends Face
     private final NodeBuilder nodeBuilder;
 
     NodeStateFacetsConfig(NodeBuilder nodeBuilder) {
-        this.nodeBuilder = nodeBuilder.child(":facet-config");
+        this.nodeBuilder = nodeBuilder.child(LuceneIndexConstants.FACETS);
         for (String child : this.nodeBuilder.getChildNodeNames()) {
             super.setMultiValued(child, 
this.nodeBuilder.child(child).getProperty(MULTIVALUED).getValue(Type.BOOLEAN));
         }

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java?rev=1780538&r1=1780537&r2=1780538&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/FacetTest.java
 Fri Jan 27 11:06:17 2017
@@ -66,6 +66,8 @@ public class FacetTest extends AbstractQ
 
     @After
     protected void tearDown() throws Exception {
+        assertTrue(superuser.nodeExists("/oak:index/luceneGlobal/facets"));
+
         if (superuser.nodeExists(FACET_CONFING_PROP_PATH)) {
             superuser.getProperty(LuceneIndexConstants.PROP_FACETS).remove();
             superuser.save();