From 306e03c53680c370424ef05072d1ecdfe558f050 Mon Sep 17 00:00:00 2001 From: Lasse Westh-Nielsen Date: Thu, 2 Aug 2012 11:23:23 +0100 Subject: [PATCH] tidying up warnings --- .../data/neo4j/aspects/support/IndexTest.java | 11 +++++------ .../neo4j/aspects/support/NodeEntityTest.java | 4 ++-- .../NoopTypeRepresentationStrategyTest.java | 2 +- ...renceNodeTypeRepresentationStrategyTest.java | 2 +- .../data/neo4j/config/ConfigurationCheck.java | 6 ++++-- .../core/UncategorizedGraphStoreException.java | 3 ++- .../DelegatingFieldAccessorFactory.java | 2 +- .../neo4j/fieldaccess/DetachedEntityState.java | 17 +---------------- .../FieldAccessorFactoryProviders.java | 11 ++--------- ...atedToViaCollectionFieldAccessorFactory.java | 3 ++- .../neo4j/fieldaccess/RelationshipHelper.java | 2 +- ...odePropertyFieldAccessorListenerFactory.java | 5 +++-- .../mapping/InvalidEntityTypeException.java | 2 ++ .../repository/AbstractGraphRepository.java | 2 +- .../neo4j/support/DelegatingGraphDatabase.java | 1 - .../data/neo4j/support/Neo4jTemplate.java | 15 +++++---------- .../conversion/NoSuchColumnFoundException.java | 2 ++ .../support/index/NoSuchIndexException.java | 1 + .../IndexCreationMappingEventListener.java | 5 +++-- .../mapping/Neo4JPersistentPropertyImpl.java | 1 + .../support/mapping/SourceStateTransmitter.java | 6 +----- .../support/query/CypherQueryExecutor.java | 2 +- .../data/persistence/StateProvider.java | 3 ++- .../neo4j/mapping/Neo4jPersistentTestBase.java | 2 +- .../data/neo4j/repository/ReadWriteTest.java | 3 +-- .../neo4j/template/Neo4jTemplateApiTest.java | 11 ++--------- .../repository/GraphRepositoryTest-context.xml | 3 +-- 27 files changed, 49 insertions(+), 78 deletions(-) diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java index 2f40dc451..7abdf0766 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java @@ -40,7 +40,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.Collection; -import java.util.Date; import java.util.HashSet; import static org.junit.Assert.assertEquals; @@ -84,7 +83,7 @@ public class IndexTest extends EntityTestBase { //@Transactional //@Ignore("remove property from index not workin") public void testRemovePropertyFromIndex() { - Transaction tx = neo4jTemplate.beginTx(); + Transaction tx = neo4jTemplate.getGraphDatabase().beginTx(); try { Group group = persist(new Group()); group.setName(NAME_VALUE); @@ -101,7 +100,7 @@ public class IndexTest extends EntityTestBase { //@Transactional //@Ignore("remove property from index not workin") public void testRemoveNodeFromIndex() { - Transaction tx = neo4jTemplate.beginTx(); + Transaction tx = neo4jTemplate.getGraphDatabase().beginTx(); try { Group group = persist(new Group()); group.setName(NAME_VALUE); @@ -358,7 +357,7 @@ public class IndexTest extends EntityTestBase { Transaction tx = null; final Person p; try { - tx = neo4jTemplate.beginTx(); + tx = neo4jTemplate.getGraphDatabase().beginTx(); p = persistedPerson(NAME_VALUE2, 30); tx.success(); } finally { @@ -366,7 +365,7 @@ public class IndexTest extends EntityTestBase { } Assert.assertEquals(p, personRepository.findByPropertyValue(NAME_INDEX, "name", NAME_VALUE2)); try { - tx = neo4jTemplate.beginTx(); + tx = neo4jTemplate.getGraphDatabase().beginTx(); p.setName(NAME_VALUE); tx.success(); } finally { @@ -374,7 +373,7 @@ public class IndexTest extends EntityTestBase { } Assert.assertEquals(p, personRepository.findByPropertyValue(NAME_INDEX, "name", NAME_VALUE)); try { - tx = neo4jTemplate.beginTx(); + tx = neo4jTemplate.getGraphDatabase().beginTx(); p.setName(NAME_VALUE2); tx.success(); } finally { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTest.java index 5f82ae2c7..b34240cf3 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTest.java @@ -176,7 +176,7 @@ public class NodeEntityTest extends EntityTestBase { // own transaction handling because of http://wiki.neo4j.org/content/Delete_Semantics @Test(expected = DataRetrievalFailureException.class) public void testDeleteEntityFromGDC() { - Transaction tx = neo4jTemplate.beginTx(); + Transaction tx = neo4jTemplate.getGraphDatabase().beginTx(); Person p = persistedPerson("Michael", 35); Person spouse = persistedPerson("Tina", 36); p.setSpouse(spouse); @@ -192,7 +192,7 @@ public class NodeEntityTest extends EntityTestBase { @Test(expected = DataRetrievalFailureException.class) public void testDeleteEntity() { - Transaction tx = neo4jTemplate.beginTx(); + Transaction tx = neo4jTemplate.getGraphDatabase().beginTx(); Person p = persistedPerson("Michael", 35); Person spouse = persistedPerson("Tina", 36); p.setSpouse(spouse); diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/NoopTypeRepresentationStrategyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/NoopTypeRepresentationStrategyTest.java index 3f9431149..27033c7d8 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/NoopTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/NoopTypeRepresentationStrategyTest.java @@ -106,7 +106,7 @@ public class NoopTypeRepresentationStrategyTest extends EntityTestBase { } private Thing createThing() { - Transaction tx = neo4jTemplate.beginTx(); + Transaction tx = neo4jTemplate.getGraphDatabase().beginTx(); try { Node node = neo4jTemplate.createNode(); thing = new Thing(); diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategyTest.java index 0982af740..e22c99113 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategyTest.java @@ -93,7 +93,7 @@ public class SubReferenceNodeTypeRepresentationStrategyTest extends EntityTestBa } private void createThing() { - Transaction tx = neo4jTemplate.beginTx(); + Transaction tx = neo4jTemplate.getGraphDatabase().beginTx(); try { thingNode = neo4jTemplate.createNode(); thing = neo4jTemplate.setPersistentState(new Thing(),thingNode); diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/ConfigurationCheck.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/ConfigurationCheck.java index 3947a91c3..9a685ee08 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/ConfigurationCheck.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/ConfigurationCheck.java @@ -67,11 +67,13 @@ public class ConfigurationCheck implements ApplicationListener typeInformation = type.getTypeInformation(); final FieldAccessorFactoryProviders fieldAccessorFactoryProviders = accessorFactoryProviderCache.get(typeInformation); if (fieldAccessorFactoryProviders != null) return fieldAccessorFactoryProviders; - final FieldAccessorFactoryProviders newFieldAccessorFactories = new FieldAccessorFactoryProviders(typeInformation, template); + final FieldAccessorFactoryProviders newFieldAccessorFactories = new FieldAccessorFactoryProviders(); type.doWithProperties(new PropertyHandler() { @Override public void doWithPersistentProperty(Neo4jPersistentProperty property) { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java index d05f36096..a84f83147 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java @@ -161,13 +161,6 @@ public class DetachedEntityState implements EntityState { public Object getDefaultValue(Neo4jPersistentProperty property) { return delegate.getDefaultValue(property); } - private Object getDefaultValue(final Class type) { - if (type.isPrimitive()) { - if (type.equals(boolean.class)) return false; - return 0; - } - return null; - } @SuppressWarnings("deprecation") @Override @@ -254,14 +247,6 @@ public class DetachedEntityState implements EntityState { return this.dirty.containsKey(property); } - private void clearDirty() { - this.dirty.clear(); - } - - private void clearDirty(final Field f) { - this.dirty.remove(f); - } - private void addDirty(final Neo4jPersistentProperty property, final Object previousValue, boolean fromGraph) { this.dirty.put(property, new ExistingValue(previousValue,fromGraph)); } @@ -275,7 +260,7 @@ public class DetachedEntityState implements EntityState { @Override public Object persist() { if (!isDetached()) return getEntity(); - Transaction tx = template.beginTx(); + Transaction tx = template.getGraphDatabase().beginTx(); try { Object result = delegate.persist(); diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorFactoryProviders.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorFactoryProviders.java index 0e5493c1b..a2be99db7 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorFactoryProviders.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorFactoryProviders.java @@ -17,8 +17,6 @@ package org.springframework.data.neo4j.fieldaccess; import org.springframework.data.neo4j.mapping.Neo4jPersistentProperty; -import org.springframework.data.neo4j.support.Neo4jTemplate; -import org.springframework.data.util.TypeInformation; import java.util.ArrayList; import java.util.HashMap; @@ -63,15 +61,10 @@ public class FieldAccessorFactoryProviders { } } - private final TypeInformation type; private final List> fieldAccessorFactoryProviders = new ArrayList>(); - private final IdFieldAccessorFactory idFieldAccessorFactory; private Neo4jPersistentProperty idProperty; - FieldAccessorFactoryProviders(TypeInformation type, Neo4jTemplate template) { - this.type = type; - idFieldAccessorFactory= new IdFieldAccessorFactory(template); - } + FieldAccessorFactoryProviders() {} public Map getFieldAccessors() { int count = fieldAccessorFactoryProviders.size(); @@ -89,7 +82,7 @@ public class FieldAccessorFactoryProviders { final Map> result = new HashMap>(count,1); for (int i = 0; i < count; i++) { FieldAccessorFactoryProvider fieldAccessorFactoryProvider = fieldAccessorFactoryProviders.get(i); - final List listeners = (List) fieldAccessorFactoryProvider.listeners(); + final List listeners = fieldAccessorFactoryProvider.listeners(); result.put(fieldAccessorFactoryProvider.getProperty(), listeners); } return result; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/RelatedToViaCollectionFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/RelatedToViaCollectionFieldAccessorFactory.java index 509ce606f..83a73ec86 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/RelatedToViaCollectionFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/RelatedToViaCollectionFieldAccessorFactory.java @@ -104,7 +104,8 @@ public class RelatedToViaCollectionFieldAccessorFactory implements FieldAccessor if (!(newVal instanceof Set)) { throw new IllegalArgumentException("New value must be at least an Iterable, was: " + newVal.getClass()); } - return relationshipEntities.loadEndNodeToRelationshipEntityMapping(startNode, (Iterable) newVal, relatedType); + @SuppressWarnings("unchecked") Iterable iterable = (Iterable) newVal; + return relationshipEntities.loadEndNodeToRelationshipEntityMapping(startNode, iterable, relatedType); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/RelationshipHelper.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/RelationshipHelper.java index d51fe6dd2..16dca68f4 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/RelationshipHelper.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/RelationshipHelper.java @@ -71,7 +71,7 @@ public class RelationshipHelper { protected void removeMissingRelationshipsInStoreAndKeepOnlyNewRelationShipsInSet( Node node, Set targetNodes, - Class targetType ) { + Class targetType ) { for ( Relationship relationship : node.getRelationships( type, direction ) ) { if ( !targetNodes.remove( relationship.getOtherNode( node ) ) ) { if ( targetType != null ) { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ValidatingNodePropertyFieldAccessorListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ValidatingNodePropertyFieldAccessorListenerFactory.java index b1aab6ada..b5aa0e51b 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ValidatingNodePropertyFieldAccessorListenerFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ValidatingNodePropertyFieldAccessorListenerFactory.java @@ -70,14 +70,15 @@ class ValidatingNodePropertyFieldAccessorListenerFactory implements FieldAccesso public ValidatingNodePropertyFieldAccessorListener(final Neo4jPersistentProperty field, Validator validator) { this.propertyName = field.getName(); - this.entityType = (Neo4jPersistentEntity) field.getOwner(); + this.entityType = field.getOwner(); this.validator = validator; } @Override public void valueChanged(Object entity, Object oldVal, Object newVal) { if (validator==null) return; - Set> constraintViolations = validator.validateValue((Class)entityType.getType(), propertyName, newVal); + @SuppressWarnings("unchecked") Class type = (Class) entityType.getType(); + Set> constraintViolations = validator.validateValue(type, propertyName, newVal); if (!constraintViolations.isEmpty()) throw new ValidationException("Error validating field "+propertyName+ " of "+entityType+": "+constraintViolations); } } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/InvalidEntityTypeException.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/InvalidEntityTypeException.java index f1574644f..14a368adb 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/InvalidEntityTypeException.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/InvalidEntityTypeException.java @@ -22,6 +22,8 @@ import org.springframework.data.mapping.model.MappingException; * @since 21.10.11 */ public class InvalidEntityTypeException extends MappingException { + private static final long serialVersionUID = -162835100413817687L; + public InvalidEntityTypeException(String s) { super(s); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java index 56c95038f..ae7beb82f 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java @@ -114,7 +114,7 @@ public abstract class AbstractGraphRepository im for (U entity : entities) { save(entity); } - return (Iterable) entities; + return entities; } /** diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java index f1f7e0b65..4c92ae14d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java @@ -22,7 +22,6 @@ import org.neo4j.graphdb.index.IndexManager; import org.neo4j.graphdb.index.UniqueFactory; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.index.lucene.ValueContext; -import org.neo4j.kernel.AbstractGraphDatabase; import org.neo4j.kernel.GraphDatabaseAPI; import org.neo4j.kernel.Traversal; import org.neo4j.kernel.impl.transaction.SpringTransactionManager; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jTemplate.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jTemplate.java index 84f841183..2e8685e5c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jTemplate.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Neo4jTemplate.java @@ -267,14 +267,6 @@ public class Neo4jTemplate implements Neo4jOperations { return node; } - /** - * Delegates to {@link GraphDatabase} - */ - @Deprecated - public Transaction beginTx() { // TODO remove ! - return infrastructure.getGraphDatabase().beginTx(); - } - public boolean isNodeEntity(Class targetType) { return getMappingContext().isNodeEntity(targetType); } @@ -289,8 +281,8 @@ public class Neo4jTemplate implements Neo4jOperations { return save( entity, null ); } - public T save( T entity, RelationshipType annotationProvidedRelationshipType ) - { + @SuppressWarnings("unchecked") + public T save( T entity, RelationshipType annotationProvidedRelationshipType ) { return (T) infrastructure.getEntityPersister().persist(entity, getMappingPolicy(entity), this, annotationProvidedRelationshipType ); } @@ -317,6 +309,7 @@ public class Neo4jTemplate implements Neo4jOperations { } @Override + @SuppressWarnings("unchecked") public R getRelationshipBetween(Object start, Object end, Class relationshipEntityClass, String relationshipType) { notNull(start,"start",end,"end",relationshipEntityClass,"relationshipEntityClass",relationshipType,"relationshipType"); final Relationship relationship = infrastructure.getEntityStateHandler().getRelationshipBetween(start, end, relationshipType); @@ -327,6 +320,7 @@ public class Neo4jTemplate implements Neo4jOperations { } @Override + @SuppressWarnings("unchecked") public Iterable getRelationshipsBetween(Object start, Object end, Class relationshipEntityClass, String relationshipType) { notNull(start,"start",end,"end",relationshipEntityClass,"relationshipEntityClass",relationshipType,"relationshipType"); final Iterable relationships = infrastructure.getEntityStateHandler().getRelationshipsBetween(start, end, relationshipType); @@ -495,6 +489,7 @@ public class Neo4jTemplate implements Neo4jOperations { } @Override + @SuppressWarnings("unchecked") public ResultConverter getDefaultConverter() { final ResultConverter resultConverter = infrastructure.getResultConverter(); if (resultConverter instanceof Neo4jTemplateAware) { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/conversion/NoSuchColumnFoundException.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/conversion/NoSuchColumnFoundException.java index a5aee33d2..d3223319b 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/conversion/NoSuchColumnFoundException.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/conversion/NoSuchColumnFoundException.java @@ -18,6 +18,8 @@ package org.springframework.data.neo4j.support.conversion; import org.springframework.data.mapping.model.MappingException; public class NoSuchColumnFoundException extends MappingException { + private static final long serialVersionUID = 3426743116009442464L; + public NoSuchColumnFoundException( String column ) { super( "Expexted a column named "+ column + " to be in the result set." ); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/NoSuchIndexException.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/NoSuchIndexException.java index b351dc5af..96ef2fa11 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/NoSuchIndexException.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/NoSuchIndexException.java @@ -22,6 +22,7 @@ import org.springframework.dao.DataRetrievalFailureException; * @since 16.10.11 */ public class NoSuchIndexException extends DataRetrievalFailureException { + private static final long serialVersionUID = -5708027180371353224L; private final String index; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/IndexCreationMappingEventListener.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/IndexCreationMappingEventListener.java index e21e5f5c4..f8377cfe1 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/IndexCreationMappingEventListener.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/IndexCreationMappingEventListener.java @@ -15,6 +15,7 @@ */ package org.springframework.data.neo4j.support.mapping; +import org.neo4j.graphdb.index.Index; import org.springframework.context.ApplicationListener; import org.springframework.data.mapping.PropertyHandler; import org.springframework.data.mapping.event.MappingContextEvent; @@ -40,9 +41,9 @@ public class IndexCreationMappingEventListener implements ApplicationListener entity) { final Class entityType = entity.getType(); - template.getIndex(entityType, null, IndexType.SIMPLE); + @SuppressWarnings("unchecked") Index index = template.getIndex(entityType, null, IndexType.SIMPLE); entity.doWithProperties(new PropertyHandler() { @Override public void doWithPersistentProperty(Neo4jPersistentProperty property) { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4JPersistentPropertyImpl.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4JPersistentPropertyImpl.java index 7503acf0f..139aeca47 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4JPersistentPropertyImpl.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4JPersistentPropertyImpl.java @@ -335,6 +335,7 @@ class Neo4jPersistentPropertyImpl extends AbstractPersistentProperty { entityState.setValue(property, value, mappingPolicy); } - private T getProperty(BeanWrapper, Object> wrapper, Neo4jPersistentProperty property, Class type, boolean fieldAccessOnly) { - return wrapper.getProperty(property, type, fieldAccessOnly); - } - private Object getProperty(BeanWrapper, R> wrapper, Neo4jPersistentProperty property) { try { return wrapper.getProperty(property); @@ -100,7 +96,7 @@ public class SourceStateTransmitter { } public void copyPropertiesTo(final BeanWrapper, R> wrapper, S target, Neo4jPersistentEntity persistentEntity, MappingPolicy mappingPolicy, final Neo4jTemplate template) { - final Transaction tx = template.beginTx(); + final Transaction tx = template.getGraphDatabase().beginTx(); try { final EntityState entityState = entityStateFactory.getEntityState(wrapper.getBean(), false, template); entityState.setPersistentState(target); diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/query/CypherQueryExecutor.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/query/CypherQueryExecutor.java index ec24b59a6..dbb40d6bf 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/query/CypherQueryExecutor.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/query/CypherQueryExecutor.java @@ -52,6 +52,6 @@ public class CypherQueryExecutor implements QueryOperations> } public T queryForObject(String statement, Class type, Map params) { - return (T) queryEngine.query(statement, params).to(type).single(); + return queryEngine.query(statement, params).to(type).single(); } } \ No newline at end of file diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/persistence/StateProvider.java b/spring-data-neo4j/src/main/java/org/springframework/data/persistence/StateProvider.java index 832b8e4e4..4bcdf4c92 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/persistence/StateProvider.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/persistence/StateProvider.java @@ -29,6 +29,7 @@ public abstract class StateProvider { private StateProvider() { } + @SuppressWarnings("unchecked") public static void setUnderlyingState(STATE state) { if (stateHolder.get() != null) throw new IllegalStateException("StateHolder already contains state " + stateHolder.get() + " in thread " @@ -37,7 +38,7 @@ public abstract class StateProvider { } public static STATE retrieveState() { - STATE result = (STATE) stateHolder.get(); + @SuppressWarnings("unchecked") STATE result = (STATE) stateHolder.get(); stateHolder.remove(); return result; } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jPersistentTestBase.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jPersistentTestBase.java index 2268a544a..1f25e6568 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jPersistentTestBase.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jPersistentTestBase.java @@ -95,7 +95,7 @@ public class Neo4jPersistentTestBase { conversionService = template.getConversionService(); - tx = template.beginTx(); + tx = template.getGraphDatabase().beginTx(); group = new Group(); michael = new Person("Michael", 37); emil = new Person("Emil", 30); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/ReadWriteTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/ReadWriteTest.java index 4f90f0e8a..35ec3f1bc 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/ReadWriteTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/ReadWriteTest.java @@ -16,7 +16,6 @@ package org.springframework.data.neo4j.repository; import org.junit.Ignore; -import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.Transaction; import org.neo4j.kernel.impl.util.FileUtils; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -42,7 +41,7 @@ public class ReadWriteTest { delete = true; assertEquals(Volvo.class, car.getClass()); } else { - Transaction tx = template.beginTx(); + Transaction tx = template.getGraphDatabase().beginTx(); Volvo volvo = template.save(new Volvo()); assertEquals(1, volvo.id.intValue()); tx.success(); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTest.java index 874bbb0b3..4a49c723a 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTest.java @@ -35,7 +35,6 @@ import org.springframework.data.neo4j.support.Neo4jTemplate; import org.springframework.data.neo4j.support.index.IndexType; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; -import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.transaction.support.TransactionCallbackWithoutResult; import org.springframework.transaction.support.TransactionTemplate; @@ -84,7 +83,7 @@ public class Neo4jTemplateApiTest { @Test public void testBeginTxWithoutConfiguredTxManager() throws Exception { Neo4jTemplate template = new Neo4jTemplate(graphDatabase); - Transaction tx = template.beginTx(); + Transaction tx = template.getGraphDatabase().beginTx(); Node node = template.createNode(); node.setProperty("name","foo"); tx.success(); @@ -95,7 +94,7 @@ public class Neo4jTemplateApiTest { @Test public void testInstantiateEntity() throws Exception { Neo4jTemplate template = new Neo4jTemplate(graphDatabase,transactionManager); - Transaction tx = template.beginTx(); + Transaction tx = template.getGraphDatabase().beginTx(); Person michael = template.save(new Person("Michael", 37)); assertNotNull(michael.getId()); } @@ -345,12 +344,6 @@ public class Neo4jTemplateApiTest { assertEquals("rel2",relationship.getProperty("name","not set")); } - private static class PathRelationshipNameMapper extends ResultConverter.ResultConverterAdapter { - @Override - public String convert(Path path, Class type) { - return (String) path.lastRelationship().getProperty("name","not set"); - } - } private static class PathNodeNameMapper extends ResultConverter.ResultConverterAdapter { @Override public String convert(Path path, Class type) { diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/GraphRepositoryTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/GraphRepositoryTest-context.xml index ad891d341..08d6d11c3 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/GraphRepositoryTest-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/GraphRepositoryTest-context.xml @@ -3,10 +3,9 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:neo4j="http://www.springframework.org/schema/data/neo4j" - xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd - http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd"> + http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd">