From e3e30cafdd75f2232d7ca0fbd05c5430ec8d51c3 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sat, 27 Aug 2022 17:15:08 +1200 Subject: [PATCH] Refactor tidy error and log messages - part 2 --- ebean-api/src/main/java/io/ebean/DbContext.java | 12 +++--------- .../main/java/io/ebean/event/ShutdownManager.java | 4 +--- .../java/io/ebeaninternal/api/LoadManyRequest.java | 2 +- .../ebeaninternal/server/core/DefaultBeanLoader.java | 2 +- .../server/core/bootup/BootupClasses.java | 2 +- .../server/deploy/BeanDescriptorManager.java | 5 ----- .../io/ebeaninternal/server/deploy/BeanTable.java | 4 ---- .../server/executor/DefaultBackgroundExecutor.java | 1 - 8 files changed, 7 insertions(+), 25 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DbContext.java b/ebean-api/src/main/java/io/ebean/DbContext.java index 3dca530a6..8f3883e8e 100644 --- a/ebean-api/src/main/java/io/ebean/DbContext.java +++ b/ebean-api/src/main/java/io/ebean/DbContext.java @@ -16,7 +16,6 @@ import static java.lang.System.Logger.Level.ERROR; final class DbContext { private static final System.Logger log = EbeanVersion.log; - static { EbeanVersion.getVersion(); } @@ -24,14 +23,9 @@ final class DbContext { private static final DbContext INSTANCE = new DbContext(); private final ConcurrentHashMap concMap = new ConcurrentHashMap<>(); - private final HashMap syncMap = new HashMap<>(); - private final ReentrantLock lock = new ReentrantLock(); - /** - * The 'default' Database. - */ private Database defaultDatabase; private DbContext() { @@ -70,9 +64,9 @@ final class DbContext { */ Database getDefault() { if (defaultDatabase == null) { - String msg = "The default Database has not been defined?"; - msg += " This is normally set via the ebean.datasource.default property."; - msg += " Otherwise it should be registered programmatically via registerServer()"; + String msg = "The default Database has not been defined?" + + " This is normally set via the ebean.datasource.default property." + + " Otherwise it should be registered programmatically via registerServer()"; throw new PersistenceException(msg); } return defaultDatabase; diff --git a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java index 3de1bb10b..91c351f30 100644 --- a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java +++ b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java @@ -122,9 +122,7 @@ public final class ShutdownManager { // Already run shutdown... return; } - if (log.isLoggable(DEBUG)) { - log.log(DEBUG, "Ebean shutting down"); - } + log.log(DEBUG, "Ebean shutting down"); stopping = true; deregisterShutdownHook(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java index b2956f1d2..41cd37de9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java @@ -117,7 +117,7 @@ public final class LoadManyRequest extends LoadRequest { if (log.isLoggable(DEBUG)) { EntityBean ownerBean = bc.getOwnerBean(); Object parentId = desc.getId(ownerBean); - log.log(DEBUG, "BeanCollection after lazy load was empty. type:" + ownerBean.getClass().getName() + " id:" + parentId + " owner:" + ownerBean); + log.log(DEBUG, "BeanCollection after lazy load was empty. type:{0} id:{1} owner:{2}", ownerBean.getClass().getName(), parentId, ownerBean); } } else if (loadCache && many.isUseCache()) { desc.cacheManyPropPut(many, bc, desc.getId(bc.getOwnerBean())); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index 4731ebd01..38a0ebe4d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -110,7 +110,7 @@ final class DefaultBeanLoader { if (beanCollection != null) { if (beanCollection.checkEmptyLazyLoad()) { if (log.isLoggable(DEBUG)) { - log.log(DEBUG, "BeanCollection after load was empty. Owner:" + beanCollection.getOwnerBean()); + log.log(DEBUG, "BeanCollection after load was empty. Owner:{0}", beanCollection.getOwnerBean()); } } else if (useManyIdCache) { parentDesc.cacheManyPropPut(many, beanCollection, parentId); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java index 40c4ad442..464731024 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java @@ -207,7 +207,7 @@ public class BootupClasses implements Predicate> { try { return cls.getConstructor().newInstance(); } catch (NoSuchMethodException e) { - log.log(DEBUG, "Ignore/expected - no default constructor: " + e.getMessage()); + log.log(DEBUG, "Ignore/expected - no default constructor: {0}", e.getMessage()); return null; } catch (Exception e) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 1c8311a4d..9293d9d2c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -868,11 +868,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy if (possibleLower.contains(searchName)) { // we have a match prop.setMappedBy(possibleMappedBy); - if (log.isLoggable(DEBUG)) { - String m = "Implicitly found mappedBy for " + targetDesc + "." + prop; - m += " by searching for [" + searchName + "] against " + matchSet; - log.log(DEBUG, m); - } return true; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java index 0cc2f6ccf..5f76d4779 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java @@ -1,13 +1,10 @@ package io.ebeaninternal.server.deploy; -import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.server.core.InternString; import io.ebeaninternal.server.deploy.meta.DeployBeanTable; import io.ebeaninternal.server.deploy.meta.DeployTableJoin; import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; -import static java.lang.System.Logger.Level.DEBUG; - /** * Used for associated beans in place of a BeanDescriptor. This is done to avoid @@ -107,7 +104,6 @@ public final class BeanTable { if (complexKey) { // just to copy the column name rather than prefix with the foreignKeyPrefix. // I think that with complex keys this is the more common approach. - CoreLog.internal.log(DEBUG, "On table[{0}] foreign key column [{1}]", baseTable, lc); fk = lc; } if (sqlFormulaSelect != null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java index f134f9da7..d7975e04b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java @@ -28,7 +28,6 @@ public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor { this.schedulePool = new DaemonScheduleThreadPool(schedulePoolSize, shutdownWaitSeconds, namePrefix + "-periodic-"); this.pool = new DaemonExecutorService(shutdownWaitSeconds, namePrefix); this.wrapper = wrapper; - log.log(DEBUG, "Created backgroundExecutor {0} (schedulePoolSize={1}, shutdownWaitSeconds={2})", namePrefix, schedulePoolSize, shutdownWaitSeconds); } /**