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

Merge pull request #6 from ractive/master

Browse Source 
Some cosmetical changes
This commit is contained in:
Michael Hunger
2011-10-18 05:45:23 -07:00
parent 6f5c206b05 ef6ad1c0c3
commit f5d8cd1446
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/EntityPersister.java
View File

@@ -27,5 +27,5 @@ public interface EntityPersister {
<S extends PropertyContainer, T> T createEntityFromState(S state, Class<T> type);
<S extends PropertyContainer, T> T createEntityFromStoredType(S state);
boolean isNodeEntity(Class<?> targetType);
boolean isRelationshipEntity(Class targetType);
boolean isRelationshipEntity(Class<?> targetType);
}

24
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jTemplate.java
View File

@@ -28,7 +28,6 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.neo4j.annotation.QueryType;
import org.springframework.data.neo4j.conversion.QueryResultBuilder;
import org.springframework.data.neo4j.conversion.Result;
import org.springframework.data.neo4j.conversion.ResultConverter;
import org.springframework.data.neo4j.core.GraphDatabase;
import org.springframework.data.neo4j.core.TypeRepresentationStrategy;
import org.springframework.data.neo4j.core.UncategorizedGraphStoreException;
@@ -96,11 +95,10 @@ public class Neo4jTemplate implements Neo4jOperations, EntityPersister {
@Override
@SuppressWarnings({"unchecked"})
public <T> GraphRepository<T> repositoryFor(Class<T> clazz) {
notNull(clazz,"entity type");
if (isNodeEntity(clazz)) return new NodeGraphRepository(clazz, this);
if (isRelationshipEntity(clazz)) return new RelationshipGraphRepository(clazz, this);
if (isNodeEntity(clazz)) return new NodeGraphRepository<T>(clazz, this);
if (isRelationshipEntity(clazz)) return new RelationshipGraphRepository<T>(clazz, this);
throw new IllegalArgumentException("Can't create graph repository for non graph entity of type " + clazz);
}
@@ -120,7 +118,6 @@ public class Neo4jTemplate implements Neo4jOperations, EntityPersister {
return infrastructure.getIndexProvider().getIndex(type, indexName, null);
}
@SuppressWarnings("unchecked")
public <S extends PropertyContainer, T> Index<S> getIndex(Class<T> type, String indexName, Boolean fullText) {
return infrastructure.getIndexProvider().getIndex(type, indexName, fullText);
}
@@ -160,11 +157,13 @@ public class Neo4jTemplate implements Neo4jOperations, EntityPersister {
return infrastructure.getTypeRepresentationStrategies().count(entityClass);
}
@Override
public <S extends PropertyContainer, T> T createEntityFromStoredType(S state) {
notNull(state,"node or relationship");
return infrastructure.getEntityPersister().createEntityFromStoredType(state);
}
@Override
public <S extends PropertyContainer, T> T createEntityFromState(S state, Class<T> type) {
notNull(state,"node or relationship",type,"entity class");
return infrastructure.getEntityPersister().createEntityFromState(state, type);
@@ -177,13 +176,11 @@ public class Neo4jTemplate implements Neo4jOperations, EntityPersister {
}
@Override
@SuppressWarnings("unchecked")
public <S extends PropertyContainer> S getPersistentState(Object entity) {
notNull(entity,"entity");
return infrastructure.getEntityPersister().getPersistentState(entity);
}
@SuppressWarnings("unchecked")
public <S extends PropertyContainer, T> T setPersistentState(T entity, S state) {
notNull(entity,"entity",state,"node or relationship");
infrastructure.getEntityPersister().setPersistentState(entity, state);
@@ -231,6 +228,7 @@ public class Neo4jTemplate implements Neo4jOperations, EntityPersister {
return convert(node, target);
}
@SuppressWarnings("unused")
private <T> Node createNode(Map<String, Object> properties, Class<T> target, TypeRepresentationStrategy<Node> nodeTypeRepresentationStrategy) {
final Node node = createNode(properties);
if (nodeTypeRepresentationStrategy != null) {
@@ -242,22 +240,24 @@ public class Neo4jTemplate implements Neo4jOperations, EntityPersister {
/**
* Delegates to {@link GraphDatabaseService}
*/
public Transaction beginTx() { // todo remove !
public Transaction beginTx() { // TODO remove !
return infrastructure.getGraphDatabaseService().beginTx();
}
@SuppressWarnings("unused")
@PostConstruct
public Neo4jTemplate postConstruct() {
infrastructure.postConstruct();
return this;
}
@Override
public boolean isNodeEntity(Class<?> targetType) {
return infrastructure.getMappingContext().isNodeEntity(targetType);
}
public boolean isRelationshipEntity(Class targetType) {
@Override
public boolean isRelationshipEntity(Class<?> targetType) {
return infrastructure.getMappingContext().isRelationshipEntity(targetType);
}
@@ -350,6 +350,7 @@ public class Neo4jTemplate implements Neo4jOperations, EntityPersister {
TransactionTemplate template = new TransactionTemplate(infrastructure.getTransactionManager());
return template.execute(new TransactionCallback<T>() {
@Override
public T doInTransaction(TransactionStatus status) {
return doExecute(callback);
}
@@ -357,7 +358,6 @@ public class Neo4jTemplate implements Neo4jOperations, EntityPersister {
}
@Override
@SuppressWarnings("unchecked")
public Node getReferenceNode() {
try {
return infrastructure.getGraphDatabase().getReferenceNode();
@@ -408,7 +408,7 @@ public class Neo4jTemplate implements Neo4jOperations, EntityPersister {
@Override
@SuppressWarnings("unchecked")
public <T> Result<T> convert(Iterable<T> iterable) {
return new QueryResultBuilder<T>(iterable, (ResultConverter<T, ?>) infrastructure.getResultConverter());
return new QueryResultBuilder<T>(iterable, infrastructure.getResultConverter());
}
@Override