Simplified code, passing only mock as parameter

Also made the constructors package-protected, followed by IDEA hint. It's always a good idea to reduce the scope.
huangbotao · Nov 25, 2018 · 38dc92d · 38dc92d
1 parent 88a2d3d
commit 38dc92d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/org/mockito/internal/stubbing/BaseStubbing.java b/src/main/java/org/mockito/internal/stubbing/BaseStubbing.java
@@ -4,24 +4,24 @@
  */
 package org.mockito.internal.stubbing;
 
-import static org.mockito.internal.exceptions.Reporter.notAnException;
-import static org.mockito.internal.progress.ThreadSafeMockingProgress.mockingProgress;
-import static org.objenesis.ObjenesisHelper.newInstance;
-
 import org.mockito.internal.stubbing.answers.CallsRealMethods;
 import org.mockito.internal.stubbing.answers.Returns;
 import org.mockito.internal.stubbing.answers.ThrowsException;
 import org.mockito.stubbing.Answer;
 import org.mockito.stubbing.OngoingStubbing;
 
+import static org.mockito.internal.exceptions.Reporter.notAnException;
+import static org.mockito.internal.progress.ThreadSafeMockingProgress.mockingProgress;
+import static org.objenesis.ObjenesisHelper.newInstance;
+
 public abstract class BaseStubbing<T> implements OngoingStubbing<T> {
 
 
     // Keep strong ref to mock preventing premature garbage collection when using 'One-liner stubs'. See #1541.
     private final Object strongMockRef;
 
-    public BaseStubbing(InvocationContainerImpl invocationContainer) {
-        this.strongMockRef = invocationContainer.invokedMock();
+    BaseStubbing(Object mock) {
+        this.strongMockRef = mock;
     }
 
     @Override

diff --git a/src/main/java/org/mockito/internal/stubbing/ConsecutiveStubbing.java b/src/main/java/org/mockito/internal/stubbing/ConsecutiveStubbing.java
@@ -11,8 +11,8 @@ public class ConsecutiveStubbing<T> extends BaseStubbing<T> {
 
     private final InvocationContainerImpl invocationContainer;
 
-    public ConsecutiveStubbing(InvocationContainerImpl invocationContainer) {
-        super(invocationContainer);
+    ConsecutiveStubbing(InvocationContainerImpl invocationContainer) {
+        super(invocationContainer.invokedMock());
         this.invocationContainer = invocationContainer;
     }
 

diff --git a/src/main/java/org/mockito/internal/stubbing/OngoingStubbingImpl.java b/src/main/java/org/mockito/internal/stubbing/OngoingStubbingImpl.java
@@ -19,7 +19,7 @@ public class OngoingStubbingImpl<T> extends BaseStubbing<T> {
     private Strictness strictness;
 
     public OngoingStubbingImpl(InvocationContainerImpl invocationContainer) {
-        super(invocationContainer);
+        super(invocationContainer.invokedMock());
         this.invocationContainer = invocationContainer;
     }