You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2017/10/27 13:39:13 UTC

svn commit: r1813536 - /jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/InitializerTest.java

Author: chetanm
Date: Fri Oct 27 13:39:13 2017
New Revision: 1813536

URL: http://svn.apache.org/viewvc?rev=1813536&view=rev
Log:
OAK-6873 - UserInitializer should not use hard coded QueryIndexProvider

Adapt testcase

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/InitializerTest.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/InitializerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/InitializerTest.java?rev=1813536&r1=1813535&r2=1813536&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/InitializerTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/InitializerTest.java Fri Oct 27 13:39:13 2017
@@ -24,8 +24,13 @@ import java.io.IOException;
 import com.google.common.collect.ImmutableMap;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.InitialContent;
+import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
+import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider;
 import org.apache.jackrabbit.oak.security.SecurityProviderImpl;
 import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
+import org.apache.jackrabbit.oak.spi.lifecycle.WorkspaceInitializer;
+import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider;
+import org.apache.jackrabbit.oak.spi.query.QueryIndexProviderAware;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
 import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -48,7 +53,14 @@ public class InitializerTest {
                                 "usersPath", "/home/users",
                                 "groupsPath", "/home/groups",
                                 "defaultDepth", "1")))));
-        provider.getConfiguration(UserConfiguration.class).getWorkspaceInitializer().initialize(
+        WorkspaceInitializer workspaceInitializer = provider.getConfiguration(UserConfiguration.class).getWorkspaceInitializer();
+
+        if (workspaceInitializer instanceof QueryIndexProviderAware) {
+            ((QueryIndexProviderAware) workspaceInitializer).setQueryIndexProvider(
+                    new CompositeQueryIndexProvider(new PropertyIndexProvider(), new NodeTypeIndexProvider()));
+        }
+
+        workspaceInitializer.initialize(
                 builder, "default");
         builder.getNodeState();
     }