diff --git a/spring-data-neo4j-aspects/pom.xml b/spring-data-neo4j-aspects/pom.xml index 03a0cbfd3..32658cf27 100644 --- a/spring-data-neo4j-aspects/pom.xml +++ b/spring-data-neo4j-aspects/pom.xml @@ -50,43 +50,41 @@ - - org.slf4j - slf4j-api - - - org.slf4j - jcl-over-slf4j - compile - - - org.slf4j - slf4j-log4j12 - runtime - - - log4j - log4j - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - + + org.slf4j + slf4j-api + compile + + + org.slf4j + slf4j-log4j12 + runtime + true + + + log4j + log4j + + + javax.mail + mail + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + runtime + true + javax.annotation diff --git a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/node/Neo4jNodeBacking.aj b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/node/Neo4jNodeBacking.aj index 6b30d8af2..b8371194a 100644 --- a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/node/Neo4jNodeBacking.aj +++ b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/node/Neo4jNodeBacking.aj @@ -17,8 +17,6 @@ package org.springframework.data.neo4j.aspects.support.node; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.FieldSignature; import org.neo4j.graphdb.DynamicRelationshipType; @@ -28,6 +26,8 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.graphdb.traversal.Traverser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.neo4j.annotation.*; import org.springframework.data.neo4j.aspects.core.NodeBacked; @@ -61,7 +61,7 @@ import static org.springframework.data.neo4j.support.DoReturn.unwrap; */ public privileged aspect Neo4jNodeBacking { // extends AbstractTypeAnnotatingMixinFields { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); declare parents : (@NodeEntity *) implements NodeBacked; diff --git a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/relationship/Neo4jRelationshipBacking.aj b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/relationship/Neo4jRelationshipBacking.aj index 998f07f92..980324544 100644 --- a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/relationship/Neo4jRelationshipBacking.aj +++ b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/relationship/Neo4jRelationshipBacking.aj @@ -16,11 +16,11 @@ package org.springframework.data.neo4j.aspects.support.relationship; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.FieldSignature; import org.neo4j.graphdb.Relationship; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.neo4j.annotation.RelationshipEntity; import org.springframework.data.neo4j.aspects.core.NodeBacked; import org.springframework.data.neo4j.aspects.core.RelationshipBacked; @@ -41,7 +41,7 @@ import static org.springframework.data.neo4j.support.DoReturn.unwrap; */ public aspect Neo4jRelationshipBacking { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); declare parents : (@RelationshipEntity *) implements RelationshipBacked; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTest.java index 029c84a3f..81d4e9d3d 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTest.java @@ -16,10 +16,10 @@ package org.springframework.data.neo4j.aspects.support; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.neo4j.support.Neo4jTemplate; import org.springframework.data.neo4j.support.node.Neo4jHelper; @@ -37,7 +37,7 @@ import static org.springframework.data.neo4j.aspects.Person.persistedPerson; public class EntityPropertyValidationTest extends EntityTestBase { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); @Autowired private Neo4jTemplate template; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityTestBase.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityTestBase.java index 02bc79a1f..8a62f2e87 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityTestBase.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityTestBase.java @@ -15,13 +15,13 @@ */ package org.springframework.data.neo4j.aspects.support; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.convert.ConversionService; import org.springframework.data.neo4j.aspects.FriendshipRepository; @@ -40,7 +40,7 @@ import java.util.Set; * @since 15.10.11 */ public class EntityTestBase { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); @Autowired protected Neo4jTemplate neo4jTemplate; @Autowired protected ConversionService conversionService; diff --git a/spring-data-neo4j-aspects/template.mf b/spring-data-neo4j-aspects/template.mf index e59eed60e..1deea7bd2 100644 --- a/spring-data-neo4j-aspects/template.mf +++ b/spring-data-neo4j-aspects/template.mf @@ -19,10 +19,10 @@ Import-Template: org.neo4j.cypher.*;version="0";resolution:=optional, org.w3c.dom.*;version="0", org.aspectj.*;version="[1.6.5, 2.0.0)", - org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.commons.configuration.*;version="0", org.objectweb.jotm.*;version="0", org.apache.lucene.*;version="0", + org.slf4j.*;version="0", javax.validation.*;version="0";resolution:=optional, javax.annotation.*;version="0";resolution:=optional, javax.naming.*;version="0";resolution:=optional, diff --git a/spring-data-neo4j-cross-store/pom.xml b/spring-data-neo4j-cross-store/pom.xml index d7cfa22c8..7bd8d72c1 100644 --- a/spring-data-neo4j-cross-store/pom.xml +++ b/spring-data-neo4j-cross-store/pom.xml @@ -53,43 +53,41 @@ - - org.slf4j - slf4j-api - - - org.slf4j - jcl-over-slf4j - compile - - - org.slf4j - slf4j-log4j12 - runtime - - - log4j - log4j - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - + + org.slf4j + slf4j-api + compile + + + org.slf4j + slf4j-log4j12 + runtime + true + + + log4j + log4j + + + javax.mail + mail + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + runtime + true + javax.annotation diff --git a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationTest.java b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationTest.java index adb9baefe..d32689ccf 100644 --- a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationTest.java +++ b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationTest.java @@ -16,11 +16,11 @@ package org.springframework.data.neo4j.partial; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.neo4j.support.Neo4jTemplate; import org.springframework.data.neo4j.support.node.Neo4jHelper; @@ -44,7 +44,7 @@ import javax.sql.DataSource; @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RecommendationTest { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); @Autowired PlatformTransactionManager transactionManager; diff --git a/spring-data-neo4j-cross-store/template.mf b/spring-data-neo4j-cross-store/template.mf index 4bb173307..25aa5fa61 100644 --- a/spring-data-neo4j-cross-store/template.mf +++ b/spring-data-neo4j-cross-store/template.mf @@ -19,10 +19,10 @@ Import-Template: org.neo4j.cypher.*;version="0";resolution:=optional, org.w3c.dom.*;version="0", org.aspectj.*;version="[1.6.5, 2.0.0)", - org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.commons.configuration.*;version="0", org.objectweb.jotm.*;version="0", org.apache.lucene.*;version="0", + org.slf4j.*;version="0", javax.validation.*;version="0";resolution:=optional, javax.annotation.*;version="0";resolution:=optional, javax.naming.*;version="0";resolution:=optional, diff --git a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/AbstractTestWithUserAccount.java b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/AbstractTestWithUserAccount.java index 8b492271e..31047dfe4 100644 --- a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/AbstractTestWithUserAccount.java +++ b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/AbstractTestWithUserAccount.java @@ -8,9 +8,9 @@ import javax.persistence.EntityTransaction; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceUnit; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Before; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.neo4j.support.Neo4jTemplate; import org.springframework.data.neo4j.support.node.Neo4jHelper; @@ -22,7 +22,7 @@ import com.springone.myrestaurants.domain.UserAccount; public class AbstractTestWithUserAccount { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); protected Long userId; @Autowired diff --git a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/RestaurantRepositoryTest.java b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/RestaurantRepositoryTest.java index 81e2d7834..b4698a979 100644 --- a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/RestaurantRepositoryTest.java +++ b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/RestaurantRepositoryTest.java @@ -2,10 +2,10 @@ package com.springone.myrestaurants.data; import com.springone.myrestaurants.domain.Restaurant; import junit.framework.Assert; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.neo4j.support.Neo4jTemplate; import org.springframework.data.neo4j.support.node.Neo4jHelper; @@ -25,7 +25,7 @@ import java.util.List; @DirtiesContext public class RestaurantRepositoryTest { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); @Autowired PlatformTransactionManager transactionManager; diff --git a/spring-data-neo4j-parent/pom.xml b/spring-data-neo4j-parent/pom.xml index 49f8376fa..ff101eb3e 100644 --- a/spring-data-neo4j-parent/pom.xml +++ b/spring-data-neo4j-parent/pom.xml @@ -296,17 +296,20 @@ org.slf4j slf4j-api ${org.slf4j.version} + compile org.slf4j jcl-over-slf4j ${org.slf4j.version} + runtime org.slf4j slf4j-log4j12 ${org.slf4j.version} runtime + true log4j @@ -331,6 +334,7 @@ runtime + true diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml index 0f1e41d54..971d347cc 100644 --- a/spring-data-neo4j-rest/pom.xml +++ b/spring-data-neo4j-rest/pom.xml @@ -231,12 +231,13 @@ org.slf4j jcl-over-slf4j - compile + runtime org.slf4j slf4j-log4j12 runtime + true log4j @@ -260,6 +261,7 @@ runtime + true diff --git a/spring-data-neo4j-rest/template.mf b/spring-data-neo4j-rest/template.mf index 4b0d196ea..0f68e55a1 100644 --- a/spring-data-neo4j-rest/template.mf +++ b/spring-data-neo4j-rest/template.mf @@ -11,8 +11,8 @@ Import-Template: org.springframework.data.neo4j.*;version="0", org.neo4j.*;version="0", org.w3c.dom.*;version="0", - org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.lucene.*;version="0", + org.slf4j.*;version="0", javax.annotation.*;version="0";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, com.sun.jersey.api.*;version="0", diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml index 5490910ca..c7410f784 100644 --- a/spring-data-neo4j/pom.xml +++ b/spring-data-neo4j/pom.xml @@ -53,17 +53,13 @@ org.slf4j slf4j-api - runtime - - - org.slf4j - jcl-over-slf4j - compile + compile org.slf4j slf4j-log4j12 runtime + true log4j @@ -86,7 +82,8 @@ jmxri - runtime + runtime + true diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DefaultEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DefaultEntityState.java index e087033b5..0a9bf265d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DefaultEntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DefaultEntityState.java @@ -16,8 +16,8 @@ package org.springframework.data.neo4j.fieldaccess; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.neo4j.core.EntityState; import org.springframework.data.neo4j.mapping.MappingPolicy; import org.springframework.data.neo4j.mapping.Neo4jPersistentEntity; @@ -38,7 +38,7 @@ public abstract class DefaultEntityState implements EntityState { private final Map fieldAccessors = new HashMap(); private final Map> fieldAccessorListeners = new HashMap>(); private STATE state; - protected final static Log log= LogFactory.getLog(DefaultEntityState.class); + protected final static Logger log= LoggerFactory.getLogger(DefaultEntityState.class); private final FieldAccessorFactoryProviders fieldAccessorFactoryProviders; protected final Neo4jPersistentEntity persistentEntity; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java index 81004bd38..19f9c808a 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java @@ -16,8 +16,8 @@ package org.springframework.data.neo4j.fieldaccess; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.mapping.Association; import org.springframework.data.mapping.AssociationHandler; import org.springframework.data.mapping.PropertyHandler; @@ -31,7 +31,7 @@ import java.util.*; public abstract class DelegatingFieldAccessorFactory implements FieldAccessorFactory { - private final static Log log = LogFactory.getLog(DelegatingFieldAccessorFactory.class); + private final static Logger log = LoggerFactory.getLogger(DelegatingFieldAccessorFactory.class); protected final Neo4jTemplate template; 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 f5e9b3717..e65ba7514 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 @@ -16,9 +16,9 @@ package org.springframework.data.neo4j.fieldaccess; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.neo4j.graphdb.Transaction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.neo4j.core.EntityState; import org.springframework.data.neo4j.mapping.MappingPolicy; import org.springframework.data.neo4j.mapping.Neo4jPersistentEntity; @@ -38,9 +38,10 @@ import static org.springframework.data.neo4j.support.DoReturn.unwrap; * @since 15.09.2010 */ public class DetachedEntityState implements EntityState { + private final static Logger log = LoggerFactory.getLogger(DetachedEntityState.class); + private final Map dirty = new HashMap(); protected final EntityState delegate; - private final static Log log = LogFactory.getLog(DetachedEntityState.class); private Neo4jTemplate template; private Neo4jPersistentEntity persistentEntity; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java index d25dd8b9f..be0d2a5ca 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java @@ -16,11 +16,11 @@ package org.springframework.data.neo4j.fieldaccess; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.index.Index; import org.neo4j.index.lucene.ValueContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.neo4j.mapping.Neo4jPersistentProperty; import org.springframework.data.neo4j.support.Neo4jTemplate; @@ -59,7 +59,7 @@ public class IndexingPropertyFieldAccessorListenerFactory implements FieldAccessListener { - private final static Log log = LogFactory.getLog( IndexingPropertyFieldAccessorListener.class ); + private final static Logger log = LoggerFactory.getLogger(IndexingPropertyFieldAccessorListener.class); protected final String indexKey; private final Neo4jPersistentProperty property; 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 315cefa52..b1aab6ada 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 @@ -16,10 +16,9 @@ package org.springframework.data.neo4j.fieldaccess; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.neo4j.graphdb.PropertyContainer; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.neo4j.mapping.Neo4jPersistentEntity; import org.springframework.data.neo4j.mapping.Neo4jPersistentProperty; import org.springframework.data.neo4j.support.Neo4jTemplate; @@ -64,7 +63,7 @@ class ValidatingNodePropertyFieldAccessorListenerFactory implements FieldAccesso */ public static class ValidatingNodePropertyFieldAccessorListener implements FieldAccessListener { - private final static Log log = LogFactory.getLog( ValidatingNodePropertyFieldAccessorListener.class ); + private final static Logger log = LoggerFactory.getLogger(ValidatingNodePropertyFieldAccessorListener.class); private String propertyName; private Validator validator; private Neo4jPersistentEntity entityType; 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 0b576e52f..53e0568a5 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 @@ -16,14 +16,14 @@ package org.springframework.data.neo4j.support; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.neo4j.graphdb.*; import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.index.IndexManager; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.kernel.AbstractGraphDatabase; import org.neo4j.kernel.Traversal; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.convert.ConversionService; import org.springframework.data.neo4j.annotation.QueryType; import org.springframework.data.neo4j.conversion.DefaultConverter; @@ -50,10 +50,11 @@ import java.util.Map; */ public class DelegatingGraphDatabase implements GraphDatabase { + private static final Logger log = LoggerFactory.getLogger(DelegatingGraphDatabase.class); + protected GraphDatabaseService delegate; private ConversionService conversionService; private ResultConverter resultConverter; - private static final Log log = LogFactory.getLog(DelegatingGraphDatabase.class); public DelegatingGraphDatabase(final GraphDatabaseService delegate) { this.delegate = delegate; 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 c0e309e23..cc00bb91f 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 @@ -16,25 +16,12 @@ package org.springframework.data.neo4j.support; -import static org.springframework.data.neo4j.support.ParameterCheck.*; - -import java.util.Map; - -import javax.annotation.PostConstruct; -import javax.validation.Validator; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.neo4j.graphdb.DynamicRelationshipType; -import org.neo4j.graphdb.GraphDatabaseService; -import org.neo4j.graphdb.Node; -import org.neo4j.graphdb.Path; -import org.neo4j.graphdb.PropertyContainer; -import org.neo4j.graphdb.Relationship; -import org.neo4j.graphdb.Transaction; +import org.neo4j.graphdb.*; import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.helpers.collection.ClosableIterable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.convert.ConversionService; import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; @@ -56,7 +43,6 @@ import org.springframework.data.neo4j.repository.NodeGraphRepositoryImpl; import org.springframework.data.neo4j.repository.RelationshipGraphRepository; import org.springframework.data.neo4j.support.index.IndexProvider; import org.springframework.data.neo4j.support.index.IndexType; -import org.springframework.data.neo4j.support.mapping.EntityCreatingClosableIterable; import org.springframework.data.neo4j.support.mapping.EntityStateHandler; import org.springframework.data.neo4j.support.mapping.Neo4jEntityPersister; import org.springframework.data.neo4j.support.mapping.Neo4jPersistentEntityImpl; @@ -70,6 +56,12 @@ import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; +import javax.annotation.PostConstruct; +import javax.validation.Validator; +import java.util.Map; + +import static org.springframework.data.neo4j.support.ParameterCheck.notNull; + /** * Mediator class for the graph related services like the {@link GraphDatabaseService}, the used * {@link org.springframework.data.neo4j.core.TypeRepresentationStrategy}, entity instantiators for nodes and relationships as well as a spring conversion service. @@ -83,7 +75,7 @@ import org.springframework.transaction.support.TransactionTemplate; TODO This is a merge of GraphDatabaseContext and the previous Neo4jTemplate, so it still contains inconsistencies, if you spot them, please mark them with a TODO */ public class Neo4jTemplate implements Neo4jOperations, EntityPersister { - private static final Log log = LogFactory.getLog(Neo4jTemplate.class); + private static final Logger log = LoggerFactory.getLogger(Neo4jTemplate.class); private MappingInfrastructure infrastructure = new MappingInfrastructure(); diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/AbstractConstructorEntityInstantiator.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/AbstractConstructorEntityInstantiator.java index 1558901fa..804d10f1d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/AbstractConstructorEntityInstantiator.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/AbstractConstructorEntityInstantiator.java @@ -15,8 +15,8 @@ */ package org.springframework.data.neo4j.support.mapping; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.neo4j.mapping.EntityInstantiator; import org.springframework.data.neo4j.mapping.MappingPolicy; import org.springframework.data.persistence.StateBackedCreator; @@ -36,7 +36,7 @@ import java.util.Map; */ public abstract class AbstractConstructorEntityInstantiator implements EntityInstantiator { - private final Log log = LogFactory.getLog(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final Map, StateBackedCreator> cache = new HashMap, StateBackedCreator>(); @SuppressWarnings("unchecked") diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java index adf88137c..6af59fa81 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java @@ -16,13 +16,13 @@ package org.springframework.data.neo4j.support.typerepresentation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.neo4j.graphdb.*; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.helpers.collection.ClosableIterable; import org.neo4j.helpers.collection.IterableWrapper; import org.neo4j.kernel.Traversal; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.neo4j.core.GraphDatabase; import org.springframework.data.neo4j.core.NodeTypeRepresentationStrategy; @@ -40,7 +40,7 @@ import java.util.List; * @since 13.09.2010 */ public class SubReferenceNodeTypeRepresentationStrategy implements NodeTypeRepresentationStrategy { - private final static Log log = LogFactory.getLog(SubReferenceNodeTypeRepresentationStrategy.class); + private final static Logger log = LoggerFactory.getLogger(SubReferenceNodeTypeRepresentationStrategy.class); public final static RelationshipType INSTANCE_OF_RELATIONSHIP_TYPE = DynamicRelationshipType.withName("INSTANCE_OF"); public final static RelationshipType SUBCLASS_OF_RELATIONSHIP_TYPE = DynamicRelationshipType.withName("SUBCLASS_OF"); diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/ChainedTransactionManager.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/ChainedTransactionManager.java index f255827c3..c94a1c39d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/ChainedTransactionManager.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/ChainedTransactionManager.java @@ -16,8 +16,8 @@ package org.springframework.data.neo4j.transaction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.transaction.*; import java.util.ArrayList; @@ -33,7 +33,7 @@ import static java.util.Arrays.asList; */ public class ChainedTransactionManager implements PlatformTransactionManager { - private final static Log logger = LogFactory.getLog(ChainedTransactionManager.class); + private final static Logger logger = LoggerFactory.getLogger(ChainedTransactionManager.class); private final List transactionManagers; private final SynchronizationManager synchronizationManager; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTest.java index 0599ddfda..d97303235 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTest.java @@ -16,13 +16,13 @@ package org.springframework.data.neo4j.repository; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.neo4j.helpers.collection.IteratorUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -51,9 +51,7 @@ import java.util.Map; import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; import static org.junit.internal.matchers.IsCollectionContaining.hasItem; import static org.junit.internal.matchers.IsCollectionContaining.hasItems; import static org.neo4j.helpers.collection.IteratorUtil.addToCollection; @@ -64,7 +62,7 @@ import static org.neo4j.helpers.collection.IteratorUtil.asCollection; @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class GraphRepositoryTest { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); @Autowired private Neo4jTemplate neo4jTemplate; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/SpatialGraphRepositoryTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/SpatialGraphRepositoryTest.java index 0032e7798..ddba5668a 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/SpatialGraphRepositoryTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/SpatialGraphRepositoryTest.java @@ -16,11 +16,11 @@ package org.springframework.data.neo4j.repository; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.neo4j.model.Person; import org.springframework.data.neo4j.support.Neo4jTemplate; @@ -48,7 +48,7 @@ import static org.neo4j.helpers.collection.IteratorUtil.asCollection; @Transactional public class SpatialGraphRepositoryTest { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); @Autowired private Neo4jTemplate neo4jTemplate; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityTestBase.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityTestBase.java index d24bb259c..babee3ded 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityTestBase.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityTestBase.java @@ -15,13 +15,13 @@ */ package org.springframework.data.neo4j.support; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.convert.ConversionService; import org.springframework.data.neo4j.model.FriendshipRepository; @@ -40,7 +40,7 @@ import java.util.Set; * @since 15.10.11 */ public class EntityTestBase { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); @Autowired protected Neo4jTemplate template; @Autowired protected ConversionService conversionService; diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf index 2f5acd6b1..fe01af201 100644 --- a/spring-data-neo4j/template.mf +++ b/spring-data-neo4j/template.mf @@ -20,10 +20,10 @@ Import-Template: org.neo4j.cypher.*;version="0";resolution:=optional, org.w3c.dom.*;version="0", org.aspectj.*;version="[1.6.5, 2.0.0)", - org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.commons.configuration.*;version="0", org.objectweb.jotm.*;version="0", org.apache.lucene.*;version="0", + org.slf4j.*;version="0", javax.validation.*;version="0";resolution:=optional, javax.annotation.*;version="0";resolution:=optional, javax.naming.*;version="0";resolution:=optional,