From bca2adc32a635e8381951a1e044fd4c5bd8b989d Mon Sep 17 00:00:00 2001
From: Jens Schauder <jschauder@vmware.com>
Date: Wed, 17 Nov 2021 13:50:56 +0100
Subject: [PATCH] Polishing.

Guard String.format in debug logs with isDebugEnabled.

See #2359
---
 .../repository/cdi/JpaRepositoryExtension.java    |  7 ++++---
 .../JpaMetamodelMappingContextFactoryBean.java    |  2 +-
 .../data/jpa/repository/query/NamedQuery.java     | 14 +++++++++++---
 .../support/MergingPersistenceUnitManager.java    | 15 ++++++++++++---
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java b/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java
index 50bcda0f3..23fab9896 100644
--- a/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java
+++ b/src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java
@@ -49,7 +49,7 @@ public class JpaRepositoryExtension extends CdiRepositoryExtensionSupport {
 
 	private static final Log LOGGER = LogFactory.getLog(JpaRepositoryExtension.class);
 
-	private final Map<Set<Annotation>, Bean<EntityManager>> entityManagers = new HashMap<Set<Annotation>, Bean<EntityManager>>();
+	private final Map<Set<Annotation>, Bean<EntityManager>> entityManagers = new HashMap<>();
 
 	public JpaRepositoryExtension() {
 		LOGGER.info("Activating CDI extension for Spring Data JPA repositories.");
@@ -64,11 +64,12 @@ public class JpaRepositoryExtension extends CdiRepositoryExtensionSupport {
 	 */
 	@SuppressWarnings("unchecked")
 	<X> void processBean(@Observes ProcessBean<X> processBean) {
+
 		Bean<X> bean = processBean.getBean();
 		for (Type type : bean.getTypes()) {
 			// Check if the bean is an EntityManager.
 			if (type instanceof Class<?> && EntityManager.class.isAssignableFrom((Class<?>) type)) {
-				Set<Annotation> qualifiers = new HashSet<Annotation>(bean.getQualifiers());
+				Set<Annotation> qualifiers = new HashSet<>(bean.getQualifiers());
 				if (bean.isAlternative() || !entityManagers.containsKey(qualifiers)) {
 					LOGGER.debug(String.format("Discovered '%s' with qualifiers %s.", EntityManager.class.getName(), qualifiers));
 					entityManagers.put(qualifiers, (Bean<EntityManager>) bean);
@@ -121,7 +122,7 @@ public class JpaRepositoryExtension extends CdiRepositoryExtensionSupport {
 		}
 
 		// Construct and return the repository bean.
-		return new JpaRepositoryBean<T>(beanManager, entityManagerBean, qualifiers, repositoryType,
+		return new JpaRepositoryBean<>(beanManager, entityManagerBean, qualifiers, repositoryType,
 				Optional.of(getCustomImplementationDetector()));
 	}
 }
diff --git a/src/main/java/org/springframework/data/jpa/repository/config/JpaMetamodelMappingContextFactoryBean.java b/src/main/java/org/springframework/data/jpa/repository/config/JpaMetamodelMappingContextFactoryBean.java
index ca000690d..d7f69b861 100644
--- a/src/main/java/org/springframework/data/jpa/repository/config/JpaMetamodelMappingContextFactoryBean.java
+++ b/src/main/java/org/springframework/data/jpa/repository/config/JpaMetamodelMappingContextFactoryBean.java
@@ -71,7 +71,7 @@ public class JpaMetamodelMappingContextFactoryBean extends AbstractFactoryBean<J
 	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance()
 	 */
 	@Override
-	protected JpaMetamodelMappingContext createInstance() throws Exception {
+	protected JpaMetamodelMappingContext createInstance() {
 
 		if (LOG.isDebugEnabled()) {
 			LOG.debug("Initializing JpaMetamodelMappingContext…");
diff --git a/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java b/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java
index 8927619ec..f9a581671 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/NamedQuery.java
@@ -115,7 +115,10 @@ final class NamedQuery extends AbstractJpaQuery {
 			lookupEm.createNamedQuery(queryName);
 			return true;
 		} catch (IllegalArgumentException e) {
-			LOG.debug(String.format("Did not find named query %s", queryName));
+
+			if (LOG.isDebugEnabled()) {
+				LOG.debug(String.format("Did not find named query %s", queryName));
+			}
 			return false;
 		} finally {
 			lookupEm.close();
@@ -134,15 +137,20 @@ final class NamedQuery extends AbstractJpaQuery {
 
 		final String queryName = method.getNamedQueryName();
 
-		LOG.debug(String.format("Looking up named query %s", queryName));
+		if (LOG.isDebugEnabled()) {
+			LOG.debug(String.format("Looking up named query %s", queryName));
+		}
 
 		if (!hasNamedQuery(em, queryName)) {
 			return null;
 		}
 
 		try {
+
 			RepositoryQuery query = new NamedQuery(method, em);
-			LOG.debug(String.format("Found named query %s!", queryName));
+			if (LOG.isDebugEnabled()) {
+				LOG.debug(String.format("Found named query %s!", queryName));
+			}
 			return query;
 		} catch (IllegalArgumentException e) {
 			return null;
diff --git a/src/main/java/org/springframework/data/jpa/support/MergingPersistenceUnitManager.java b/src/main/java/org/springframework/data/jpa/support/MergingPersistenceUnitManager.java
index b8bf05bb1..f6877b8a1 100644
--- a/src/main/java/org/springframework/data/jpa/support/MergingPersistenceUnitManager.java
+++ b/src/main/java/org/springframework/data/jpa/support/MergingPersistenceUnitManager.java
@@ -68,21 +68,30 @@ public class MergingPersistenceUnitManager extends DefaultPersistenceUnitManager
 
 		for (URL url : oldPui.getJarFileUrls()) {
 			if (!pui.getJarFileUrls().contains(url)) {
-				LOG.debug(String.format("Adding JAR file URL %s to persistence unit %s.", url, persistenceUnitName));
+
+				if (LOG.isDebugEnabled()) {
+					LOG.debug(String.format("Adding JAR file URL %s to persistence unit %s.", url, persistenceUnitName));
+				}
 				pui.addJarFileUrl(url);
 			}
 		}
 
 		for (String className : oldPui.getManagedClassNames()) {
 			if (!pui.getManagedClassNames().contains(className)) {
-				LOG.debug(String.format("Adding class %s to PersistenceUnit %s", className, persistenceUnitName));
+
+				if (LOG.isDebugEnabled()) {
+					LOG.debug(String.format("Adding class %s to PersistenceUnit %s", className, persistenceUnitName));
+				}
 				pui.addManagedClassName(className);
 			}
 		}
 
 		for (String mappingFileName : oldPui.getMappingFileNames()) {
 			if (!pui.getMappingFileNames().contains(mappingFileName)) {
-				LOG.debug(String.format("Adding mapping file to persistence unit %s.", mappingFileName, persistenceUnitName));
+
+				if (LOG.isDebugEnabled()) {
+					LOG.debug(String.format("Adding mapping file to persistence unit %s.", mappingFileName, persistenceUnitName));
+				}
 				pui.addMappingFileName(mappingFileName);
 			}
 		}