From ed2455f460128ec785ff38b17f380472f2502236 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Thu, 3 Dec 2020 15:47:14 +1300 Subject: [PATCH] #2121 - Refactor internals move DefaultBackgroundExecutor etc --- .../java/io/ebeaninternal/server/core/DefaultContainer.java | 5 +++-- .../server/{lib => executor}/DaemonScheduleThreadPool.java | 2 +- .../server/{lib => executor}/DaemonThreadFactory.java | 2 +- .../server/{core => executor}/DefaultBackgroundExecutor.java | 3 +-- .../{core => executor}/DefaultBackgroundExecutorTest.java | 3 ++- .../sql => executor}/TestShutdownWithBackgroundTasks.java | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) rename ebean-core/src/main/java/io/ebeaninternal/server/{lib => executor}/DaemonScheduleThreadPool.java (97%) rename ebean-core/src/main/java/io/ebeaninternal/server/{lib => executor}/DaemonThreadFactory.java (95%) rename ebean-core/src/main/java/io/ebeaninternal/server/{core => executor}/DefaultBackgroundExecutor.java (96%) rename ebean-core/src/test/java/io/ebeaninternal/server/{core => executor}/DefaultBackgroundExecutorTest.java (97%) rename ebean-core/src/test/java/io/ebeaninternal/server/{lib/sql => executor}/TestShutdownWithBackgroundTasks.java (96%) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java index 46f9124c0..a352a5b6d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java @@ -10,14 +10,15 @@ import io.ebean.config.TenantMode; import io.ebean.config.UnderscoreNamingConvention; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.config.dbplatform.h2.H2Platform; +import io.ebean.event.ShutdownManager; import io.ebean.service.SpiContainer; +import io.ebeaninternal.api.DbOffline; import io.ebeaninternal.api.SpiBackgroundExecutor; import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.api.DbOffline; import io.ebeaninternal.server.cluster.ClusterManager; import io.ebeaninternal.server.core.bootup.BootupClassPathSearch; import io.ebeaninternal.server.core.bootup.BootupClasses; -import io.ebean.event.ShutdownManager; +import io.ebeaninternal.server.executor.DefaultBackgroundExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java similarity index 97% rename from ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java rename to ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java index c6636794d..3bdf15777 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.lib; +package io.ebeaninternal.server.executor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonThreadFactory.java similarity index 95% rename from ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java rename to ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonThreadFactory.java index 4b1c87770..d1bbf3ee1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonThreadFactory.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.lib; +package io.ebeaninternal.server.executor; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java similarity index 96% rename from ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java rename to ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java index 238911959..c93cbfac7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java @@ -1,7 +1,6 @@ -package io.ebeaninternal.server.core; +package io.ebeaninternal.server.executor; import io.ebeaninternal.api.SpiBackgroundExecutor; -import io.ebeaninternal.server.lib.DaemonScheduleThreadPool; import org.slf4j.MDC; import java.util.Map; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java similarity index 97% rename from ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java index aa8c56598..264edac57 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java @@ -1,5 +1,6 @@ -package io.ebeaninternal.server.core; +package io.ebeaninternal.server.executor; +import io.ebeaninternal.server.executor.DefaultBackgroundExecutor; import org.junit.Ignore; import org.junit.Test; import org.slf4j.MDC; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestShutdownWithBackgroundTasks.java b/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java similarity index 96% rename from ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestShutdownWithBackgroundTasks.java rename to ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java index f8846ac62..a0a98c38a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/lib/sql/TestShutdownWithBackgroundTasks.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.lib.sql; +package io.ebeaninternal.server.executor; import io.ebean.BackgroundExecutor; import io.ebean.BaseTestCase;