diff --git a/pom.xml b/pom.xml index c60608a00..b3d32640b 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ version - ${pom.version} + ${project.version} @@ -184,7 +184,7 @@ maven-javadoc-plugin 2.5 - true + true true
Spring Data Document
1.5 @@ -263,16 +263,10 @@ + - - repository.plugin.springsource.release - SpringSource Maven Repository - http://repository.springsource.com/maven/bundles/release - - - spring-libs-release - Spring Framework Maven Release Repository - http://repo.springsource.org/libs-release + spring-plugins-release + http://repo.springsource.org/plugins-release diff --git a/spring-data-mongodb-cross-store/pom.xml b/spring-data-mongodb-cross-store/pom.xml index 8d4b24995..cf21aa35a 100644 --- a/spring-data-mongodb-cross-store/pom.xml +++ b/spring-data-mongodb-cross-store/pom.xml @@ -15,10 +15,12 @@ org.springframework spring-beans + ${org.springframework.version.range} org.springframework spring-tx + ${org.springframework.version.range} org.springframework @@ -28,82 +30,19 @@ org.springframework spring-orm - - - org.springframework - spring-test - test + ${org.springframework.version.range} org.springframework.data spring-data-commons-core + ${data.commons.version} - org.springframework.data spring-data-mongodb - - - - - - 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 - - - - javax.annotation - jsr250-api - true - - - - org.mockito - mockito-all - test - - - - junit - junit + ${project.version} diff --git a/spring-data-mongodb-log4j/pom.xml b/spring-data-mongodb-log4j/pom.xml index 523d255ba..9fd1aca25 100644 --- a/spring-data-mongodb-log4j/pom.xml +++ b/spring-data-mongodb-log4j/pom.xml @@ -28,45 +28,7 @@ log4j log4j - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - compile - - - - - org.mockito - mockito-all - test - - - - org.hamcrest - hamcrest-all - 1.1 - test - - - - junit - junit - test + ${log4j.version} diff --git a/spring-data-mongodb-parent/pom.xml b/spring-data-mongodb-parent/pom.xml index 12bea98b9..81d82ea3e 100644 --- a/spring-data-mongodb-parent/pom.xml +++ b/spring-data-mongodb-parent/pom.xml @@ -12,9 +12,9 @@ UTF-8 4.8.1 - 1.2.15 + 1.2.16 1.8.4 - 1.5.10 + 1.6.1 1.6.1 3.0.7.RELEASE 4.0.0.RELEASE @@ -22,42 +22,7 @@ 1.3.0.BUILD-SNAPSHOT 1.6.11.RELEASE - - - strict - - false - - - - fast - - true - true - - - - staging - - - spring-site-staging - file:///${java.io.tmpdir}/spring-data/mongodb/docs - - - spring-milestone-staging - file:///${java.io.tmpdir}/spring-data/mongodb/milestone - - - spring-snapshot-staging - file:///${java.io.tmpdir}/spring-data/mongodb/snapshot - - - - - bootstrap - - - + http://www.springsource.com/download/community @@ -79,163 +44,62 @@ s3://maven.springframework.org/snapshot - - - - - - - org.springframework - spring-aop - ${org.springframework.version.range} - - - org.springframework - spring-beans - ${org.springframework.version.range} - - - org.springframework - spring-core - ${org.springframework.version.range} - - - org.springframework - spring-tx - ${org.springframework.version.range} - - - org.springframework - spring-orm - ${org.springframework.version.range} - - - org.springframework - spring-web - ${org.springframework.version.range} - - - org.springframework - spring-expression - ${org.springframework.version.range} - - - org.springframework - spring-test - ${org.springframework.version.range} - test - + + - - - org.springframework.data - spring-data-commons-core - ${data.commons.version} - - - org.springframework.data - spring-data-commons-aspects - ${data.commons.version} - - - org.springframework.data - spring-data-couchdb - ${project.version} - - - org.springframework.data - spring-data-mongodb - ${project.version} - + + + org.mockito + mockito-all + ${org.mockito.version} + test + - - - org.slf4j - slf4j-api - ${org.slf4j.version} - runtime - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - runtime - - - org.slf4j - slf4j-log4j12 - ${org.slf4j.version} - runtime - - - log4j - log4j - ${log4j.version} - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - + + org.hamcrest + hamcrest-all + 1.1 + test + - - javax.annotation - jsr250-api - 1.0 - true - + + junit + junit + ${junit.version} + test + - - org.mockito - mockito-all - ${org.mockito.version} - test - + + joda-time + joda-time + 1.6 + test + - - junit - junit - ${junit.version} - test - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + test + + + org.slf4j + slf4j-log4j12 + ${org.slf4j.version} + test + + + log4j + log4j + ${log4j.version} + test + - - - - - - log4j - log4j - ${log4j.version} - test - @@ -369,22 +233,14 @@ - - repository.plugin.springsource.release - SpringSource Maven Repository - http://repository.springsource.com/maven/bundles/release - - - spring-libs-release - Spring Framework Maven Release Repository - http://repo.springsource.org/libs-release + spring-plugins-release + http://repo.springsource.org/plugins-release - spring-libs-snapshot - Spring Framework Maven Release Repository - http://repo.springsource.org/libs-snapshot + spring-libs-release + http://repo.springsource.org/libs-release diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index 24342885a..5b7701243 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -19,17 +19,41 @@ + + org.springframework + spring-tx + ${org.springframework.version.range} + + + org.springframework + spring-context + ${org.springframework.version.range} + org.springframework spring-beans + ${org.springframework.version.range} + + + org.springframework + spring-core + ${org.springframework.version.range} + + + commons-logging + commons-logging + + org.springframework spring-expression + ${org.springframework.version.range} org.springframework spring-test + ${org.springframework.version.range} test @@ -76,57 +100,10 @@ javax.annotation jsr250-api + 1.0 true - - - org.mockito - mockito-all - test - - - - org.hamcrest - hamcrest-all - 1.1 - test - - - - junit - junit - test - - - - joda-time - joda-time - 1.6 - test - - - - org.slf4j - slf4j-api - test - - - org.slf4j - jcl-over-slf4j - test - - - org.slf4j - slf4j-log4j12 - test - - - log4j - log4j - test - - diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java index 3456c657f..14d88def5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2011-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,32 +15,27 @@ */ package org.springframework.data.mongodb.core; -import com.mongodb.DB; -import com.mongodb.Mongo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.jmx.export.annotation.ManagedResource; +import org.springframework.util.Assert; + +import com.mongodb.DB; +import com.mongodb.Mongo; /** * Mongo server administration exposed via JMX annotations * * @author Mark Pollack */ - @ManagedResource(description = "Mongo Admin Operations") public class MongoAdmin implements MongoAdminOperations { - /** - * Logger available to subclasses - */ - protected final Log logger = LogFactory.getLog(getClass()); - - private Mongo mongo; + private final Mongo mongo; private String username; private String password; public MongoAdmin(Mongo mongo) { + Assert.notNull(mongo); this.mongo = mongo; } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbUtils.java index 6dfdc0991..2600e3846 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbUtils.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbUtils.java @@ -15,14 +15,15 @@ */ package org.springframework.data.mongodb.core; -import com.mongodb.DB; -import com.mongodb.Mongo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.mongodb.CannotGetMongoDbConnectionException; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.util.Assert; +import com.mongodb.DB; +import com.mongodb.Mongo; + /** * Helper class featuring helper methods for internal MongoDb classes. *

@@ -36,7 +37,7 @@ import org.springframework.util.Assert; */ public abstract class MongoDbUtils { - private static final Log LOGGER = LogFactory.getLog(MongoDbUtils.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MongoDbUtils.class); /** * Private constructor to prevent instantiation. diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoFactoryBean.java index 71a7a735f..205e72c9c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoFactoryBean.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 the original author or authors. + * Copyright 2010-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,14 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.mongodb.core; import java.util.Arrays; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.FactoryBean; import org.springframework.dao.DataAccessException; import org.springframework.dao.support.PersistenceExceptionTranslator; @@ -41,11 +38,6 @@ import com.mongodb.WriteConcern; */ public class MongoFactoryBean implements FactoryBean, PersistenceExceptionTranslator { - /** - * Logger, available to subclasses. - */ - protected final Log logger = LogFactory.getLog(getClass()); - private MongoOptions mongoOptions; private String host; private Integer port; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java index eb12df708..f7266c22f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java @@ -29,9 +29,9 @@ import java.util.Map; import java.util.Scanner; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.bson.types.ObjectId; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -107,7 +107,7 @@ import com.mongodb.util.JSON; */ public class MongoTemplate implements MongoOperations, ApplicationContextAware { - private static final Log LOGGER = LogFactory.getLog(MongoTemplate.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MongoTemplate.class); private static final String ID = "_id"; private static final WriteResultChecking DEFAULT_WRITE_RESULT_CHECKING = WriteResultChecking.NONE; @SuppressWarnings("serial") diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoDbFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoDbFactory.java index a395c3655..1db56a77b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoDbFactory.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoDbFactory.java @@ -17,8 +17,6 @@ package org.springframework.data.mongodb.core; import java.net.UnknownHostException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.dao.DataAccessException; import org.springframework.data.authentication.UserCredentials; @@ -39,8 +37,6 @@ import com.mongodb.WriteConcern; */ public class SimpleMongoDbFactory implements DisposableBean, MongoDbFactory { - protected final Log logger = LogFactory.getLog(getClass()); - private final Mongo mongo; private final String databaseName; private String username; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java index 71f80b8ee..997a08cef 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Locale; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.GenericTypeResolver; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.Converter; @@ -52,7 +52,7 @@ import org.springframework.util.Assert; */ public class CustomConversions { - private static final Log LOG = LogFactory.getLog(CustomConversions.class); + private static final Logger LOG = LoggerFactory.getLogger(CustomConversions.class); private static final String READ_CONVERTER_NOT_SIMPLE = "Registering converter from %s to %s as reading converter although it doesn't convert from a Mongo supported type! You might wanna check you annotation setup at the converter implementation."; private static final String WRITE_CONVERTER_NOT_SIMPLE = "Registering converter from %s to %s as writing converter although it doesn't convert to a Mongo supported type! You might wanna check you annotation setup at the converter implementation."; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java index f539a04b3..9a63a5a45 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -72,7 +72,7 @@ import com.mongodb.DBRef; */ public class MappingMongoConverter extends AbstractMongoConverter implements ApplicationContextAware { - protected static final Log log = LogFactory.getLog(MappingMongoConverter.class); + protected static final Logger log = LoggerFactory.getLogger(MappingMongoConverter.class); protected final MappingContext, MongoPersistentProperty> mappingContext; protected final SpelExpressionParser spelExpressionParser = new SpelExpressionParser(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java index e70fc14ce..50ddc2491 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java @@ -18,7 +18,14 @@ package org.springframework.data.mongodb.core.convert; import java.math.BigDecimal; import java.math.BigInteger; +<<<<<<< HEAD +======= +import org.bson.BSON; +import org.bson.types.Binary; +>>>>>>> d1396e2... DATAMONGO-391 - Move to SLF4J for logging. import org.bson.types.ObjectId; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.core.convert.converter.Converter; import org.springframework.util.StringUtils; @@ -119,4 +126,55 @@ abstract class MongoConverters { return StringUtils.hasText(source) ? new BigInteger(source) : null; } } +<<<<<<< HEAD +======= + + /** + * Custom {@link Converter} to convert {@link UUID}s into {@link Binary}s. + * + * @author Oliver Gierke + */ + public static enum UUIDToBinaryConverter implements Converter { + + INSTANCE; + + /* + * (non-Javadoc) + * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) + */ + public Binary convert(UUID source) { + + try { + return source == null ? null : new Binary(BSON.B_UUID, source.toString().getBytes("UTF-8")); + } catch (UnsupportedEncodingException e) { + throw new MappingException(String.format("Could nor convert UUID %s into Binary!", source.toString()), e); + } + } + } + + public static enum BinaryToUUIDConverter implements Converter { + + INSTANCE; + + private static final Logger LOG = LoggerFactory.getLogger(BinaryToUUIDConverter.class); + + /* + * (non-Javadoc) + * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) + */ + public UUID convert(Binary source) { + + if (BSON.B_UUID != source.getType()) { + LOG.warn(String.format("Source binary %s is not an UUID actually! Trying to read it nevertheless...", + source.toString())); + } + + try { + return source == null ? null : UUID.fromString(new String(source.getData(), "UTF-8")); + } catch (UnsupportedEncodingException e) { + throw new MappingException(String.format("Could not convert Binary %s into UUID!", source.toString()), e); + } + } + } +>>>>>>> d1396e2... DATAMONGO-391 - Move to SLF4J for logging. } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java index 3bd717888..ad773e3c0 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java @@ -20,8 +20,8 @@ import java.lang.reflect.Field; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationListener; import org.springframework.data.mapping.PropertyHandler; import org.springframework.data.mapping.event.MappingContextEvent; @@ -47,7 +47,7 @@ import com.mongodb.util.JSON; public class MongoPersistentEntityIndexCreator implements ApplicationListener, MongoPersistentProperty>> { - private static final Log log = LogFactory.getLog(MongoPersistentEntityIndexCreator.class); + private static final Logger log = LoggerFactory.getLogger(MongoPersistentEntityIndexCreator.class); private final Map, Boolean> classesSeen = new ConcurrentHashMap, Boolean>(); private final MongoDbFactory mongoDbFactory; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java index 5308fdfd9..8e4fa265d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java @@ -21,9 +21,9 @@ import java.math.BigInteger; import java.util.HashSet; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.bson.types.ObjectId; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.mapping.Association; import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty; import org.springframework.data.mapping.model.SimpleTypeHolder; @@ -39,7 +39,7 @@ import com.mongodb.DBObject; public class BasicMongoPersistentProperty extends AnnotationBasedPersistentProperty implements MongoPersistentProperty { - private static final Log LOG = LogFactory.getLog(BasicMongoPersistentProperty.class); + private static final Logger LOG = LoggerFactory.getLogger(BasicMongoPersistentProperty.class); private static final String ID_FIELD_NAME = "_id"; private static final Set> SUPPORTED_ID_TYPES = new HashSet>(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java index fec81b2c3..9467dad8b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java @@ -15,12 +15,13 @@ */ package org.springframework.data.mongodb.core.mapping.event; -import com.mongodb.DBObject; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationListener; import org.springframework.core.GenericTypeResolver; +import com.mongodb.DBObject; + /** * Base class to implement domain class specific {@link ApplicationListener}s. * @@ -29,7 +30,7 @@ import org.springframework.core.GenericTypeResolver; */ public abstract class AbstractMongoEventListener implements ApplicationListener> { - protected final Log LOG = LogFactory.getLog(getClass()); + private static final Logger LOG = LoggerFactory.getLogger(AbstractMongoEventListener.class); private final Class domainClass; /** diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java index 8e1f6989c..54ccde4a9 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011 by the original author(s). + * Copyright 2011-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -15,22 +15,31 @@ */ package org.springframework.data.mongodb.core.mapping.event; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.mongodb.DBObject; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * @author Jon Brisbin */ public class LoggingEventListener extends AbstractMongoEventListener { - private Log log = LogFactory.getLog(getClass()); + private static final Logger log = LoggerFactory.getLogger(LoggingEventListener.class); + /* + * (non-Javadoc) + * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeConvert(java.lang.Object) + */ @Override public void onBeforeConvert(Object source) { log.info("onBeforeConvert: " + source); } + /* + * (non-Javadoc) + * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeSave(java.lang.Object, com.mongodb.DBObject) + */ @Override public void onBeforeSave(Object source, DBObject dbo) { try { @@ -39,19 +48,30 @@ public class LoggingEventListener extends AbstractMongoEventListener { } } + /* + * (non-Javadoc) + * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterSave(java.lang.Object, com.mongodb.DBObject) + */ @Override public void onAfterSave(Object source, DBObject dbo) { log.info("onAfterSave: " + source + ", " + dbo); } + /* + * (non-Javadoc) + * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterLoad(com.mongodb.DBObject) + */ @Override public void onAfterLoad(DBObject dbo) { log.info("onAfterLoad: " + dbo); } + /* + * (non-Javadoc) + * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterConvert(com.mongodb.DBObject, java.lang.Object) + */ @Override public void onAfterConvert(DBObject dbo, Object source) { log.info("onAfterConvert: " + dbo + ", " + source); } - } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AbstractMonitor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AbstractMonitor.java index fde9c6271..2a958750e 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AbstractMonitor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AbstractMonitor.java @@ -15,13 +15,14 @@ */ package org.springframework.data.mongodb.monitor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.data.mongodb.core.MongoDbUtils; + import com.mongodb.CommandResult; import com.mongodb.DB; import com.mongodb.Mongo; import com.mongodb.MongoException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.data.mongodb.core.MongoDbUtils; /** * Base class to encapsulate common configuration settings when connecting to a database @@ -30,7 +31,7 @@ import org.springframework.data.mongodb.core.MongoDbUtils; */ public abstract class AbstractMonitor { - private final Log logger = LogFactory.getLog(getClass()); + private final Logger logger = LoggerFactory.getLogger(getClass()); protected Mongo mongo; private String username; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java index a94d9d365..2188713f3 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java @@ -20,8 +20,8 @@ import static org.springframework.data.mongodb.core.query.Criteria.*; import java.util.Collection; import java.util.Iterator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.domain.Sort; import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.mapping.context.PersistentPropertyPath; @@ -47,7 +47,7 @@ import org.springframework.util.Assert; */ class MongoQueryCreator extends AbstractQueryCreator { - private static final Log LOG = LogFactory.getLog(MongoQueryCreator.class); + private static final Logger LOG = LoggerFactory.getLogger(MongoQueryCreator.class); private final MongoParameterAccessor accessor; private final boolean isGeoNearQuery; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java index adc1142b7..3cb8bda36 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java @@ -18,9 +18,9 @@ package org.springframework.data.mongodb.repository.query; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.bson.types.ObjectId; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.query.BasicQuery; import org.springframework.data.mongodb.core.query.Query; @@ -33,7 +33,7 @@ import org.springframework.data.mongodb.core.query.Query; public class StringBasedMongoQuery extends AbstractMongoQuery { private static final Pattern PLACEHOLDER = Pattern.compile("\\?(\\d+)"); - private static final Log LOG = LogFactory.getLog(StringBasedMongoQuery.class); + private static final Logger LOG = LoggerFactory.getLogger(StringBasedMongoQuery.class); private final String query; private final String fieldSpec; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java index 7d0605a9a..380d15efc 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java @@ -19,8 +19,8 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.index.Index; @@ -43,7 +43,7 @@ import org.springframework.util.Assert; class IndexEnsuringQueryCreationListener implements QueryCreationListener { private static final Set GEOSPATIAL_TYPES = new HashSet(Arrays.asList(Type.NEAR, Type.WITHIN)); - private static final Log LOG = LogFactory.getLog(IndexEnsuringQueryCreationListener.class); + private static final Logger LOG = LoggerFactory.getLogger(IndexEnsuringQueryCreationListener.class); private final MongoOperations operations; diff --git a/spring-data-mongodb/template.mf b/spring-data-mongodb/template.mf index f06932777..2d8e9e162 100644 --- a/spring-data-mongodb/template.mf +++ b/spring-data-mongodb/template.mf @@ -13,8 +13,8 @@ Import-Template: javax.tools.*;version="0", org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.apache.commons.collections15.*;version="[4.0.0,5.0.0)";resolution:=optional, - org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.bson.*;version="0", + org.slf4j.*;version="${org.slf4j.version:[=.=.=,+1.0.0)}", org.springframework.*;version="${org.springframework.version.30:[=.=.=.=,+1.0.0)}", org.springframework.data.*;version="${data.commons.version:[=.=.=.=,+1.0.0)}", org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",