Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2016-11-18 16:57:02 +00:00
commit 9ec38dc8c1
1 changed files with 5 additions and 1 deletions

View File

@ -36,7 +36,7 @@ import org.springframework.util.ReflectionUtils;
*
* @author Andy Wilkinson
*/
class SpringBootMockUtil {
final class SpringBootMockUtil {
private static final MockUtilAdapter adapter;
@ -50,6 +50,10 @@ class SpringBootMockUtil {
}
}
private SpringBootMockUtil() {
}
static MockCreationSettings<?> getMockSettings(Object mock) {
return adapter.getMockSettings(mock);
}