From fa0f58cc84e20442a845de02525ae7c89b4b9dd4 Mon Sep 17 00:00:00 2001 From: moznion Date: Thu, 26 Nov 2020 22:53:24 +0900 Subject: [PATCH] #933: Move the interfaces to manage the state to leshan-core package Move the interfaces `Destroyable`, `Startable` and `Stoppable` to `leshan-core` package from `leshan-server-core`. This commit aims to use these interfaces with `LwM2mObjectEnabler` to control the state of that. Ref: https://github.com/eclipse/leshan/issues/933#issuecomment-731036021 Signed-off-by: moznion --- .../main/java/org/eclipse/leshan/core}/Destroyable.java | 2 +- .../src/main/java/org/eclipse/leshan/core}/Startable.java | 2 +- .../src/main/java/org/eclipse/leshan/core}/Stoppable.java | 2 +- .../eclipse/leshan/server/californium/LeshanServer.java | 6 +++--- .../bootstrap/CaliforniumLwM2mBootstrapRequestSender.java | 4 ++-- .../californium/bootstrap/LeshanBootstrapServer.java | 8 ++++---- .../registration/InMemoryRegistrationStore.java | 6 +++--- .../request/CaliforniumLwM2mRequestSender.java | 2 +- .../request/CaliforniumQueueModeRequestSender.java | 4 ++-- .../leshan/server/californium/request/RequestSender.java | 2 +- .../eclipse/leshan/server/queue/PresenceServiceImpl.java | 2 +- .../leshan/server/redis/RedisRegistrationStore.java | 6 +++--- 12 files changed, 23 insertions(+), 23 deletions(-) rename {leshan-server-core/src/main/java/org/eclipse/leshan/server => leshan-core/src/main/java/org/eclipse/leshan/core}/Destroyable.java (96%) rename {leshan-server-core/src/main/java/org/eclipse/leshan/server => leshan-core/src/main/java/org/eclipse/leshan/core}/Startable.java (95%) rename {leshan-server-core/src/main/java/org/eclipse/leshan/server => leshan-core/src/main/java/org/eclipse/leshan/core}/Stoppable.java (95%) diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Destroyable.java b/leshan-core/src/main/java/org/eclipse/leshan/core/Destroyable.java similarity index 96% rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/Destroyable.java rename to leshan-core/src/main/java/org/eclipse/leshan/core/Destroyable.java index 9f6f5923e7..e791ee4df4 100644 --- a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Destroyable.java +++ b/leshan-core/src/main/java/org/eclipse/leshan/core/Destroyable.java @@ -13,7 +13,7 @@ * Contributors: * Sierra Wireless - initial API and implementation *******************************************************************************/ -package org.eclipse.leshan.server; +package org.eclipse.leshan.core; public interface Destroyable { diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Startable.java b/leshan-core/src/main/java/org/eclipse/leshan/core/Startable.java similarity index 95% rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/Startable.java rename to leshan-core/src/main/java/org/eclipse/leshan/core/Startable.java index fb41866754..34a7c228d1 100644 --- a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Startable.java +++ b/leshan-core/src/main/java/org/eclipse/leshan/core/Startable.java @@ -13,7 +13,7 @@ * Contributors: * Sierra Wireless - initial API and implementation *******************************************************************************/ -package org.eclipse.leshan.server; +package org.eclipse.leshan.core; public interface Startable { diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Stoppable.java b/leshan-core/src/main/java/org/eclipse/leshan/core/Stoppable.java similarity index 95% rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/Stoppable.java rename to leshan-core/src/main/java/org/eclipse/leshan/core/Stoppable.java index c4fb7bb779..5c5beaa13d 100644 --- a/leshan-server-core/src/main/java/org/eclipse/leshan/server/Stoppable.java +++ b/leshan-core/src/main/java/org/eclipse/leshan/core/Stoppable.java @@ -13,7 +13,7 @@ * Contributors: * Sierra Wireless - initial API and implementation *******************************************************************************/ -package org.eclipse.leshan.server; +package org.eclipse.leshan.core; public interface Stoppable { diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServer.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServer.java index e1e1474a4e..67e81c51ef 100644 --- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServer.java +++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServer.java @@ -44,9 +44,9 @@ import org.eclipse.leshan.core.response.LwM2mResponse; import org.eclipse.leshan.core.response.ResponseCallback; import org.eclipse.leshan.core.util.Validate; -import org.eclipse.leshan.server.Destroyable; -import org.eclipse.leshan.server.Startable; -import org.eclipse.leshan.server.Stoppable; +import org.eclipse.leshan.core.Destroyable; +import org.eclipse.leshan.core.Startable; +import org.eclipse.leshan.core.Stoppable; import org.eclipse.leshan.server.californium.observation.ObservationServiceImpl; import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore; import org.eclipse.leshan.server.californium.registration.RegisterResource; diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/CaliforniumLwM2mBootstrapRequestSender.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/CaliforniumLwM2mBootstrapRequestSender.java index 81b6f29006..4812ad91fe 100644 --- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/CaliforniumLwM2mBootstrapRequestSender.java +++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/CaliforniumLwM2mBootstrapRequestSender.java @@ -30,7 +30,7 @@ import org.eclipse.leshan.core.response.ErrorCallback; import org.eclipse.leshan.core.response.LwM2mResponse; import org.eclipse.leshan.core.response.ResponseCallback; -import org.eclipse.leshan.server.Destroyable; +import org.eclipse.leshan.core.Destroyable; import org.eclipse.leshan.server.bootstrap.BootstrapSession; import org.eclipse.leshan.server.bootstrap.LwM2mBootstrapRequestSender; import org.eclipse.leshan.server.californium.request.RequestSender; @@ -134,4 +134,4 @@ public void cancelOngoingRequests(BootstrapSession session) { public void destroy() { sender.destroy(); } -} \ No newline at end of file +} diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServer.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServer.java index 03e02b3577..3a5ba27c50 100644 --- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServer.java +++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServer.java @@ -27,9 +27,9 @@ import org.eclipse.leshan.core.node.codec.LwM2mNodeDecoder; import org.eclipse.leshan.core.node.codec.LwM2mNodeEncoder; import org.eclipse.leshan.core.util.Validate; -import org.eclipse.leshan.server.Destroyable; -import org.eclipse.leshan.server.Startable; -import org.eclipse.leshan.server.Stoppable; +import org.eclipse.leshan.core.Destroyable; +import org.eclipse.leshan.core.Startable; +import org.eclipse.leshan.core.Stoppable; import org.eclipse.leshan.server.bootstrap.BootstrapConfigurationStore; import org.eclipse.leshan.server.bootstrap.BootstrapHandler; import org.eclipse.leshan.server.bootstrap.BootstrapHandlerFactory; @@ -245,4 +245,4 @@ public CoapEndpoint getUnsecuredEndpoint() { return unsecuredEndpoint; } } -} \ No newline at end of file +} diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/registration/InMemoryRegistrationStore.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/registration/InMemoryRegistrationStore.java index a25fa0bd78..ae47a8b48c 100644 --- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/registration/InMemoryRegistrationStore.java +++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/registration/InMemoryRegistrationStore.java @@ -48,9 +48,9 @@ import org.eclipse.californium.elements.EndpointContext; import org.eclipse.leshan.core.observation.Observation; import org.eclipse.leshan.core.util.NamedThreadFactory; -import org.eclipse.leshan.server.Destroyable; -import org.eclipse.leshan.server.Startable; -import org.eclipse.leshan.server.Stoppable; +import org.eclipse.leshan.core.Destroyable; +import org.eclipse.leshan.core.Startable; +import org.eclipse.leshan.core.Stoppable; import org.eclipse.leshan.server.californium.observation.ObserveUtil; import org.eclipse.leshan.server.registration.Deregistration; import org.eclipse.leshan.server.registration.ExpirationListener; diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumLwM2mRequestSender.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumLwM2mRequestSender.java index 9474890db4..a1c5a3d659 100644 --- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumLwM2mRequestSender.java +++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumLwM2mRequestSender.java @@ -37,7 +37,7 @@ import org.eclipse.leshan.core.response.ObserveResponse; import org.eclipse.leshan.core.response.ResponseCallback; import org.eclipse.leshan.core.util.Validate; -import org.eclipse.leshan.server.Destroyable; +import org.eclipse.leshan.core.Destroyable; import org.eclipse.leshan.server.californium.observation.ObservationServiceImpl; import org.eclipse.leshan.server.model.LwM2mModelProvider; import org.eclipse.leshan.server.registration.Registration; diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java index 2ab41eee87..a9085d5fd7 100644 --- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java +++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java @@ -21,7 +21,7 @@ import org.eclipse.leshan.core.request.exception.ClientSleepingException; import org.eclipse.leshan.core.request.exception.TimeoutException; import org.eclipse.leshan.core.response.ErrorCallback; -import org.eclipse.leshan.server.Destroyable; +import org.eclipse.leshan.core.Destroyable; import org.eclipse.leshan.server.queue.PresenceServiceImpl; import org.eclipse.leshan.server.queue.QueueModeLwM2mRequestSender; import org.eclipse.leshan.server.registration.Registration; @@ -136,4 +136,4 @@ public void destroy() { ((Destroyable) delegatedSender).destroy(); } } -} \ No newline at end of file +} diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/RequestSender.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/RequestSender.java index 2871d65ff0..2fda8c012e 100644 --- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/RequestSender.java +++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/RequestSender.java @@ -53,7 +53,7 @@ import org.eclipse.leshan.core.response.ResponseCallback; import org.eclipse.leshan.core.util.NamedThreadFactory; import org.eclipse.leshan.core.util.Validate; -import org.eclipse.leshan.server.Destroyable; +import org.eclipse.leshan.core.Destroyable; import org.eclipse.leshan.server.request.LowerLayerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java b/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java index 6b26183913..569ffcf919 100644 --- a/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java +++ b/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.eclipse.leshan.core.util.NamedThreadFactory; -import org.eclipse.leshan.server.Destroyable; +import org.eclipse.leshan.core.Destroyable; import org.eclipse.leshan.server.registration.Registration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisRegistrationStore.java b/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisRegistrationStore.java index 96d6f76c34..cd8ad077cd 100644 --- a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisRegistrationStore.java +++ b/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisRegistrationStore.java @@ -41,9 +41,9 @@ import org.eclipse.leshan.core.observation.Observation; import org.eclipse.leshan.core.util.NamedThreadFactory; import org.eclipse.leshan.core.util.Validate; -import org.eclipse.leshan.server.Destroyable; -import org.eclipse.leshan.server.Startable; -import org.eclipse.leshan.server.Stoppable; +import org.eclipse.leshan.core.Destroyable; +import org.eclipse.leshan.core.Startable; +import org.eclipse.leshan.core.Stoppable; import org.eclipse.leshan.server.californium.observation.ObserveUtil; import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore; import org.eclipse.leshan.server.redis.serialization.ObservationSerDes;