Add checks: AvoidStarImport, RegexpSinglelineJava (#6217)

* `AvoidStarImport`, let's be explicit about imports. So, no `*` allowed.
* `RegexpSinglelineJava`, avoid assertions from Junit 4 and Jupiter. It
fails by suggesting to use AssertJ instead.

Author: eddumelendez

config/checkstyle/checkstyle.xml

@@ -22,6 +22,7 @@
             />
             <property name="allowSingleLineStatement" value="true"/>
         </module>
+        <module name="AvoidStarImport"/>
         <module name="AvoidStaticImport">
             <property name="excludes"
                       value="
@@ -38,6 +39,20 @@
                       "
             />
         </module>
+        <module name="RegexpSinglelineJava">
+            <property name="maximum" value="0"/>
+            <property name="format" value="org\.junit\.Assert\.assert" />
+            <property name="message"
+                      value="Please use AssertJ imports." />
+            <property name="ignoreComments" value="true" />
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="maximum" value="0"/>
+            <property name="format" value="org\.junit\.jupiter\.api\.Assertions\.assert" />
+            <property name="message"
+                      value="Please use AssertJ imports." />
+            <property name="ignoreComments" value="true" />
+        </module>
         <module name="EmptyLineSeparator">
             <property name="allowNoEmptyLineBetweenFields" value="false" />
         </module>

core/src/main/java/org/testcontainers/dockerclient/AuditLoggingDockerClient.java

@@ -1,7 +1,14 @@
 package org.testcontainers.dockerclient;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.*;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.SyncDockerCmd;
 import lombok.experimental.Delegate;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;

core/src/main/java/org/testcontainers/images/LoggedPullImageResultCallback.java

@@ -8,7 +8,11 @@
 import java.io.Closeable;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 /**
  * {@link PullImageResultCallback} with improved logging of pull progress.

core/src/main/java/org/testcontainers/images/builder/dockerfile/DockerfileBuilder.java

@@ -3,7 +3,19 @@
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.images.builder.dockerfile.statement.Statement;
-import org.testcontainers.images.builder.dockerfile.traits.*;
+import org.testcontainers.images.builder.dockerfile.traits.AddStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.CmdStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.CopyStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.DockerfileBuilderTrait;
+import org.testcontainers.images.builder.dockerfile.traits.EntryPointStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.EnvStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.ExposeStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.FromStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.LabelStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.RunStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.UserStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.VolumeStatementTrait;
+import org.testcontainers.images.builder.dockerfile.traits.WorkdirStatementTrait;
 
 import java.util.ArrayList;
 import java.util.List;

core/src/main/java/org/testcontainers/utility/LazyFuture.java

@@ -4,7 +4,9 @@
 import lombok.Getter;
 import org.rnorth.ducttape.timeouts.Timeouts;
 
-import java.util.concurrent.*;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**

core/src/test/java/org/testcontainers/containers/wait/strategy/WaitAllStrategyTest.java

@@ -14,7 +14,11 @@
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 public class WaitAllStrategyTest {
 

core/src/test/java/org/testcontainers/junit/DockerComposeContainerScalingTest.java

@@ -1,6 +1,10 @@
 package org.testcontainers.junit;
 
-import org.junit.*;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.utility.TestEnvironment;
 import redis.clients.jedis.Jedis;

core/src/test/java/org/testcontainers/utility/LazyFutureTest.java

@@ -6,7 +6,11 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;

examples/spring-boot/src/main/java/com/example/DemoController.java

@@ -1,7 +1,11 @@
 package com.example;
 
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 public class DemoController {

modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java

@@ -11,14 +11,15 @@
 import com.influxdb.client.write.Point;
 import com.influxdb.query.FluxRecord;
 import com.influxdb.query.FluxTable;
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class InfluxDBContainerTest {
 
     private static final String USERNAME = "new-test-user";
@@ -47,8 +48,8 @@ public void getInfluxDBClient() {
             influxDBContainer.start();
 
             try (final InfluxDBClient influxDBClient = createClient(influxDBContainer)) {
-                Assertions.assertThat(influxDBClient).isNotNull();
-                Assertions.assertThat(influxDBClient.ping()).isTrue();
+                assertThat(influxDBClient).isNotNull();
+                assertThat(influxDBClient.ping()).isTrue();
             }
         }
     }
@@ -65,16 +66,16 @@ public void getInfluxDBClientWithAdminToken() {
         ) {
             influxDBContainer.start();
             final Optional<String> adminToken = influxDBContainer.getAdminToken();
-            Assertions.assertThat(adminToken).isNotEmpty();
+            assertThat(adminToken).isNotEmpty();
 
             try (
                 final InfluxDBClient influxDBClient = createClientWithToken(
                     influxDBContainer.getUrl(),
                     adminToken.get()
                 )
             ) {
-                Assertions.assertThat(influxDBClient).isNotNull();
-                Assertions.assertThat(influxDBClient.ping()).isTrue();
+                assertThat(influxDBClient).isNotNull();
+                assertThat(influxDBClient.ping()).isTrue();
             }
         }
     }
@@ -97,11 +98,10 @@ public void getBucket() {
 
             try (final InfluxDBClient influxDBClient = createClient(influxDBContainer)) {
                 final Bucket bucket = influxDBClient.getBucketsApi().findBucketByName(BUCKET);
-                Assertions.assertThat(bucket).isNotNull();
+                assertThat(bucket).isNotNull();
 
-                Assertions.assertThat(bucket.getName()).isEqualTo(BUCKET);
-                Assertions
-                    .assertThat(bucket.getRetentionRules())
+                assertThat(bucket.getName()).isEqualTo(BUCKET);
+                assertThat(bucket.getRetentionRules())
                     .hasSize(1)
                     .first()
                     .extracting(BucketRetentionRules::getEverySeconds)
@@ -141,7 +141,7 @@ public void queryForWriteAndRead() {
 
                 final FluxTable fluxTable = queryApi.query(flux).get(0);
                 final List<FluxRecord> records = fluxTable.getRecords();
-                Assertions.assertThat(records).hasSize(1);
+                assertThat(records).hasSize(1);
             }
         }
     }