Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump versions.errorprone from 2.4.0 to 2.5.1 #2176

Merged
merged 2 commits into from
Jan 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -267,6 +268,7 @@ public MockitoMockObjectInputStream(
* @throws ClassNotFoundException
*/
@Override
@SuppressWarnings("BanSerializableRead")
protected Class<?> resolveClass(ObjectStreamClass desc)
throws IOException, ClassNotFoundException {
if (notMarkedAsAMockitoMock(readObject())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down