Merge branch '5.1.x'

2019-04-03 16:29:28 -04:00
parent 1c5aa6a8d3 b3bc2d9253
commit 2c28e4e972
3 changed files with 6 additions and 12 deletions
--- a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferUtilsTests.java
@@ -49,7 +49,9 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.buffer.support.DataBufferTestUtils;

 import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.isA;
 import static org.mockito.Mockito.*;

 /**