From 93d15ccb4998d64829e9bb6fc09c770cdbc4377d Mon Sep 17 00:00:00 2001 From: Simon Bernard Date: Wed, 13 Jul 2022 10:54:32 +0200 Subject: [PATCH] Sort all java imports. --- .../leshan/core/demo/ValidateDemoModelsTest.java | 1 - .../node/codec/senml/LwM2mResolvedSenMLRecord.java | 2 +- .../core/request/AbstractSimpleDownlinkRequest.java | 2 +- .../leshan/core/request/WriteCompositeRequest.java | 2 +- .../org/eclipse/leshan/core/util/X509CertUtil.java | 8 ++++++-- .../core/link/attributes/AttributeSetTest.java | 2 -- .../org/eclipse/leshan/core/tlv/TlvDecoderTest.java | 4 ---- .../org/eclipse/leshan/core/tlv/TlvEncoderTest.java | 7 +------ .../eclipse/leshan/core/util/X509CertUtilTest.java | 13 ++++++++----- .../request/CaliforniumQueueModeRequestSender.java | 2 +- .../leshan/server/queue/PresenceServiceImpl.java | 2 +- .../leshan/server/demo/servlet/log/CoapMessage.java | 2 +- 12 files changed, 21 insertions(+), 26 deletions(-) diff --git a/leshan-core-demo/src/test/java/org/eclipse/leshan/core/demo/ValidateDemoModelsTest.java b/leshan-core-demo/src/test/java/org/eclipse/leshan/core/demo/ValidateDemoModelsTest.java index 7d2e41dcb9..40e2a16de1 100644 --- a/leshan-core-demo/src/test/java/org/eclipse/leshan/core/demo/ValidateDemoModelsTest.java +++ b/leshan-core-demo/src/test/java/org/eclipse/leshan/core/demo/ValidateDemoModelsTest.java @@ -17,7 +17,6 @@ import java.io.IOException; -import org.eclipse.leshan.core.demo.LwM2mDemoConstant; import org.eclipse.leshan.core.model.InvalidDDFFileException; import org.eclipse.leshan.core.model.InvalidModelException; import org.eclipse.leshan.core.model.ObjectLoader; diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mResolvedSenMLRecord.java b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mResolvedSenMLRecord.java index 154e9e5ca3..8ceddead42 100644 --- a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mResolvedSenMLRecord.java +++ b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mResolvedSenMLRecord.java @@ -15,8 +15,8 @@ *******************************************************************************/ package org.eclipse.leshan.core.node.codec.senml; -import org.eclipse.leshan.core.node.LwM2mPath; import org.eclipse.leshan.core.node.InvalidLwM2mPathException; +import org.eclipse.leshan.core.node.LwM2mPath; import org.eclipse.leshan.senml.ResolvedSenMLRecord; import org.eclipse.leshan.senml.SenMLRecord; diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/AbstractSimpleDownlinkRequest.java b/leshan-core/src/main/java/org/eclipse/leshan/core/request/AbstractSimpleDownlinkRequest.java index c3fb4b4a19..6f7c6143dd 100644 --- a/leshan-core/src/main/java/org/eclipse/leshan/core/request/AbstractSimpleDownlinkRequest.java +++ b/leshan-core/src/main/java/org/eclipse/leshan/core/request/AbstractSimpleDownlinkRequest.java @@ -15,8 +15,8 @@ *******************************************************************************/ package org.eclipse.leshan.core.request; -import org.eclipse.leshan.core.node.LwM2mPath; import org.eclipse.leshan.core.node.InvalidLwM2mPathException; +import org.eclipse.leshan.core.node.LwM2mPath; import org.eclipse.leshan.core.request.exception.InvalidRequestException; import org.eclipse.leshan.core.response.LwM2mResponse; diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/WriteCompositeRequest.java b/leshan-core/src/main/java/org/eclipse/leshan/core/request/WriteCompositeRequest.java index d87a317641..6d565313c4 100644 --- a/leshan-core/src/main/java/org/eclipse/leshan/core/request/WriteCompositeRequest.java +++ b/leshan-core/src/main/java/org/eclipse/leshan/core/request/WriteCompositeRequest.java @@ -22,9 +22,9 @@ import java.util.Map; import java.util.Map.Entry; +import org.eclipse.leshan.core.node.InvalidLwM2mPathException; import org.eclipse.leshan.core.node.LwM2mNode; import org.eclipse.leshan.core.node.LwM2mPath; -import org.eclipse.leshan.core.node.InvalidLwM2mPathException; import org.eclipse.leshan.core.node.LwM2mResourceInstance; import org.eclipse.leshan.core.node.LwM2mSingleResource; import org.eclipse.leshan.core.node.ObjectLink; diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/X509CertUtil.java b/leshan-core/src/main/java/org/eclipse/leshan/core/util/X509CertUtil.java index 0ccc297f7d..7ca2d5684b 100644 --- a/leshan-core/src/main/java/org/eclipse/leshan/core/util/X509CertUtil.java +++ b/leshan-core/src/main/java/org/eclipse/leshan/core/util/X509CertUtil.java @@ -1,11 +1,15 @@ package org.eclipse.leshan.core.util; -import javax.security.auth.x500.X500Principal; import java.net.InetAddress; import java.security.Principal; import java.security.cert.CertificateParsingException; import java.security.cert.X509Certificate; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.security.auth.x500.X500Principal; /** * X.509 Certificate Utilities for accessing certificate details. diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeSetTest.java b/leshan-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeSetTest.java index 7f32efb275..3f69cfffa8 100644 --- a/leshan-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeSetTest.java +++ b/leshan-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeSetTest.java @@ -22,8 +22,6 @@ import java.util.Map; import org.eclipse.leshan.core.LwM2m.Version; -import org.eclipse.leshan.core.link.attributes.Attribute; -import org.eclipse.leshan.core.link.attributes.InvalidAttributeException; import org.eclipse.leshan.core.link.lwm2m.attributes.AssignationLevel; import org.eclipse.leshan.core.link.lwm2m.attributes.DefaultLwM2mAttributeParser; import org.eclipse.leshan.core.link.lwm2m.attributes.LwM2mAttributeParser; diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvDecoderTest.java b/leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvDecoderTest.java index 99b8181ea3..fd90bea986 100644 --- a/leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvDecoderTest.java +++ b/leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvDecoderTest.java @@ -21,10 +21,6 @@ import java.util.Arrays; import org.eclipse.leshan.core.node.ObjectLink; -import org.eclipse.leshan.core.tlv.Tlv; -import org.eclipse.leshan.core.tlv.TlvDecoder; -import org.eclipse.leshan.core.tlv.TlvEncoder; -import org.eclipse.leshan.core.tlv.TlvException; import org.eclipse.leshan.core.util.Hex; import org.junit.Test; import org.slf4j.Logger; diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvEncoderTest.java b/leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvEncoderTest.java index da37e8da39..33caf81f33 100644 --- a/leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvEncoderTest.java +++ b/leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvEncoderTest.java @@ -15,16 +15,11 @@ *******************************************************************************/ package org.eclipse.leshan.core.tlv; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.nio.ByteBuffer; import java.util.Date; -import org.eclipse.leshan.core.tlv.Tlv; -import org.eclipse.leshan.core.tlv.TlvDecoder; -import org.eclipse.leshan.core.tlv.TlvEncoder; -import org.eclipse.leshan.core.tlv.TlvException; import org.eclipse.leshan.core.tlv.Tlv.TlvType; import org.junit.Test; diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/util/X509CertUtilTest.java b/leshan-core/src/test/java/org/eclipse/leshan/core/util/X509CertUtilTest.java index 727c949f6b..49d16fdc07 100644 --- a/leshan-core/src/test/java/org/eclipse/leshan/core/util/X509CertUtilTest.java +++ b/leshan-core/src/test/java/org/eclipse/leshan/core/util/X509CertUtilTest.java @@ -1,19 +1,22 @@ package org.eclipse.leshan.core.util; -import org.junit.Assert; -import org.junit.Test; - -import javax.security.auth.x500.X500Principal; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; -import java.security.*; +import java.security.GeneralSecurityException; +import java.security.KeyStore; +import java.security.KeyStoreException; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; +import javax.security.auth.x500.X500Principal; + +import org.junit.Assert; +import org.junit.Test; + public class X509CertUtilTest { private final KeyStore keyStore; diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java index 7e6978f330..aab5cf9ff9 100644 --- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java +++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CaliforniumQueueModeRequestSender.java @@ -17,11 +17,11 @@ import org.eclipse.californium.core.coap.Request; import org.eclipse.californium.core.coap.Response; +import org.eclipse.leshan.core.Destroyable; import org.eclipse.leshan.core.californium.CoapResponseCallback; import org.eclipse.leshan.core.request.exception.ClientSleepingException; import org.eclipse.leshan.core.request.exception.TimeoutException; import org.eclipse.leshan.core.response.ErrorCallback; -import org.eclipse.leshan.core.Destroyable; import org.eclipse.leshan.server.queue.PresenceServiceImpl; import org.eclipse.leshan.server.queue.QueueModeLwM2mRequestSender; import org.eclipse.leshan.server.registration.Registration; diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java b/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java index 41cddfa05e..019e4b9914 100644 --- a/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java +++ b/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java @@ -26,8 +26,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.eclipse.leshan.core.util.NamedThreadFactory; import org.eclipse.leshan.core.Destroyable; +import org.eclipse.leshan.core.util.NamedThreadFactory; import org.eclipse.leshan.server.registration.Registration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/log/CoapMessage.java b/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/log/CoapMessage.java index fa7f89b16a..d69791a6bf 100644 --- a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/log/CoapMessage.java +++ b/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/log/CoapMessage.java @@ -24,13 +24,13 @@ import org.apache.commons.lang.StringUtils; import org.eclipse.californium.core.coap.CoAP.Type; -import org.eclipse.leshan.core.util.Hex; import org.eclipse.californium.core.coap.EmptyMessage; import org.eclipse.californium.core.coap.Option; import org.eclipse.californium.core.coap.OptionNumberRegistry; import org.eclipse.californium.core.coap.OptionSet; import org.eclipse.californium.core.coap.Request; import org.eclipse.californium.core.coap.Response; +import org.eclipse.leshan.core.util.Hex; public class CoapMessage {