From 24447a00d512c15335aa178bf0b49fbe4b78f740 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Thu, 30 Jan 2020 22:09:19 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version --- .../checkstyle/checkstyle-suppressions.xml | 9 -------- .baseline/checkstyle/checkstyle.xml | 23 +++++++++---------- build.gradle | 3 +-- .../compose/DockerComposeExtension.java | 4 ++-- .../docker/compose/EventsIntegrationTest.java | 16 ++++++------- .../docker/compose/RecordingCluster.java | 4 ++-- .../DaemonEnvironmentValidator.java | 4 ++-- .../configuration/DaemonHostIpResolver.java | 2 +- .../RemoteEnvironmentValidator.java | 2 +- .../configuration/ShutdownStrategy.java | 2 +- .../docker/compose/connection/Container.java | 4 ++-- .../compose/connection/ContainerNames.java | 2 +- .../compose/connection/DockerMachine.java | 2 +- .../execution/DockerForMacHostsIssue.java | 4 ++-- .../execution/GracefulShutdownStrategy.java | 2 +- .../execution/KillDownShutdownStrategy.java | 2 +- .../execution/SkipShutdownStrategy.java | 2 +- .../logging/DoNothingLogCollector.java | 2 +- .../docker/compose/logging/LogDirectory.java | 2 +- .../docker/compose/reporting/GitUtils.java | 2 +- .../docker/compose/reporting/Reporter.java | 6 ++--- .../docker/compose/TestContainerNames.java | 2 +- .../compose/execution/CommandShould.java | 4 ++-- ...gContainerRemovingDockerComposeShould.java | 4 ++-- .../compose/logging/LogDirectoryTest.java | 2 +- .../DockerMachineEnvironmentMatcher.java | 2 +- gradle.properties | 1 - 27 files changed, 51 insertions(+), 63 deletions(-) diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml b/.baseline/checkstyle/checkstyle-suppressions.xml index 24bf28c67..c0f855b14 100644 --- a/.baseline/checkstyle/checkstyle-suppressions.xml +++ b/.baseline/checkstyle/checkstyle-suppressions.xml @@ -26,13 +26,4 @@ - - - - - - - - - diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml index 792229cfc..dcac6f1b5 100644 --- a/.baseline/checkstyle/checkstyle.xml +++ b/.baseline/checkstyle/checkstyle.xml @@ -53,6 +53,9 @@ + + + @@ -84,11 +87,13 @@ + org.apache.commons.lang3.Validate.*, + org.assertj.core.api.Assertions.*, + org.mockito.Mockito.*"/> @@ -110,7 +115,6 @@ - @@ -369,10 +373,6 @@ - - - - @@ -410,7 +410,6 @@ - @@ -422,6 +421,7 @@ + @@ -435,7 +435,7 @@ - + @@ -468,10 +468,9 @@ - + - diff --git a/build.gradle b/build.gradle index 704640842..7efdab4eb 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1' - classpath 'com.palantir.baseline:gradle-baseline-java:0.62.1' + classpath 'com.palantir.baseline:gradle-baseline-java:3.1.1' classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.16.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2' classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0' @@ -25,7 +25,6 @@ buildscript { plugins { id 'com.palantir.git-version' version '0.12.2' - id 'com.palantir.configuration-resolver' version '0.2.0' } apply plugin: 'com.palantir.baseline' diff --git a/docker-compose-junit-jupiter/src/main/java/com/palantir/docker/compose/DockerComposeExtension.java b/docker-compose-junit-jupiter/src/main/java/com/palantir/docker/compose/DockerComposeExtension.java index 2b8834a2c..82d50fb19 100644 --- a/docker-compose-junit-jupiter/src/main/java/com/palantir/docker/compose/DockerComposeExtension.java +++ b/docker-compose-junit-jupiter/src/main/java/com/palantir/docker/compose/DockerComposeExtension.java @@ -31,12 +31,12 @@ public abstract class DockerComposeExtension extends DockerComposeManager implements BeforeAllCallback, AfterAllCallback { @Override - public void beforeAll(ExtensionContext unused) throws IOException, InterruptedException { + public void beforeAll(ExtensionContext _value) throws IOException, InterruptedException { before(); } @Override - public void afterAll(ExtensionContext unused) { + public void afterAll(ExtensionContext _value) { after(); } diff --git a/docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/EventsIntegrationTest.java b/docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/EventsIntegrationTest.java index 07d101754..b204fe586 100644 --- a/docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/EventsIntegrationTest.java +++ b/docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/EventsIntegrationTest.java @@ -130,22 +130,22 @@ private void runDockerComposeRule(DockerComposeManager dockerComposeManager) thr private Optional isClusterWait(Event event) { return event.accept(new Event.Visitor>() { @Override - public Optional visitBuild(BuildEvent value) { + public Optional visitBuild(BuildEvent _value) { return Optional.empty(); } @Override - public Optional visitPull(PullEvent value) { + public Optional visitPull(PullEvent _value) { return Optional.empty(); } @Override - public Optional visitUp(UpEvent value) { + public Optional visitUp(UpEvent _value) { return Optional.empty(); } @Override - public Optional visitWaitForServices(WaitForServicesEvent value) { + public Optional visitWaitForServices(WaitForServicesEvent _value) { return Optional.empty(); } @@ -155,22 +155,22 @@ public Optional visitClusterWait(ClusterWaitEvent value) { } @Override - public Optional visitShutdownStop(ShutdownStopEvent value) { + public Optional visitShutdownStop(ShutdownStopEvent _value) { return Optional.empty(); } @Override - public Optional visitLogCollection(LogCollectionEvent value) { + public Optional visitLogCollection(LogCollectionEvent _value) { return Optional.empty(); } @Override - public Optional visitShutdown(ShutdownEvent value) { + public Optional visitShutdown(ShutdownEvent _value) { return Optional.empty(); } @Override - public Optional visitUnknown(String unknownType) { + public Optional visitUnknown(String _unknownType) { return Optional.empty(); } }); diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/RecordingCluster.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/RecordingCluster.java index 2fdedc3dc..6a9697e75 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/RecordingCluster.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/RecordingCluster.java @@ -16,17 +16,17 @@ package com.palantir.docker.compose; -import com.google.common.collect.Sets; import com.palantir.docker.compose.connection.Cluster; import com.palantir.docker.compose.connection.Container; import com.palantir.docker.compose.connection.ContainerCache; import java.io.IOException; import java.util.List; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; final class RecordingCluster extends Cluster { private final Cluster delegate; - private final Set recordedContainerNames = Sets.newConcurrentHashSet(); + private final Set recordedContainerNames = ConcurrentHashMap.newKeySet(); RecordingCluster(Cluster delegate) { this.delegate = delegate; diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidator.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidator.java index 217c1c1d4..bb56c250f 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidator.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonEnvironmentValidator.java @@ -28,11 +28,11 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -public class DaemonEnvironmentValidator implements EnvironmentValidator { +public final class DaemonEnvironmentValidator implements EnvironmentValidator { private static final Set ILLEGAL_VARIABLES = ImmutableSet.of(DOCKER_TLS_VERIFY, DOCKER_HOST, DOCKER_CERT_PATH); private static final Supplier SUPPLIER = Suppliers.memoize( - () -> new DaemonEnvironmentValidator())::get; + () -> new DaemonEnvironmentValidator()); public static DaemonEnvironmentValidator instance() { return SUPPLIER.get(); diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonHostIpResolver.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonHostIpResolver.java index bdb2118e8..714a0991c 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonHostIpResolver.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/DaemonHostIpResolver.java @@ -20,7 +20,7 @@ public class DaemonHostIpResolver implements HostIpResolver { public static final String LOCALHOST = "127.0.0.1"; @Override - public String resolveIp(String dockerHost) { + public String resolveIp(String _dockerHost) { return LOCALHOST; } } diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidator.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidator.java index d812714c7..fe1567822 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidator.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/RemoteEnvironmentValidator.java @@ -30,7 +30,7 @@ import java.util.Set; import java.util.stream.Collectors; -public class RemoteEnvironmentValidator implements EnvironmentValidator { +public final class RemoteEnvironmentValidator implements EnvironmentValidator { private static final Set SECURE_VARIABLES = ImmutableSet.of(DOCKER_TLS_VERIFY, DOCKER_CERT_PATH); private static final RemoteEnvironmentValidator VALIDATOR = new RemoteEnvironmentValidator(); diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ShutdownStrategy.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ShutdownStrategy.java index be71d765e..f853145a0 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ShutdownStrategy.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/configuration/ShutdownStrategy.java @@ -60,7 +60,7 @@ static ShutdownStrategy callbackAndThen(Runnable callback, ShutdownStrategy shut return new CallbackThenDelegateShutdownStrategy(shutdownStrategy, callback); } - default void stop(DockerCompose dockerCompose) throws IOException, InterruptedException {} + default void stop(DockerCompose _dockerCompose) throws IOException, InterruptedException {} void shutdown(DockerCompose dockerCompose, Docker docker) throws IOException, InterruptedException; diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java index 2d04f884c..67e06c30d 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Container.java @@ -33,7 +33,7 @@ public class Container { private final Docker docker; private final DockerCompose dockerCompose; - private Supplier portMappings = Suppliers.memoize(this::getDockerPorts)::get; + private Supplier portMappings = Suppliers.memoize(this::getDockerPorts); public Container(String containerName, Docker docker, DockerCompose dockerCompose) { this.containerName = containerName; @@ -94,7 +94,7 @@ public DockerPort port(int internalPort) { public void start() throws IOException, InterruptedException { dockerCompose.start(this); - portMappings = Suppliers.memoize(this::getDockerPorts)::get; + portMappings = Suppliers.memoize(this::getDockerPorts); } public void stop() throws IOException, InterruptedException { diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerNames.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerNames.java index 5129f02d3..e9ef196a8 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerNames.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/ContainerNames.java @@ -23,7 +23,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -public class ContainerNames { +public final class ContainerNames { private static final Pattern HEAD_PATTERN = Pattern.compile("-+(\r|\n)+"); private static final Pattern BODY_PATTERN = Pattern.compile("(\r|\n)+"); diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerMachine.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerMachine.java index d6525fe73..d8a7f927a 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerMachine.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/DockerMachine.java @@ -113,7 +113,7 @@ public static RemoteBuilder remoteMachine() { return new RemoteBuilder(); } - public static class RemoteBuilder { + public static final class RemoteBuilder { private final Map dockerEnvironment = newHashMap(); private Map additionalEnvironment = newHashMap(); diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerForMacHostsIssue.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerForMacHostsIssue.java index e8ed064d1..040c360e3 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerForMacHostsIssue.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/DockerForMacHostsIssue.java @@ -17,7 +17,7 @@ * * @see Docker Compose Issue #3419 */ -public class DockerForMacHostsIssue { +public final class DockerForMacHostsIssue { private static final String REDIRECT_LINE = "127.0.0.1 localunixsocket\n"; private static final String WARNING_MESSAGE = "\n\n **** WARNING: Your tests may be slow ****\n" @@ -48,7 +48,7 @@ private static boolean localunixsocketRedirectedInEtcHosts() { } } - public static void main(String[] args) { + public static void main(String[] _args) { issueWarning(); } diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/GracefulShutdownStrategy.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/GracefulShutdownStrategy.java index a89607732..a3f9b95f1 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/GracefulShutdownStrategy.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/GracefulShutdownStrategy.java @@ -25,7 +25,7 @@ public void stop(DockerCompose dockerCompose) throws IOException, InterruptedExc } @Override - public void shutdown(DockerCompose dockerCompose, Docker docker) throws IOException, InterruptedException { + public void shutdown(DockerCompose dockerCompose, Docker _docker) throws IOException, InterruptedException { log.debug("Downing docker-compose cluster"); dockerCompose.down(); } diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/KillDownShutdownStrategy.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/KillDownShutdownStrategy.java index 08bc5c229..427b720a4 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/KillDownShutdownStrategy.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/KillDownShutdownStrategy.java @@ -27,7 +27,7 @@ public void stop(DockerCompose dockerCompose) throws IOException, InterruptedExc } @Override - public void shutdown(DockerCompose dockerCompose, Docker docker) throws IOException, InterruptedException { + public void shutdown(DockerCompose dockerCompose, Docker _docker) throws IOException, InterruptedException { log.debug("Downing docker-compose cluster"); dockerCompose.down(); } diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/SkipShutdownStrategy.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/SkipShutdownStrategy.java index d405d6568..3a26df204 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/SkipShutdownStrategy.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/execution/SkipShutdownStrategy.java @@ -13,7 +13,7 @@ public class SkipShutdownStrategy implements ShutdownStrategy { private static final Logger log = LoggerFactory.getLogger(SkipShutdownStrategy.class); @Override - public void shutdown(DockerCompose dockerCompose, Docker docker) { + public void shutdown(DockerCompose _dockerCompose, Docker _docker) { log.warn("\n" + "******************************************************************************************\n" + "* docker-compose-rule has been configured to skip docker-compose shutdown: *\n" diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/DoNothingLogCollector.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/DoNothingLogCollector.java index 340b4edca..ba1b72d32 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/DoNothingLogCollector.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/DoNothingLogCollector.java @@ -20,5 +20,5 @@ public class DoNothingLogCollector implements LogCollector { @Override - public void collectLogs(DockerCompose dockerCompose) { } + public void collectLogs(DockerCompose _dockerCompose) { } } diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogDirectory.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogDirectory.java index 7b5732b88..9ee605e61 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogDirectory.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/logging/LogDirectory.java @@ -6,7 +6,7 @@ import java.util.Optional; -public class LogDirectory { +public final class LogDirectory { private LogDirectory() {} diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/reporting/GitUtils.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/reporting/GitUtils.java index 47fb8e8de..fdb09cbc9 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/reporting/GitUtils.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/reporting/GitUtils.java @@ -24,7 +24,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -class GitUtils { +final class GitUtils { private static final Pattern SSH_REGEX = Pattern.compile(sshRegex()); private static final Pattern JUST_A_PATH = Pattern.compile("[\\w/]+", Pattern.UNICODE_CHARACTER_CLASS); diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/reporting/Reporter.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/reporting/Reporter.java index 781e8c389..128d5013e 100644 --- a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/reporting/Reporter.java +++ b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/reporting/Reporter.java @@ -26,7 +26,7 @@ interface Reporter { void addException(Exception exception); void report(); - class NoOpReporter implements Reporter { + final class NoOpReporter implements Reporter { private static final Logger log = LoggerFactory.getLogger(NoOpReporter.class); public static final Reporter INSTANCE = new NoOpReporter(); @@ -34,11 +34,11 @@ class NoOpReporter implements Reporter { private NoOpReporter() { } @Override - public void addRun(DockerComposeRun dockerComposeRun) { + public void addRun(DockerComposeRun _dockerComposeRun) { } @Override - public void addException(Exception exception) { + public void addException(Exception _exception) { } @Override diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/TestContainerNames.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/TestContainerNames.java index 1bbd6ed63..bd42ec061 100644 --- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/TestContainerNames.java +++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/TestContainerNames.java @@ -11,7 +11,7 @@ import java.util.Arrays; import java.util.List; -public class TestContainerNames { +public final class TestContainerNames { private TestContainerNames() {} diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/CommandShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/CommandShould.java index 859cc43a7..c1854ad6d 100644 --- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/CommandShould.java +++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/CommandShould.java @@ -21,7 +21,7 @@ import static org.hamcrest.core.Is.is; import static org.mockito.Matchers.anyVararg; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.io.IOException; @@ -66,7 +66,7 @@ public void before() throws IOException { not_invoke_error_handler_when_exit_code_of_the_executed_process_is_0() throws IOException, InterruptedException { dockerComposeCommand.execute(errorHandler, "rm", "-f"); - verifyZeroInteractions(errorHandler); + verifyNoMoreInteractions(errorHandler); } @Test public void diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerComposeShould.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerComposeShould.java index a577db65c..95560396f 100644 --- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerComposeShould.java +++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/execution/ConflictingContainerRemovingDockerComposeShould.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import com.google.common.collect.ImmutableSet; import java.io.IOException; @@ -51,7 +51,7 @@ public void call_up_only_once_if_successful() throws IOException, InterruptedExc conflictingContainerRemovingDockerCompose.up(); verify(dockerCompose, times(1)).up(); - verifyZeroInteractions(docker); + verifyNoMoreInteractions(docker); } @Test diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/LogDirectoryTest.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/LogDirectoryTest.java index dd66ae671..3a18bf003 100644 --- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/LogDirectoryTest.java +++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/logging/LogDirectoryTest.java @@ -45,5 +45,5 @@ public void circleAwareLogDirectory_should_append_logDirectoryName_to_path() { assertThat(directory, is("/tmp/circle-artifacts.123456/dockerLogs/some-path")); } - private static class SomeTestClass {} + private static final class SomeTestClass {} } diff --git a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/DockerMachineEnvironmentMatcher.java b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/DockerMachineEnvironmentMatcher.java index b59b113ce..6b7b10df4 100644 --- a/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/DockerMachineEnvironmentMatcher.java +++ b/docker-compose-rule-core/src/test/java/com/palantir/docker/compose/matchers/DockerMachineEnvironmentMatcher.java @@ -43,7 +43,7 @@ protected boolean matchesSafely() { } @Override - protected void describeMismatchSafely(DockerMachine item, Description mismatchDescription) { + protected void describeMismatchSafely(DockerMachine _item, Description mismatchDescription) { mismatchDescription.appendText("\nThese environment variables were missing:\n"); mismatchDescription.appendValue(missingEnvironmentVariables()); } diff --git a/gradle.properties b/gradle.properties index d30e764d3..f97ebb7d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1 @@ -com.palantir.baseline-versions.disable=true org.gradle.parallel=true