From 330617f9d80958757d8fdf7f163343d39ab18441 Mon Sep 17 00:00:00 2001 From: Simon Bernard Date: Fri, 30 Jun 2023 18:37:29 +0200 Subject: [PATCH] Expose CoapEndpoint instead of Endpoint at client side --- .../californium/endpoint/CaliforniumClientEndpoint.java | 8 ++++---- .../endpoint/CaliforniumClientEndpointFactory.java | 7 ++++--- .../endpoint/CaliforniumClientEndpointsProvider.java | 3 ++- .../endpoint/coap/CoapClientEndpointFactory.java | 2 +- .../endpoint/coaps/CoapsClientEndpointFactory.java | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpoint.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpoint.java index a6e6125bae..99fa3f9922 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpoint.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpoint.java @@ -24,7 +24,7 @@ import org.eclipse.californium.core.coap.Request; import org.eclipse.californium.core.coap.Response; import org.eclipse.californium.core.config.CoapConfig; -import org.eclipse.californium.core.network.Endpoint; +import org.eclipse.californium.core.network.CoapEndpoint; import org.eclipse.leshan.client.californium.CaliforniumConnectionController; import org.eclipse.leshan.client.endpoint.ClientEndpointToolbox; import org.eclipse.leshan.client.endpoint.LwM2mClientEndpoint; @@ -49,7 +49,7 @@ public class CaliforniumClientEndpoint implements LwM2mClientEndpoint { private final Protocol protocol; private final ScheduledExecutorService executor; - private final Endpoint endpoint; + private final CoapEndpoint endpoint; private final ClientEndpointToolbox toolbox; private final ClientCoapMessageTranslator translator; private final IdentityHandler identityHandler; @@ -57,7 +57,7 @@ public class CaliforniumClientEndpoint implements LwM2mClientEndpoint { private final LwM2mModel model; private final ExceptionTranslator exceptionTranslator; - public CaliforniumClientEndpoint(Protocol protocol, Endpoint endpoint, ClientCoapMessageTranslator translator, + public CaliforniumClientEndpoint(Protocol protocol, CoapEndpoint endpoint, ClientCoapMessageTranslator translator, ClientEndpointToolbox toolbox, IdentityHandler identityHandler, CaliforniumConnectionController connectionController, LwM2mModel model, ExceptionTranslator exceptionTranslator, ScheduledExecutorService executor) { @@ -171,7 +171,7 @@ public void forceReconnection(LwM2mServer server, boolean resume) { connectionController.forceReconnection(endpoint, server, resume); } - public Endpoint getCoapEndpoint() { + public CoapEndpoint getCoapEndpoint() { return endpoint; } } diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointFactory.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointFactory.java index 77cbd13622..c89426dd48 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointFactory.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointFactory.java @@ -19,7 +19,7 @@ import java.security.cert.Certificate; import java.util.List; -import org.eclipse.californium.core.network.Endpoint; +import org.eclipse.californium.core.network.CoapEndpoint; import org.eclipse.californium.elements.config.Configuration; import org.eclipse.leshan.client.californium.CaliforniumConnectionController; import org.eclipse.leshan.client.endpoint.ClientEndpointToolbox; @@ -32,8 +32,9 @@ public interface CaliforniumClientEndpointFactory { Protocol getProtocol(); - Endpoint createCoapEndpoint(InetAddress clientAddress, Configuration defaultConfiguration, ServerInfo serverInfo, - boolean clientInitiatedOnly, List trustStore, ClientEndpointToolbox toolbox); + CoapEndpoint createCoapEndpoint(InetAddress clientAddress, Configuration defaultConfiguration, + ServerInfo serverInfo, boolean clientInitiatedOnly, List trustStore, + ClientEndpointToolbox toolbox); CaliforniumConnectionController createConnectionController(); diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointsProvider.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointsProvider.java index 84d7f74a1d..094ead72cc 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointsProvider.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointsProvider.java @@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit; import org.eclipse.californium.core.CoapServer; +import org.eclipse.californium.core.network.CoapEndpoint; import org.eclipse.californium.core.network.Endpoint; import org.eclipse.californium.core.network.Exchange; import org.eclipse.californium.core.server.resources.Resource; @@ -172,7 +173,7 @@ public LwM2mServer createEndpoint(ServerInfo serverInfo, boolean clientInitiated if (endpointFactory.getProtocol().getUriScheme().equals(serverInfo.getFullUri().getScheme())) { // create Californium endpoint - Endpoint coapEndpoint = endpointFactory.createCoapEndpoint(clientAddress, serverConfig, serverInfo, + CoapEndpoint coapEndpoint = endpointFactory.createCoapEndpoint(clientAddress, serverConfig, serverInfo, clientInitiatedOnly, trustStore, toolbox); if (coapEndpoint != null) { diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapClientEndpointFactory.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapClientEndpointFactory.java index 5ca0754977..bd75d0504f 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapClientEndpointFactory.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapClientEndpointFactory.java @@ -65,7 +65,7 @@ protected String getLoggingTag(URI uri) { } @Override - public Endpoint createCoapEndpoint(InetAddress clientAddress, Configuration defaultConfiguration, + public CoapEndpoint createCoapEndpoint(InetAddress clientAddress, Configuration defaultConfiguration, ServerInfo serverInfo, boolean clientInitiatedOnly, List trustStore, ClientEndpointToolbox toolbox) { return createEndpointBuilder(new InetSocketAddress(clientAddress, 0), serverInfo, defaultConfiguration).build(); diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coaps/CoapsClientEndpointFactory.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coaps/CoapsClientEndpointFactory.java index 75fc2611d5..bfd0557717 100644 --- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coaps/CoapsClientEndpointFactory.java +++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coaps/CoapsClientEndpointFactory.java @@ -112,7 +112,7 @@ protected String getLoggingTag(URI uri) { } @Override - public Endpoint createCoapEndpoint(InetAddress clientAddress, Configuration defaultConfiguration, + public CoapEndpoint createCoapEndpoint(InetAddress clientAddress, Configuration defaultConfiguration, ServerInfo serverInfo, boolean clientInitiatedOnly, List trustStore, ClientEndpointToolbox toolbox) {