Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed 2 failing tests, errors in flush and setDirty and Field are not identical

Browse Source
This commit is contained in:
Michael Hunger
2010-09-03 20:58:49 +02:00
parent 9e87a66310
commit fd6e340732
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jNodeBacking.aj
View File

@@ -140,9 +140,13 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEn
private void NodeBacked.clearDirty() {
if (this.dirty!=null) this.dirty.clear();
}
private String NodeBacked.dump() {
if (this.dirty!=null) return this.dirty.toString();
return "";
}
private void NodeBacked.addDirty(Field f, Object previousValue) {
if (this.dirty==null) this.dirty=new IdentityHashMap<Field, Object>();
if (this.dirty==null) this.dirty=new HashMap<Field, Object>();
this.dirty.put(f,previousValue);
}
@@ -226,6 +230,7 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEn
if (entity.isDirty()) {
for (final Map.Entry<Field,Object> entry : entity.eachDirty()) {
final Field field = entry.getKey();
log.warn("Flushing dirty Entity new node "+newNode+" field "+field);
if (!newNode) {
checkConcurrentModification(entity, entry, field);
}
@@ -279,10 +284,13 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEn
Field f = fieldSignature.getField();
if (!transactionIsRunning()) {
log.warn("Outside of transaction, GET value from field "+f+" has node "+entity.hasUnderlyingNode()+" dirty "+entity.isDirty(f)+" "+entity.dump());
if (!entity.hasUnderlyingNode() || (entity.isDirty(f))) {
log.warn("Outside of transaction, GET value from field "+f);
return proceed(entity);
}
}
log.trace("Inside of transaction, GET-FLUSH to field "+f+" has node "+entity.hasUnderlyingNode()+" dirty "+entity.isDirty()+" "+entity.dump());
flushDirty(entity);
@@ -298,12 +306,20 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEn
FieldSignature fieldSignature=(FieldSignature) thisJoinPoint.getSignature();
Field f = fieldSignature.getField();
if (!transactionIsRunning()) {
log.warn("Outside of transaction, SET value "+newVal+" to field "+f+" has node "+entity.hasUnderlyingNode()+" dirty "+entity.isDirty(f));
if (!entity.isDirty(f)) {
Object existingValue = entity.hasUnderlyingNode() ? getDefaultValue(f.getType()) : getValueFromEntity(f,entity);
Object existingValue;
if (entity.hasUnderlyingNode()) existingValue = getNodePropertyOrRelationship(f, entity).value;
else {
existingValue = getValueFromEntity(f, entity);
if (existingValue==null) existingValue=getDefaultValue(f.getType());
}
entity.addDirty(f,existingValue);
}
log.warn("Outside of transaction, SET2 value "+newVal+" to field "+f+" has node "+entity.hasUnderlyingNode()+" dirty "+entity.isDirty(f)+" "+entity.dump());
return proceed(entity, newVal);
}
log.trace("Inside of transaction, FLUSH-SET value "+newVal+" to field "+f+" has node "+entity.hasUnderlyingNode()+" dirty "+entity.isDirty()+" "+entity.dump());
flushDirty(entity);
ShouldProceedOrReturn shouldProceedOrReturn=setNodePropertyOrRelationship(f,entity,newVal);

3
src/test/java/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest.java
View File

@@ -141,6 +141,7 @@ public class Neo4jGraphPersistenceTest {
}
// @Test(expected = InvalidDataAccessResourceUsageException.class)
@Test
public void testSetPropertyOutsideTransaction() {
Transaction tx = graphDatabaseService.beginTx();
Person p = null;
@@ -164,6 +165,7 @@ public class Neo4jGraphPersistenceTest {
}
// @Test(expected = InvalidDataAccessResourceUsageException.class)
@Test
public void testCreateRelationshipOutsideTransaction() {
Transaction tx = graphDatabaseService.beginTx();
Person p = null;
@@ -182,6 +184,7 @@ public class Neo4jGraphPersistenceTest {
try {
Assert.assertEquals(spouse,p.getSpouse());
spouse2 = new Person("Rana", 5);
p.setSpouse(spouse2);
tx.success();
} finally {
tx.finish();

6
src/test/resources/log4j.properties
View File

@@ -17,6 +17,6 @@ log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
log4j.category.org.springframework=WARN
log4j.category.org.springframework.data=TRACE
log4j.category.org.springframework.datastore=TRACE
log4j.category.org.springframework.persistence=TRACE
#log4j.category.org.springframework.data=TRACE
#log4j.category.org.springframework.datastore=TRACE
#log4j.category.org.springframework.persistence=TRACE