From dba1f011029adcaf0a85a3eb6218b0e11a4c59f0 Mon Sep 17 00:00:00 2001 From: DerFrZocker Date: Sat, 15 Jul 2023 13:28:48 +0200 Subject: [PATCH] Run spotlessApply --- .../internal/configuration/plugins/PluginRegistry.java | 2 +- .../internal/creation/bytebuddy/MockMethodAdvice.java | 6 +++++- .../internal/creation/bytebuddy/MockMethodInterceptor.java | 3 ++- .../java/org/mockito/internal/exceptions/Reporter.java | 6 +++++- .../internal/invocation/DefaultInvocationFactory.java | 7 ++++++- .../stubbing/defaultanswers/ReturnsSmartNulls.java | 3 ++- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java b/src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java index 68b5786585..f037ca8f3a 100644 --- a/src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java +++ b/src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java @@ -51,7 +51,7 @@ class PluginRegistry { new PluginLoader(pluginSwitch).loadPlugin(DoNotMockEnforcer.class); private final LocationFactory locationFactory = - new PluginLoader(pluginSwitch).loadPlugin(LocationFactory.class); + new PluginLoader(pluginSwitch).loadPlugin(LocationFactory.class); PluginRegistry() { instantiatorProvider = diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java b/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java index eaed5f9720..4ed5546148 100644 --- a/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java +++ b/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java @@ -131,7 +131,11 @@ public Callable handle(Object instance, Method origin, Object[] arguments) th } return new ReturnValueWrapper( interceptor.doIntercept( - instance, origin, arguments, realMethod, Plugins.getLocationFactory().create(true))); + instance, + origin, + arguments, + realMethod, + Plugins.getLocationFactory().create(true))); } @Override diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodInterceptor.java b/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodInterceptor.java index 913bde12b4..94f1ff290d 100644 --- a/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodInterceptor.java +++ b/src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodInterceptor.java @@ -53,7 +53,8 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Object doIntercept(Object mock, Method invokedMethod, Object[] arguments, RealMethod realMethod) throws Throwable { - return doIntercept(mock, invokedMethod, arguments, realMethod, Plugins.getLocationFactory().create()); + return doIntercept( + mock, invokedMethod, arguments, realMethod, Plugins.getLocationFactory().create()); } Object doIntercept( diff --git a/src/main/java/org/mockito/internal/exceptions/Reporter.java b/src/main/java/org/mockito/internal/exceptions/Reporter.java index 0de024ceb7..c2d9f1f663 100644 --- a/src/main/java/org/mockito/internal/exceptions/Reporter.java +++ b/src/main/java/org/mockito/internal/exceptions/Reporter.java @@ -419,7 +419,11 @@ public static MockitoAssertionError wantedButNotInvoked( } private static String createWantedButNotInvokedMessage(DescribedInvocation wanted) { - return join("Wanted but not invoked:", wanted.toString(), Plugins.getLocationFactory().create(), ""); + return join( + "Wanted but not invoked:", + wanted.toString(), + Plugins.getLocationFactory().create(), + ""); } public static MockitoAssertionError wantedButNotInvokedInOrder( diff --git a/src/main/java/org/mockito/internal/invocation/DefaultInvocationFactory.java b/src/main/java/org/mockito/internal/invocation/DefaultInvocationFactory.java index c235b7ddee..1838b259c4 100644 --- a/src/main/java/org/mockito/internal/invocation/DefaultInvocationFactory.java +++ b/src/main/java/org/mockito/internal/invocation/DefaultInvocationFactory.java @@ -71,7 +71,12 @@ private static InterceptedInvocation createInvocation( RealMethod realMethod, MockCreationSettings settings) { return createInvocation( - mock, invokedMethod, arguments, realMethod, settings, Plugins.getLocationFactory().create()); + mock, + invokedMethod, + arguments, + realMethod, + settings, + Plugins.getLocationFactory().create()); } private static MockitoMethod createMockitoMethod(Method method, MockCreationSettings settings) { diff --git a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java b/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java index e0cf3eb726..2b30048e81 100644 --- a/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java +++ b/src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java @@ -65,7 +65,8 @@ public Object apply(Class type) { MockCreationSettings mockSettings = MockUtil.getMockSettings(invocation.getMock()); Answer defaultAnswer = - new ThrowsSmartNullPointer(invocation, Plugins.getLocationFactory().create()); + new ThrowsSmartNullPointer( + invocation, Plugins.getLocationFactory().create()); return Mockito.mock( type,