Remove "impl" package in leshan-client-cf

eclipse-leshan · Oct 29, 2019 · c79d91c · c79d91c
1 parent d7d54e7
commit c79d91c
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 16 deletions.
diff --git a/...ium/impl/CaliforniumEndpointsManager.java → ...ifornium/CaliforniumEndpointsManager.java b/...ium/impl/CaliforniumEndpointsManager.java → ...ifornium/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
@@ -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/...fornium/impl/LwM2mClientCoapResource.java → .../californium/LwM2mClientCoapResource.java b/...fornium/impl/LwM2mClientCoapResource.java → .../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/...client/californium/impl/RootResource.java → ...shan/client/californium/RootResource.java b/...client/californium/impl/RootResource.java → ...shan/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/...ifornium/impl/SecurityObjectPskStore.java → ...t/californium/SecurityObjectPskStore.java b/...ifornium/impl/SecurityObjectPskStore.java → ...t/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/...t/californium/impl/BootstrapResource.java → ...ifornium/bootstrap/BootstrapResource.java b/...t/californium/impl/BootstrapResource.java → ...ifornium/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/...ient/californium/impl/ObjectResource.java → ...nt/californium/object/ObjectResource.java b/...ient/californium/impl/ObjectResource.java → ...nt/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/...lifornium/impl/ResourceObserveFilter.java → ...fornium/object/ResourceObserveFilter.java b/...lifornium/impl/ResourceObserveFilter.java → ...fornium/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/...m/impl/CaliforniumLwM2mRequestSender.java → ...equest/CaliforniumLwM2mRequestSender.java b/...m/impl/CaliforniumLwM2mRequestSender.java → ...equest/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/.../californium/impl/CoapRequestBuilder.java → ...lifornium/request/CoapRequestBuilder.java b/.../californium/impl/CoapRequestBuilder.java → ...lifornium/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/...nium/impl/LwM2mClientResponseBuilder.java → ...m/request/LwM2mClientResponseBuilder.java b/...nium/impl/LwM2mClientResponseBuilder.java → ...m/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/...gration-tests/src/test/java/org/eclipse/leshan/integration/tests/LockStepLwM2mClient.java b/...gration-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;