Index: oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>MacRoman =================================================================== --- oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java (revision 1303365) +++ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java (revision ) @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.jcr; import org.apache.jackrabbit.mk.api.MicroKernel; -import org.apache.jackrabbit.oak.jcr.SessionImpl.Context; import org.apache.jackrabbit.oak.jcr.json.FullJsonParser; import org.apache.jackrabbit.oak.jcr.json.JsonValue; import org.apache.jackrabbit.oak.jcr.json.JsonValue.JsonObject; @@ -54,9 +53,9 @@ */ private static final Logger log = LoggerFactory.getLogger(WorkspaceImpl.class); - private final Context sessionContext; + private final SessionContext sessionContext; - public WorkspaceImpl(Context sessionContext) { + public WorkspaceImpl(SessionContext sessionContext) { this.sessionContext = sessionContext; } \ No newline at end of file Index: oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/NodeStateProvider.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>MacRoman =================================================================== --- oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/NodeStateProvider.java (revision 1303365) +++ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/NodeStateProvider.java (revision ) @@ -20,7 +20,8 @@ package org.apache.jackrabbit.oak.jcr.state; import org.apache.commons.collections.map.LRUMap; -import org.apache.jackrabbit.oak.jcr.SessionImpl.Context; +import org.apache.jackrabbit.oak.jcr.SessionContext; +import org.apache.jackrabbit.oak.jcr.SessionImpl; import org.apache.jackrabbit.oak.jcr.configuration.RepositoryConfiguration; import org.apache.jackrabbit.oak.jcr.state.ChangeTree.NodeDelta; import org.apache.jackrabbit.oak.jcr.util.Path; @@ -29,11 +30,11 @@ import java.util.Map; public class NodeStateProvider { - private final Context sessionContext; + private final SessionContext sessionContext; private final TransientSpace transientSpace; private final Map cache; - public NodeStateProvider(Context sessionContext, TransientSpace transientSpace) { + public NodeStateProvider(SessionContext sessionContext, TransientSpace transientSpace) { this.sessionContext = sessionContext; this.transientSpace = transientSpace; Index: oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>MacRoman =================================================================== --- oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java (revision 1303365) +++ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java (revision ) @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.jcr; -import org.apache.jackrabbit.oak.jcr.SessionImpl.Context; import org.apache.jackrabbit.oak.jcr.json.JsonValue; import org.apache.jackrabbit.oak.jcr.state.TransientNodeState; import org.apache.jackrabbit.oak.jcr.util.LogUtil; @@ -56,7 +55,7 @@ private final String name; private final JsonValue value; - static Property create(Context sessionContext, Path path) throws PathNotFoundException, + static Property create(SessionContext sessionContext, Path path) throws PathNotFoundException, ItemNotFoundException { TransientNodeState parentState = getNodeState(sessionContext, path.getParent()); @@ -69,16 +68,16 @@ return new PropertyImpl(sessionContext, parentState, name, value); } - static Property create(Context sessionContext, TransientNodeState parentState, String name, JsonValue value) { + static Property create(SessionContext sessionContext, TransientNodeState parentState, String name, JsonValue value) { return new PropertyImpl(sessionContext, parentState, name, value); } - public static boolean exist(Context sessionContext, Path path) { + public static boolean exist(SessionContext sessionContext, Path path) { TransientNodeState parentState = getNodeState(sessionContext, path.getParent()); return parentState != null && parentState.hasProperty(path.getName()); } - private PropertyImpl(Context sessionContext, TransientNodeState parentState, String name, JsonValue value) { + private PropertyImpl(SessionContext sessionContext, TransientNodeState parentState, String name, JsonValue value) { super(sessionContext); this.parentState = parentState; this.name = name; \ No newline at end of file Index: oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>MacRoman =================================================================== --- oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java (revision 1303365) +++ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java (revision ) @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.jcr; -import org.apache.jackrabbit.oak.jcr.SessionImpl.Context; import org.apache.jackrabbit.oak.jcr.state.TransientNodeState; import org.apache.jackrabbit.oak.jcr.util.Path; import org.slf4j.Logger; @@ -35,14 +34,14 @@ */ abstract class ItemImpl implements Item { - protected final Context sessionContext; + protected final SessionContext sessionContext; /** * logger instance */ private static final Logger log = LoggerFactory.getLogger(ItemImpl.class); - protected ItemImpl(Context sessionContext) { + protected ItemImpl(SessionContext sessionContext) { this.sessionContext = sessionContext; } @@ -133,7 +132,7 @@ return sessionContext.getValueFactory(); } - protected static TransientNodeState getNodeState(Context sessionContext, Path path) { + protected static TransientNodeState getNodeState(SessionContext sessionContext, Path path) { return sessionContext.getNodeStateProvider().getNodeState(path); } \ No newline at end of file Index: oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/TransientNodeState.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>MacRoman =================================================================== --- oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/TransientNodeState.java (revision 1303365) +++ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/state/TransientNodeState.java (revision ) @@ -19,7 +19,11 @@ package org.apache.jackrabbit.oak.jcr.state; -import org.apache.jackrabbit.oak.jcr.SessionImpl.Context; +import org.apache.jackrabbit.mk.model.ChildNodeEntry; +import org.apache.jackrabbit.mk.model.NodeState; +import org.apache.jackrabbit.mk.model.PropertyState; +import org.apache.jackrabbit.oak.jcr.SessionContext; +import org.apache.jackrabbit.oak.jcr.SessionImpl; import org.apache.jackrabbit.oak.jcr.json.JsonValue; import org.apache.jackrabbit.oak.jcr.json.JsonValue.JsonAtom; import org.apache.jackrabbit.oak.jcr.state.ChangeTree.NodeDelta; @@ -28,9 +32,6 @@ import org.apache.jackrabbit.oak.jcr.util.PagedIterator; import org.apache.jackrabbit.oak.jcr.util.Path; import org.apache.jackrabbit.oak.jcr.util.Predicate; -import org.apache.jackrabbit.mk.model.ChildNodeEntry; -import org.apache.jackrabbit.mk.model.NodeState; -import org.apache.jackrabbit.mk.model.PropertyState; import javax.jcr.ItemExistsException; import javax.jcr.ItemNotFoundException; @@ -47,13 +48,13 @@ public class TransientNodeState { private static final int BATCH_SIZE = 256; - private final Context sessionContext; + private final SessionContext sessionContext; private String revision; private NodeState persistentNodeState; private NodeDelta nodeDelta; - TransientNodeState(Context sessionContext, NodeDelta nodeDelta) { + TransientNodeState(SessionContext sessionContext, NodeDelta nodeDelta) { this.sessionContext = sessionContext; this.nodeDelta = nodeDelta; } Index: oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>MacRoman =================================================================== --- oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java (revision 1303365) +++ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java (revision ) @@ -19,7 +19,7 @@ import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.commons.iterator.NodeIteratorAdapter; import org.apache.jackrabbit.commons.iterator.PropertyIteratorAdapter; -import org.apache.jackrabbit.oak.jcr.SessionImpl.Context; +import org.apache.jackrabbit.mk.model.PropertyState; import org.apache.jackrabbit.oak.jcr.json.JsonValue; import org.apache.jackrabbit.oak.jcr.json.JsonValue.JsonAtom; import org.apache.jackrabbit.oak.jcr.state.PropertyStateImpl; @@ -31,7 +31,6 @@ import org.apache.jackrabbit.oak.jcr.util.Path; import org.apache.jackrabbit.oak.jcr.util.Predicate; import org.apache.jackrabbit.oak.jcr.util.ValueConverter; -import org.apache.jackrabbit.mk.model.PropertyState; import org.apache.jackrabbit.value.ValueHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,11 +73,11 @@ private final TransientNodeState state; - static boolean exist(Context sessionContext, Path path) { + static boolean exist(SessionContext sessionContext, Path path) { return getNodeState(sessionContext, path) != null; } - static Node create(Context sessionContext, Path path) throws PathNotFoundException { + static Node create(SessionContext sessionContext, Path path) throws PathNotFoundException { TransientNodeState state = getNodeState(sessionContext, path); if (state == null) { throw new PathNotFoundException(path.toJcrPath()); @@ -87,11 +86,11 @@ return new NodeImpl(sessionContext, state); } - static Node create(Context sessionContext, TransientNodeState state) { + static Node create(SessionContext sessionContext, TransientNodeState state) { return new NodeImpl(sessionContext, state); } - private NodeImpl(Context sessionContext, TransientNodeState state) { + private NodeImpl(SessionContext sessionContext, TransientNodeState state) { super(sessionContext); this.state = state; } \ No newline at end of file Index: oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>MacRoman =================================================================== --- oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java (revision 1303365) +++ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java (revision ) @@ -94,9 +94,7 @@ } }; - public interface Context extends SessionContext{} - - private final Context sessionContext = new Context() { + private final SessionContext sessionContext = new SessionContext() { @Override public SessionImpl getSession() { \ No newline at end of file