Removing jetbrain annotations

core/build.gradle

@@ -164,11 +164,8 @@ dependencies {
 
     compile 'junit:junit:4.12'
     compile 'org.slf4j:slf4j-api:1.7.30'
-    compile 'org.jetbrains:annotations:19.0.0'
     compile 'org.apache.commons:commons-compress:1.20'
-    compile ('org.rnorth.duct-tape:duct-tape:1.0.8') {
-        exclude(group: 'org.jetbrains', module: 'annotations')
-    }
+    compile ('org.rnorth.duct-tape:duct-tape:1.0.8')
 
     compile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 

core/src/main/java/org/testcontainers/containers/FixedHostPortGenericContainer.java

@@ -1,6 +1,6 @@
 package org.testcontainers.containers;
 
-import org.jetbrains.annotations.NotNull;
+import lombok.NonNull;
 
 /**
  * Variant of {@link GenericContainer} that allows a fixed port on the docker host to be mapped to a container port.
@@ -17,7 +17,7 @@ public class FixedHostPortGenericContainer<SELF extends FixedHostPortGenericCont
      * @deprecated it is highly recommended that {@link FixedHostPortGenericContainer} not be used, as it risks port conflicts.
      */
     @Deprecated
-    public FixedHostPortGenericContainer(@NotNull String dockerImageName) {
+    public FixedHostPortGenericContainer(@NonNull String dockerImageName) {
         super(dockerImageName);
     }
 

core/src/main/java/org/testcontainers/containers/GenericContainer.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerCmd;
@@ -28,8 +27,6 @@
 import lombok.SneakyThrows;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.rnorth.ducttape.ratelimits.RateLimiter;
@@ -171,14 +168,12 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
 
     private int startupAttempts = 1;
 
-    @Nullable
     private String workingDirectory = null;
 
     /**
      * The shared memory size to use when starting the container.
      * This value is in bytes.
      */
-    @Nullable
     private Long shmSize;
 
     // Maintain order in which entries are added, as earlier target location may be a prefix of a later location.
@@ -221,7 +216,6 @@ public class GenericContainer<SELF extends GenericContainer<SELF>>
             .withConstantThroughput()
             .build();
 
-    @Nullable
     private Map<String, String> tmpFsMapping;
 
     @Setter(AccessLevel.NONE)
@@ -701,7 +695,6 @@ protected Integer getLivenessCheckPort() {
      * @return the ports on which to check if the container is ready
      * @deprecated use {@link #getLivenessCheckPortNumbers()} instead
      */
-    @NotNull
     @NonNull
     @Deprecated
     protected Set<Integer> getLivenessCheckPorts() {

core/src/main/java/org/testcontainers/containers/startupcheck/MinimumDurationRunningStartupCheckStrategy.java

@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import org.jetbrains.annotations.NotNull;
+import lombok.NonNull;
 import org.testcontainers.utility.DockerStatus;
 
 import java.time.Duration;
@@ -14,10 +14,10 @@
  */
 public class MinimumDurationRunningStartupCheckStrategy extends StartupCheckStrategy {
 
-    @NotNull
+    @NonNull
     private final Duration minimumRunningDuration;
 
-    public MinimumDurationRunningStartupCheckStrategy(@NotNull Duration minimumRunningDuration) {
+    public MinimumDurationRunningStartupCheckStrategy(@NonNull Duration minimumRunningDuration) {
         this.minimumRunningDuration = minimumRunningDuration;
     }
 

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

@@ -1,10 +1,17 @@
 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.NonNull;
 import lombok.experimental.Delegate;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
@@ -29,7 +36,7 @@ public AuditLoggingDockerClient(DockerClient wrappedClient) {
     }
 
     @Override
-    public CreateContainerCmd createContainerCmd(@NotNull String image) {
+    public CreateContainerCmd createContainerCmd(@NonNull String image) {
         return wrappedCommand(CreateContainerCmd.class,
                 wrappedClient.createContainerCmd(image),
                 (cmd, res) -> doLog("CREATE", image, res.getId(), cmd),
@@ -38,31 +45,31 @@ public CreateContainerCmd createContainerCmd(@NotNull String image) {
     }
 
     @Override
-    public StartContainerCmd startContainerCmd(@NotNull String containerId) {
+    public StartContainerCmd startContainerCmd(@NonNull String containerId) {
         return wrappedCommand(StartContainerCmd.class,
                 wrappedClient.startContainerCmd(containerId),
                 (cmd, res) -> doLog("START", null, containerId, cmd),
                 (cmd, e) -> doLog("START", null, containerId, cmd, e));
     }
 
     @Override
-    public RemoveContainerCmd removeContainerCmd(@NotNull String containerId) {
+    public RemoveContainerCmd removeContainerCmd(@NonNull String containerId) {
         return wrappedCommand(RemoveContainerCmd.class,
                 wrappedClient.removeContainerCmd(containerId),
                 (cmd, res) -> doLog("REMOVE", null, containerId, cmd),
                 (cmd, e) -> doLog("REMOVE", null, containerId, cmd, e));
     }
 
     @Override
-    public StopContainerCmd stopContainerCmd(@NotNull String containerId) {
+    public StopContainerCmd stopContainerCmd(@NonNull String containerId) {
         return wrappedCommand(StopContainerCmd.class,
                 wrappedClient.stopContainerCmd(containerId),
                 (cmd, res) -> doLog("STOP", null, containerId, cmd),
                 (cmd, e) -> doLog("STOP", null, containerId, cmd, e));
     }
 
     @Override
-    public KillContainerCmd killContainerCmd(@NotNull String containerId) {
+    public KillContainerCmd killContainerCmd(@NonNull String containerId) {
         return wrappedCommand(KillContainerCmd.class,
                 wrappedClient.killContainerCmd(containerId),
                 (cmd, res) -> doLog("KILL", null, containerId, cmd),
@@ -78,7 +85,7 @@ public CreateNetworkCmd createNetworkCmd() {
     }
 
     @Override
-    public RemoveNetworkCmd removeNetworkCmd(@NotNull String networkId) {
+    public RemoveNetworkCmd removeNetworkCmd(@NonNull String networkId) {
         return wrappedCommand(RemoveNetworkCmd.class,
                 wrappedClient.removeNetworkCmd(networkId),
                 (cmd, res) -> doLog("REMOVE_NETWORK", null, null, cmd),

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

@@ -14,7 +14,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.jetbrains.annotations.Nullable;
 import org.rnorth.ducttape.TimeoutException;
 import org.rnorth.ducttape.ratelimits.RateLimiter;
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
@@ -176,10 +175,10 @@ public static DockerClientProviderStrategy getFirstValidStrategy(List<DockerClie
 
                         return Stream.of(strategy);
                     } catch (Exception | ExceptionInInitializerError | NoClassDefFoundError e) {
-                        @Nullable String throwableMessage = e.getMessage();
+                        String throwableMessage = e.getMessage();
                         @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
                         Throwable rootCause = Throwables.getRootCause(e);
-                        @Nullable String rootCauseMessage = rootCause.getMessage();
+                        String rootCauseMessage = rootCause.getMessage();
 
                         String failureDescription;
                         if (throwableMessage != null && throwableMessage.equals(rootCauseMessage)) {

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

@@ -6,7 +6,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.SystemUtils;
-import org.jetbrains.annotations.Nullable;
 
 import java.net.URI;
 import java.nio.file.Files;
@@ -25,7 +24,6 @@ public final class RootlessDockerClientProviderStrategy extends DockerClientProv
     public static final int PRIORITY = UnixSocketClientProviderStrategy.PRIORITY + 1;
 
     @Getter(lazy = true)
-    @Nullable
     private final Path socketPath = resolveSocketPath();
 
     private Path resolveSocketPath() {

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

@@ -3,7 +3,6 @@
 import com.github.dockerjava.transport.SSLConfig;
 import lombok.Builder;
 import lombok.Value;
-import org.jetbrains.annotations.Nullable;
 
 import java.net.URI;
 
@@ -13,6 +12,5 @@ public class TransportConfig {
 
     URI dockerHost;
 
-    @Nullable
     SSLConfig sslConfig;
 }

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

@@ -3,11 +3,10 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.DockerCmd;
+import lombok.NonNull;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.MDC;
 
 import java.util.List;
@@ -25,24 +24,24 @@
 @UtilityClass
 public class AuditLogger {
 
-    private static final ObjectMapper objectMapper = new ObjectMapper();
-    public static final String MDC_PREFIX = AuditLogger.class.getCanonicalName();
+    private final ObjectMapper objectMapper = new ObjectMapper();
+    public final String MDC_PREFIX = AuditLogger.class.getCanonicalName();
 
-    public static void doLog(@NotNull String action,
-                             @Nullable String image,
-                             @Nullable String containerId,
-                             @NotNull DockerCmd<?> cmd) {
+    public static void doLog(@NonNull String action,
+                             String image,
+                             String containerId,
+                             @NonNull DockerCmd<?> cmd) {
 
         doLog(action, image, containerId, cmd, null);
     }
 
-    public static void doLog(@NotNull String action,
-                             @Nullable String image,
-                             @Nullable String containerId,
-                             @NotNull DockerCmd<?> cmd,
-                             @Nullable Exception e) {
+    public static void doLog(@NonNull String action,
+                             String image,
+                             String containerId,
+                             @NonNull DockerCmd<?> cmd,
+                             Exception e) {
 
-        if (! log.isTraceEnabled()) {
+        if (!log.isTraceEnabled()) {
             return;
         }
 
@@ -69,10 +68,10 @@ public static void doLog(@NotNull String action,
         MDC.remove(MDC_PREFIX + ".Exception");
     }
 
-    public static void doComposeLog(@NotNull String[] commandParts,
-                                    @Nullable List<String> env) {
+    public static void doComposeLog(@NonNull String[] commandParts,
+                                    List<String> env) {
 
-        if (! log.isTraceEnabled()) {
+        if (!log.isTraceEnabled()) {
             return;
         }
 

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

@@ -2,8 +2,8 @@
 
 import com.github.dockerjava.api.model.AuthConfig;
 import com.google.common.base.MoreObjects;
+import lombok.NonNull;
 import lombok.experimental.UtilityClass;
-import org.jetbrains.annotations.NotNull;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 
@@ -27,7 +27,7 @@ public static String toSafeString(AuthConfig authConfig) {
             .toString();
     }
 
-    @NotNull
+    @NonNull
     private static String obfuscated(String value) {
         return isNullOrEmpty(value) ? "blank" : "hidden non-blank value";
     }

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

@@ -1,6 +1,6 @@
 package org.testcontainers.utility;
 
-import org.jetbrains.annotations.NotNull;
+import lombok.NonNull;
 import org.slf4j.Logger;
 import org.zeroturnaround.exec.InvalidExitValueException;
 import org.zeroturnaround.exec.ProcessExecutor;
@@ -72,7 +72,7 @@ public static boolean executableExists(String executable) {
         return false;
     }
 
-    @NotNull
+    @NonNull
     public static String[] getSystemPath() {
         return System.getenv("PATH").split(Pattern.quote(File.pathSeparator));
     }

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

@@ -1,11 +1,10 @@
 package org.testcontainers.utility;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.common.annotations.VisibleForTesting;
+import lombok.NonNull;
 
-import org.jetbrains.annotations.NotNull;
+import java.util.ArrayList;
+import java.util.List;
 
 public final class ComparableVersion implements Comparable<ComparableVersion> {
 
@@ -18,7 +17,7 @@ public ComparableVersion(String version) {
     }
 
     @Override
-    public int compareTo(@NotNull ComparableVersion other) {
+    public int compareTo(@NonNull ComparableVersion other) {
         for (int i=0; i<Math.min(this.parts.length, other.parts.length); i++) {
             int thisPart = this.parts[i];
             int otherPart = other.parts[i];

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

@@ -6,7 +6,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.jetbrains.annotations.NotNull;
+import lombok.NonNull;
 
 import java.util.regex.Pattern;
 
@@ -23,7 +23,7 @@ public final class DockerImageName {
     private final String rawName;
     private final String registry;
     private final String repo;
-    @NotNull private final Versioning versioning;
+    @NonNull private final Versioning versioning;
 
     /**
      * Parses a docker image name from a provided string.
@@ -85,7 +85,7 @@ public DockerImageName(String fullImageName) {
      * @deprecated use {@link DockerImageName#parse(String)}.{@link DockerImageName#withTag(String)} instead
      */
     @Deprecated
-    public DockerImageName(String nameWithoutTag, @NotNull String version) {
+    public DockerImageName(String nameWithoutTag, @NonNull String version) {
         this.rawName = nameWithoutTag;
         final int slashIndex = nameWithoutTag.indexOf('/');