From 2affd49eb8b0a30fe37506908ed02c0055c85ae1 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Bergamin Date: Thu, 11 Aug 2011 11:51:59 +0200 Subject: [PATCH] Using DelegatingFieldAccessorFactory and DelegatingFieldAccessorFactory throughout the code --- .../data/neo4j/config/Neo4jConfiguration.java | 4 ++-- .../data/neo4j/support/node/NodeEntityState.java | 4 ++-- .../data/neo4j/support/node/NodeEntityStateFactory.java | 6 +++--- .../neo4j/support/relationship/RelationshipEntityState.java | 2 +- .../relationship/RelationshipEntityStateFactory.java | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java index 9e6b72f8f..debdca5d1 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java @@ -174,12 +174,12 @@ public class Neo4jConfiguration { } @Bean - public NodeDelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory() throws Exception { + public DelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory() throws Exception { return new NodeDelegatingFieldAccessorFactory(graphDatabaseContext()); } @Bean - public RelationshipDelegatingFieldAccessorFactory relationshipDelegatingFieldAccessorFactory() throws Exception { + public DelegatingFieldAccessorFactory relationshipDelegatingFieldAccessorFactory() throws Exception { return new RelationshipDelegatingFieldAccessorFactory(graphDatabaseContext()); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/NodeEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/NodeEntityState.java index 0f854b868..f6e396dcd 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/NodeEntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/NodeEntityState.java @@ -21,7 +21,7 @@ import org.neo4j.graphdb.NotInTransactionException; import org.springframework.dao.InvalidDataAccessResourceUsageException; import org.springframework.data.neo4j.core.NodeBacked; import org.springframework.data.neo4j.fieldaccess.DefaultEntityState; -import org.springframework.data.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory; +import org.springframework.data.neo4j.fieldaccess.DelegatingFieldAccessorFactory; import org.springframework.data.neo4j.support.GraphDatabaseContext; /** @@ -32,7 +32,7 @@ public class NodeEntityState extends DefaultEntitySta private final GraphDatabaseContext graphDatabaseContext; - public NodeEntityState(final Node underlyingState, final ENTITY entity, final Class type, final GraphDatabaseContext graphDatabaseContext, final NodeDelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory) { + public NodeEntityState(final Node underlyingState, final ENTITY entity, final Class type, final GraphDatabaseContext graphDatabaseContext, final DelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory) { super(underlyingState, entity, type, nodeDelegatingFieldAccessorFactory); this.graphDatabaseContext = graphDatabaseContext; } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/NodeEntityStateFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/NodeEntityStateFactory.java index 8abdb92a9..02873f613 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/NodeEntityStateFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/NodeEntityStateFactory.java @@ -24,8 +24,8 @@ import org.neo4j.graphdb.Node; import org.springframework.data.neo4j.annotation.NodeEntity; import org.springframework.data.neo4j.core.EntityState; import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.fieldaccess.DelegatingFieldAccessorFactory; import org.springframework.data.neo4j.fieldaccess.DetachedEntityState; -import org.springframework.data.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory; import org.springframework.data.neo4j.support.GraphDatabaseContext; public class NodeEntityStateFactory { @@ -34,7 +34,7 @@ public class NodeEntityStateFactory { private EntityManagerFactory entityManagerFactory; - private NodeDelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory; + private DelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory; private PartialNodeEntityState.PartialNodeDelegatingFieldAccessorFactory delegatingFieldAccessorFactory; @@ -61,7 +61,7 @@ public class NodeEntityStateFactory { } public void setNodeDelegatingFieldAccessorFactory( - NodeDelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory) { + DelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory) { this.nodeDelegatingFieldAccessorFactory = nodeDelegatingFieldAccessorFactory; } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityState.java index c07464199..ff578b4bd 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityState.java @@ -32,7 +32,7 @@ public class RelationshipEntityState extends private final GraphDatabaseContext graphDatabaseContext; - public RelationshipEntityState(final Relationship underlyingState, final ENTITY entity, final Class type, final GraphDatabaseContext graphDatabaseContext, final RelationshipDelegatingFieldAccessorFactory delegatingFieldAccessorFactory) { + public RelationshipEntityState(final Relationship underlyingState, final ENTITY entity, final Class type, final GraphDatabaseContext graphDatabaseContext, final DelegatingFieldAccessorFactory delegatingFieldAccessorFactory) { super(underlyingState, entity, type, delegatingFieldAccessorFactory); this.graphDatabaseContext = graphDatabaseContext; } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityStateFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityStateFactory.java index 580a704d9..609eaba44 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityStateFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityStateFactory.java @@ -19,14 +19,14 @@ package org.springframework.data.neo4j.support.relationship; import org.neo4j.graphdb.Relationship; import org.springframework.data.neo4j.core.EntityState; import org.springframework.data.neo4j.core.RelationshipBacked; -import org.springframework.data.neo4j.fieldaccess.RelationshipDelegatingFieldAccessorFactory; +import org.springframework.data.neo4j.fieldaccess.DelegatingFieldAccessorFactory; import org.springframework.data.neo4j.support.GraphDatabaseContext; public class RelationshipEntityStateFactory { private GraphDatabaseContext graphDatabaseContext; - private RelationshipDelegatingFieldAccessorFactory relationshipDelegatingFieldAccessorFactory; + private DelegatingFieldAccessorFactory relationshipDelegatingFieldAccessorFactory; public EntityState getEntityState(final RelationshipBacked entity) { return new RelationshipEntityState(null,entity,entity.getClass(), graphDatabaseContext, relationshipDelegatingFieldAccessorFactory); @@ -37,7 +37,7 @@ public class RelationshipEntityStateFactory { } public void setRelationshipDelegatingFieldAccessorFactory( - RelationshipDelegatingFieldAccessorFactory delegatingFieldAccessorFactory) { + DelegatingFieldAccessorFactory delegatingFieldAccessorFactory) { this.relationshipDelegatingFieldAccessorFactory = delegatingFieldAccessorFactory; } }