Author: sseifert
Date: Thu Oct 16 19:02:45 2014
New Revision: 1632413
URL: http://svn.apache.org/r1632413
Log:
SLING-4042 minor optimization
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/AbstractItem.java
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/ItemData.java
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockNode.java
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockProperty.java
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/AbstractItem.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/AbstractItem.java?rev=1632413&r1=1632412&r2=1632413&view=diff
==============================================================================
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/AbstractItem.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/AbstractItem.java
Thu Oct 16 19:02:45 2014
@@ -32,27 +32,27 @@ import org.apache.commons.lang3.StringUt
*/
abstract class AbstractItem implements Item {
- private final String path;
+ protected final ItemData itemData;
private final Session session;
- public AbstractItem(final String path, final Session session) {
- this.path = path;
+ public AbstractItem(final ItemData itemData, final Session session) {
+ this.itemData = itemData;
this.session = session;
}
@Override
public String getName() {
- return ResourceUtil.getName(this.path);
+ return this.itemData.getName();
}
@Override
public String getPath() {
- return this.path;
+ return this.itemData.getPath();
}
@Override
public Node getParent() throws RepositoryException {
- return (Node) getSession().getItem(ResourceUtil.getParent(this.path));
+ return (Node) getSession().getItem(ResourceUtil.getParent(getPath()));
}
@Override
@@ -75,14 +75,14 @@ abstract class AbstractItem implements I
if (depth < 0 || depth > getDepth()) {
throw new ItemNotFoundException();
}
- return this.session.getItem(ResourceUtil.getParent(this.path, depth));
+ return this.session.getItem(ResourceUtil.getParent(getPath(), depth));
}
protected String makeAbsolutePath(final String relativePath) {
String absolutePath = relativePath;
// ensure the path is absolute and normalized
if (!StringUtils.startsWith(absolutePath, "/")) {
- absolutePath = this.path + "/" + absolutePath; // NOPMD
+ absolutePath = getPath() + "/" + absolutePath; // NOPMD
}
return ResourceUtil.normalize(absolutePath);
}
@@ -98,10 +98,10 @@ abstract class AbstractItem implements I
@Override
public int getDepth() throws RepositoryException {
- if (StringUtils.equals("/", this.path)) {
+ if (StringUtils.equals("/", getPath())) {
return 0;
} else {
- return StringUtils.countMatches(this.path, "/");
+ return StringUtils.countMatches(getPath(), "/");
}
}
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/ItemData.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/ItemData.java?rev=1632413&r1=1632412&r2=1632413&view=diff
==============================================================================
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/ItemData.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/ItemData.java
Thu Oct 16 19:02:45 2014
@@ -31,6 +31,7 @@ import javax.jcr.nodetype.NodeType;
class ItemData {
private final String path;
+ private final String name;
private final boolean isNode;
private final String uuid;
private final NodeType nodeType;
@@ -40,6 +41,7 @@ class ItemData {
private ItemData(String path, boolean isNode, String uuid, NodeType
nodeType) {
super();
this.path = path;
+ this.name = ResourceUtil.getName(path);
this.uuid = uuid;
this.isNode = isNode;
this.nodeType = nodeType;
@@ -50,7 +52,7 @@ class ItemData {
}
public String getName() {
- return ResourceUtil.getName(path);
+ return name;
}
public boolean isNode() {
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockNode.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockNode.java?rev=1632413&r1=1632412&r2=1632413&view=diff
==============================================================================
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockNode.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockNode.java
Thu Oct 16 19:02:45 2014
@@ -49,11 +49,8 @@ import org.apache.jackrabbit.commons.ite
*/
class MockNode extends AbstractItem implements Node {
- private final ItemData itemData;
-
public MockNode(final ItemData itemData, final Session session) {
- super(itemData.getPath(), session);
- this.itemData = itemData;
+ super(itemData, session);
}
@Override
Modified:
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockProperty.java
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockProperty.java?rev=1632413&r1=1632412&r2=1632413&view=diff
==============================================================================
---
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockProperty.java
(original)
+++
sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockProperty.java
Thu Oct 16 19:02:45 2014
@@ -39,11 +39,8 @@ import org.apache.jackrabbit.value.Binar
*/
class MockProperty extends AbstractItem implements Property {
- private final ItemData itemData;
-
public MockProperty(final ItemData itemData, final Session session) {
- super(itemData.getPath(), session);
- this.itemData = itemData;
+ super(itemData, session);
if (this.itemData.getValues() == null) {
try {
this.itemData.setValues(new Value[] {
getSession().getValueFactory().createValue("") });
