diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/CaliforniumEndpointsManager.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/CaliforniumEndpointsManager.java similarity index 99% rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/CaliforniumEndpointsManager.java rename to leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/CaliforniumEndpointsManager.java index 9c30e98196..d032491d03 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/CaliforniumEndpointsManager.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/CaliforniumEndpointsManager.java @@ -13,7 +13,7 @@ * Contributors: * Sierra Wireless - initial API and implementation *******************************************************************************/ -package org.eclipse.leshan.client.californium.impl; +package org.eclipse.leshan.client.californium; import java.io.IOException; import java.net.InetSocketAddress; 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 937e052aec..f784ea0b10 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 @@ -25,10 +25,9 @@ import org.eclipse.californium.core.network.config.NetworkConfig; import org.eclipse.californium.core.server.resources.Resource; import org.eclipse.californium.scandium.config.DtlsConnectorConfig.Builder; -import org.eclipse.leshan.client.californium.impl.BootstrapResource; -import org.eclipse.leshan.client.californium.impl.CaliforniumEndpointsManager; -import org.eclipse.leshan.client.californium.impl.CaliforniumLwM2mRequestSender; -import org.eclipse.leshan.client.californium.impl.ObjectResource; +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.observer.LwM2mClientObserver; import org.eclipse.leshan.client.observer.LwM2mClientObserverDispatcher; import org.eclipse.leshan.client.resource.LwM2mObjectEnabler; @@ -87,7 +86,7 @@ public LeshanClient(String endpoint, InetSocketAddress localAddress, @Override protected Resource createRoot() { // Use to handle Delete on "/" - return new org.eclipse.leshan.client.californium.impl.RootResource(bootstrapHandler, this); + return new org.eclipse.leshan.client.californium.RootResource(bootstrapHandler, this); } }; diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/LwM2mClientCoapResource.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/LwM2mClientCoapResource.java similarity index 98% rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/LwM2mClientCoapResource.java rename to leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/LwM2mClientCoapResource.java index 176397c3dc..1f579c7455 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/LwM2mClientCoapResource.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/LwM2mClientCoapResource.java @@ -13,7 +13,7 @@ * Contributors: * Sierra Wireless - initial API and implementation *******************************************************************************/ -package org.eclipse.leshan.client.californium.impl; +package org.eclipse.leshan.client.californium; import org.eclipse.californium.core.CoapResource; import org.eclipse.californium.core.network.Exchange; diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/RootResource.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/RootResource.java similarity index 98% rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/RootResource.java rename to leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/RootResource.java index f5703abcbc..7e18d02951 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/RootResource.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/RootResource.java @@ -14,7 +14,7 @@ * Sierra Wireless - initial API and implementation * Achim Kraus (Bosch Software Innovations GmbH) - use ServerIdentity *******************************************************************************/ -package org.eclipse.leshan.client.californium.impl; +package org.eclipse.leshan.client.californium; import static org.eclipse.leshan.core.californium.ResponseCodeUtil.toCoapResponseCode; diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/SecurityObjectPskStore.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/SecurityObjectPskStore.java similarity index 99% rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/SecurityObjectPskStore.java rename to leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/SecurityObjectPskStore.java index 7d0207c3d2..0a4cbe1243 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/SecurityObjectPskStore.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/SecurityObjectPskStore.java @@ -14,7 +14,7 @@ * Sierra Wireless - initial API and implementation * Achim Kraus (Bosch Software Innovations GmbH) - use ServerIdentity.SYSTEM *******************************************************************************/ -package org.eclipse.leshan.client.californium.impl; +package org.eclipse.leshan.client.californium; import static org.eclipse.leshan.LwM2mId.*; import static org.eclipse.leshan.client.request.ServerIdentity.SYSTEM; diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/BootstrapResource.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/bootstrap/BootstrapResource.java similarity index 96% rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/BootstrapResource.java rename to leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/bootstrap/BootstrapResource.java index b4335a1b83..3e286054e3 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/BootstrapResource.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/bootstrap/BootstrapResource.java @@ -14,7 +14,7 @@ * Sierra Wireless - initial API and implementation * Achim Kraus (Bosch Software Innovations GmbH) - use ServerIdentity *******************************************************************************/ -package org.eclipse.leshan.client.californium.impl; +package org.eclipse.leshan.client.californium.bootstrap; import static org.eclipse.leshan.core.californium.ResponseCodeUtil.toCoapResponseCode; @@ -23,6 +23,7 @@ import org.eclipse.californium.core.coap.Response; import org.eclipse.californium.core.server.resources.CoapExchange; import org.eclipse.californium.core.server.resources.Resource; +import org.eclipse.leshan.client.californium.LwM2mClientCoapResource; import org.eclipse.leshan.client.request.ServerIdentity; import org.eclipse.leshan.client.servers.BootstrapHandler; import org.eclipse.leshan.core.request.BootstrapFinishRequest; diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/ObjectResource.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/ObjectResource.java similarity index 99% rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/ObjectResource.java rename to leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/ObjectResource.java index 22d3d07c56..395a654651 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/ObjectResource.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/ObjectResource.java @@ -17,7 +17,7 @@ * Achim Kraus (Bosch Software Innovations GmbH) - implement POST "/oid/iid" * as UPDATE instance *******************************************************************************/ -package org.eclipse.leshan.client.californium.impl; +package org.eclipse.leshan.client.californium.object; import static org.eclipse.leshan.core.californium.ResponseCodeUtil.toCoapResponseCode; @@ -28,6 +28,7 @@ import org.eclipse.californium.core.server.resources.CoapExchange; import org.eclipse.californium.core.server.resources.Resource; import org.eclipse.leshan.Link; +import org.eclipse.leshan.client.californium.LwM2mClientCoapResource; import org.eclipse.leshan.client.request.ServerIdentity; import org.eclipse.leshan.client.resource.LwM2mObjectEnabler; import org.eclipse.leshan.client.resource.NotifySender; diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/ResourceObserveFilter.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/ResourceObserveFilter.java similarity index 96% rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/ResourceObserveFilter.java rename to leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/ResourceObserveFilter.java index deddf155fe..bd84d22b4d 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/ResourceObserveFilter.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/ResourceObserveFilter.java @@ -14,7 +14,7 @@ * Achim Kraus (Bosch Software Innovations GmbH) - Initial creation ******************************************************************************/ -package org.eclipse.leshan.client.californium.impl; +package org.eclipse.leshan.client.californium.object; import org.eclipse.californium.core.observe.ObserveRelation; import org.eclipse.californium.core.observe.ObserveRelationFilter; diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/CaliforniumLwM2mRequestSender.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/CaliforniumLwM2mRequestSender.java similarity index 96% rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/CaliforniumLwM2mRequestSender.java rename to leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/CaliforniumLwM2mRequestSender.java index 08fc5627da..b1208a645c 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/CaliforniumLwM2mRequestSender.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/CaliforniumLwM2mRequestSender.java @@ -13,13 +13,14 @@ * Contributors: * Zebra Technologies - initial API and implementation *******************************************************************************/ -package org.eclipse.leshan.client.californium.impl; +package org.eclipse.leshan.client.californium.request; import java.net.InetSocketAddress; import org.eclipse.californium.core.coap.MessageObserver; import org.eclipse.californium.core.coap.Request; import org.eclipse.californium.core.coap.Response; +import org.eclipse.leshan.client.californium.CaliforniumEndpointsManager; import org.eclipse.leshan.client.request.LwM2mRequestSender; import org.eclipse.leshan.core.californium.AsyncRequestObserver; import org.eclipse.leshan.core.californium.SyncRequestObserver; diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/CoapRequestBuilder.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/CoapRequestBuilder.java similarity index 98% rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/CoapRequestBuilder.java rename to leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/CoapRequestBuilder.java index 20b4d339fd..e5ecefae8c 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/CoapRequestBuilder.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/CoapRequestBuilder.java @@ -13,7 +13,7 @@ * Contributors: * Zebra Technologies - initial API and implementation *******************************************************************************/ -package org.eclipse.leshan.client.californium.impl; +package org.eclipse.leshan.client.californium.request; import java.net.InetSocketAddress; import java.util.HashMap; diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/LwM2mClientResponseBuilder.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/LwM2mClientResponseBuilder.java similarity index 98% rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/LwM2mClientResponseBuilder.java rename to leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/LwM2mClientResponseBuilder.java index d81699ba18..de3d7d3d54 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/impl/LwM2mClientResponseBuilder.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/LwM2mClientResponseBuilder.java @@ -13,7 +13,7 @@ * Contributors: * Zebra Technologies - initial API and implementation *******************************************************************************/ -package org.eclipse.leshan.client.californium.impl; +package org.eclipse.leshan.client.californium.request; import static org.eclipse.leshan.core.californium.ResponseCodeUtil.toLwM2mResponseCode; diff --git a/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/LockStepLwM2mClient.java b/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/LockStepLwM2mClient.java index 593a1a8880..55a76953b5 100644 --- a/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/LockStepLwM2mClient.java +++ b/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/LockStepLwM2mClient.java @@ -22,7 +22,7 @@ import org.eclipse.californium.core.network.serialization.UdpDataSerializer; import org.eclipse.californium.core.test.lockstep.LockstepEndpoint; import org.eclipse.californium.elements.RawData; -import org.eclipse.leshan.client.californium.impl.CoapRequestBuilder; +import org.eclipse.leshan.client.californium.request.CoapRequestBuilder; import org.eclipse.leshan.core.request.UplinkRequest; import org.eclipse.leshan.core.response.LwM2mResponse;