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 md...@apache.org on 2013/04/29 14:44:20 UTC
svn commit: r1477010 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core:
AbstractNodeLocation.java AbstractPropertyLocation.java
AbstractTreeLocation.java NullLocation.java ReadOnlyTree.java TreeImpl.java
Author: mduerig
Date: Mon Apr 29 12:44:20 2013
New Revision: 1477010
URL: http://svn.apache.org/r1477010
Log:
OAK-798: Review / refactor TreeImpl and related classes
OAK-709: Consider moving permission evaluation to the node state level
Also mark implementations of TreeLocation as @Deprecated
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractNodeLocation.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractPropertyLocation.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractTreeLocation.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/NullLocation.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractNodeLocation.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractNodeLocation.java?rev=1477010&r1=1477009&r2=1477010&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractNodeLocation.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractNodeLocation.java Mon Apr 29 12:44:20 2013
@@ -26,6 +26,7 @@ import org.apache.jackrabbit.oak.api.Tre
/**
* AbstractNodeLocation... TODO
*/
+@Deprecated
abstract class AbstractNodeLocation<T extends Tree> extends AbstractTreeLocation {
protected final T tree;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractPropertyLocation.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractPropertyLocation.java?rev=1477010&r1=1477009&r2=1477010&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractPropertyLocation.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractPropertyLocation.java Mon Apr 29 12:44:20 2013
@@ -28,6 +28,7 @@ import org.apache.jackrabbit.oak.commons
/**
* AbstractPropertyLocation... TODO
*/
+@Deprecated
abstract class AbstractPropertyLocation<T extends Tree> extends AbstractTreeLocation {
protected final AbstractNodeLocation<T> parentLocation;
protected final String name;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractTreeLocation.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractTreeLocation.java?rev=1477010&r1=1477009&r2=1477010&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractTreeLocation.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractTreeLocation.java Mon Apr 29 12:44:20 2013
@@ -22,6 +22,7 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.TreeLocation;
+@Deprecated
abstract class AbstractTreeLocation implements TreeLocation {
@Override
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/NullLocation.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/NullLocation.java?rev=1477010&r1=1477009&r2=1477010&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/NullLocation.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/NullLocation.java Mon Apr 29 12:44:20 2013
@@ -29,6 +29,7 @@ import static com.google.common.base.Obj
* This {@code TreeLocation} refers to an invalid location in a tree. That is
* to a location where no item resides.
*/
+@Deprecated
final class NullLocation extends AbstractTreeLocation {
public static final NullLocation NULL = new NullLocation();
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java?rev=1477010&r1=1477009&r2=1477010&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java Mon Apr 29 12:44:20 2013
@@ -273,6 +273,7 @@ public class ReadOnlyTree implements Tre
//-------------------------------------------------------< TreeLocation >---
+ @Deprecated
private final class NodeLocation extends AbstractNodeLocation<ReadOnlyTree> {
private NodeLocation(ReadOnlyTree tree) {
@@ -315,6 +316,7 @@ public class ReadOnlyTree implements Tre
}
}
+ @Deprecated
private final class PropertyLocation extends AbstractPropertyLocation<ReadOnlyTree> {
private PropertyLocation(AbstractNodeLocation<ReadOnlyTree> parentLocation, String name) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java?rev=1477010&r1=1477009&r2=1477010&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java Mon Apr 29 12:44:20 2013
@@ -605,6 +605,7 @@ public class TreeImpl implements Tree {
//-------------------------------------------------------< TreeLocation >---
+ @Deprecated
private final class NodeLocation extends AbstractNodeLocation<TreeImpl> {
private NodeLocation(TreeImpl tree) {
@@ -642,6 +643,7 @@ public class TreeImpl implements Tree {
}
}
+ @Deprecated
private static final class PropertyLocation extends AbstractPropertyLocation<TreeImpl> {
private PropertyLocation(AbstractNodeLocation<TreeImpl> parentLocation, String name) {