Fix imports

open-coap · Sep 4, 2024 · 3b7e093 · 3b7e093
1 parent 90d7318
commit 3b7e093
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 43 deletions.
diff --git a/coap-core/src/main/java/com/mbed/coap/server/CoapRequestLogger.java b/coap-core/src/main/java/com/mbed/coap/server/CoapRequestLogger.java
@@ -19,17 +19,16 @@
 import com.mbed.coap.packet.CoapResponse;
 import com.mbed.coap.utils.Filter;
 import com.mbed.coap.utils.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
-import org.slf4j.event.Level;
-import org.slf4j.spi.LoggingEventBuilder;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+import org.slf4j.event.Level;
+import org.slf4j.spi.LoggingEventBuilder;
 
 public class CoapRequestLogger implements Filter.SimpleFilter<CoapRequest, CoapResponse> {
     private final LoggingEventBuilder loggingEventBuilder;

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
@@ -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
@@ -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-core/src/main/java/com/mbed/coap/transport/CoapTransport.java b/coap-core/src/main/java/com/mbed/coap/transport/CoapTransport.java
@@ -16,7 +16,6 @@
 package com.mbed.coap.transport;
 
 import com.mbed.coap.packet.CoapPacket;
-
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.CompletableFuture;

diff --git a/coap-core/src/main/java/com/mbed/coap/transport/LoggingCoapTransport.java b/coap-core/src/main/java/com/mbed/coap/transport/LoggingCoapTransport.java
@@ -16,12 +16,11 @@
 package com.mbed.coap.transport;
 
 import com.mbed.coap.packet.CoapPacket;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.CompletableFuture;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LoggingCoapTransport implements CoapTransport {
     private static Logger LOGGER = LoggerFactory.getLogger(LoggingCoapTransport.class);

diff --git a/coap-core/src/test/java/com/mbed/coap/server/CoapRequestLoggerTest.java b/coap-core/src/test/java/com/mbed/coap/server/CoapRequestLoggerTest.java
@@ -15,24 +15,22 @@
  */
 package com.mbed.coap.server;
 
+import static com.mbed.coap.packet.CoapRequest.get;
+import static com.mbed.coap.utils.CoapRequestBuilderFilter.REQUEST_BUILDER_FILTER;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
 import com.mbed.coap.packet.CoapRequest;
 import com.mbed.coap.packet.CoapResponse;
 import com.mbed.coap.utils.Filter;
+import java.net.InetSocketAddress;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.LoggerFactory;
 
-import java.net.InetSocketAddress;
-
-import static com.mbed.coap.packet.CoapRequest.get;
-import static com.mbed.coap.utils.CoapRequestBuilderFilter.REQUEST_BUILDER_FILTER;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 class CoapRequestLoggerTest {
     private Logger logger = (Logger) LoggerFactory.getLogger(CoapRequestLoggerTest.class);
     private CoapRequestLogger.CoapRequestLoggerBuilder loggerFilterBuilder = CoapRequestLogger.builder().logger(logger);

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
@@ -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<CoapRequest, CoapResponse> route = RouterService.NOT_FOUND_SERVICE;

diff --git a/coap-tcp/src/main/java/com/mbed/coap/server/messaging/CoapTcpDispatcher.java b/coap-tcp/src/main/java/com/mbed/coap/server/messaging/CoapTcpDispatcher.java
@@ -15,16 +15,21 @@
  */
 package com.mbed.coap.server.messaging;
 
-import com.mbed.coap.packet.*;
+import static com.mbed.coap.utils.FutureHelpers.logError;
+import com.mbed.coap.packet.CoapPacket;
+import com.mbed.coap.packet.CoapRequest;
+import com.mbed.coap.packet.CoapResponse;
+import com.mbed.coap.packet.Code;
+import com.mbed.coap.packet.Opaque;
+import com.mbed.coap.packet.SeparateResponse;
+import com.mbed.coap.packet.SignalingOptions;
+import com.mbed.coap.packet.SignallingHeaderOptions;
 import com.mbed.coap.transport.CoapTcpListener;
 import com.mbed.coap.utils.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.net.InetSocketAddress;
 import java.util.function.Function;
-
-import static com.mbed.coap.utils.FutureHelpers.logError;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CoapTcpDispatcher implements CoapTcpListener {
     private static final Logger LOGGER = LoggerFactory.getLogger(CoapTcpDispatcher.class);