[exo-jcr-commits] exo-jcr SVN: r1584 - in jcr/trunk/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/api/writing and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Jan 26 12:08:21 EST 2010
Author: skabashnyuk
Date: 2010-01-26 12:08:20 -0500 (Tue, 26 Jan 2010)
New Revision: 1584
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestNodeReference.java
Log:
EXOJCR-442 : fix SessionDataManager.getReferences
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2010-01-26 16:28:19 UTC (rev 1583)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2010-01-26 17:08:20 UTC (rev 1584)
@@ -151,7 +151,9 @@
NodeData parent = (NodeData)getItemData(Constants.ROOT_UUID);
if (path.equals(Constants.ROOT_PATH))
+ {
return parent;
+ }
QPathEntry[] relPathEntries = path.getRelPath(path.getDepth());
@@ -564,7 +566,9 @@
{
ItemState lastState = states.get(states.size() - 1);
if (lastState.isAdded() || lastState.isDeleted())
+ {
return false;
+ }
return true;
}
@@ -597,7 +601,7 @@
.getIdentity()))
{
PropertyImpl item;
- ItemState state = changesLog.getItemState(identifier);
+ ItemState state = changesLog.getItemState(data.getIdentifier());
if (state != null)
{
if (state.isDeleted())
@@ -829,13 +833,17 @@
{
long start = System.currentTimeMillis();
if (log.isDebugEnabled())
+ {
log.debug("getACL(" + path.getAsString() + " ) >>>>>");
+ }
try
{
NodeData parent = (NodeData)getItemData(Constants.ROOT_UUID);
if (path.equals(Constants.ROOT_PATH))
+ {
return parent.getACL();
+ }
ItemData item = null;
QPathEntry[] relPathEntries = path.getRelPath(path.getDepth());
@@ -844,12 +852,18 @@
item = getItemData(parent, relPathEntries[i]);
if (item == null)
+ {
break;
+ }
if (item.isNode())
+ {
parent = (NodeData)item;
+ }
else if (i < relPathEntries.length - 1)
+ {
throw new IllegalPathException("Get ACL. Path can not contains a property as the intermediate element");
+ }
}
if (item != null && item.isNode())
@@ -877,23 +891,31 @@
{
long start = System.currentTimeMillis();
if (log.isDebugEnabled())
+ {
log.debug("getACL(" + parent.getQPath().getAsString() + " + " + name.getAsString() + " ) >>>>>");
+ }
try
{
ItemData item = getItemData(parent, name);
if (item != null && item.isNode())
+ {
// node ACL
return ((NodeData)item).getACL();
+ }
else
+ {
// item not found or it's a property - return parent ACL
return parent.getACL();
+ }
}
finally
{
if (log.isDebugEnabled())
+ {
log.debug("getACL(" + parent.getQPath().getAsString() + " + " + name.getAsString() + ") <<<<< "
+ ((System.currentTimeMillis() - start) / 1000d) + "sec");
+ }
}
}
@@ -983,7 +1005,9 @@
for (ItemData data : list)
{
if (data.equals(itemData))
+ {
rootAdded = true;
+ }
deletes.add(new ItemState(data, ItemState.DELETED, fireEvent, ancestorToSave, false));
// if subnode contains JCR_VERSIONHISTORY property
// we should remove version storage manually
@@ -1036,14 +1060,18 @@
Collections.sort(deletes, new PathSorter());
if (!fireEvent)
+ {
// 7 erase evenFire flag if it's a new item
changesLog.eraseEventFire(itemData.getIdentifier());
+ }
changesLog.addAll(deletes);
// log.info(changesLog.dump())
if (itemData.isNode())
+ {
// 8 reindex same-name siblings
changesLog.addAll(reindexSameNameSiblings((NodeData)itemData, this));
+ }
}
/**
@@ -1064,12 +1092,14 @@
{
ItemState vhState = changesLog.getItemState(vhID);
if (vhState != null && vhState.isDeleted())
+ {
// [PN] TODO check why we here if VH already isn't exists.
// usecase: child version remove when child versionable node is located
// as child
// of its containing history versionable node.
// We may check this case in ChildVersionRemoveVisitor.
return;
+ }
throw new RepositoryException("Version history is not found. UUID: " + vhID
+ ". Context item (ancestor to save) " + ancestorToSave.getAsString());
@@ -1094,12 +1124,14 @@
{
if (!sref.getQPath().isDescendantOf(vhnode.getQPath())
&& (containingHistory != null ? !sref.getQPath().isDescendantOf(containingHistory) : true))
+ {
// has a reference to the VH in version storage,
// it's a REFERENCE property jcr:childVersionHistory of
// nt:versionedChild
// i.e. this VH is a child history in an another history.
// We can't remove this VH now.
return;
+ }
}
else if (wsSession != session)
{
@@ -1115,7 +1147,9 @@
finally
{
if (wsSession != session)
+ {
wsSession.logout();
+ }
}
}
@@ -1200,7 +1234,9 @@
public ItemImpl update(ItemState itemState, boolean pool) throws RepositoryException
{
if (itemState.isDeleted())
+ {
throw new RepositoryException("Illegal state DELETED. Use delete(...) method");
+ }
changesLog.add(itemState);
@@ -1223,7 +1259,9 @@
public void updateItemState(ItemState itemState) throws RepositoryException
{
if (itemState.isDeleted())
+ {
throw new RepositoryException("Illegal state DELETED. Use delete(...) method");
+ }
changesLog.add(itemState);
}
@@ -1247,7 +1285,9 @@
PlainChangesLog cLog = changesLog.pushLog(path);
if (log.isDebugEnabled())
+ {
log.debug(" ----- commit -------- \n" + cLog.dump());
+ }
try
{
@@ -1292,7 +1332,9 @@
{
changesLog.addAll(cLog.getAllStates());
if (log.isDebugEnabled())
+ {
log.debug(" ----- rollback ----- \n" + cLog.dump());
+ }
}
/**
@@ -1308,7 +1350,7 @@
List<PropertyData> sessionTransient = new ArrayList<PropertyData>();
for (PropertyData p : persisted)
{
- sessionTransient.add((PropertyData)p);
+ sessionTransient.add(p);
}
return sessionTransient;
}
@@ -1384,7 +1426,9 @@
{
node = (NodeData)getItemData(changedItem.getData().getParentIdentifier());
if (node == null)
+ {
return; // parent was deleted
+ }
}
if (node.getACL().getPermissionsSize() < 1)
@@ -1411,9 +1455,11 @@
{
if (!accessManager.hasPermission(parent.getACL(), new String[]{PermissionType.REMOVE}, session
.getUserState().getIdentity()))
+ {
throw new AccessDeniedException("Access denied: REMOVE "
+ changedItem.getData().getQPath().getAsString() + " for: " + session.getUserID() + " item owner "
+ parent.getACL().getOwner());
+ }
}
else if (changedItem.getData().isNode())
{
@@ -1434,9 +1480,11 @@
// add or update property
if (!accessManager.hasPermission(parent.getACL(), new String[]{PermissionType.SET_PROPERTY}, session
.getUserState().getIdentity()))
+ {
throw new AccessDeniedException("Access denied: SET_PROPERTY "
+ changedItem.getData().getQPath().getAsString() + " for: " + session.getUserID() + " item owner "
+ parent.getACL().getOwner());
+ }
}
} // else - parent not found, deleted in this session or from another
}
@@ -1488,9 +1536,11 @@
{
if (getItemData(nData, new QPathEntry(itemDefinitionData.getName(), 0)) == null)
+ {
throw new ConstraintViolationException("Mandatory item " + itemDefinitionData.getName()
+ " not found. Node [" + nData.getQPath().getAsString() + " primary type: "
+ nData.getPrimaryTypeName().getAsString() + "]");
+ }
}
}
@@ -2088,7 +2138,9 @@
for (ItemImpl pitem : snapshort)
{
if (pitem.getData().getQPath().isDescendantOf(parentPath))
+ {
desc.add(pitem);
+ }
}
return desc;
@@ -2159,7 +2211,9 @@
return new VersionHistoryImpl(data, session);
}
else
+ {
return node;
+ }
}
private NodeImpl createNode(NodeData data, NodeData parent) throws RepositoryException
@@ -2174,7 +2228,9 @@
return new VersionHistoryImpl(data, session);
}
else
+ {
return node;
+ }
}
private PropertyImpl createProperty(ItemData data) throws RepositoryException
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestNodeReference.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestNodeReference.java 2010-01-26 16:28:19 UTC (rev 1583)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestNodeReference.java 2010-01-26 17:08:20 UTC (rev 1584)
@@ -69,10 +69,12 @@
PropertyIterator refs = testNode.getReferences();
if (log.isDebugEnabled())
+ {
while (refs.hasNext())
{
log.debug("ref >>>" + refs.nextProperty());
}
+ }
assertEquals(1, testNode.getReferences().getSize());
assertEquals(1, testNode1.getReferences().getSize());
@@ -150,32 +152,38 @@
PropertyIterator refs = testNode.getReferences();
if (log.isDebugEnabled())
+ {
while (refs.hasNext())
{
Property p = refs.nextProperty();
log.debug(testNode.getPath() + " ref >>> " + p.getPath());
}
+ }
assertEquals(4, testNode.getReferences().getSize());
refs = testNode1.getReferences();
if (log.isDebugEnabled())
+ {
while (refs.hasNext())
{
Property p = refs.nextProperty();
log.debug(testNode1.getPath() + " ref >>> " + p.getPath());
}
+ }
assertEquals(5, testNode1.getReferences().getSize());
refs = testNode2.getReferences();
if (log.isDebugEnabled())
+ {
while (refs.hasNext())
{
Property p = refs.nextProperty();
log.debug(testNode2.getPath() + " ref >>> " + p.getPath());
}
+ }
assertEquals(2, testNode2.getReferences().getSize());
testNode.remove();
@@ -232,32 +240,38 @@
refs = testNode.getReferences();
if (log.isDebugEnabled())
+ {
while (refs.hasNext())
{
Property p = refs.nextProperty();
log.debug(testNode.getPath() + " ref >>> " + p.getPath());
}
+ }
assertEquals(0, testNode.getReferences().getSize());
refs = testNode1.getReferences();
if (log.isDebugEnabled())
+ {
while (refs.hasNext())
{
Property p = refs.nextProperty();
log.debug(testNode1.getPath() + " ref >>> " + p.getPath());
}
+ }
assertEquals(5, testNode1.getReferences().getSize());
refs = testNode2.getReferences();
if (log.isDebugEnabled())
+ {
while (refs.hasNext())
{
Property p = refs.nextProperty();
log.debug(testNode2.getPath() + " ref >>> " + p.getPath());
}
+ }
assertEquals(2, testNode2.getReferences().getSize());
testNode.remove();
@@ -311,4 +325,23 @@
}
}
+ public void testGetRegerencesOnChangedNode() throws Exception
+ {
+
+ Node testNode = root.addNode("testGetReferences", "nt:unstructured");
+ Node refNode = root.addNode("refNode", "nt:unstructured");
+ assertTrue(testNode.canAddMixin("mix:referenceable"));
+
+ testNode.addMixin("mix:referenceable");
+ refNode.setProperty("p", refNode.getSession().getValueFactory().createValue(testNode));
+ session.save();
+
+ // change node
+ assertTrue(testNode.canAddMixin("mix:lockable"));
+ testNode.addMixin("mix:lockable");
+
+ PropertyIterator refs = testNode.getReferences();
+ assertEquals(1, refs.getSize());
+
+ }
}
More information about the exo-jcr-commits
mailing list