From 556c46fa305f5a0dbaadae602b09b20eb60402e1 Mon Sep 17 00:00:00 2001 From: Simon Bernard Date: Thu, 26 Jan 2023 16:17:25 +0100 Subject: [PATCH] Remove CoapClient creation, use coapServer.clientService() instead --- .../javacoap/endpoint/JavaCoapServerEndpoint.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/endpoint/JavaCoapServerEndpoint.java b/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/endpoint/JavaCoapServerEndpoint.java index 52947fc1a6..711b3b5ebf 100644 --- a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/endpoint/JavaCoapServerEndpoint.java +++ b/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/endpoint/JavaCoapServerEndpoint.java @@ -41,8 +41,6 @@ import org.eclipse.leshan.server.request.LowerLayerConfig; import org.eclipse.leshan.transport.javacoap.observation.ObservationUtil; -import com.mbed.coap.client.CoapClient; -import com.mbed.coap.client.CoapClientBuilder; import com.mbed.coap.client.ObservationConsumer; import com.mbed.coap.packet.CoapRequest; import com.mbed.coap.packet.CoapResponse; @@ -132,11 +130,8 @@ protected CompletableFuture sendLwM2mRequest(Client // Create Coap Request to send from LWM2M Request CoapRequest coapRequest = translator.createCoapRequest(destination, lwm2mRequest, toolbox); - // Create a Coap Client to send request - CoapClient coapClient = CoapClientBuilder.clientFor(destination.getIdentity().getPeerAddress(), coapServer); - // Send CoAP Request - CompletableFuture coapResponseFuture = coapClient.send(coapRequest); + CompletableFuture coapResponseFuture = coapServer.clientService().apply(coapRequest); // On response, create LWM2M Response from CoAP response CompletableFuture lwm2mResponseFuture = coapResponseFuture.thenApply(coapResponse -> translator @@ -156,11 +151,8 @@ protected CompletableFuture sendObserveRequest(Clie Opaque token = translator.getTokenGenerator().createToken(); final CoapRequest hackedCoapRequest = coapRequest.token(token); - // Create a Coap Client to send request - CoapClient coapClient = CoapClientBuilder.clientFor(destination.getIdentity().getPeerAddress(), coapServer); - // Send CoAP Request - CompletableFuture coapResponseFuture = coapClient.send(hackedCoapRequest); + CompletableFuture coapResponseFuture = coapServer.clientService().apply(hackedCoapRequest); // Handle Notifications // --------------------