diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java index 34b59e780..2b96add6b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java @@ -88,14 +88,18 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport { private ServerAddress parseServerAddress(String source) { if (!StringUtils.hasText(source)) { - LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source)); + if(LOG.isWarnEnabled()) { + LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source)); + } return null; } String[] hostAndPort = extractHostAddressAndPort(source.trim()); if (hostAndPort.length > 2) { - LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source)); + if(LOG.isWarnEnabled()) { + LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source)); + } return null; } @@ -105,9 +109,13 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport { return port == null ? new ServerAddress(hostAddress) : new ServerAddress(hostAddress, port); } catch (UnknownHostException e) { - LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "host", hostAndPort[0])); + if(LOG.isWarnEnabled()) { + LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "host", hostAndPort[0])); + } } catch (NumberFormatException e) { - LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "port", hostAndPort[1])); + if(LOG.isWarnEnabled()) { + LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "port", hostAndPort[1])); + } } return null; 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 365990a74..c2005db07 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 @@ -208,8 +208,10 @@ public class MongoPersistentEntityIndexCreator implements ApplicationListener ObjectUtils.nullSafeEquals(indexNameToLookUp, indexInfo.getName())) // .next() // .doOnError(e -> { - LOGGER.debug( - String.format("Failed to load index information for collection '%s'.", indexDefinition.getCollection()), - e); + if(LOGGER.isDebugEnabled()) { + LOGGER.debug( + String.format("Failed to load index information for collection '%s'.", indexDefinition.getCollection()), + e); + } }); } 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 31d9dadfb..66c88cf9b 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 @@ -93,9 +93,11 @@ public class BasicMongoPersistentProperty extends AnnotationBasedPersistentPrope String annotatedName = getAnnotatedFieldName(); if (!ID_FIELD_NAME.equals(annotatedName)) { - LOG.warn(String.format( - "Customizing field name for id property '%s.%s' is not allowed! Custom name ('%s') will not be considered!", - owner.getName(), getName(), annotatedName)); + if(LOG.isWarnEnabled()) { + LOG.warn(String.format( + "Customizing field name for id property '%s.%s' is not allowed! Custom name ('%s') will not be considered!", + owner.getName(), getName(), annotatedName)); + } } } } 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 b86bb7f39..eb6e1751c 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 @@ -40,7 +40,9 @@ public class LoggingEventListener extends AbstractMongoEventListener { */ @Override public void onBeforeConvert(BeforeConvertEvent event) { - LOGGER.info(String.format("onBeforeConvert: %s", event.getSource())); + if(LOGGER.isInfoEnabled()) { + LOGGER.info(String.format("onBeforeConvert: %s", event.getSource())); + } } /* @@ -49,7 +51,9 @@ public class LoggingEventListener extends AbstractMongoEventListener { */ @Override public void onBeforeSave(BeforeSaveEvent event) { - LOGGER.info(String.format("onBeforeSave: %s, %s", event.getSource(), serializeToJsonSafely(event.getDocument()))); + if(LOGGER.isInfoEnabled()) { + LOGGER.info(String.format("onBeforeSave: %s, %s", event.getSource(), serializeToJsonSafely(event.getDocument()))); + } } /* @@ -58,7 +62,9 @@ public class LoggingEventListener extends AbstractMongoEventListener { */ @Override public void onAfterSave(AfterSaveEvent event) { - LOGGER.info(String.format("onAfterSave: %s, %s", event.getSource(), serializeToJsonSafely(event.getDocument()))); + if(LOGGER.isInfoEnabled()) { + LOGGER.info(String.format("onAfterSave: %s, %s", event.getSource(), serializeToJsonSafely(event.getDocument()))); + } } /* @@ -67,7 +73,9 @@ public class LoggingEventListener extends AbstractMongoEventListener { */ @Override public void onAfterLoad(AfterLoadEvent event) { - LOGGER.info(String.format("onAfterLoad: %s", serializeToJsonSafely(event.getDocument()))); + if(LOGGER.isInfoEnabled()) { + LOGGER.info(String.format("onAfterLoad: %s", serializeToJsonSafely(event.getDocument()))); + } } /* @@ -76,7 +84,9 @@ public class LoggingEventListener extends AbstractMongoEventListener { */ @Override public void onAfterConvert(AfterConvertEvent event) { - LOGGER.info(String.format("onAfterConvert: %s, %s", serializeToJsonSafely(event.getDocument()), event.getSource())); + if(LOGGER.isInfoEnabled()) { + LOGGER.info(String.format("onAfterConvert: %s, %s", serializeToJsonSafely(event.getDocument()), event.getSource())); + } } /* @@ -85,7 +95,9 @@ public class LoggingEventListener extends AbstractMongoEventListener { */ @Override public void onAfterDelete(AfterDeleteEvent event) { - LOGGER.info(String.format("onAfterDelete: %s", serializeToJsonSafely(event.getDocument()))); + if(LOGGER.isInfoEnabled()) { + LOGGER.info(String.format("onAfterDelete: %s", serializeToJsonSafely(event.getDocument()))); + } } /* @@ -94,6 +106,8 @@ public class LoggingEventListener extends AbstractMongoEventListener { */ @Override public void onBeforeDelete(BeforeDeleteEvent event) { - LOGGER.info(String.format("onBeforeDelete: %s", serializeToJsonSafely(event.getDocument()))); + if(LOGGER.isInfoEnabled()) { + LOGGER.info(String.format("onBeforeDelete: %s", serializeToJsonSafely(event.getDocument()))); + } } } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java index 9f93a0274..747e2061b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java @@ -59,14 +59,14 @@ public class ValidatingMongoEventListener extends AbstractMongoEventListener event) { if (LOG.isDebugEnabled()) { - LOG.debug(String.format("Validating object: {}", event.getSource())); + LOG.debug(String.format("Validating object: %s", event.getSource())); } Set violations = validator.validate(event.getSource()); if (!violations.isEmpty()) { if (LOG.isDebugEnabled()) { - LOG.info(String.format("During object: {} validation violations found: {}", event.getSource(), violations)); + LOG.info(String.format("During object: %s validation violations found: %s", event.getSource(), violations)); } throw new ConstraintViolationException(violations); } 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 43f66810a..05ef1686b 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 @@ -136,7 +136,10 @@ class IndexEnsuringQueryCreationListener implements QueryCreationListener