Formatting: remove groups for org/com and add jakarta to import order (…

…#304)
kokuwaio · Sep 18, 2024 · 4cc1c55 · 4cc1c55
1 parent 5e4eb73
commit 4cc1c55
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 38 deletions.
diff --git a/pom.xml b/pom.xml
@@ -302,7 +302,7 @@
 					<artifactId>impsort-maven-plugin</artifactId>
 					<version>${version.net.revelc.code.impsort}</version>
 					<configuration>
-						<groups>java.,javax.,org.,com.</groups>
+						<groups>java.,javax.,jakarta.</groups>
 						<removeUnused>true</removeUnused>
 						<treatSamePackageAsUnused>true</treatSamePackageAsUnused>
 					</configuration>

diff --git a/src/main/java/io/kokuwa/maven/k3s/mojo/ApplyMojo.java b/src/main/java/io/kokuwa/maven/k3s/mojo/ApplyMojo.java
@@ -17,14 +17,13 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import io.kokuwa.maven.k3s.util.Await;
+import io.kokuwa.maven.k3s.util.Task;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 
-import io.kokuwa.maven.k3s.util.Await;
-import io.kokuwa.maven.k3s.util.Task;
-
 /**
  * Mojo for kubectl apply.
  *

diff --git a/src/main/java/io/kokuwa/maven/k3s/mojo/ImageMojo.java b/src/main/java/io/kokuwa/maven/k3s/mojo/ImageMojo.java
@@ -18,13 +18,12 @@
 import java.util.stream.Stream;
 import java.util.zip.Adler32;
 
+import io.kokuwa.maven.k3s.util.Docker.ContainerImage;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 
-import io.kokuwa.maven.k3s.util.Docker.ContainerImage;
-
 /**
  * Import images into k3s containerd.
  *

diff --git a/src/main/java/io/kokuwa/maven/k3s/mojo/K3sMojo.java b/src/main/java/io/kokuwa/maven/k3s/mojo/K3sMojo.java
@@ -3,15 +3,14 @@
 import java.io.File;
 import java.nio.file.Path;
 
+import io.kokuwa.maven.k3s.util.Docker;
+import io.kokuwa.maven.k3s.util.Marker;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.kokuwa.maven.k3s.util.Docker;
-import io.kokuwa.maven.k3s.util.Marker;
-
 /**
  * Base class for all mojos of this plugin.
  *

diff --git a/src/main/java/io/kokuwa/maven/k3s/mojo/RunMojo.java b/src/main/java/io/kokuwa/maven/k3s/mojo/RunMojo.java
@@ -10,13 +10,12 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import io.kokuwa.maven.k3s.util.Await;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 
-import io.kokuwa.maven.k3s.util.Await;
-
 /**
  * Mojo for start k3s container.
  *

diff --git a/src/main/java/io/kokuwa/maven/k3s/util/Docker.java b/src/main/java/io/kokuwa/maven/k3s/util/Docker.java
@@ -10,14 +10,13 @@
 import java.util.Optional;
 import java.util.function.Function;
 
-import org.apache.maven.plugin.MojoExecutionException;
-import org.slf4j.Logger;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.slf4j.Logger;
 
 /**
  * Wrapper for docker commands.

diff --git a/src/test/java/io/kokuwa/maven/k3s/LifecycleTest.java b/src/test/java/io/kokuwa/maven/k3s/LifecycleTest.java
@@ -5,14 +5,13 @@
 import java.io.File;
 import java.util.List;
 
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
 import io.kokuwa.maven.k3s.mojo.ApplyMojo;
 import io.kokuwa.maven.k3s.mojo.ImageMojo;
 import io.kokuwa.maven.k3s.mojo.RemoveMojo;
 import io.kokuwa.maven.k3s.mojo.RunMojo;
 import io.kokuwa.maven.k3s.test.AbstractTest;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test fof all mojos to simulate test lifecycle.

diff --git a/src/test/java/io/kokuwa/maven/k3s/mojo/ApplyMojoTest.java b/src/test/java/io/kokuwa/maven/k3s/mojo/ApplyMojoTest.java
@@ -4,12 +4,11 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
 
+import io.kokuwa.maven.k3s.test.AbstractTest;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import io.kokuwa.maven.k3s.test.AbstractTest;
-
 /**
  * Test for {@link ApplyMojo}.
  *

diff --git a/src/test/java/io/kokuwa/maven/k3s/mojo/ImageMojoTest.java b/src/test/java/io/kokuwa/maven/k3s/mojo/ImageMojoTest.java
@@ -12,12 +12,11 @@
 import java.nio.file.StandardCopyOption;
 import java.util.List;
 
+import io.kokuwa.maven.k3s.test.AbstractTest;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import io.kokuwa.maven.k3s.test.AbstractTest;
-
 /**
  * Test for {@link ImageMojo}.
  *

diff --git a/src/test/java/io/kokuwa/maven/k3s/mojo/RemoveMojoTest.java b/src/test/java/io/kokuwa/maven/k3s/mojo/RemoveMojoTest.java
@@ -4,12 +4,11 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import io.kokuwa.maven.k3s.test.AbstractTest;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import io.kokuwa.maven.k3s.test.AbstractTest;
-
 /**
  * Test for {@link RemoveMojo}.
  *

diff --git a/src/test/java/io/kokuwa/maven/k3s/mojo/RestartMojoTest.java b/src/test/java/io/kokuwa/maven/k3s/mojo/RestartMojoTest.java
@@ -7,12 +7,11 @@
 
 import java.util.List;
 
+import io.kokuwa.maven.k3s.test.AbstractTest;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import io.kokuwa.maven.k3s.test.AbstractTest;
-
 /**
  * Test for {@link RestartMojo}.
  *

diff --git a/src/test/java/io/kokuwa/maven/k3s/mojo/RunMojoTest.java b/src/test/java/io/kokuwa/maven/k3s/mojo/RunMojoTest.java
@@ -11,15 +11,14 @@
 import java.io.File;
 import java.util.List;
 
-import org.apache.maven.plugin.MojoExecutionException;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-
 import io.kokuwa.maven.k3s.test.AbstractTest;
 import io.kokuwa.maven.k3s.test.LoggerCapturer;
 import io.kokuwa.maven.k3s.util.Await;
 import io.kokuwa.maven.k3s.util.Task;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
 
 /**
  * Test for {@link RunMojo}.

diff --git a/src/test/java/io/kokuwa/maven/k3s/test/AbstractTest.java b/src/test/java/io/kokuwa/maven/k3s/test/AbstractTest.java
@@ -10,6 +10,7 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 
+import io.kokuwa.maven.k3s.util.Docker;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -19,8 +20,6 @@
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.kokuwa.maven.k3s.util.Docker;
-
 /**
  * Base class for all test cases.
  *

diff --git a/src/test/java/io/kokuwa/maven/k3s/test/MojoExtension.java b/src/test/java/io/kokuwa/maven/k3s/test/MojoExtension.java
@@ -9,6 +9,8 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
+import io.kokuwa.maven.k3s.mojo.K3sMojo;
+import io.kokuwa.maven.k3s.util.Docker;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -20,9 +22,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.kokuwa.maven.k3s.mojo.K3sMojo;
-import io.kokuwa.maven.k3s.util.Docker;
-
 /**
  * JUnit extension to provide prepared mojos as test parameter.
  *

diff --git a/src/test/java/io/kokuwa/maven/k3s/util/DockerTest.java b/src/test/java/io/kokuwa/maven/k3s/util/DockerTest.java
@@ -12,14 +12,13 @@
 import java.util.UUID;
 import java.util.function.BiConsumer;
 
+import io.kokuwa.maven.k3s.test.AbstractTest;
+import io.kokuwa.maven.k3s.util.Docker.Container;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 
-import io.kokuwa.maven.k3s.test.AbstractTest;
-import io.kokuwa.maven.k3s.util.Docker.Container;
-
 /**
  * Test for {@link Docker}.
  *