From 39b6335fef8ff2444edbe0c5e5237e77dac83863 Mon Sep 17 00:00:00 2001 From: Simon Bernard Date: Thu, 30 Jan 2020 16:41:57 +0100 Subject: [PATCH] Move all registration stuff in theirs own "engine" package --- .../org/eclipse/leshan/client/californium/LeshanClient.java | 4 ++-- .../leshan/client/californium/LeshanClientBuilder.java | 6 +++--- .../eclipse/leshan/client/RegistrationUpdateHandler.java | 1 + .../client/{ => engine}/DefaultRegistrationEngine.java | 4 +++- .../{ => engine}/DefaultRegistrationEngineFactory.java | 3 ++- .../leshan/client/{ => engine}/RegistrationEngine.java | 4 +++- .../client/{ => engine}/RegistrationEngineFactory.java | 3 ++- 7 files changed, 16 insertions(+), 9 deletions(-) rename leshan-client-core/src/main/java/org/eclipse/leshan/client/{ => engine}/DefaultRegistrationEngine.java (99%) rename leshan-client-core/src/main/java/org/eclipse/leshan/client/{ => engine}/DefaultRegistrationEngineFactory.java (97%) rename leshan-client-core/src/main/java/org/eclipse/leshan/client/{ => engine}/RegistrationEngine.java (91%) rename leshan-client-core/src/main/java/org/eclipse/leshan/client/{ => engine}/RegistrationEngineFactory.java (93%) 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 index 02014cca2c..b36a6fb978 100644 --- 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/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClientBuilder.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClientBuilder.java index d91eec47dd..ba31ed4133 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClientBuilder.java +++ b/leshan-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 index e4d40fece0..c5373efd9b 100644 --- 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/leshan-client-core/src/main/java/org/eclipse/leshan/client/DefaultRegistrationEngine.java b/leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngine.java similarity index 99% rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/DefaultRegistrationEngine.java rename to leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngine.java index ae7b3fe70f..3bb5b0f873 100644 --- a/leshan-client-core/src/main/java/org/eclipse/leshan/client/DefaultRegistrationEngine.java +++ b/leshan-client-core/src/main/java/org/eclipse/leshan/client/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/leshan-client-core/src/main/java/org/eclipse/leshan/client/DefaultRegistrationEngineFactory.java b/leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngineFactory.java similarity index 97% rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/DefaultRegistrationEngineFactory.java rename to leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngineFactory.java index 9dd892508c..e3e4f4652b 100644 --- a/leshan-client-core/src/main/java/org/eclipse/leshan/client/DefaultRegistrationEngineFactory.java +++ b/leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/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/leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationEngine.java b/leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngine.java similarity index 91% rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationEngine.java rename to leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngine.java index 2eaf78b6a2..5c9cbd2f4a 100644 --- a/leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationEngine.java +++ b/leshan-client-core/src/main/java/org/eclipse/leshan/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/leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationEngineFactory.java b/leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngineFactory.java similarity index 93% rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationEngineFactory.java rename to leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngineFactory.java index 5367d462d6..71d6318d03 100644 --- a/leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationEngineFactory.java +++ b/leshan-client-core/src/main/java/org/eclipse/leshan/client/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;