Skip to content

S
spring-boot
Commit 9ec38dc8 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.5.x'

parents 9273b178 f35fa873
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpringBootMockUtil.java
View file @ 9ec38dc8
...@@ -36,7 +36,7 @@ import org.springframework.util.ReflectionUtils; ...@@ -36,7 +36,7 @@ import org.springframework.util.ReflectionUtils;
* *
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
class SpringBootMockUtil { final class SpringBootMockUtil {
private static final MockUtilAdapter adapter; private static final MockUtilAdapter adapter;
...@@ -50,6 +50,10 @@ class SpringBootMockUtil { ...@@ -50,6 +50,10 @@ class SpringBootMockUtil {
} }
} }
private SpringBootMockUtil() {
}
static MockCreationSettings<?> getMockSettings(Object mock) { static MockCreationSettings<?> getMockSettings(Object mock) {
return adapter.getMockSettings(mock); return adapter.getMockSettings(mock);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment