From 79f06bae95074c7c6d8ce862db100ab74edddf6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jan 2021 12:08:26 +0000 Subject: [PATCH] Bump versions.errorprone from 2.4.0 to 2.5.1 (#2176) * Bump versions.errorprone from 2.4.0 to 2.5.1 Bumps `versions.errorprone` from 2.4.0 to 2.5.1. Updates `error_prone_core` from 2.4.0 to 2.5.1 - [Release notes](https://github.com/google/error-prone/releases) - [Commits](https://github.com/google/error-prone/compare/v2.4.0...v2.5.1) Updates `error_prone_test_helpers` from 2.4.0 to 2.5.1 - [Release notes](https://github.com/google/error-prone/releases) - [Commits](https://github.com/google/error-prone/compare/v2.4.0...v2.5.1) Signed-off-by: dependabot[bot] * Fix ErrorProne compilation errors Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tim van der Lippe --- gradle/dependencies.gradle | 2 +- .../ByteBuddyCrossClassLoaderSerializationSupport.java | 2 ++ .../mockito/internal/creation/bytebuddy/MockMethodAdvice.java | 2 +- .../bugpatterns/AbstractMockitoAnyForPrimitiveType.java | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 79808ad5ab..25a41b3311 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -6,7 +6,7 @@ def versions = [:] versions.bytebuddy = '1.10.19' versions.junitJupiter = '5.7.0' -versions.errorprone = '2.4.0' +versions.errorprone = '2.5.1' libraries.junit4 = 'junit:junit:4.13.1' libraries.junitJupiterApi = "org.junit.jupiter:junit-jupiter-api:${versions.junitJupiter}" diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java b/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java index 90ccee882c..76aadc80e5 100644 --- a/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java +++ b/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java @@ -193,6 +193,7 @@ public CrossClassLoaderSerializationProxy(Object mockitoMock) throws IOException * @return A deserialized instance of the Mockito mock. * @throws java.io.ObjectStreamException */ + @SuppressWarnings("BanSerializableRead") private Object readResolve() throws ObjectStreamException { try { ByteArrayInputStream bis = new ByteArrayInputStream(serializedMock); @@ -267,6 +268,7 @@ public MockitoMockObjectInputStream( * @throws ClassNotFoundException */ @Override + @SuppressWarnings("BanSerializableRead") protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { if (notMarkedAsAMockitoMock(readObject())) { diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java b/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java index 9323368a14..1d9dcba590 100644 --- a/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java +++ b/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java @@ -744,7 +744,7 @@ private static void exit( public static class ForReadObject { - @SuppressWarnings("unused") + @SuppressWarnings({"unused", "BanSerializableRead"}) public static void doReadObject( @Identifier String identifier, @This MockAccess thiz, diff --git a/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/AbstractMockitoAnyForPrimitiveType.java b/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/AbstractMockitoAnyForPrimitiveType.java index 3d14b4eaad..f23f9ed836 100644 --- a/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/AbstractMockitoAnyForPrimitiveType.java +++ b/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/AbstractMockitoAnyForPrimitiveType.java @@ -70,7 +70,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState } if (argumentIndex == -1) { throw new IllegalStateException( - "Cannot find argument " + tree + " in argument list from " + parentTree); + "Cannot find argument " + state.getSourceForNode(tree) + " in argument list from " + state.getSourceForNode(parentTree)); } Type parameterType = getParameterType(parentMethod, argumentIndex);