From 1f1f0b7bc2e0c9acf193d6d5b281b1959287d360 Mon Sep 17 00:00:00 2001 From: Nikita Date: Fri, 23 Dec 2016 14:08:18 +0300 Subject: [PATCH] CronSchedule moved to org.redisson.api package --- .../src/main/java/org/redisson/RedissonExecutorService.java | 1 + .../src/main/java/org/redisson/{ => api}/CronSchedule.java | 5 ++--- .../java/org/redisson/api/RScheduledExecutorService.java | 2 -- .../org/redisson/api/RScheduledExecutorServiceAsync.java | 2 -- .../executor/RedissonScheduledExecutorServiceTest.java | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) rename redisson/src/main/java/org/redisson/{ => api}/CronSchedule.java (97%) diff --git a/redisson/src/main/java/org/redisson/RedissonExecutorService.java b/redisson/src/main/java/org/redisson/RedissonExecutorService.java index 21b6fe192..94addf097 100644 --- a/redisson/src/main/java/org/redisson/RedissonExecutorService.java +++ b/redisson/src/main/java/org/redisson/RedissonExecutorService.java @@ -40,6 +40,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; +import org.redisson.api.CronSchedule; import org.redisson.api.RFuture; import org.redisson.api.RScheduledExecutorService; import org.redisson.api.RScheduledFuture; diff --git a/redisson/src/main/java/org/redisson/CronSchedule.java b/redisson/src/main/java/org/redisson/api/CronSchedule.java similarity index 97% rename from redisson/src/main/java/org/redisson/CronSchedule.java rename to redisson/src/main/java/org/redisson/api/CronSchedule.java index 448e23e7f..7bb71b954 100644 --- a/redisson/src/main/java/org/redisson/CronSchedule.java +++ b/redisson/src/main/java/org/redisson/api/CronSchedule.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson; +package org.redisson.api; -import org.redisson.api.RScheduledExecutorService; import org.redisson.executor.CronExpression; /** @@ -27,7 +26,7 @@ import org.redisson.executor.CronExpression; * @author Nikita Koksharov * */ -public class CronSchedule { +public final class CronSchedule { private CronExpression expression; diff --git a/redisson/src/main/java/org/redisson/api/RScheduledExecutorService.java b/redisson/src/main/java/org/redisson/api/RScheduledExecutorService.java index 32dc52da7..35bb5a845 100644 --- a/redisson/src/main/java/org/redisson/api/RScheduledExecutorService.java +++ b/redisson/src/main/java/org/redisson/api/RScheduledExecutorService.java @@ -18,8 +18,6 @@ package org.redisson.api; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; -import org.redisson.CronSchedule; - /** * Distributed implementation of {@link java.util.concurrent.ScheduledExecutorService} * diff --git a/redisson/src/main/java/org/redisson/api/RScheduledExecutorServiceAsync.java b/redisson/src/main/java/org/redisson/api/RScheduledExecutorServiceAsync.java index 13de21ea5..3e293c08c 100644 --- a/redisson/src/main/java/org/redisson/api/RScheduledExecutorServiceAsync.java +++ b/redisson/src/main/java/org/redisson/api/RScheduledExecutorServiceAsync.java @@ -18,8 +18,6 @@ package org.redisson.api; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import org.redisson.CronSchedule; - /** * Distributed implementation of {@link java.util.concurrent.ScheduledExecutorService} * diff --git a/redisson/src/test/java/org/redisson/executor/RedissonScheduledExecutorServiceTest.java b/redisson/src/test/java/org/redisson/executor/RedissonScheduledExecutorServiceTest.java index 352ea5d1d..30c9d4fb4 100644 --- a/redisson/src/test/java/org/redisson/executor/RedissonScheduledExecutorServiceTest.java +++ b/redisson/src/test/java/org/redisson/executor/RedissonScheduledExecutorServiceTest.java @@ -15,9 +15,9 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.redisson.BaseTest; -import org.redisson.CronSchedule; import org.redisson.RedissonNode; import org.redisson.RedissonRuntimeEnvironment; +import org.redisson.api.CronSchedule; import org.redisson.api.RScheduledExecutorService; import org.redisson.api.RScheduledFuture; import org.redisson.config.Config;