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: eclipse-leshan#933 (comment) Signed-off-by: moznion <[email protected]>
moznion · Nov 27, 2020 · 5339609 · 5339609
1 parent b2dc0b8
commit 5339609
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 23 deletions.
diff --git a/...rg/eclipse/leshan/server/Destroyable.java → .../org/eclipse/leshan/core/Destroyable.java b/...rg/eclipse/leshan/server/Destroyable.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/.../org/eclipse/leshan/server/Startable.java → ...va/org/eclipse/leshan/core/Startable.java b/.../org/eclipse/leshan/server/Startable.java → ...va/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/.../org/eclipse/leshan/server/Stoppable.java → ...va/org/eclipse/leshan/core/Stoppable.java b/.../org/eclipse/leshan/server/Stoppable.java → ...va/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
@@ -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/...g/eclipse/leshan/server/californium/bootstrap/CaliforniumLwM2mBootstrapRequestSender.java b/...g/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();
     }
-}
+}
diff --git a/.../src/main/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServer.java b/.../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;
         }
     }
-}
+}
diff --git a/...in/java/org/eclipse/leshan/server/californium/registration/InMemoryRegistrationStore.java b/...in/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/...ain/java/org/eclipse/leshan/server/californium/request/CaliforniumLwM2mRequestSender.java b/...ain/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/...java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java b/...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();
         }
     }
-}
+}
diff --git a/...-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/RequestSender.java b/...-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
@@ -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/...an-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisRegistrationStore.java b/...an-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;