Creates a new instance of {@link CoapEndpoint}. See {@link #CoapEndpoint()} for default values of + * unspecified parameters).
+ * + * @param maxBlock1Size the maximum blocksize for inbound requests + * @param maxBlock2Size the maximum blocksize for outbound responses + */ + public CoapEndpoint(BlockSize maxBlock1Size, BlockSize maxBlock2Size) { + this(DEFAULT_NAME, NotFoundHandler.getDefault(), CoapServer.getDefaultSocket(), maxBlock1Size, maxBlock2Size); + } + /** *Creates a new instance of {@link de.uzl.itm.ncoap.application.endpoint.CoapEndpoint}
* @@ -162,7 +173,7 @@ public CoapEndpoint(String applicationName, NotFoundHandler notFoundHandler, Ine * * @param remoteSocket the desired recipient of the given {@link de.uzl.itm.ncoap.message.CoapRequest} */ - public void sendCoapRequest(CoapRequest coapRequest, ClientCallback callback, InetSocketAddress remoteSocket) { + public void sendCoapRequest(CoapRequest coapRequest, InetSocketAddress remoteSocket, ClientCallback callback) { this.responseDispatcher.sendCoapRequest(coapRequest, remoteSocket, callback); } diff --git a/ncoap-core/src/main/java/de/uzl/itm/ncoap/application/server/resource/WellKnownCoreResource.java b/ncoap-core/src/main/java/de/uzl/itm/ncoap/application/server/resource/WellKnownCoreResource.java index e17532e..af7f37a 100644 --- a/ncoap-core/src/main/java/de/uzl/itm/ncoap/application/server/resource/WellKnownCoreResource.java +++ b/ncoap-core/src/main/java/de/uzl/itm/ncoap/application/server/resource/WellKnownCoreResource.java @@ -27,7 +27,6 @@ import com.google.common.primitives.Ints; import com.google.common.util.concurrent.SettableFuture; import de.uzl.itm.ncoap.application.linkformat.LinkParam; -import de.uzl.itm.ncoap.application.linkformat.LinkValue; import de.uzl.itm.ncoap.application.linkformat.LinkValueList; import de.uzl.itm.ncoap.message.CoapMessage; import de.uzl.itm.ncoap.message.CoapRequest; @@ -39,7 +38,6 @@ import java.net.InetSocketAddress; import java.util.Arrays; -import java.util.Collection; import java.util.concurrent.ScheduledExecutorService; import static de.uzl.itm.ncoap.message.MessageCode.*; diff --git a/ncoap-core/src/main/java/de/uzl/itm/ncoap/communication/blockwise/BlockSize.java b/ncoap-core/src/main/java/de/uzl/itm/ncoap/communication/blockwise/BlockSize.java index a40a37f..81ada67 100644 --- a/ncoap-core/src/main/java/de/uzl/itm/ncoap/communication/blockwise/BlockSize.java +++ b/ncoap-core/src/main/java/de/uzl/itm/ncoap/communication/blockwise/BlockSize.java @@ -24,9 +24,6 @@ */ package de.uzl.itm.ncoap.communication.blockwise; -import de.uzl.itm.ncoap.message.options.UintOptionValue; -import jdk.nashorn.internal.ir.Block; - /** * Created by olli on 09.02.16. */ diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/AbstractCoapTest.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/AbstractCoapTest.java index 43284da..45e431c 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/AbstractCoapTest.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/AbstractCoapTest.java @@ -25,7 +25,6 @@ package de.uzl.itm.ncoap; import org.apache.log4j.*; -import org.junit.BeforeClass; /** * Abstract class to be extended by all nCoAP tests to get proper logging diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientReceivesUpdateNotifications.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientReceivesUpdateNotifications.java index 9e09bae..9039e0b 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientReceivesUpdateNotifications.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientReceivesUpdateNotifications.java @@ -45,7 +45,7 @@ import java.nio.charset.Charset; import java.util.Iterator; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; /** * Tests if a client receives notifications. diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsCONRequestThatTimesOut.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsCONRequestThatTimesOut.java index 00b4fcf..a8b36d2 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsCONRequestThatTimesOut.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsCONRequestThatTimesOut.java @@ -34,7 +34,6 @@ import de.uzl.itm.ncoap.message.MessageType; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.junit.Ignore; import org.junit.Test; import java.net.InetSocketAddress; diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsNONRequest.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsNONRequest.java index 5221a2a..538c754 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsNONRequest.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsNONRequest.java @@ -41,8 +41,7 @@ import java.nio.charset.Charset; import java.util.SortedMap; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.*; /** * Tests to verify the server functionality related to piggy-backed responses. diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsNONRequestThatTimesOut.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsNONRequestThatTimesOut.java index 2d16898..85178e5 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsNONRequestThatTimesOut.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsNONRequestThatTimesOut.java @@ -32,13 +32,12 @@ import de.uzl.itm.ncoap.message.*; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.junit.Ignore; import org.junit.Test; import java.net.InetSocketAddress; import java.net.URI; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; /** * Tests to verify the server functionality related to piggy-backed responses. diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsTheSameCONRequestTwice.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsTheSameCONRequestTwice.java index 44fd8dc..dea648d 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsTheSameCONRequestTwice.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsTheSameCONRequestTwice.java @@ -40,7 +40,7 @@ import java.net.InetSocketAddress; import java.net.URI; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; /** diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsTheSameNONRequestTwice.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsTheSameNONRequestTwice.java index 18de94b..e8a9133 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsTheSameNONRequestTwice.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ClientSendsTheSameNONRequestTwice.java @@ -40,7 +40,7 @@ import java.net.InetSocketAddress; import java.net.URI; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; /** diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ServerSendsPiggyBackedResponseTest.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ServerSendsPiggyBackedResponseTest.java index 3cddf0f..6452a29 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ServerSendsPiggyBackedResponseTest.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/ServerSendsPiggyBackedResponseTest.java @@ -41,7 +41,7 @@ import java.net.URI; import java.util.SortedMap; -import static junit.framework.Assert.*; +import static org.junit.Assert.*; /** diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/TestParallelRequestsEndpointToEndpoint.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/TestParallelRequestsEndpointToEndpoint.java index b659bf5..e8fe72e 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/TestParallelRequestsEndpointToEndpoint.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/TestParallelRequestsEndpointToEndpoint.java @@ -104,7 +104,7 @@ public void shutdownComponents() throws Exception { public void createTestScenario() throws Exception { for(int i = 0; i < NUMBER_OF_PARALLEL_REQUESTS; i++) { - client.sendCoapRequest(requests[i], clientCallbacks[i], serverSocket); + client.sendCoapRequest(requests[i], serverSocket, clientCallbacks[i]); } //await responses (10 seconds should more than enough for 100 requests!) diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/identification/EndpointIDRepeatedInResponseTest.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/identification/EndpointIDRepeatedInResponseTest.java index 1f6c339..b1fcb9b 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/identification/EndpointIDRepeatedInResponseTest.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/identification/EndpointIDRepeatedInResponseTest.java @@ -40,7 +40,6 @@ import java.net.URI; import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; /** * Created by olli on 01.09.15. diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/observe/ObservationTerminationTest.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/observe/ObservationTerminationTest.java index 689d911..ef0288c 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/observe/ObservationTerminationTest.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/communication/observe/ObservationTerminationTest.java @@ -40,7 +40,7 @@ import java.net.URI; import java.nio.charset.Charset; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; /** * Tests for the removal of observers. diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/endpoints/server/NotObservableTestWebresourceForPost.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/endpoints/server/NotObservableTestWebresourceForPost.java index 57c5769..914f9d0 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/endpoints/server/NotObservableTestWebresourceForPost.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/endpoints/server/NotObservableTestWebresourceForPost.java @@ -33,7 +33,6 @@ import de.uzl.itm.ncoap.message.CoapResponse; import de.uzl.itm.ncoap.message.MessageCode; import de.uzl.itm.ncoap.message.options.ContentFormat; -import de.uzl.itm.ncoap.message.options.OptionValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/endpoints/server/ObservableTestWebresource.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/endpoints/server/ObservableTestWebresource.java index e9692fa..9d7d4a5 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/endpoints/server/ObservableTestWebresource.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/endpoints/server/ObservableTestWebresource.java @@ -41,8 +41,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.fail; - /** * This observable resource changes its status periodically with a delay given as argument for the constructor. * There are 5 possible states. The internal state representation, i.e. the returned value v of diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/linkformat/LinkFormatTest.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/linkformat/LinkFormatTest.java index fe8ac97..dae0fb8 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/linkformat/LinkFormatTest.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/linkformat/LinkFormatTest.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Set; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; /** diff --git a/ncoap-core/src/test/java/de/uzl/itm/ncoap/linkformat/WellKnownCoreResourceTests.java b/ncoap-core/src/test/java/de/uzl/itm/ncoap/linkformat/WellKnownCoreResourceTests.java index 62a934d..6f228a1 100644 --- a/ncoap-core/src/test/java/de/uzl/itm/ncoap/linkformat/WellKnownCoreResourceTests.java +++ b/ncoap-core/src/test/java/de/uzl/itm/ncoap/linkformat/WellKnownCoreResourceTests.java @@ -38,9 +38,7 @@ import org.apache.log4j.Logger; import org.junit.Test; -import static junit.framework.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.net.InetSocketAddress; import java.net.URI; diff --git a/ncoap-simple-client/src/main/java/de/uzl/itm/ncoap/examples/client/SimpleCoapClient.java b/ncoap-simple-client/src/main/java/de/uzl/itm/ncoap/examples/client/SimpleCoapClient.java index f600f0f..7a4ebc7 100644 --- a/ncoap-simple-client/src/main/java/de/uzl/itm/ncoap/examples/client/SimpleCoapClient.java +++ b/ncoap-simple-client/src/main/java/de/uzl/itm/ncoap/examples/client/SimpleCoapClient.java @@ -24,15 +24,12 @@ */ package de.uzl.itm.ncoap.examples.client; -import de.uzl.itm.ncoap.application.client.ClientCallback; import de.uzl.itm.ncoap.application.client.CoapClient; -import de.uzl.itm.ncoap.communication.blockwise.BlockSize; import de.uzl.itm.ncoap.examples.client.callback.SimpleCallback; import de.uzl.itm.ncoap.examples.client.callback.SimpleObservationCallback; import de.uzl.itm.ncoap.examples.client.config.ClientCmdLineArgumentsWrapper; import de.uzl.itm.ncoap.examples.client.config.LoggingConfiguration; import de.uzl.itm.ncoap.message.*; -import de.uzl.itm.ncoap.message.options.ContentFormat; import java.net.*; diff --git a/ncoap-simple-server/src/main/java/de/uzl/itm/ncoap/examples/server/SimpleCoapServer.java b/ncoap-simple-server/src/main/java/de/uzl/itm/ncoap/examples/server/SimpleCoapServer.java index f1b5740..74b6f6f 100644 --- a/ncoap-simple-server/src/main/java/de/uzl/itm/ncoap/examples/server/SimpleCoapServer.java +++ b/ncoap-simple-server/src/main/java/de/uzl/itm/ncoap/examples/server/SimpleCoapServer.java @@ -29,8 +29,6 @@ import de.uzl.itm.ncoap.communication.blockwise.BlockSize; import de.uzl.itm.ncoap.message.options.OptionValue; -import java.util.concurrent.ScheduledExecutorService; - /** * This is a simple application to showcase how to use nCoAP for servers * diff --git a/ncoap-simple-server/src/main/java/de/uzl/itm/ncoap/examples/server/SimpleObservableTimeService.java b/ncoap-simple-server/src/main/java/de/uzl/itm/ncoap/examples/server/SimpleObservableTimeService.java index 3a05af9..596c76b 100644 --- a/ncoap-simple-server/src/main/java/de/uzl/itm/ncoap/examples/server/SimpleObservableTimeService.java +++ b/ncoap-simple-server/src/main/java/de/uzl/itm/ncoap/examples/server/SimpleObservableTimeService.java @@ -27,13 +27,11 @@ import static de.uzl.itm.ncoap.application.linkformat.LinkParam.Key.*; import static de.uzl.itm.ncoap.message.options.ContentFormat.*; -import com.google.common.collect.HashBasedTable; import com.google.common.primitives.Longs; import com.google.common.util.concurrent.SettableFuture; import de.uzl.itm.ncoap.application.linkformat.LinkParam; import de.uzl.itm.ncoap.application.server.resource.ObservableWebresource; import de.uzl.itm.ncoap.application.server.resource.WrappedResourceStatus; -import de.uzl.itm.ncoap.communication.dispatching.Token; import de.uzl.itm.ncoap.message.*; import de.uzl.itm.ncoap.message.options.ContentFormat; import org.apache.log4j.Logger; @@ -43,7 +41,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; /**