From 0d98101771c470a6b97263fcf0c401401b26e4c0 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Tue, 20 Sep 2022 23:48:21 +0000 Subject: [PATCH 1/3] Excavator: Upgrades Baseline to the latest version --- .baseline/checkstyle/checkstyle.xml | 4 +++- build.gradle | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml index 1a086c49c..0297c79f4 100644 --- a/.baseline/checkstyle/checkstyle.xml +++ b/.baseline/checkstyle/checkstyle.xml @@ -402,7 +402,9 @@ - + + + diff --git a/build.gradle b/build.gradle index d2a031f11..4b74f7e30 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ buildscript { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0' classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.26.0' - classpath 'com.palantir.baseline:gradle-baseline-java:4.153.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.173.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0' classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0' classpath 'com.palantir.metricschema:gradle-metric-schema:0.16.0' From 656d807f2620b7f10fb7004c8d2d42a628a64ecc Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Sun, 25 Sep 2022 18:22:45 -0400 Subject: [PATCH 2/3] suppress DirectInvocationOnMock --- build.gradle | 2 +- .../dialogue/core/BalancedNodeSelectionStrategyChannelTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4b74f7e30..249b7dd4f 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ buildscript { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0' classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.26.0' - classpath 'com.palantir.baseline:gradle-baseline-java:4.173.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.178.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0' classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0' classpath 'com.palantir.metricschema:gradle-metric-schema:0.16.0' diff --git a/dialogue-core/src/test/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannelTest.java b/dialogue-core/src/test/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannelTest.java index 6103b2647..d7fbe09b8 100644 --- a/dialogue-core/src/test/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannelTest.java +++ b/dialogue-core/src/test/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannelTest.java @@ -48,6 +48,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +@SuppressWarnings("DirectInvocationOnMock") @ExtendWith(MockitoExtension.class) class BalancedNodeSelectionStrategyChannelTest { private Random random = new Random(12388544234L); From 4bd36790624b53984a784b3d903929d28717a46c Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Sun, 25 Sep 2022 18:37:12 -0400 Subject: [PATCH 3/3] suppress more DirectInvocationOnMock --- .../java/com/palantir/dialogue/core/DialogueChannelTest.java | 1 + .../palantir/conjure/java/dialogue/serde/DefaultClientsTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/dialogue-core/src/test/java/com/palantir/dialogue/core/DialogueChannelTest.java b/dialogue-core/src/test/java/com/palantir/dialogue/core/DialogueChannelTest.java index bd7a7e124..6c15be99e 100644 --- a/dialogue-core/src/test/java/com/palantir/dialogue/core/DialogueChannelTest.java +++ b/dialogue-core/src/test/java/com/palantir/dialogue/core/DialogueChannelTest.java @@ -73,6 +73,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; +@SuppressWarnings("DirectInvocationOnMock") @ExtendWith(MockitoExtension.class) public final class DialogueChannelTest { diff --git a/dialogue-serde/src/test/java/com/palantir/conjure/java/dialogue/serde/DefaultClientsTest.java b/dialogue-serde/src/test/java/com/palantir/conjure/java/dialogue/serde/DefaultClientsTest.java index b41eb03cc..a8ac9ab0d 100644 --- a/dialogue-serde/src/test/java/com/palantir/conjure/java/dialogue/serde/DefaultClientsTest.java +++ b/dialogue-serde/src/test/java/com/palantir/conjure/java/dialogue/serde/DefaultClientsTest.java @@ -243,6 +243,7 @@ private ListenableFuture call(CallType callType, Request request) { return call(callType, request, stringDeserializer); } + @SuppressWarnings("DirectInvocationOnMock") private ListenableFuture call(CallType callType, Request request, Deserializer deserializer) { switch (callType) { case Async: