From 9e2923f571620293324ba4e4a2525f18787fdc92 Mon Sep 17 00:00:00 2001 From: Koen De Groote Date: Sun, 21 May 2017 11:50:13 +0200 Subject: [PATCH] For debug and trace levels, either added `isEnabled` check or made arguments parameterized. (#1028) --- src/main/java/io/ebean/Ebean.java | 2 +- src/main/java/io/ebean/config/PropertyExpression.java | 2 +- src/main/java/io/ebean/config/PropertyMapLoader.java | 6 +++--- .../java/io/ebeaninternal/server/core/InternString.java | 1 + .../io/ebeaninternal/server/core/bootup/ManifestReader.java | 2 +- .../ebeaninternal/server/deploy/BeanDescriptorManager.java | 6 +++--- .../io/ebeaninternal/server/deploy/BeanFinderManager.java | 2 +- .../server/deploy/BeanQueryAdapterManager.java | 2 +- .../server/deploy/PersistControllerManager.java | 2 +- .../ebeaninternal/server/deploy/PostConstructManager.java | 2 +- .../io/ebeaninternal/server/deploy/PostLoadManager.java | 2 +- .../io/ebeaninternal/server/deploy/parse/DeployUtil.java | 2 +- .../java/io/ebeaninternal/server/lib/ShutdownManager.java | 6 ++++++ .../server/transaction/JtaTransactionManager.java | 4 +++- .../io/ebeaninternal/server/type/DefaultTypeManager.java | 4 ++-- 15 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java index 5fbd9aa83..016250d67 100644 --- a/src/main/java/io/ebean/Ebean.java +++ b/src/main/java/io/ebean/Ebean.java @@ -154,7 +154,7 @@ public final class Ebean { } else { // look to see if there is a default server defined String defaultName = PrimaryServer.getDefaultServerName(); - logger.debug("defaultName:" + defaultName); + logger.debug("defaultName:{}", defaultName); if (defaultName != null && !defaultName.trim().isEmpty()) { defaultServer = getWithCreate(defaultName.trim()); } diff --git a/src/main/java/io/ebean/config/PropertyExpression.java b/src/main/java/io/ebean/config/PropertyExpression.java index fbfea2d20..4dc7e6565 100644 --- a/src/main/java/io/ebean/config/PropertyExpression.java +++ b/src/main/java/io/ebean/config/PropertyExpression.java @@ -91,7 +91,7 @@ final class PropertyExpression { // in which properties are being set/loaded. You can use // GlobalProperties.evaluateExpressions() to get any unresolved // expressions to be evaluated - logger.debug("Unable to evaluate expression [" + exp + "]"); + logger.debug("Unable to evaluate expression [{}]", exp); return null; } } diff --git a/src/main/java/io/ebean/config/PropertyMapLoader.java b/src/main/java/io/ebean/config/PropertyMapLoader.java index c9724f061..52c232527 100644 --- a/src/main/java/io/ebean/config/PropertyMapLoader.java +++ b/src/main/java/io/ebean/config/PropertyMapLoader.java @@ -112,7 +112,7 @@ final class PropertyMapLoader { otherProps = otherProps.replace("\\", "/"); InputStream is = findInputStream(otherProps); if (is != null) { - logger.debug("loading properties from " + otherProps); + logger.debug("loading properties from {}", otherProps); load(p, is); } else { logger.error("load.properties " + otherProps + " not found."); @@ -135,12 +135,12 @@ final class PropertyMapLoader { File f = new File(fileName); if (f.exists()) { - logger.debug(fileName + " found in file system"); + logger.debug("{} found in file system", fileName); return new FileInputStream(f); } else { InputStream in = findInClassPath(fileName); if (in != null) { - logger.debug(fileName + " found in classpath"); + logger.debug("{} found in classpath", fileName); } return in; } diff --git a/src/main/java/io/ebeaninternal/server/core/InternString.java b/src/main/java/io/ebeaninternal/server/core/InternString.java index d5ed47264..0de836335 100644 --- a/src/main/java/io/ebeaninternal/server/core/InternString.java +++ b/src/main/java/io/ebeaninternal/server/core/InternString.java @@ -23,6 +23,7 @@ public final class InternString { return null; } + //noinspection SynchronizationOnStaticField synchronized (map) { String v = map.get(s); if (v != null) { diff --git a/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java b/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java index 72edb61cb..25dc60dab 100644 --- a/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java +++ b/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java @@ -73,7 +73,7 @@ class ManifestReader { * Collect each individual package splitting by delimiters. */ private void add(String packages) { - String[] split = packages.split(",|;| "); + String[] split = packages.split("[,; ]"); for (String aSplit : split) { String pkg = aSplit.trim(); if (!pkg.isEmpty()) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 71312f356..9554b8470 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -626,7 +626,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { int lc = persistListenerManager.getRegisterCount(); int fc = beanFinderManager.getRegisterCount(); - logger.debug("BeanPersistControllers[" + cc + "] BeanFinders[" + fc + "] BeanPersistListeners[" + lc + "] BeanQueryAdapters[" + qa + "] BeanPostLoaders[" + pl + "] BeanPostConstructors[" + pc + "]"); + logger.debug("BeanPersistControllers[{}] BeanFinders[{}] BeanPersistListeners[{}] BeanQueryAdapters[{}] BeanPostLoaders[{}] BeanPostConstructors[{}]", cc, fc, lc, qa, pl, pc); } private void logStatus() { @@ -1239,7 +1239,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { if (desc.getIdType() == null) { if (desc.isPrimaryKeyCompoundOrNonNumeric()) { // assuming that this is a user supplied key like ISO country code or ISO currency code or lookup table code - logger.debug("Expecting user defined identity on " + desc.getFullName() + " - not using db sequence or autoincrement"); + logger.debug("Expecting user defined identity on {} - not using db sequence or autoincrement", desc.getFullName()); desc.setIdType(IdType.EXTERNAL); return; } @@ -1263,7 +1263,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { String seqName = desc.getIdGeneratorName(); if (seqName != null) { - logger.debug("explicit sequence " + seqName + " on " + desc.getFullName()); + logger.debug("explicit sequence {} on {}", seqName, desc.getFullName()); } else { String primaryKeyColumn = desc.getSinglePrimaryKeyColumn(); // use namingConvention to define sequence name diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java index 5e81ba3aa..9ffcb192c 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java @@ -32,7 +32,7 @@ public class BeanFinderManager { for (BeanFindController c : list) { if (c.isRegisterFor(deployDesc.getBeanType())) { - logger.debug("BeanFindController on[" + deployDesc.getFullName() + "] " + c.getClass().getName()); + logger.debug("BeanFindController on[{}] {}", deployDesc.getFullName(), c.getClass().getName()); deployDesc.setBeanFinder(c); } } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java index 25de267cc..5008425b3 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java @@ -33,7 +33,7 @@ public class BeanQueryAdapterManager { for (BeanQueryAdapter c : list) { if (c.isRegisterFor(deployDesc.getBeanType())) { - logger.debug("BeanQueryAdapter on[" + deployDesc.getFullName() + "] " + c.getClass().getName()); + logger.debug("BeanQueryAdapter on[{}] {}", deployDesc.getFullName(), c.getClass().getName()); deployDesc.addQueryAdapter(c); } } diff --git a/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java b/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java index 791c56ad9..06f4fae8d 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java @@ -33,7 +33,7 @@ public class PersistControllerManager { for (BeanPersistController c : list) { if (c.isRegisterFor(deployDesc.getBeanType())) { - logger.debug("BeanPersistController on[" + deployDesc.getFullName() + "] " + c.getClass().getName()); + logger.debug("BeanPersistController on[{}] {}", deployDesc.getFullName(), c.getClass().getName()); deployDesc.addPersistController(c); } } diff --git a/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java b/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java index d39b81df9..859abeb6f 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java @@ -32,7 +32,7 @@ public class PostConstructManager { for (BeanPostConstructListener c : list) { if (c.isRegisterFor(deployDesc.getBeanType())) { - logger.debug("BeanPostLoad on[" + deployDesc.getFullName() + "] " + c.getClass().getName()); + logger.debug("BeanPostLoad on[{}] {}", deployDesc.getFullName(), c.getClass().getName()); deployDesc.addPostConstructListener(c); } } diff --git a/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java b/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java index a8fac0009..f2d9b7d86 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java @@ -32,7 +32,7 @@ public class PostLoadManager { for (BeanPostLoad c : list) { if (c.isRegisterFor(deployDesc.getBeanType())) { - logger.debug("BeanPostLoad on[" + deployDesc.getFullName() + "] " + c.getClass().getName()); + logger.debug("BeanPostLoad on[{}] {}", deployDesc.getFullName(), c.getClass().getName()); deployDesc.addPostLoad(c); } } diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java index a7ad482c0..12796771c 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java @@ -202,7 +202,7 @@ public class DeployUtil { } else { // this is ok... - logger.trace("... transient property " + msg); + logger.trace("... transient property {}", msg); return null; } } catch (IllegalArgumentException e) { diff --git a/src/main/java/io/ebeaninternal/server/lib/ShutdownManager.java b/src/main/java/io/ebeaninternal/server/lib/ShutdownManager.java index 67b4d01f1..032592700 100644 --- a/src/main/java/io/ebeaninternal/server/lib/ShutdownManager.java +++ b/src/main/java/io/ebeaninternal/server/lib/ShutdownManager.java @@ -57,6 +57,7 @@ public final class ShutdownManager { * Return true if the system is in the process of stopping. */ public static boolean isStopping() { + //noinspection SynchronizationOnStaticField synchronized (servers) { return stopping; } @@ -74,6 +75,7 @@ public final class ShutdownManager { *

*/ public static void deregisterShutdownHook() { + //noinspection SynchronizationOnStaticField synchronized (servers) { try { Runtime.getRuntime().removeShutdownHook(shutdownHook); @@ -89,6 +91,7 @@ public final class ShutdownManager { * Register the shutdown hook with the Runtime. */ protected static void registerShutdownHook() { + //noinspection SynchronizationOnStaticField synchronized (servers) { try { String value = System.getProperty("ebean.registerShutdownHook"); @@ -110,6 +113,7 @@ public final class ShutdownManager { *

*/ public static void shutdown() { + //noinspection SynchronizationOnStaticField synchronized (servers) { if (stopping) { // Already run shutdown... @@ -175,6 +179,7 @@ public final class ShutdownManager { * Register an ebeanServer to be shutdown when the JVM is shutdown. */ public static void registerEbeanServer(SpiEbeanServer server) { + //noinspection SynchronizationOnStaticField synchronized (servers) { servers.add(server); } @@ -187,6 +192,7 @@ public final class ShutdownManager { *

*/ public static void unregisterEbeanServer(SpiEbeanServer server) { + //noinspection SynchronizationOnStaticField synchronized (servers) { servers.remove(server); } diff --git a/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java index 64350b7ec..c4712d6cc 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java @@ -227,7 +227,9 @@ public class JtaTransactionManager implements ExternalTransactionManager { break; default: - logger.debug("Jta Txn [" + transaction.getId() + "] status:" + status); + if (logger.isDebugEnabled()) { + logger.debug("Jta Txn [" + transaction.getId() + "] status:" + status); + } } } diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index ec03ca026..68c77e9af 100644 --- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -713,7 +713,7 @@ public final class DefaultTypeManager implements TypeManager { ScalarTypeConverter converter = foundType.newInstance(); ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, converter); - logger.debug("Register ScalarTypeWrapper from " + logicalType + " -> " + persistType + " using:" + foundType); + logger.debug("Register ScalarTypeWrapper from {} -> {} using:{}", logicalType, persistType, foundType); add(stw); } catch (Exception e) { @@ -745,7 +745,7 @@ public final class DefaultTypeManager implements TypeManager { AttributeConverter converter = foundType.newInstance(); ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, new AttributeConverterAdapter(converter)); - logger.debug("Register ScalarTypeWrapper from " + logicalType + " -> " + persistType + " using:" + foundType); + logger.debug("Register ScalarTypeWrapper from {} -> {} using:{}", logicalType, persistType, foundType); add(stw); } catch (Exception e) {