Move all registration stuff in theirs own "engine" package

eclipse-leshan · Feb 7, 2020 · 39b6335 · 39b6335
1 parent 221b755
commit 39b6335
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClient.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClient.java
@@ -29,13 +29,13 @@
 import org.eclipse.californium.elements.util.NamedThreadFactory;
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig.Builder;
 import org.eclipse.leshan.client.LwM2mClient;
-import org.eclipse.leshan.client.RegistrationEngine;
-import org.eclipse.leshan.client.RegistrationEngineFactory;
 import org.eclipse.leshan.client.RegistrationUpdateHandler;
 import org.eclipse.leshan.client.bootstrap.BootstrapHandler;
 import org.eclipse.leshan.client.californium.bootstrap.BootstrapResource;
 import org.eclipse.leshan.client.californium.object.ObjectResource;
 import org.eclipse.leshan.client.californium.request.CaliforniumLwM2mRequestSender;
+import org.eclipse.leshan.client.engine.RegistrationEngine;
+import org.eclipse.leshan.client.engine.RegistrationEngineFactory;
 import org.eclipse.leshan.client.observer.LwM2mClientObserver;
 import org.eclipse.leshan.client.observer.LwM2mClientObserverDispatcher;
 import org.eclipse.leshan.client.resource.LwM2mObjectEnabler;

diff --git a/...an-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClientBuilder.java b/...an-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClientBuilder.java
@@ -31,9 +31,9 @@
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig.Builder;
 import org.eclipse.leshan.LwM2mId;
-import org.eclipse.leshan.client.DefaultRegistrationEngineFactory;
-import org.eclipse.leshan.client.RegistrationEngine;
-import org.eclipse.leshan.client.RegistrationEngineFactory;
+import org.eclipse.leshan.client.engine.DefaultRegistrationEngineFactory;
+import org.eclipse.leshan.client.engine.RegistrationEngine;
+import org.eclipse.leshan.client.engine.RegistrationEngineFactory;
 import org.eclipse.leshan.client.object.Device;
 import org.eclipse.leshan.client.object.Security;
 import org.eclipse.leshan.client.object.Server;

diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationUpdateHandler.java b/leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationUpdateHandler.java
@@ -17,6 +17,7 @@
 
 import org.eclipse.leshan.LwM2mId;
 import org.eclipse.leshan.client.bootstrap.BootstrapHandler;
+import org.eclipse.leshan.client.engine.RegistrationEngine;
 import org.eclipse.leshan.client.resource.LwM2mObjectEnabler;
 import org.eclipse.leshan.client.resource.LwM2mObjectTree;
 import org.eclipse.leshan.client.resource.listener.ObjectsListener;

diff --git a/...han/client/DefaultRegistrationEngine.java → ...ent/engine/DefaultRegistrationEngine.java b/...han/client/DefaultRegistrationEngine.java → ...ent/engine/DefaultRegistrationEngine.java
@@ -13,7 +13,7 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.leshan.client;
+package org.eclipse.leshan.client.engine;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -27,6 +27,8 @@
 
 import org.eclipse.leshan.LwM2m;
 import org.eclipse.leshan.ResponseCode;
+import org.eclipse.leshan.client.EndpointsManager;
+import org.eclipse.leshan.client.RegistrationUpdate;
 import org.eclipse.leshan.client.bootstrap.BootstrapHandler;
 import org.eclipse.leshan.client.observer.LwM2mClientObserver;
 import org.eclipse.leshan.client.request.LwM2mRequestSender;

diff --git a/...ent/DefaultRegistrationEngineFactory.java → ...ine/DefaultRegistrationEngineFactory.java b/...ent/DefaultRegistrationEngineFactory.java → ...ine/DefaultRegistrationEngineFactory.java
@@ -13,11 +13,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.leshan.client;
+package org.eclipse.leshan.client.engine;
 
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 
+import org.eclipse.leshan.client.EndpointsManager;
 import org.eclipse.leshan.client.bootstrap.BootstrapHandler;
 import org.eclipse.leshan.client.observer.LwM2mClientObserver;
 import org.eclipse.leshan.client.request.LwM2mRequestSender;

diff --git a/...pse/leshan/client/RegistrationEngine.java → ...han/client/engine/RegistrationEngine.java b/...pse/leshan/client/RegistrationEngine.java → ...han/client/engine/RegistrationEngine.java
@@ -13,7 +13,9 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.leshan.client;
+package org.eclipse.leshan.client.engine;
+
+import org.eclipse.leshan.client.RegistrationUpdate;
 
 public interface RegistrationEngine {
 

diff --git a/...han/client/RegistrationEngineFactory.java → ...ent/engine/RegistrationEngineFactory.java b/...han/client/RegistrationEngineFactory.java → ...ent/engine/RegistrationEngineFactory.java
@@ -13,11 +13,12 @@
  * Contributors:
  *     Sierra Wireless - initial API and implementation
  *******************************************************************************/
-package org.eclipse.leshan.client;
+package org.eclipse.leshan.client.engine;
 
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 
+import org.eclipse.leshan.client.EndpointsManager;
 import org.eclipse.leshan.client.bootstrap.BootstrapHandler;
 import org.eclipse.leshan.client.observer.LwM2mClientObserver;
 import org.eclipse.leshan.client.request.LwM2mRequestSender;