From 7da0c7409584dabbfcc020342a7840d395d5fcb4 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Thu, 10 Jan 2019 10:50:45 -0600
Subject: [PATCH] Fix MethodSecurityEvaluationContextTests

Update for 4.2.x code base

Issue: gh-6384
---
 .../method/MethodSecurityEvaluationContextTests.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java
index 6a53881440..c1b5bb60a7 100644
--- a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java
+++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java
@@ -21,10 +21,9 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import org.springframework.core.ParameterNameDiscoverer;
-import org.springframework.lang.Nullable;
 import org.springframework.security.core.Authentication;
 import org.springframework.util.ReflectionUtils;
 
@@ -64,7 +63,7 @@ public class MethodSecurityEvaluationContextTests {
 		}
 
 		@Override
-		public void setVariable(String name, @Nullable Object value) {
+		public void setVariable(String name, Object value) {
 			if ( name == null ) {
 				throw new IllegalArgumentException("name  should not be null");
 			}