PR used to test bad Java import order

.github/actions/sortimport/action.yml

@@ -0,0 +1,40 @@
+name: "Check Java Import"
+description: "Check Java Import are well sorted with Maven"
+
+runs:
+  using: "composite"
+  steps:
+
+  - name: Check Java Import
+    id: sort_import
+    shell: bash
+    run: mvn -B impsort:check
+
+  - name: Add comment
+    if: failure()
+    uses: marocchino/sticky-pull-request-comment@v2
+    with:
+      header: Java Import check Failed
+      message: |
+        :x: **Java Import are not sorted !** [(more details)](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
+
+        Ensure your code build locally using: 
+        ```
+        mvn clean install
+        ```
+        Or just validate java import with : 
+        ```
+        mvn impsort:sort
+        ```
+        You can sort Java import with : 
+        ```
+        mvn impsort:
+        ```
+        See also [How configure your IDE](https://github.com/eclipse/leshan/wiki/Code-&-design-guidelines#configure-your-ide).
+
+  - name: Delete comment
+    if: success()
+    uses: marocchino/sticky-pull-request-comment@v2
+    with:
+      header: Code Formatter Validation Failed
+      delete: true

.github/workflows/main.yml

@@ -40,11 +40,17 @@ jobs:
       id: build
       uses: ./.github/actions/build
 
+    - name: Java Import Check
+      if: always()
+      id: sortimport
+      uses: ./.github/actions/sortimport
+
     - name: Code Style Check
       if: always()
       id: checkstyle
       uses: ./.github/actions/checkstyle
 
+
     - name: Check Android API Compliance
       if: ${{ always() && steps.build.conclusion == 'success' }}
       uses: ./.github/actions/android-check

build-config/pom.xml

@@ -281,6 +281,22 @@ Contributors:
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>net.revelc.code</groupId>
+                <artifactId>impsort-maven-plugin</artifactId>
+                <configuration>
+                    <removeUnused>true</removeUnused>
+                    <staticGroups>*</staticGroups>
+                    <groups>java.,javax.,org.,com.</groups>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>

eclipse/checkstyle.xml

@@ -11,7 +11,9 @@
             <property name="ignoreComments" value="true"/>
             <property name="message" value="No `sysout` or `syserr` allowed."/>
         </module>
+        <module name="AvoidStarImport" />
     </module>
+
     <module name="RegexpSingleline">
         <property name="format" value="\s+$"/>
         <property name="message" value="No trailing white space allowed."/>

eclipse/settings/org.eclipse.jdt.ui.prefs

@@ -7,7 +7,7 @@ org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.javadoc=false
 org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=2
+org.eclipse.jdt.ui.staticondemandthreshold=99
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\n * Copyright (c) ${year} Sierra Wireless and others.\n *\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v2.0\n * and Eclipse Distribution License v1.0 which accompany this distribution.\n *\n * The Eclipse Public License is available at\n *    http\://www.eclipse.org/legal/epl-v20.html\n * and the Eclipse Distribution License is available at\n *    http\://www.eclipse.org/org/documents/edl-v10.html.\n *\n * Contributors\:\n *     Sierra Wireless - initial API and implementation\n *******************************************************************************/\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="modulecomment_context" deleted\="false" description\="Comment for modules" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.modulecomment" name\="modulecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false

leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Oscore.java

@@ -17,7 +17,12 @@
  *******************************************************************************/
 package org.eclipse.leshan.client.object;
 
-import static org.eclipse.leshan.core.LwM2mId.*;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_AEAD_ALGORITHM;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_HMAC_ALGORITHM;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_MASTER_SALT;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_MASTER_SECRET;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_RECIPIENT_ID;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_SENDER_ID;
 
 import java.util.Arrays;
 import java.util.List;

leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Security.java

@@ -16,7 +16,16 @@
  *******************************************************************************/
 package org.eclipse.leshan.client.object;
 
-import static org.eclipse.leshan.core.LwM2mId.*;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE;
+import static org.eclipse.leshan.core.LwM2mId.SEC_BOOTSTRAP;
+import static org.eclipse.leshan.core.LwM2mId.SEC_CERTIFICATE_USAGE;
+import static org.eclipse.leshan.core.LwM2mId.SEC_OSCORE_SECURITY_MODE;
+import static org.eclipse.leshan.core.LwM2mId.SEC_PUBKEY_IDENTITY;
+import static org.eclipse.leshan.core.LwM2mId.SEC_SECRET_KEY;
+import static org.eclipse.leshan.core.LwM2mId.SEC_SECURITY_MODE;
+import static org.eclipse.leshan.core.LwM2mId.SEC_SERVER_ID;
+import static org.eclipse.leshan.core.LwM2mId.SEC_SERVER_PUBKEY;
+import static org.eclipse.leshan.core.LwM2mId.SEC_SERVER_URI;
 
 import java.util.Arrays;
 import java.util.List;

leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/ServersInfoExtractor.java

@@ -18,7 +18,29 @@
 package org.eclipse.leshan.client.servers;
 
 import static org.eclipse.leshan.client.servers.ServerIdentity.SYSTEM;
-import static org.eclipse.leshan.core.LwM2mId.*;
+import static org.eclipse.leshan.core.LwM2mId.DEVICE;
+import static org.eclipse.leshan.core.LwM2mId.DVC_SUPPORTED_BINDING;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_AEAD_ALGORITHM;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_HMAC_ALGORITHM;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_MASTER_SALT;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_MASTER_SECRET;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_RECIPIENT_ID;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE_SENDER_ID;
+import static org.eclipse.leshan.core.LwM2mId.SECURITY;
+import static org.eclipse.leshan.core.LwM2mId.SEC_BOOTSTRAP;
+import static org.eclipse.leshan.core.LwM2mId.SEC_CERTIFICATE_USAGE;
+import static org.eclipse.leshan.core.LwM2mId.SEC_OSCORE_SECURITY_MODE;
+import static org.eclipse.leshan.core.LwM2mId.SEC_PUBKEY_IDENTITY;
+import static org.eclipse.leshan.core.LwM2mId.SEC_SECRET_KEY;
+import static org.eclipse.leshan.core.LwM2mId.SEC_SECURITY_MODE;
+import static org.eclipse.leshan.core.LwM2mId.SEC_SERVER_ID;
+import static org.eclipse.leshan.core.LwM2mId.SEC_SERVER_PUBKEY;
+import static org.eclipse.leshan.core.LwM2mId.SEC_SERVER_URI;
+import static org.eclipse.leshan.core.LwM2mId.SERVER;
+import static org.eclipse.leshan.core.LwM2mId.SRV_BINDING;
+import static org.eclipse.leshan.core.LwM2mId.SRV_LIFETIME;
+import static org.eclipse.leshan.core.LwM2mId.SRV_SERVER_ID;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

leshan-client-core/src/test/java/org/eclipse/leshan/client/util/BaseInstanceEnablerFactoryTest.java

@@ -15,7 +15,8 @@
  *******************************************************************************/
 package org.eclipse.leshan.client.util;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 
 import java.util.Arrays;
 import java.util.Collections;

leshan-client-core/src/test/java/org/eclipse/leshan/client/util/LinkFormatHelperTest.java

@@ -16,7 +16,8 @@
  *******************************************************************************/
 package org.eclipse.leshan.client.util;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Arrays;

leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/LeshanClientDemo.java

@@ -15,8 +15,21 @@
  *******************************************************************************/
 package org.eclipse.leshan.client.demo;
 
-import static org.eclipse.leshan.client.object.Security.*;
-import static org.eclipse.leshan.core.LwM2mId.*;
+import static org.eclipse.leshan.client.object.Security.noSec;
+import static org.eclipse.leshan.client.object.Security.noSecBootstap;
+import static org.eclipse.leshan.client.object.Security.oscoreOnly;
+import static org.eclipse.leshan.client.object.Security.oscoreOnlyBootstrap;
+import static org.eclipse.leshan.client.object.Security.psk;
+import static org.eclipse.leshan.client.object.Security.pskBootstrap;
+import static org.eclipse.leshan.client.object.Security.rpk;
+import static org.eclipse.leshan.client.object.Security.rpkBootstrap;
+import static org.eclipse.leshan.client.object.Security.x509;
+import static org.eclipse.leshan.client.object.Security.x509Bootstrap;
+import static org.eclipse.leshan.core.LwM2mId.DEVICE;
+import static org.eclipse.leshan.core.LwM2mId.LOCATION;
+import static org.eclipse.leshan.core.LwM2mId.OSCORE;
+import static org.eclipse.leshan.core.LwM2mId.SECURITY;
+import static org.eclipse.leshan.core.LwM2mId.SERVER;
 
 import java.io.File;
 import java.io.PrintWriter;

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;

leshan-core/src/main/java/org/eclipse/leshan/core/credentials/CredentialsReader.java

@@ -19,7 +19,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.RandomAccessFile;
+import java.io.*;
 import java.security.GeneralSecurityException;
 
 /**

leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonArrayEntrySerDes.java

@@ -18,16 +18,16 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import org.eclipse.leshan.core.json.JsonArrayEntry;
 import org.eclipse.leshan.core.model.ResourceModel.Type;
 import org.eclipse.leshan.core.util.datatype.ULong;
 import org.eclipse.leshan.core.util.json.JacksonJsonSerDes;
 import org.eclipse.leshan.core.util.json.JsonException;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
 public class JsonArrayEntrySerDes extends JacksonJsonSerDes<JsonArrayEntry> {
 
     @Override

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;
 

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;
 

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;

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.

leshan-core/src/test/java/org/eclipse/leshan/core/VersionTest.java

@@ -15,7 +15,8 @@
  *******************************************************************************/
 package org.eclipse.leshan.core;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.leshan.core.LwM2m.LwM2mVersion;
 import org.eclipse.leshan.core.LwM2m.Version;

leshan-core/src/test/java/org/eclipse/leshan/core/datatype/NumberUtilTest.java

@@ -15,7 +15,9 @@
  *******************************************************************************/
 package org.eclipse.leshan.core.datatype;
 
-import static org.eclipse.leshan.core.util.datatype.NumberUtil.*;
+import static org.eclipse.leshan.core.util.datatype.NumberUtil.longToInt;
+import static org.eclipse.leshan.core.util.datatype.NumberUtil.numberToLong;
+import static org.eclipse.leshan.core.util.datatype.NumberUtil.numberToULong;
 import static org.junit.Assert.assertEquals;
 
 import java.math.BigDecimal;

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;

leshan-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeTest.java

@@ -1,6 +1,8 @@
 package org.eclipse.leshan.core.link.attributes;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.leshan.core.LwM2m.Version;
 import org.eclipse.leshan.core.link.lwm2m.attributes.AssignationLevel;

leshan-core/src/test/java/org/eclipse/leshan/core/model/LwM2mModelRespositotyTest.java

@@ -15,7 +15,8 @@
  *******************************************************************************/
 package org.eclipse.leshan.core.model;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import java.io.IOException;
 import java.util.ArrayList;

leshan-core/src/test/java/org/eclipse/leshan/core/node/LwM2MResourceTest.java

@@ -15,7 +15,8 @@
  *******************************************************************************/
 package org.eclipse.leshan.core.node;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 import java.util.HashMap;
 import java.util.Map;