From 3974280f48f12d0b2e2e40e0883bd2d5a80dc816 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sat, 2 Sep 2023 15:14:44 +0200 Subject: [PATCH] Cleaned up imports. --- .../com/soebes/itf/examples/ITWithBeforeEachMavenIT.java | 8 +++----- .../examples/mps/MavenProjectSourcesLocationThreeIT.java | 2 -- .../soebes/itf/jupiter/maven/MavenExecutionResult.java | 5 +++-- .../soebes/itf/jupiter/extension/AnnotationHelper.java | 1 - .../soebes/itf/jupiter/extension/ApplicationExecutor.java | 1 - .../itf/jupiter/extension/DirectoryResolverResult.java | 1 - .../soebes/itf/jupiter/extension/MavenITExtension.java | 2 +- .../itf/jupiter/extension/MavenProjectLocation.java | 1 - .../java/com/soebes/itf/jupiter/extension/PathUtils.java | 7 ++++--- .../com/soebes/itf/jupiter/extension/PathUtilsTest.java | 7 ++++--- .../test/java/com/soebes/itf/maven/plugin/BasicIT.java | 1 - 11 files changed, 15 insertions(+), 21 deletions(-) diff --git a/itf-examples/src/test/java/com/soebes/itf/examples/ITWithBeforeEachMavenIT.java b/itf-examples/src/test/java/com/soebes/itf/examples/ITWithBeforeEachMavenIT.java index a9e2fff191..6e3061feac 100644 --- a/itf-examples/src/test/java/com/soebes/itf/examples/ITWithBeforeEachMavenIT.java +++ b/itf-examples/src/test/java/com/soebes/itf/examples/ITWithBeforeEachMavenIT.java @@ -23,18 +23,16 @@ import com.soebes.itf.jupiter.extension.MavenTest; import com.soebes.itf.jupiter.maven.MavenExecutionResult; import com.soebes.itf.jupiter.maven.MavenProjectResult; +import org.junit.jupiter.api.BeforeEach; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.jupiter.api.BeforeEach; - -import java.io.IOException; -import java.util.List; - import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat; @MavenJupiterExtension diff --git a/itf-examples/src/test/java/com/soebes/itf/examples/mps/MavenProjectSourcesLocationThreeIT.java b/itf-examples/src/test/java/com/soebes/itf/examples/mps/MavenProjectSourcesLocationThreeIT.java index 2d6f887b64..3133c5bb1c 100644 --- a/itf-examples/src/test/java/com/soebes/itf/examples/mps/MavenProjectSourcesLocationThreeIT.java +++ b/itf-examples/src/test/java/com/soebes/itf/examples/mps/MavenProjectSourcesLocationThreeIT.java @@ -24,10 +24,8 @@ import com.soebes.itf.jupiter.extension.MavenTest; import com.soebes.itf.jupiter.maven.MavenExecutionResult; import org.apache.maven.model.Model; -import org.assertj.core.api.Assertions; import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat; -import static org.assertj.core.api.Assertions.assertThat; /** * Example integration test to demonstrate the usage diff --git a/itf-extension-maven/src/main/java/com/soebes/itf/jupiter/maven/MavenExecutionResult.java b/itf-extension-maven/src/main/java/com/soebes/itf/jupiter/maven/MavenExecutionResult.java index a4c37d23ef..17c4efcf82 100644 --- a/itf-extension-maven/src/main/java/com/soebes/itf/jupiter/maven/MavenExecutionResult.java +++ b/itf-extension-maven/src/main/java/com/soebes/itf/jupiter/maven/MavenExecutionResult.java @@ -19,10 +19,11 @@ * under the License. */ -import static org.apiguardian.api.API.Status.EXPERIMENTAL; +import org.apiguardian.api.API; import java.util.StringJoiner; -import org.apiguardian.api.API; + +import static org.apiguardian.api.API.Status.EXPERIMENTAL; /** * @author Karl Heinz Marbaise diff --git a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/AnnotationHelper.java b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/AnnotationHelper.java index d76da8fa87..f2e9ef8355 100644 --- a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/AnnotationHelper.java +++ b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/AnnotationHelper.java @@ -25,7 +25,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; diff --git a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/ApplicationExecutor.java b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/ApplicationExecutor.java index 41334b4190..4507d0327b 100644 --- a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/ApplicationExecutor.java +++ b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/ApplicationExecutor.java @@ -26,7 +26,6 @@ import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.util.ArrayList; import java.util.Collections; diff --git a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/DirectoryResolverResult.java b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/DirectoryResolverResult.java index f024c17d93..96c7a2f3a1 100644 --- a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/DirectoryResolverResult.java +++ b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/DirectoryResolverResult.java @@ -23,7 +23,6 @@ import java.lang.reflect.Method; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Optional; /** diff --git a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/MavenITExtension.java b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/MavenITExtension.java index c0cf5db8a7..f47423835a 100644 --- a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/MavenITExtension.java +++ b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/MavenITExtension.java @@ -59,7 +59,7 @@ import static com.soebes.itf.jupiter.extension.AnnotationHelper.options; import static com.soebes.itf.jupiter.extension.AnnotationHelper.profiles; import static com.soebes.itf.jupiter.extension.AnnotationHelper.systemProperties; -import static com.soebes.itf.jupiter.extension.MavenProjectSources.ResourceUsage.*; +import static com.soebes.itf.jupiter.extension.MavenProjectSources.ResourceUsage.DEFAULT; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; diff --git a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/MavenProjectLocation.java b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/MavenProjectLocation.java index 3b5cd78ea8..0413b0cbdc 100644 --- a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/MavenProjectLocation.java +++ b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/MavenProjectLocation.java @@ -24,7 +24,6 @@ import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; -import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; diff --git a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/PathUtils.java b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/PathUtils.java index 2593683e73..a68384dbc1 100644 --- a/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/PathUtils.java +++ b/itf-jupiter-extension/src/main/java/com/soebes/itf/jupiter/extension/PathUtils.java @@ -19,9 +19,9 @@ * under the License. */ -import static org.apiguardian.api.API.Status.INTERNAL; - import com.soebes.itf.jupiter.extension.exceptions.PathUtilException; +import org.apiguardian.api.API; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -32,7 +32,8 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apiguardian.api.API; + +import static org.apiguardian.api.API.Status.INTERNAL; /** * @author Karl Heinz Marbaise diff --git a/itf-jupiter-extension/src/test/java/com/soebes/itf/jupiter/extension/PathUtilsTest.java b/itf-jupiter-extension/src/test/java/com/soebes/itf/jupiter/extension/PathUtilsTest.java index cf91725632..c73208e071 100644 --- a/itf-jupiter-extension/src/test/java/com/soebes/itf/jupiter/extension/PathUtilsTest.java +++ b/itf-jupiter-extension/src/test/java/com/soebes/itf/jupiter/extension/PathUtilsTest.java @@ -19,15 +19,16 @@ * under the License. */ -import static org.assertj.core.api.Assertions.assertThat; - import com.github.marschall.memoryfilesystem.MemoryFileSystemBuilder; +import org.junit.jupiter.api.Test; + import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.FileSystem; import java.nio.file.Files; import java.nio.file.Path; -import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; class PathUtilsTest { diff --git a/itf-maven-plugin/src/test/java/com/soebes/itf/maven/plugin/BasicIT.java b/itf-maven-plugin/src/test/java/com/soebes/itf/maven/plugin/BasicIT.java index fa7fd67792..4e7e09fb3a 100644 --- a/itf-maven-plugin/src/test/java/com/soebes/itf/maven/plugin/BasicIT.java +++ b/itf-maven-plugin/src/test/java/com/soebes/itf/maven/plugin/BasicIT.java @@ -26,7 +26,6 @@ import com.soebes.itf.jupiter.maven.MavenExecutionResult; import org.junit.jupiter.api.DisplayName; -import java.io.File; import java.nio.file.Path; import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;