Author: tomekr
Date: Fri Sep 23 08:26:18 2016
New Revision: 1762025
URL: http://svn.apache.org/viewvc?rev=1762025&view=rev
Log:
OAK-4847: Support any types of node builders in the initializers
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java?rev=1762025&r1=1762024&r2=1762025&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
Fri Sep 23 08:26:18 2016
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
+import static com.google.common.collect.Maps.newHashMap;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
@@ -34,7 +35,7 @@ import org.apache.jackrabbit.oak.spi.sta
/**
* Basic in-memory node state implementation.
*/
-class MemoryNodeState extends AbstractNodeState {
+public class MemoryNodeState extends AbstractNodeState {
private final Map<String, PropertyState> properties;
@@ -173,4 +174,21 @@ class MemoryNodeState extends AbstractNo
return true;
}
+ public static MemoryNodeState wrap(NodeState state) {
+ if (state instanceof MemoryNodeState) {
+ return (MemoryNodeState) state;
+ }
+
+ Map<String, PropertyState> properties = newHashMap();
+ for (PropertyState property : state.getProperties()) {
+ properties.put(property.getName(), property);
+ }
+
+ Map<String, NodeState> nodes = newHashMap();
+ for (ChildNodeEntry child : state.getChildNodeEntries()) {
+ nodes.put(child.getName(), wrap(child.getNodeState()));
+ }
+
+ return new MemoryNodeState(properties, nodes);
+ }
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java?rev=1762025&r1=1762024&r2=1762025&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
Fri Sep 23 08:26:18 2016
@@ -22,6 +22,8 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
+import static org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState.wrap;
+import static
org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.squeeze;
import static
org.apache.jackrabbit.oak.plugins.version.VersionConstants.REP_VERSIONSTORAGE;
import com.google.common.collect.ImmutableList;
@@ -32,7 +34,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
import
org.apache.jackrabbit.oak.plugins.index.counter.NodeCounterEditorProvider;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
-import org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState;
import org.apache.jackrabbit.oak.plugins.name.NamespaceEditorProvider;
import org.apache.jackrabbit.oak.plugins.name.Namespaces;
import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
@@ -58,7 +59,7 @@ public class InitialContent implements R
private static NodeState createInitialContent() {
NodeBuilder builder = EMPTY_NODE.builder();
new InitialContent().initialize(builder);
- return ModifiedNodeState.squeeze(builder.getNodeState());
+ return squeeze(builder.getNodeState());
}
/**
@@ -115,7 +116,7 @@ public class InitialContent implements R
}
// squeeze node state before it is passed to store (OAK-2411)
- NodeState base = ModifiedNodeState.squeeze(builder.getNodeState());
+ NodeState base = wrap(builder.getNodeState());
NodeStore store = new MemoryNodeStore(base);
NodeTypeRegistry.registerBuiltIn(RootFactory.createSystemRoot(
store, new EditorHook(new CompositeEditorProvider(
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java?rev=1762025&r1=1762024&r2=1762025&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
Fri Sep 23 08:26:18 2016
@@ -23,7 +23,6 @@ import org.apache.jackrabbit.JcrConstant
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
-import org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState;
import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.oak.plugins.tree.RootFactory;
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
@@ -35,6 +34,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState.wrap;
+
/**
* {@code RepositoryInitializer} that asserts the existence and node type of
* the /jcr:system/jcr:privileges node that is used to store privilege
definitions.
@@ -55,7 +56,7 @@ class PrivilegeInitializer implements Re
privileges.setProperty(JcrConstants.JCR_PRIMARYTYPE,
NT_REP_PRIVILEGES, Type.NAME);
// squeeze node state before it is passed to store (OAK-2411)
- NodeState base = ModifiedNodeState.squeeze(builder.getNodeState());
+ NodeState base = wrap(builder.getNodeState());
NodeStore store = new MemoryNodeStore(base);
try {
Root systemRoot = RootFactory.createSystemRoot(store, null,
null, null, null, null);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java?rev=1762025&r1=1762024&r2=1762025&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
Fri Sep 23 08:26:18 2016
@@ -30,7 +30,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
-import org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState;
import org.apache.jackrabbit.oak.plugins.tree.RootFactory;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
@@ -48,6 +47,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState.wrap;
/**
* Creates initial set of users to be present in a given workspace. This
@@ -91,7 +91,7 @@ class UserInitializer implements Workspa
@Override
public void initialize(NodeBuilder builder, String workspaceName) {
// squeeze node state before it is passed to store (OAK-2411)
- NodeState base = ModifiedNodeState.squeeze(builder.getNodeState());
+ NodeState base = wrap(builder.getNodeState());
MemoryNodeStore store = new MemoryNodeStore(base);
Root root = RootFactory.createSystemRoot(store, EmptyHook.INSTANCE,
workspaceName,
