Clean TestServerBuilder use argument instead of attribute

sbernard31 · sbernard31 · commit 7dd230c0ad0c · 2024-10-15T17:24:53.000+02:00
diff --git a/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/util/LeshanTestBootstrapServerBuilder.java b/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/util/LeshanTestBootstrapServerBuilder.java
@@ -182,9 +182,9 @@ public LeshanTestBootstrapServerBuilder with(EditableSecurityStore securityStore
     }
 
     private BootstrapServerProtocolProvider getCaliforniumProtocolProvider(Protocol protocol) {
-        if (protocolToUse.equals(Protocol.COAP)) {
+        if (protocol.equals(Protocol.COAP)) {
             return new CoapBootstrapServerProtocolProvider();
-        } else if (protocolToUse.equals(Protocol.COAPS)) {
+        } else if (protocol.equals(Protocol.COAPS)) {
             return new CoapsBootstrapServerProtocolProvider(dtlsConfig -> {
                 if (!CertPairs.isEmpty()) {
                     dtlsConfig.setCertificateIdentityProvider(new MapBasedCertificateProvider(CertPairs));
@@ -206,7 +206,7 @@ public void applyDefaultValue(Configuration configuration) {
     }
 
     private BootstrapServerProtocolProvider getCaliforniumProtocolProviderSupportingOscore(Protocol protocol) {
-        if (protocolToUse.equals(Protocol.COAP)) {
+        if (protocol.equals(Protocol.COAP)) {
             return new CoapBootstrapServerProtocolProvider() {
                 @Override
                 public CaliforniumBootstrapServerEndpointFactory createDefaultEndpointFactory(EndpointUri uri,
diff --git a/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/util/LeshanTestServerBuilder.java b/leshan-integration-tests/src/test/java/org/eclipse/leshan/integration/tests/util/LeshanTestServerBuilder.java
@@ -209,9 +209,9 @@ public LeshanTestServerBuilder withUpdateOnSendOperation() {
     }
 
     protected ServerProtocolProvider getCaliforniumProtocolProvider(Protocol protocol) {
-        if (protocolToUse.equals(Protocol.COAP)) {
+        if (protocol.equals(Protocol.COAP)) {
             return new CoapServerProtocolProvider();
-        } else if (protocolToUse.equals(Protocol.COAPS)) {
+        } else if (protocol.equals(Protocol.COAPS)) {
             return new CoapsServerProtocolProvider(dtlsConfig -> {
                 if (!keyPairs.isEmpty()) {
                     dtlsConfig.setCertificateIdentityProvider(new MapBasedRawPublicKeyProvider(keyPairs));
@@ -238,7 +238,7 @@ public void applyDefaultValue(Configuration configuration) {
     }
 
     private ServerProtocolProvider getCaliforniumProtocolProviderSupportingOscore(Protocol protocol) {
-        if (protocolToUse.equals(Protocol.COAP)) {
+        if (protocol.equals(Protocol.COAP)) {
             return new CoapServerProtocolProvider() {
                 @Override
                 public CaliforniumServerEndpointFactory createDefaultEndpointFactory(EndpointUri uri,
@@ -252,11 +252,11 @@ public CaliforniumServerEndpointFactory createDefaultEndpointFactory(EndpointUri
     }
 
     protected LwM2mServerEndpointsProvider getJavaCoapProtocolProvider(Protocol protocol) {
-        if (protocolToUse.equals(Protocol.COAP)) {
+        if (protocol.equals(Protocol.COAP)) {
             return new JavaCoapServerEndpointsProvider(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
-        } else if (protocolToUse.equals(Protocol.COAP_TCP)) {
+        } else if (protocol.equals(Protocol.COAP_TCP)) {
             return new JavaCoapTcpServerEndpointsProvider(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
-        } else if (protocolToUse.equals(Protocol.COAPS_TCP)) {
+        } else if (protocol.equals(Protocol.COAPS_TCP)) {
             return new JavaCoapsTcpServerEndpointsProvider(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
         }
         throw new IllegalStateException(String.format("No Californium Protocol Provider for protocol %s", protocol));
