fixup! Fixes mockito#2626 : Introduce MockSettings.mockMaker

JojOatXGME · Sep 3, 2022 · 696385b · 696385b
1 parent 39539d6
commit 696385b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/src/main/java/org/mockito/internal/configuration/plugins/DefaultMockitoPlugins.java b/src/main/java/org/mockito/internal/configuration/plugins/DefaultMockitoPlugins.java
@@ -71,8 +71,7 @@ public <T> T getDefaultPlugin(Class<T> pluginType) {
         return create(pluginType, className);
     }
 
-    public String getDefaultPluginClass(String classOrAlias) {
-        // TODO: #2701 We could make this method static?
+    public static String getDefaultPluginClass(String classOrAlias) {
         return DEFAULT_PLUGINS.get(classOrAlias);
     }
 

diff --git a/src/main/java/org/mockito/internal/configuration/plugins/PluginInitializer.java b/src/main/java/org/mockito/internal/configuration/plugins/PluginInitializer.java
@@ -18,12 +18,10 @@ class PluginInitializer {
 
     private final PluginSwitch pluginSwitch;
     private final Set<String> alias;
-    private final DefaultMockitoPlugins plugins;
 
-    PluginInitializer(PluginSwitch pluginSwitch, Set<String> alias, DefaultMockitoPlugins plugins) {
+    PluginInitializer(PluginSwitch pluginSwitch, Set<String> alias) {
         this.pluginSwitch = pluginSwitch;
         this.alias = alias;
-        this.plugins = plugins;
     }
 
     /**
@@ -47,7 +45,7 @@ public <T> T loadImpl(Class<T> service) {
                     new PluginFinder(pluginSwitch).findPluginClass(Iterables.toIterable(resources));
             if (classOrAlias != null) {
                 if (alias.contains(classOrAlias)) {
-                    classOrAlias = plugins.getDefaultPluginClass(classOrAlias);
+                    classOrAlias = DefaultMockitoPlugins.getDefaultPluginClass(classOrAlias);
                 }
                 Class<?> pluginClass = loader.loadClass(classOrAlias);
                 Object plugin = pluginClass.getDeclaredConstructor().newInstance();
@@ -79,7 +77,7 @@ public <T> List<T> loadImpls(Class<T> service) {
             List<T> impls = new ArrayList<>();
             for (String classOrAlias : classesOrAliases) {
                 if (alias.contains(classOrAlias)) {
-                    classOrAlias = plugins.getDefaultPluginClass(classOrAlias);
+                    classOrAlias = DefaultMockitoPlugins.getDefaultPluginClass(classOrAlias);
                 }
                 Class<?> pluginClass = loader.loadClass(classOrAlias);
                 Object plugin = pluginClass.getDeclaredConstructor().newInstance();

diff --git a/src/main/java/org/mockito/internal/configuration/plugins/PluginLoader.java b/src/main/java/org/mockito/internal/configuration/plugins/PluginLoader.java
@@ -27,8 +27,7 @@ class PluginLoader {
     PluginLoader(PluginSwitch pluginSwitch) {
         this(
                 new DefaultMockitoPlugins(),
-                new PluginInitializer(
-                        pluginSwitch, Collections.emptySet(), new DefaultMockitoPlugins()));
+                new PluginInitializer(pluginSwitch, Collections.emptySet()));
     }
 
     /**
@@ -40,10 +39,7 @@ class PluginLoader {
     PluginLoader(PluginSwitch pluginSwitch, String... alias) {
         this(
                 new DefaultMockitoPlugins(),
-                new PluginInitializer(
-                        pluginSwitch,
-                        new HashSet<>(Arrays.asList(alias)),
-                        new DefaultMockitoPlugins()));
+                new PluginInitializer(pluginSwitch, new HashSet<>(Arrays.asList(alias))));
     }
 
     /**

diff --git a/src/main/java/org/mockito/internal/util/MockUtil.java b/src/main/java/org/mockito/internal/util/MockUtil.java
@@ -33,7 +33,6 @@ public class MockUtil {
     private static final Map<Class<? extends MockMaker>, MockMaker> mockMakers =
             new ConcurrentHashMap<>(
                     Collections.singletonMap(defaultMockMaker.getClass(), defaultMockMaker));
-    private static final DefaultMockitoPlugins defaultMockitoPlugins = new DefaultMockitoPlugins();
 
     private MockUtil() {}
 
@@ -44,7 +43,7 @@ private static MockMaker getMockMaker(String mockMaker) {
 
         String typeName;
         if (DefaultMockitoPlugins.MOCK_MAKER_ALIASES.contains(mockMaker)) {
-            typeName = defaultMockitoPlugins.getDefaultPluginClass(mockMaker);
+            typeName = DefaultMockitoPlugins.getDefaultPluginClass(mockMaker);
         } else {
             typeName = mockMaker;
         }

diff --git a/src/test/java/org/mockito/internal/configuration/plugins/DefaultMockitoPluginsTest.java b/src/test/java/org/mockito/internal/configuration/plugins/DefaultMockitoPluginsTest.java
@@ -26,14 +26,14 @@ public class DefaultMockitoPluginsTest extends TestBase {
     public void provides_plugins() throws Exception {
         assertEquals(
                 "org.mockito.internal.creation.bytebuddy.InlineByteBuddyMockMaker",
-                plugins.getDefaultPluginClass(INLINE_ALIAS));
+                DefaultMockitoPlugins.getDefaultPluginClass(INLINE_ALIAS));
         assertEquals(InlineByteBuddyMockMaker.class, plugins.getInlineMockMaker().getClass());
         assertEquals(
                 "org.mockito.internal.creation.proxy.ProxyMockMaker",
-                plugins.getDefaultPluginClass(PROXY_ALIAS));
+                DefaultMockitoPlugins.getDefaultPluginClass(PROXY_ALIAS));
         assertEquals(
                 "org.mockito.internal.creation.bytebuddy.ByteBuddyMockMaker",
-                plugins.getDefaultPluginClass(SUBCLASS_ALIAS));
+                DefaultMockitoPlugins.getDefaultPluginClass(SUBCLASS_ALIAS));
         assertEquals(
                 ByteBuddyMockMaker.class, plugins.getDefaultPlugin(MockMaker.class).getClass());
         assertNotNull(plugins.getDefaultPlugin(InstantiatorProvider2.class));