Refactor CoapRequest with builder pattern

Author: szysas

coap-cli/src/main/java/com/mbed/coap/cli/SendCommand.java

@@ -17,6 +17,7 @@
 package com.mbed.coap.cli;
 
 import static com.mbed.coap.cli.TransportOptions.addressFromUri;
+import static com.mbed.coap.packet.CoapRequest.request;
 import com.mbed.coap.CoapConstants;
 import com.mbed.coap.client.CoapClient;
 import com.mbed.coap.packet.BlockSize;
@@ -82,15 +83,16 @@ public Integer call() throws Exception {
             Thread.sleep(200);
 
             String uriPath = uri.getPath().isEmpty() ? CoapConstants.WELL_KNOWN_CORE : uri.getPath();
-            request = CoapRequest.of(null, method, uriPath)
+            request = request(method, uriPath)
                     .query(uri.getQuery() == null ? "" : uri.getQuery())
                     .blockSize(blockSize)
                     .payload(hexPayload ? Opaque.decodeHex(payload) : Opaque.of(payload))
+                    .contentFormat(contentFormat)
+                    .accept(accept)
                     .options(o -> o
-                            .contentFormat(contentFormat)
                             .proxyUri(proxyUri)
-                            .accept(accept)
-                    );
+                    )
+                    .build();
             CoapResponse resp = cli.sendSync(request);
 
             if (resp.getPayload().nonEmpty()) {

coap-cli/src/test/java/com/mbed/coap/cli/CoapCliTest.java

@@ -18,9 +18,9 @@
 import static com.mbed.coap.packet.BlockSize.S_16;
 import static com.mbed.coap.packet.CoapRequest.get;
 import static com.mbed.coap.packet.CoapResponse.coapResponse;
-import static com.mbed.coap.packet.CoapOptionsBuilder.options;
 import static com.mbed.coap.packet.CoapResponse.ok;
 import static com.mbed.coap.transport.udp.DatagramSocketTransport.udp;
+import static com.mbed.coap.utils.Assertions.assertEquals;
 import static java.lang.String.format;
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -93,7 +93,7 @@ void simplestRequest() {
         // then
         assertEquals(0, exitCode);
         assertEquals("\nDziala!\n", sw.toString().replace("\r", ""));
-        assertEquals(CoapRequest.get("/test"), sendCommand.request);
+        assertEquals(get("/test"), sendCommand.request);
     }
 
     @Test
@@ -109,10 +109,10 @@ void requestWithAllCoapParameters() {
         assertEquals(0, exitCode);
         assertEquals("\nReceived 29\n", sw.toString().replace("\r", ""));
 
-        CoapRequest expected = CoapRequest.post("/test")
+        CoapRequest.Builder expected = CoapRequest.post("/test")
                 .options(it -> it
                         .query("par1", "val1")
-                        .block1Req(1, S_16, false)
+                        .block1Req(0, S_16, true)
                         .proxyUri("http://another-uri")
                         .requestTag(sendCommand.request.options().getRequestTag()) // it's random
                 )
@@ -129,7 +129,7 @@ public void requestWithHexPayload() {
         assertEquals(0, exitCode);
         assertEquals("\nReceived 27\n", sw.toString().replace("\r", ""));
 
-        CoapRequest expected = CoapRequest.post("/test")
+        CoapRequest.Builder expected = CoapRequest.post("/test")
                 .payload(Opaque.decodeHex("a16e626573745f6775697461726973746a476172795f4d6f6f7265"), MediaTypes.CT_APPLICATION_CBOR)
                 .accept(MediaTypes.CT_APPLICATION_JSON);
         assertEquals(expected, sendCommand.request);

coap-core/src/main/java/com/mbed/coap/client/CoapClient.java

@@ -60,13 +60,21 @@ public static CoapClient create(InetSocketAddress target, CoapServer server, Fun
     }
 
     public CompletableFuture<CoapResponse> send(CoapRequest request) {
-        return clientService.apply(request.address(destination));
+        return clientService.apply(request.withAddress(destination));
+    }
+
+    public CompletableFuture<CoapResponse> send(CoapRequest.Builder request) {
+        return send(request.build());
     }
 
     public CoapResponse sendSync(CoapRequest request) throws CoapException {
         return await(send(request));
     }
 
+    public CoapResponse sendSync(CoapRequest.Builder request) throws CoapException {
+        return sendSync(request.build());
+    }
+
     private static CoapResponse await(CompletableFuture<CoapResponse> future) throws CoapException {
         try {
             return future.get(5, TimeUnit.MINUTES);