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 1a69f90e3..ed56860fa 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 @@ -20,6 +20,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationListener; import org.springframework.core.GenericTypeResolver; +import org.springframework.data.mongodb.core.query.SerializationUtils; /** * Base class to implement domain class specific {@link ApplicationListener}s. @@ -104,7 +105,7 @@ public abstract class AbstractMongoEventListener implements ApplicationListen public void onBeforeConvert(BeforeConvertEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format("onBeforeConvert(%s)", event.getSource())); + LOG.debug(String.format("onBeforeConvert(%s)", SerializationUtils.serializeToJsonSafely(event.getSource()))); } } @@ -117,7 +118,7 @@ public abstract class AbstractMongoEventListener implements ApplicationListen public void onBeforeSave(BeforeSaveEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format("onBeforeSave(%s, %s)", event.getSource(), event.getDocument())); + LOG.debug(String.format("onBeforeSave(%s, %s)", SerializationUtils.serializeToJsonSafely(event.getSource()), SerializationUtils.serializeToJsonSafely(event.getDocument()))); } } @@ -130,7 +131,7 @@ public abstract class AbstractMongoEventListener implements ApplicationListen public void onAfterSave(AfterSaveEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format("onAfterSave(%s, %s)", event.getSource(), event.getDocument())); + LOG.debug(String.format("onAfterSave(%s, %s)", SerializationUtils.serializeToJsonSafely(event.getSource()), SerializationUtils.serializeToJsonSafely(event.getDocument()))); } } @@ -143,7 +144,7 @@ public abstract class AbstractMongoEventListener implements ApplicationListen public void onAfterLoad(AfterLoadEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format("onAfterLoad(%s)", event.getDocument())); + LOG.debug(String.format("onAfterLoad(%s)", SerializationUtils.serializeToJsonSafely(event.getDocument()))); } } @@ -156,7 +157,7 @@ public abstract class AbstractMongoEventListener implements ApplicationListen public void onAfterConvert(AfterConvertEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format("onAfterConvert(%s, %s)", event.getDocument(), event.getSource())); + LOG.debug(String.format("onAfterConvert(%s, %s)", SerializationUtils.serializeToJsonSafely(event.getDocument()), SerializationUtils.serializeToJsonSafely(event.getSource()))); } } @@ -169,7 +170,7 @@ public abstract class AbstractMongoEventListener implements ApplicationListen public void onAfterDelete(AfterDeleteEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format("onAfterDelete(%s)", event.getDocument())); + LOG.debug(String.format("onAfterDelete(%s)", SerializationUtils.serializeToJsonSafely(event.getDocument()))); } } @@ -182,7 +183,7 @@ public abstract class AbstractMongoEventListener implements ApplicationListen public void onBeforeDelete(BeforeDeleteEvent event) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format("onBeforeDelete(%s)", event.getDocument())); + LOG.debug(String.format("onBeforeDelete(%s)", SerializationUtils.serializeToJsonSafely(event.getDocument()))); } } } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListenerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListenerUnitTests.java index f66592d6e..eec825bff 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListenerUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListenerUnitTests.java @@ -17,15 +17,18 @@ package org.springframework.data.mongodb.core.mapping.event; import static org.assertj.core.api.Assertions.*; +import java.time.Instant; + import org.bson.Document; import org.junit.jupiter.api.Test; - import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.mongodb.core.mapping.Account; import org.springframework.data.mongodb.repository.Contact; import org.springframework.data.mongodb.repository.Person; +import com.mongodb.BasicDBObject; + /** * Unit tests for {@link AbstractMongoEventListener}. * @@ -154,6 +157,14 @@ public class AbstractMongoEventListenerUnitTests { assertThat(listener.invokedOnBeforeDelete).isFalse(); } + @Test // GH-3968 + public void debugLogShouldNotFailMongoDBCodecError() { + + MongoMappingEvent event = new BeforeConvertEvent<>(new BasicDBObject("date", Instant.now()), "collection-1"); + UntypedEventListener listener = new UntypedEventListener(); + listener.onApplicationEvent(event); + } + class SamplePersonEventListener extends AbstractMongoEventListener { boolean invokedOnBeforeConvert; diff --git a/spring-data-mongodb/src/test/resources/logback.xml b/spring-data-mongodb/src/test/resources/logback.xml index a36841c97..64550c957 100644 --- a/spring-data-mongodb/src/test/resources/logback.xml +++ b/spring-data-mongodb/src/test/resources/logback.xml @@ -7,11 +7,16 @@ + + + + +