From 440831f861bc083484df1d225d7101a9fb426c36 Mon Sep 17 00:00:00 2001 From: Aleksandr Kolosov Date: Wed, 4 Sep 2024 09:39:27 +0300 Subject: [PATCH] Fix imports --- .../mbed/coap/server/CoapServerBuilder.java | 31 +++++++++++++------ .../coap/server/messaging/CoapDispatcher.java | 10 +++--- .../coap/server/CoapServerBuilderForTcp.java | 19 +++++++++--- 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/coap-core/src/main/java/com/mbed/coap/server/CoapServerBuilder.java b/coap-core/src/main/java/com/mbed/coap/server/CoapServerBuilder.java index 31e1cc35..36b900bd 100644 --- a/coap-core/src/main/java/com/mbed/coap/server/CoapServerBuilder.java +++ b/coap-core/src/main/java/com/mbed/coap/server/CoapServerBuilder.java @@ -16,15 +16,35 @@ */ package com.mbed.coap.server; +import static com.mbed.coap.transport.TransportContext.RESPONSE_TIMEOUT; +import static com.mbed.coap.utils.Timer.toTimer; +import static com.mbed.coap.utils.Validations.require; +import static java.util.Objects.requireNonNull; +import static java.util.stream.Collectors.toList; import com.mbed.coap.client.CoapClient; -import com.mbed.coap.packet.*; +import com.mbed.coap.packet.BlockSize; +import com.mbed.coap.packet.CoapPacket; +import com.mbed.coap.packet.CoapRequest; +import com.mbed.coap.packet.CoapResponse; +import com.mbed.coap.packet.SeparateResponse; import com.mbed.coap.server.block.BlockWiseIncomingFilter; import com.mbed.coap.server.block.BlockWiseNotificationFilter; import com.mbed.coap.server.block.BlockWiseOutgoingFilter; import com.mbed.coap.server.filter.CongestionControlFilter; import com.mbed.coap.server.filter.EchoFilter; import com.mbed.coap.server.filter.ResponseTimeoutFilter; -import com.mbed.coap.server.messaging.*; +import com.mbed.coap.server.messaging.Capabilities; +import com.mbed.coap.server.messaging.CapabilitiesResolver; +import com.mbed.coap.server.messaging.CoapDispatcher; +import com.mbed.coap.server.messaging.CoapRequestConverter; +import com.mbed.coap.server.messaging.DuplicateDetector; +import com.mbed.coap.server.messaging.ExchangeFilter; +import com.mbed.coap.server.messaging.MessageIdSupplier; +import com.mbed.coap.server.messaging.MessageIdSupplierImpl; +import com.mbed.coap.server.messaging.ObservationMapper; +import com.mbed.coap.server.messaging.PiggybackedExchangeFilter; +import com.mbed.coap.server.messaging.RequestTagSupplier; +import com.mbed.coap.server.messaging.RetransmissionFilter; import com.mbed.coap.server.observe.NotificationsReceiver; import com.mbed.coap.server.observe.ObservationsStore; import com.mbed.coap.transmission.RetransmissionBackOff; @@ -33,7 +53,6 @@ import com.mbed.coap.utils.Filter; import com.mbed.coap.utils.Service; import com.mbed.coap.utils.Timer; - import java.io.IOException; import java.net.InetSocketAddress; import java.time.Duration; @@ -43,12 +62,6 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import static com.mbed.coap.transport.TransportContext.RESPONSE_TIMEOUT; -import static com.mbed.coap.utils.Timer.toTimer; -import static com.mbed.coap.utils.Validations.require; -import static java.util.Objects.requireNonNull; -import static java.util.stream.Collectors.toList; - public final class CoapServerBuilder { private static final long DELAYED_TRANSACTION_TIMEOUT_MS = 120000; //2 minutes diff --git a/coap-core/src/main/java/com/mbed/coap/server/messaging/CoapDispatcher.java b/coap-core/src/main/java/com/mbed/coap/server/messaging/CoapDispatcher.java index 5b4aeb9d..8a3e4756 100644 --- a/coap-core/src/main/java/com/mbed/coap/server/messaging/CoapDispatcher.java +++ b/coap-core/src/main/java/com/mbed/coap/server/messaging/CoapDispatcher.java @@ -15,19 +15,17 @@ */ package com.mbed.coap.server.messaging; +import static com.mbed.coap.utils.FutureHelpers.logError; +import static com.mbed.coap.utils.FutureHelpers.logErrorIgnoreCancelled; +import static java.util.Objects.requireNonNull; import com.mbed.coap.packet.CoapPacket; import com.mbed.coap.packet.MessageType; import com.mbed.coap.packet.SeparateResponse; import com.mbed.coap.utils.Service; +import java.util.function.Function; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.function.Function; - -import static com.mbed.coap.utils.FutureHelpers.logError; -import static com.mbed.coap.utils.FutureHelpers.logErrorIgnoreCancelled; -import static java.util.Objects.requireNonNull; - public final class CoapDispatcher { private static final Logger LOGGER = LoggerFactory.getLogger(CoapDispatcher.class); diff --git a/coap-tcp/src/main/java/com/mbed/coap/server/CoapServerBuilderForTcp.java b/coap-tcp/src/main/java/com/mbed/coap/server/CoapServerBuilderForTcp.java index 33d1928a..ba5cf921 100644 --- a/coap-tcp/src/main/java/com/mbed/coap/server/CoapServerBuilderForTcp.java +++ b/coap-tcp/src/main/java/com/mbed/coap/server/CoapServerBuilderForTcp.java @@ -16,27 +16,36 @@ */ package com.mbed.coap.server; +import static java.util.Objects.requireNonNull; import com.mbed.coap.client.CoapClient; -import com.mbed.coap.packet.*; +import com.mbed.coap.packet.BlockSize; +import com.mbed.coap.packet.CoapPacket; +import com.mbed.coap.packet.CoapRequest; +import com.mbed.coap.packet.CoapResponse; +import com.mbed.coap.packet.CoapTcpPacketConverter; +import com.mbed.coap.packet.Code; +import com.mbed.coap.packet.SeparateResponse; import com.mbed.coap.server.block.BlockWiseIncomingFilter; import com.mbed.coap.server.block.BlockWiseNotificationFilter; import com.mbed.coap.server.block.BlockWiseOutgoingFilter; import com.mbed.coap.server.filter.CongestionControlFilter; -import com.mbed.coap.server.messaging.*; +import com.mbed.coap.server.messaging.Capabilities; +import com.mbed.coap.server.messaging.CapabilitiesStorage; +import com.mbed.coap.server.messaging.CapabilitiesStorageImpl; +import com.mbed.coap.server.messaging.CoapTcpDispatcher; +import com.mbed.coap.server.messaging.PayloadSizeVerifier; +import com.mbed.coap.server.messaging.TcpExchangeFilter; import com.mbed.coap.server.observe.NotificationsReceiver; import com.mbed.coap.server.observe.ObservationsStore; import com.mbed.coap.transport.CoapTcpTransport; import com.mbed.coap.transport.LoggingCoapTransport; import com.mbed.coap.utils.Filter; import com.mbed.coap.utils.Service; - import java.io.IOException; import java.net.InetSocketAddress; import java.util.Objects; import java.util.function.Function; -import static java.util.Objects.requireNonNull; - public class CoapServerBuilderForTcp { private CoapTcpTransport coapTransport; private Service route = RouterService.NOT_FOUND_SERVICE;