diff --git a/jmock-imposters/src/main/java/org/jmock/imposters/ByteBuddyClassImposteriser.java b/jmock-imposters/src/main/java/org/jmock/imposters/ByteBuddyClassImposteriser.java
index afb85862d..f2118ac91 100644
--- a/jmock-imposters/src/main/java/org/jmock/imposters/ByteBuddyClassImposteriser.java
+++ b/jmock-imposters/src/main/java/org/jmock/imposters/ByteBuddyClassImposteriser.java
@@ -14,7 +14,6 @@
import org.jmock.api.Invocation;
import org.jmock.api.Invokable;
import org.jmock.internal.SearchingClassLoader;
-import org.jmock.internal.matcher.MethodMatcher;
import org.objenesis.Objenesis;
import org.objenesis.ObjenesisStd;
diff --git a/jmock/src/main/java/org/jmock/api/Invocation.java b/jmock/src/main/java/org/jmock/api/Invocation.java
index 3c1f3a391..2100361a8 100644
--- a/jmock/src/main/java/org/jmock/api/Invocation.java
+++ b/jmock/src/main/java/org/jmock/api/Invocation.java
@@ -41,8 +41,15 @@ public class Invocation implements SelfDescribing {
};
+ /**
+ * Support distinguish between building expectations and asserting against expectations.
+ * ByteBuddy (for example) checks runtime return types.
+ * It's simplest and safest to return null when building expectations
+ */
public enum ExpectationMode {
- BUILDING, ASSERTING, LEGACY
+ BUILDING, // We're building the expectations so invocations can return null
+ ASSERTING, // Return the default or specified reply
+ LEGACY // Legacy mode old imposters
}
public Invocation(ExpectationMode mode, Object invoked, Method method, Object... parameterValues) {
diff --git a/testjar/pom.xml b/testjar/pom.xml
index 04310e512..f5b967e84 100644
--- a/testjar/pom.xml
+++ b/testjar/pom.xml
@@ -22,7 +22,6 @@
org.apache.maven.plugins
maven-dependency-plugin
- 2.9
copy