Author: tomekr
Date: Fri Sep 23 08:36:12 2016
New Revision: 1762027
URL: http://svn.apache.org/viewvc?rev=1762027&view=rev
Log:
OAK-4847: Support any types of node builders in the initializers
-wrap the nodes in constructor rather than initializer methods
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/memory/MemoryNodeStore.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=1762027&r1=1762026&r2=1762027&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:36:12 2016
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.spi.sta
/**
* Basic in-memory node state implementation.
*/
-public class MemoryNodeState extends AbstractNodeState {
+class MemoryNodeState extends AbstractNodeState {
private final Map<String, PropertyState> properties;
@@ -174,7 +174,7 @@ public class MemoryNodeState extends Abs
return true;
}
- public static MemoryNodeState wrap(NodeState state) {
+ static MemoryNodeState wrap(NodeState state) {
if (state instanceof MemoryNodeState) {
return (MemoryNodeState) state;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java?rev=1762027&r1=1762026&r2=1762027&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
Fri Sep 23 08:36:12 2016
@@ -66,7 +66,7 @@ public class MemoryNodeStore implements
private final AtomicInteger checkpointCounter = new AtomicInteger();
public MemoryNodeStore(NodeState state) {
- this.root = new AtomicReference<NodeState>(state);
+ this.root = new
AtomicReference<NodeState>(MemoryNodeState.wrap(state));
}
public MemoryNodeStore() {
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=1762027&r1=1762026&r2=1762027&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:36:12 2016
@@ -22,7 +22,6 @@ 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;
@@ -116,7 +115,7 @@ public class InitialContent implements R
}
// squeeze node state before it is passed to store (OAK-2411)
- NodeState base = wrap(builder.getNodeState());
+ NodeState base = 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=1762027&r1=1762026&r2=1762027&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:36:12 2016
@@ -34,8 +34,6 @@ 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.
@@ -56,7 +54,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 = wrap(builder.getNodeState());
+ NodeState base = 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=1762027&r1=1762026&r2=1762027&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:36:12 2016
@@ -47,7 +47,6 @@ 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 +90,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 = wrap(builder.getNodeState());
+ NodeState base = builder.getNodeState();
MemoryNodeStore store = new MemoryNodeStore(base);
Root root = RootFactory.createSystemRoot(store, EmptyHook.INSTANCE,
workspaceName,
