From 70c8f6cec35216fa9af1b2804e9200cfd400d24b Mon Sep 17 00:00:00 2001 From: Tim van der Lippe Date: Fri, 1 Oct 2021 16:14:30 +0100 Subject: [PATCH] Remove all Incubating annotations For all of these APIs, we have been shipping them for at least 1 major release. We consider all of these APIs part of the public API contract now and therefore we should mark them as such. This PR removes all usages of the annotation. If we were to later remove an API, it will first have to be deprecated and then removed in a subsequent major release. However, we have no plans to do so with any of these APIs. --- src/main/java/org/mockito/AdditionalAnswers.java | 13 ------------- src/main/java/org/mockito/MockSettings.java | 7 ------- src/main/java/org/mockito/MockedConstruction.java | 1 - src/main/java/org/mockito/MockedStatic.java | 1 - src/main/java/org/mockito/MockingDetails.java | 1 - src/main/java/org/mockito/Mockito.java | 15 --------------- src/main/java/org/mockito/MockitoFramework.java | 7 ------- src/main/java/org/mockito/MockitoSession.java | 4 ---- src/main/java/org/mockito/ScopedMock.java | 1 - ...BuddyCrossClassLoaderSerializationSupport.java | 2 -- .../creation/bytebuddy/ByteBuddyMockMaker.java | 2 -- .../bytebuddy/InlineByteBuddyMockMaker.java | 2 -- .../InlineDelegateByteBuddyMockMaker.java | 2 -- .../mockito/invocation/InvocationContainer.java | 2 -- .../org/mockito/invocation/InvocationFactory.java | 3 --- .../java/org/mockito/invocation/MockHandler.java | 3 --- src/main/java/org/mockito/junit/MockitoJUnit.java | 2 -- src/main/java/org/mockito/junit/MockitoRule.java | 2 -- .../java/org/mockito/junit/MockitoTestRule.java | 2 -- .../org/mockito/junit/VerificationCollector.java | 4 ---- .../mockito/listeners/VerificationListener.java | 2 -- .../listeners/VerificationStartedEvent.java | 5 ----- .../listeners/VerificationStartedListener.java | 4 ---- .../org/mockito/mock/MockCreationSettings.java | 6 ------ .../java/org/mockito/mock/SerializableMode.java | 4 ---- .../java/org/mockito/plugins/InlineMockMaker.java | 4 ---- .../java/org/mockito/plugins/MemberAccessor.java | 3 --- src/main/java/org/mockito/plugins/MockMaker.java | 8 -------- .../java/org/mockito/plugins/MockitoLogger.java | 4 ---- .../java/org/mockito/plugins/PluginSwitch.java | 3 --- src/main/java/org/mockito/quality/Strictness.java | 5 ----- .../mockito/session/MockitoSessionBuilder.java | 8 -------- .../org/mockito/session/MockitoSessionLogger.java | 3 --- src/main/java/org/mockito/stubbing/Answer1.java | 3 --- src/main/java/org/mockito/stubbing/Answer2.java | 3 --- src/main/java/org/mockito/stubbing/Answer3.java | 3 --- src/main/java/org/mockito/stubbing/Answer4.java | 3 --- src/main/java/org/mockito/stubbing/Answer5.java | 3 --- src/main/java/org/mockito/stubbing/Answer6.java | 3 --- src/main/java/org/mockito/stubbing/Stubbing.java | 2 -- .../org/mockito/stubbing/ValidableAnswer.java | 2 -- .../java/org/mockito/stubbing/VoidAnswer1.java | 3 --- .../java/org/mockito/stubbing/VoidAnswer2.java | 3 --- .../java/org/mockito/stubbing/VoidAnswer3.java | 3 --- .../java/org/mockito/stubbing/VoidAnswer4.java | 3 --- .../java/org/mockito/stubbing/VoidAnswer5.java | 3 --- .../java/org/mockito/stubbing/VoidAnswer6.java | 3 --- .../mockito/verification/VerificationEvent.java | 2 -- 48 files changed, 177 deletions(-) diff --git a/src/main/java/org/mockito/AdditionalAnswers.java b/src/main/java/org/mockito/AdditionalAnswers.java index c7d2683f63..7825289bde 100644 --- a/src/main/java/org/mockito/AdditionalAnswers.java +++ b/src/main/java/org/mockito/AdditionalAnswers.java @@ -330,7 +330,6 @@ public static Answer returnsElementsOf(Collection elements) { * * @since 2.8.44 */ - @Incubating public static Answer answersWithDelay(long sleepyTime, Answer answer) { return (Answer) new AnswersWithDelay(sleepyTime, (Answer) answer); } @@ -344,7 +343,6 @@ public static Answer answersWithDelay(long sleepyTime, Answer answer) * @return the answer object to use * @since 2.1.0 */ - @Incubating public static Answer answer(Answer1 answer) { return toAnswer(answer); } @@ -357,7 +355,6 @@ public static Answer answer(Answer1 answer) { * @return the answer object to use * @since 2.1.0 */ - @Incubating public static Answer answerVoid(VoidAnswer1 answer) { return toAnswer(answer); } @@ -372,7 +369,6 @@ public static Answer answerVoid(VoidAnswer1 answer) { * @return the answer object to use * @since 2.1.0 */ - @Incubating public static Answer answer(Answer2 answer) { return toAnswer(answer); } @@ -386,7 +382,6 @@ public static Answer answer(Answer2 answer) { * @return the answer object to use * @since 2.1.0 */ - @Incubating public static Answer answerVoid(VoidAnswer2 answer) { return toAnswer(answer); } @@ -402,7 +397,6 @@ public static Answer answerVoid(VoidAnswer2 answer) { * @return the answer object to use * @since 2.1.0 */ - @Incubating public static Answer answer(Answer3 answer) { return toAnswer(answer); } @@ -417,7 +411,6 @@ public static Answer answer(Answer3 answer) { * @return the answer object to use * @since 2.1.0 */ - @Incubating public static Answer answerVoid(VoidAnswer3 answer) { return toAnswer(answer); } @@ -434,7 +427,6 @@ public static Answer answerVoid(VoidAnswer3 answer) { * @return the answer object to use * @since 2.1.0 */ - @Incubating public static Answer answer(Answer4 answer) { return toAnswer(answer); } @@ -450,7 +442,6 @@ public static Answer answer(Answer4 answer) { * @return the answer object to use * @since 2.1.0 */ - @Incubating public static Answer answerVoid(VoidAnswer4 answer) { return toAnswer(answer); } @@ -468,7 +459,6 @@ public static Answer answerVoid(VoidAnswer4 answe * @return the answer object to use * @since 2.1.0 */ - @Incubating public static Answer answer(Answer5 answer) { return toAnswer(answer); } @@ -486,7 +476,6 @@ public static Answer answer(Answer5 answ * @return the answer object to use * @since 2.1.0 */ - @Incubating public static Answer answerVoid(VoidAnswer5 answer) { return toAnswer(answer); } @@ -506,7 +495,6 @@ public static Answer answerVoid(VoidAnswer5 * @return the answer object to use * @since 2.26.0 */ - @Incubating public static Answer answer(Answer6 answer) { return toAnswer(answer); } @@ -525,7 +513,6 @@ public static Answer answer(Answer6 Answer answerVoid(VoidAnswer6 answer) { return toAnswer(answer); } diff --git a/src/main/java/org/mockito/MockSettings.java b/src/main/java/org/mockito/MockSettings.java index a1fdb508fd..c24d31ae9f 100644 --- a/src/main/java/org/mockito/MockSettings.java +++ b/src/main/java/org/mockito/MockSettings.java @@ -255,7 +255,6 @@ public interface MockSettings extends Serializable { * @return settings instance so that you can fluently specify other settings * @since 2.11.0 */ - @Incubating MockSettings verificationStartedListeners(VerificationStartedListener... listeners); /** @@ -296,7 +295,6 @@ public interface MockSettings extends Serializable { * @return settings instance so that you can fluently specify other settings * @since 2.7.14 (useConstructor with no arguments was supported since 1.10.12) */ - @Incubating MockSettings useConstructor(Object... args); /** @@ -311,7 +309,6 @@ public interface MockSettings extends Serializable { * @return settings instance so that you can fluently specify other settings * @since 1.10.12 */ - @Incubating MockSettings outerInstance(Object outerClassInstance); /** @@ -322,7 +319,6 @@ public interface MockSettings extends Serializable { * @return settings instance so that you can fluently specify other settings * @since 1.10.13 */ - @Incubating MockSettings withoutAnnotations(); /** @@ -337,7 +333,6 @@ public interface MockSettings extends Serializable { * @return immutable view of mock settings * @since 2.10.0 */ - @Incubating MockCreationSettings build(Class typeToMock); /** @@ -352,7 +347,6 @@ public interface MockSettings extends Serializable { * @return immutable view of mock settings * @since 2.10.0 */ - @Incubating MockCreationSettings buildStatic(Class classToMock); /** @@ -366,6 +360,5 @@ public interface MockSettings extends Serializable { * * For more information and an elaborate example, see {@link Mockito#lenient()}. */ - @Incubating MockSettings lenient(); } diff --git a/src/main/java/org/mockito/MockedConstruction.java b/src/main/java/org/mockito/MockedConstruction.java index c00fb021a2..5c2ec2128d 100644 --- a/src/main/java/org/mockito/MockedConstruction.java +++ b/src/main/java/org/mockito/MockedConstruction.java @@ -19,7 +19,6 @@ * * @param The type for which the construction is being mocked. */ -@Incubating public interface MockedConstruction extends ScopedMock { List constructed(); diff --git a/src/main/java/org/mockito/MockedStatic.java b/src/main/java/org/mockito/MockedStatic.java index 7a209c3233..9095556fd7 100644 --- a/src/main/java/org/mockito/MockedStatic.java +++ b/src/main/java/org/mockito/MockedStatic.java @@ -23,7 +23,6 @@ * * @param The type being mocked. */ -@Incubating public interface MockedStatic extends ScopedMock { /** diff --git a/src/main/java/org/mockito/MockingDetails.java b/src/main/java/org/mockito/MockingDetails.java index 6087eb455a..c32e04e5c9 100644 --- a/src/main/java/org/mockito/MockingDetails.java +++ b/src/main/java/org/mockito/MockingDetails.java @@ -117,7 +117,6 @@ public interface MockingDetails { * @return mock handler instance of this mock * @since 2.10.0 */ - @Incubating MockHandler getMockHandler(); /** diff --git a/src/main/java/org/mockito/Mockito.java b/src/main/java/org/mockito/Mockito.java index e6dc5d9bfe..8d7154c513 100644 --- a/src/main/java/org/mockito/Mockito.java +++ b/src/main/java/org/mockito/Mockito.java @@ -2068,7 +2068,6 @@ public static T spy(T object) { * @return a spy of the provided class * @since 1.10.12 */ - @Incubating public static T spy(Class classToSpy) { return MOCKITO_CORE.mock( classToSpy, withSettings().useConstructor().defaultAnswer(CALLS_REAL_METHODS)); @@ -2090,7 +2089,6 @@ public static T spy(Class classToSpy) { * @param classToMock class or interface of which static mocks should be mocked. * @return mock controller */ - @Incubating public static MockedStatic mockStatic(Class classToMock) { return mockStatic(classToMock, withSettings()); } @@ -2112,7 +2110,6 @@ public static MockedStatic mockStatic(Class classToMock) { * @param defaultAnswer the default answer when invoking static methods. * @return mock controller */ - @Incubating public static MockedStatic mockStatic(Class classToMock, Answer defaultAnswer) { return mockStatic(classToMock, withSettings().defaultAnswer(defaultAnswer)); } @@ -2134,7 +2131,6 @@ public static MockedStatic mockStatic(Class classToMock, Answer defaul * @param name the name of the mock to use in error messages. * @return mock controller */ - @Incubating public static MockedStatic mockStatic(Class classToMock, String name) { return mockStatic(classToMock, withSettings().name(name)); } @@ -2156,7 +2152,6 @@ public static MockedStatic mockStatic(Class classToMock, String name) * @param mockSettings the settings to use where only name and default answer are considered. * @return mock controller */ - @Incubating public static MockedStatic mockStatic(Class classToMock, MockSettings mockSettings) { return MOCKITO_CORE.mockStatic(classToMock, mockSettings); } @@ -2174,7 +2169,6 @@ public static MockedStatic mockStatic(Class classToMock, MockSettings * last answer is used. If this array is empty, the {@code defaultAnswer} is used. * @return mock controller */ - @Incubating public static MockedConstruction mockConstructionWithAnswer( Class classToMock, Answer defaultAnswer, Answer... additionalAnswers) { return mockConstruction( @@ -2203,7 +2197,6 @@ public static MockedConstruction mockConstructionWithAnswer( * @param classToMock non-abstract class of which constructions should be mocked. * @return mock controller */ - @Incubating public static MockedConstruction mockConstruction(Class classToMock) { return mockConstruction(classToMock, index -> withSettings(), (mock, context) -> {}); } @@ -2219,7 +2212,6 @@ public static MockedConstruction mockConstruction(Class classToMock) { * @param mockInitializer a callback to prepare a mock's methods after its instantiation. * @return mock controller */ - @Incubating public static MockedConstruction mockConstruction( Class classToMock, MockedConstruction.MockInitializer mockInitializer) { return mockConstruction(classToMock, withSettings(), mockInitializer); @@ -2236,7 +2228,6 @@ public static MockedConstruction mockConstruction( * @param mockSettings the mock settings to use. * @return mock controller */ - @Incubating public static MockedConstruction mockConstruction( Class classToMock, MockSettings mockSettings) { return mockConstruction(classToMock, context -> mockSettings); @@ -2253,7 +2244,6 @@ public static MockedConstruction mockConstruction( * @param mockSettingsFactory the mock settings to use. * @return mock controller */ - @Incubating public static MockedConstruction mockConstruction( Class classToMock, Function mockSettingsFactory) { @@ -2272,7 +2262,6 @@ public static MockedConstruction mockConstruction( * @param mockInitializer a callback to prepare a mock's methods after its instantiation. * @return mock controller */ - @Incubating public static MockedConstruction mockConstruction( Class classToMock, MockSettings mockSettings, @@ -2292,7 +2281,6 @@ public static MockedConstruction mockConstruction( * @param mockInitializer a callback to prepare a mock's methods after its instantiation. * @return mock controller */ - @Incubating public static MockedConstruction mockConstruction( Class classToMock, Function mockSettingsFactory, @@ -3257,7 +3245,6 @@ public static VerificationMode description(String description) { * * @since 2.1.0 */ - @Incubating public static MockitoFramework framework() { return new DefaultMockitoFramework(); } @@ -3270,7 +3257,6 @@ public static MockitoFramework framework() { * * @since 2.7.0 */ - @Incubating public static MockitoSessionBuilder mockitoSession() { return new DefaultMockitoSessionBuilder(); } @@ -3338,7 +3324,6 @@ public static MockitoSessionBuilder mockitoSession() { * * @since 2.20.0 */ - @Incubating public static LenientStubber lenient() { return MOCKITO_CORE.lenient(); } diff --git a/src/main/java/org/mockito/MockitoFramework.java b/src/main/java/org/mockito/MockitoFramework.java index da03ef4d80..c3d590ceb7 100644 --- a/src/main/java/org/mockito/MockitoFramework.java +++ b/src/main/java/org/mockito/MockitoFramework.java @@ -19,7 +19,6 @@ * * @since 2.1.0 */ -@Incubating @NotExtensible public interface MockitoFramework { @@ -53,7 +52,6 @@ public interface MockitoFramework { * @return this instance of mockito framework (fluent builder pattern) * @since 2.1.0 */ - @Incubating MockitoFramework addListener(MockitoListener listener) throws RedundantListenerException; /** @@ -70,7 +68,6 @@ public interface MockitoFramework { * @return this instance of mockito framework (fluent builder pattern) * @since 2.1.0 */ - @Incubating MockitoFramework removeListener(MockitoListener listener); /** @@ -81,7 +78,6 @@ public interface MockitoFramework { * @return object that gives access to mockito plugins * @since 2.10.0 */ - @Incubating MockitoPlugins getPlugins(); /** @@ -91,7 +87,6 @@ public interface MockitoFramework { * @return object that can construct invocations * @since 2.10.0 */ - @Incubating InvocationFactory getInvocationFactory(); /** @@ -130,7 +125,6 @@ public interface MockitoFramework { * @since 2.25.0 * @see #clearInlineMock(Object) */ - @Incubating void clearInlineMocks(); /** @@ -142,6 +136,5 @@ public interface MockitoFramework { * @since 2.25.0 * @see #clearInlineMocks() */ - @Incubating void clearInlineMock(Object mock); } diff --git a/src/main/java/org/mockito/MockitoSession.java b/src/main/java/org/mockito/MockitoSession.java index c7989be1fc..4afa24341a 100644 --- a/src/main/java/org/mockito/MockitoSession.java +++ b/src/main/java/org/mockito/MockitoSession.java @@ -86,7 +86,6 @@ * * @since 2.7.0 */ -@Incubating @NotExtensible public interface MockitoSession { @@ -101,7 +100,6 @@ public interface MockitoSession { * @param strictness new strictness for this session. * @since 2.15.0 */ - @Incubating void setStrictness(Strictness strictness); /** @@ -123,7 +121,6 @@ public interface MockitoSession { * @see #finishMocking(Throwable) * @since 2.7.0 */ - @Incubating void finishMocking(); /** @@ -140,6 +137,5 @@ public interface MockitoSession { * @see #finishMocking() * @since 2.15.0 */ - @Incubating void finishMocking(Throwable failure); } diff --git a/src/main/java/org/mockito/ScopedMock.java b/src/main/java/org/mockito/ScopedMock.java index 3ef0d9b3d3..ab2b94c76d 100644 --- a/src/main/java/org/mockito/ScopedMock.java +++ b/src/main/java/org/mockito/ScopedMock.java @@ -8,7 +8,6 @@ * Represents a mock with a thread-local explicit scope. Scoped mocks must be closed by the entity * that activates the scoped mock. */ -@Incubating public interface ScopedMock extends AutoCloseable { /** diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java b/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java index 41efec416b..02e8961385 100644 --- a/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java +++ b/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyCrossClassLoaderSerializationSupport.java @@ -21,7 +21,6 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.mockito.Incubating; import org.mockito.exceptions.base.MockitoSerializationIssue; import org.mockito.internal.configuration.plugins.Plugins; import org.mockito.internal.creation.settings.CreationSettings; @@ -58,7 +57,6 @@ * @author Brice Dutheil * @since 1.10.0 */ -@Incubating class ByteBuddyCrossClassLoaderSerializationSupport implements Serializable { private static final long serialVersionUID = 7411152578314420778L; private static final String MOCKITO_PROXY_MARKER = "ByteBuddyMockitoProxyMarker"; diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMaker.java b/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMaker.java index 35c379c4a6..f6cba2946b 100644 --- a/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMaker.java +++ b/src/main/java/org/mockito/internal/creation/bytebuddy/ByteBuddyMockMaker.java @@ -4,7 +4,6 @@ */ package org.mockito.internal.creation.bytebuddy; -import org.mockito.Incubating; import org.mockito.MockedConstruction; import org.mockito.internal.exceptions.Reporter; import org.mockito.invocation.MockHandler; @@ -65,7 +64,6 @@ public void resetMock(Object mock, MockHandler newHandler, MockCreationSettings } @Override - @Incubating public TypeMockability isTypeMockable(Class type) { return subclassByteBuddyMockMaker.isTypeMockable(type); } diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java index 92593ded9f..acfddfef34 100644 --- a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java +++ b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java @@ -4,7 +4,6 @@ */ package org.mockito.internal.creation.bytebuddy; -import org.mockito.Incubating; import org.mockito.MockedConstruction; import org.mockito.creation.instance.Instantiator; import org.mockito.internal.exceptions.Reporter; @@ -15,7 +14,6 @@ import java.util.Optional; import java.util.function.Function; -@Incubating public class InlineByteBuddyMockMaker implements ClassCreatingMockMaker, InlineMockMaker, Instantiator { private final InlineDelegateByteBuddyMockMaker inlineDelegateByteBuddyMockMaker; diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMaker.java b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMaker.java index 7178927cd9..9da65605a5 100644 --- a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMaker.java +++ b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMaker.java @@ -5,7 +5,6 @@ package org.mockito.internal.creation.bytebuddy; import net.bytebuddy.agent.ByteBuddyAgent; -import org.mockito.Incubating; import org.mockito.MockedConstruction; import org.mockito.creation.instance.InstantiationException; import org.mockito.creation.instance.Instantiator; @@ -100,7 +99,6 @@ * (also known as HotSwap). All major VM distributions such as HotSpot (OpenJDK), J9 (IBM/Websphere) or Zing (Azul) * support this feature. */ -@Incubating @SuppressSignatureCheck class InlineDelegateByteBuddyMockMaker implements ClassCreatingMockMaker, InlineMockMaker, Instantiator { diff --git a/src/main/java/org/mockito/invocation/InvocationContainer.java b/src/main/java/org/mockito/invocation/InvocationContainer.java index 9f0e82a2ee..d12df44e53 100644 --- a/src/main/java/org/mockito/invocation/InvocationContainer.java +++ b/src/main/java/org/mockito/invocation/InvocationContainer.java @@ -4,7 +4,6 @@ */ package org.mockito.invocation; -import org.mockito.Incubating; import org.mockito.NotExtensible; /** @@ -17,5 +16,4 @@ * @since 2.10.0 */ @NotExtensible -@Incubating public interface InvocationContainer {} diff --git a/src/main/java/org/mockito/invocation/InvocationFactory.java b/src/main/java/org/mockito/invocation/InvocationFactory.java index c9f1a53373..c28ef716b4 100644 --- a/src/main/java/org/mockito/invocation/InvocationFactory.java +++ b/src/main/java/org/mockito/invocation/InvocationFactory.java @@ -7,7 +7,6 @@ import java.io.Serializable; import java.lang.reflect.Method; -import org.mockito.Incubating; import org.mockito.MockitoFramework; import org.mockito.mock.MockCreationSettings; @@ -23,7 +22,6 @@ * * @since 2.10.0 */ -@Incubating public interface InvocationFactory { /** @@ -49,7 +47,6 @@ interface RealMethodBehavior extends Serializable { * @return invocation instance * @since 2.14.0 */ - @Incubating Invocation createInvocation( Object target, MockCreationSettings settings, diff --git a/src/main/java/org/mockito/invocation/MockHandler.java b/src/main/java/org/mockito/invocation/MockHandler.java index d20b76b2e6..56a0004ad4 100644 --- a/src/main/java/org/mockito/invocation/MockHandler.java +++ b/src/main/java/org/mockito/invocation/MockHandler.java @@ -6,7 +6,6 @@ import java.io.Serializable; -import org.mockito.Incubating; import org.mockito.MockSettings; import org.mockito.mock.MockCreationSettings; @@ -44,7 +43,6 @@ public interface MockHandler extends Serializable { * @return read-only settings of the mock * @since 2.10.0 */ - @Incubating MockCreationSettings getMockSettings(); /** @@ -60,6 +58,5 @@ public interface MockHandler extends Serializable { * The container is not part of the public API, please do not cast it or provide custom implementations. * @since 2.10.0 */ - @Incubating InvocationContainer getInvocationContainer(); } diff --git a/src/main/java/org/mockito/junit/MockitoJUnit.java b/src/main/java/org/mockito/junit/MockitoJUnit.java index 825303a510..bbe61308fd 100644 --- a/src/main/java/org/mockito/junit/MockitoJUnit.java +++ b/src/main/java/org/mockito/junit/MockitoJUnit.java @@ -5,7 +5,6 @@ package org.mockito.junit; import org.junit.rules.TestRule; -import org.mockito.Incubating; import org.mockito.internal.configuration.plugins.Plugins; import org.mockito.internal.junit.JUnitRule; import org.mockito.internal.junit.JUnitTestRule; @@ -56,7 +55,6 @@ public static MockitoTestRule testRule(Object testInstance) { * @return the rule instance * @since 2.1.0 */ - @Incubating public static VerificationCollector collector() { return new VerificationCollectorImpl(); } diff --git a/src/main/java/org/mockito/junit/MockitoRule.java b/src/main/java/org/mockito/junit/MockitoRule.java index 0869d012ac..10a2735e92 100644 --- a/src/main/java/org/mockito/junit/MockitoRule.java +++ b/src/main/java/org/mockito/junit/MockitoRule.java @@ -5,7 +5,6 @@ package org.mockito.junit; import org.junit.rules.MethodRule; -import org.mockito.Incubating; import org.mockito.MockSettings; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; @@ -146,6 +145,5 @@ public interface MockitoRule extends MethodRule { * * @since 2.3.0 */ - @Incubating MockitoRule strictness(Strictness strictness); } diff --git a/src/main/java/org/mockito/junit/MockitoTestRule.java b/src/main/java/org/mockito/junit/MockitoTestRule.java index 33c15e498c..5efc690a76 100644 --- a/src/main/java/org/mockito/junit/MockitoTestRule.java +++ b/src/main/java/org/mockito/junit/MockitoTestRule.java @@ -5,7 +5,6 @@ package org.mockito.junit; import org.junit.rules.TestRule; -import org.mockito.Incubating; import org.mockito.quality.Strictness; /** @@ -28,6 +27,5 @@ public interface MockitoTestRule extends TestRule { * * @since 3.3.0 */ - @Incubating MockitoTestRule strictness(Strictness strictness); } diff --git a/src/main/java/org/mockito/junit/VerificationCollector.java b/src/main/java/org/mockito/junit/VerificationCollector.java index 08962b58f3..c214b5dd22 100644 --- a/src/main/java/org/mockito/junit/VerificationCollector.java +++ b/src/main/java/org/mockito/junit/VerificationCollector.java @@ -5,7 +5,6 @@ package org.mockito.junit; import org.junit.rules.TestRule; -import org.mockito.Incubating; import org.mockito.exceptions.base.MockitoAssertionError; /** @@ -37,7 +36,6 @@ * @see org.mockito.Mockito#verify(Object, org.mockito.verification.VerificationMode) * @since 2.1.0 */ -@Incubating public interface VerificationCollector extends TestRule { /** @@ -70,7 +68,6 @@ public interface VerificationCollector extends TestRule { * @throws MockitoAssertionError If there were failed verifications * @since 2.1.0 */ - @Incubating void collectAndReport() throws MockitoAssertionError; /** @@ -96,6 +93,5 @@ public interface VerificationCollector extends TestRule { * @return this * @since 2.1.0 */ - @Incubating VerificationCollector assertLazily(); } diff --git a/src/main/java/org/mockito/listeners/VerificationListener.java b/src/main/java/org/mockito/listeners/VerificationListener.java index c42be31752..9f3aaae548 100644 --- a/src/main/java/org/mockito/listeners/VerificationListener.java +++ b/src/main/java/org/mockito/listeners/VerificationListener.java @@ -4,7 +4,6 @@ */ package org.mockito.listeners; -import org.mockito.Incubating; import org.mockito.verification.VerificationEvent; /** @@ -12,7 +11,6 @@ *

* For this to happen, it must be registered using {@link org.mockito.internal.progress.MockingProgress#addListener(MockitoListener)}. */ -@Incubating public interface VerificationListener extends MockitoListener { /** * Called after a verification happened. diff --git a/src/main/java/org/mockito/listeners/VerificationStartedEvent.java b/src/main/java/org/mockito/listeners/VerificationStartedEvent.java index b2f4a00dd8..0eb72ce410 100644 --- a/src/main/java/org/mockito/listeners/VerificationStartedEvent.java +++ b/src/main/java/org/mockito/listeners/VerificationStartedEvent.java @@ -4,15 +4,12 @@ */ package org.mockito.listeners; -import org.mockito.Incubating; - /** * The instance of this class is passed to {@link VerificationStartedListener}. * For all the details, including how and why to use this API, see {@link VerificationStartedListener}. * * @since 2.11.0 */ -@Incubating public interface VerificationStartedEvent { /** @@ -27,7 +24,6 @@ public interface VerificationStartedEvent { * @param mock to be used for verification. * @since 2.11.0 */ - @Incubating void setMock(Object mock); /** @@ -37,6 +33,5 @@ public interface VerificationStartedEvent { * * @since 2.11.0 */ - @Incubating Object getMock(); } diff --git a/src/main/java/org/mockito/listeners/VerificationStartedListener.java b/src/main/java/org/mockito/listeners/VerificationStartedListener.java index f555125557..d942a1cc3c 100644 --- a/src/main/java/org/mockito/listeners/VerificationStartedListener.java +++ b/src/main/java/org/mockito/listeners/VerificationStartedListener.java @@ -4,8 +4,6 @@ */ package org.mockito.listeners; -import org.mockito.Incubating; - /** * This listener gets notified when the user starts verification. * It allows to replace the mock object for verification. @@ -54,7 +52,6 @@ * * @since 2.11.0 */ -@Incubating public interface VerificationStartedListener { /** @@ -64,6 +61,5 @@ public interface VerificationStartedListener { * @param event object that allows to identify and replace mock for verification. * @since 2.11.0 */ - @Incubating void onVerificationStarted(VerificationStartedEvent event); } diff --git a/src/main/java/org/mockito/mock/MockCreationSettings.java b/src/main/java/org/mockito/mock/MockCreationSettings.java index 726428660b..23d5418a14 100644 --- a/src/main/java/org/mockito/mock/MockCreationSettings.java +++ b/src/main/java/org/mockito/mock/MockCreationSettings.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Set; -import org.mockito.Incubating; import org.mockito.MockSettings; import org.mockito.NotExtensible; import org.mockito.listeners.InvocationListener; @@ -90,7 +89,6 @@ public interface MockCreationSettings { * * @since 2.11.0 */ - @Incubating List getVerificationStartedListeners(); /** @@ -98,7 +96,6 @@ public interface MockCreationSettings { * * @since 1.10.12 */ - @Incubating boolean isUsingConstructor(); /** @@ -110,7 +107,6 @@ public interface MockCreationSettings { * * @since 2.7.14 */ - @Incubating Object[] getConstructorArgs(); /** @@ -119,7 +115,6 @@ public interface MockCreationSettings { * @return the outer class instance used for creation of the mock object via the constructor. * @since 1.10.12 */ - @Incubating Object getOuterClassInstance(); /** @@ -128,6 +123,5 @@ public interface MockCreationSettings { * * @since 2.20.0 */ - @Incubating boolean isLenient(); } diff --git a/src/main/java/org/mockito/mock/SerializableMode.java b/src/main/java/org/mockito/mock/SerializableMode.java index 790fc04f1d..41a5f36796 100644 --- a/src/main/java/org/mockito/mock/SerializableMode.java +++ b/src/main/java/org/mockito/mock/SerializableMode.java @@ -4,12 +4,9 @@ */ package org.mockito.mock; -import org.mockito.Incubating; - /** * Mock serializable style. */ -@Incubating public enum SerializableMode { /** @@ -25,6 +22,5 @@ public enum SerializableMode { /** * Useful if the mock is deserialized in a different classloader / vm. */ - @Incubating ACROSS_CLASSLOADERS } diff --git a/src/main/java/org/mockito/plugins/InlineMockMaker.java b/src/main/java/org/mockito/plugins/InlineMockMaker.java index f271d5203a..08fab59ae3 100644 --- a/src/main/java/org/mockito/plugins/InlineMockMaker.java +++ b/src/main/java/org/mockito/plugins/InlineMockMaker.java @@ -4,7 +4,6 @@ */ package org.mockito.plugins; -import org.mockito.Incubating; import org.mockito.MockitoFramework; /** @@ -26,7 +25,6 @@ * * @since 2.25.0 */ -@Incubating public interface InlineMockMaker extends MockMaker { /** @@ -36,7 +34,6 @@ public interface InlineMockMaker extends MockMaker { * @param mock the mock instance whose internal state is to be cleaned. * @since 2.25.0 */ - @Incubating void clearMock(Object mock); /** @@ -45,6 +42,5 @@ public interface InlineMockMaker extends MockMaker { * * @since 2.25.0 */ - @Incubating void clearAllMocks(); } diff --git a/src/main/java/org/mockito/plugins/MemberAccessor.java b/src/main/java/org/mockito/plugins/MemberAccessor.java index caccb656da..6a39d6c93f 100644 --- a/src/main/java/org/mockito/plugins/MemberAccessor.java +++ b/src/main/java/org/mockito/plugins/MemberAccessor.java @@ -4,8 +4,6 @@ */ package org.mockito.plugins; -import org.mockito.Incubating; - import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -15,7 +13,6 @@ * A member accessor is responsible for invoking methods, constructors and for setting * and reading field values. */ -@Incubating public interface MemberAccessor { Object newInstance(Constructor constructor, Object... arguments) diff --git a/src/main/java/org/mockito/plugins/MockMaker.java b/src/main/java/org/mockito/plugins/MockMaker.java index 7e06e32e5f..93a87ef0a5 100644 --- a/src/main/java/org/mockito/plugins/MockMaker.java +++ b/src/main/java/org/mockito/plugins/MockMaker.java @@ -4,7 +4,6 @@ */ package org.mockito.plugins; -import org.mockito.Incubating; import org.mockito.MockedConstruction; import org.mockito.exceptions.base.MockitoException; import org.mockito.invocation.MockHandler; @@ -132,7 +131,6 @@ default Optional createSpy( * @return object that carries the information about mockability of given type. * @since 2.1.0 */ - @Incubating TypeMockability isTypeMockable(Class type); /** @@ -151,7 +149,6 @@ default Optional createSpy( * @return A control for the static mock. * @since 3.4.0 */ - @Incubating default StaticMockControl createStaticMock( Class type, MockCreationSettings settings, MockHandler handler) { throw new MockitoException( @@ -181,7 +178,6 @@ default StaticMockControl createStaticMock( * @return A control for the mocked construction. * @since 3.5.0 */ - @Incubating default ConstructionMockControl createConstructionMock( Class type, Function> settingsFactory, @@ -201,7 +197,6 @@ default ConstructionMockControl createConstructionMock( /** * Clears all cashes for mocked types and removes all byte code alterations, if possible. */ - @Incubating default void clearAllCaches() {} /** @@ -209,7 +204,6 @@ default void clearAllCaches() {} * * @since 2.1.0 */ - @Incubating interface TypeMockability { /** * informs if type is mockable @@ -222,7 +216,6 @@ interface TypeMockability { String nonMockableReason(); } - @Incubating interface StaticMockControl { Class getType(); @@ -232,7 +225,6 @@ interface StaticMockControl { void disable(); } - @Incubating interface ConstructionMockControl { Class getType(); diff --git a/src/main/java/org/mockito/plugins/MockitoLogger.java b/src/main/java/org/mockito/plugins/MockitoLogger.java index 38ca4a8a23..d1f981be3a 100644 --- a/src/main/java/org/mockito/plugins/MockitoLogger.java +++ b/src/main/java/org/mockito/plugins/MockitoLogger.java @@ -4,8 +4,6 @@ */ package org.mockito.plugins; -import org.mockito.Incubating; - /** * Mockito logger. * @@ -35,13 +33,11 @@ * * @since 2.23.19 */ -@Incubating public interface MockitoLogger { /** * Log specified object. * * @param what to be logged */ - @Incubating void log(Object what); } diff --git a/src/main/java/org/mockito/plugins/PluginSwitch.java b/src/main/java/org/mockito/plugins/PluginSwitch.java index 916db246c9..a5db3473f7 100644 --- a/src/main/java/org/mockito/plugins/PluginSwitch.java +++ b/src/main/java/org/mockito/plugins/PluginSwitch.java @@ -4,8 +4,6 @@ */ package org.mockito.plugins; -import org.mockito.Incubating; - /** * Allows switching off the plugins that are discovered on classpath. * @@ -42,7 +40,6 @@ * * @since 1.10.15 */ -@Incubating public interface PluginSwitch { /** diff --git a/src/main/java/org/mockito/quality/Strictness.java b/src/main/java/org/mockito/quality/Strictness.java index 20ce8cb33d..b25cab33e6 100644 --- a/src/main/java/org/mockito/quality/Strictness.java +++ b/src/main/java/org/mockito/quality/Strictness.java @@ -4,7 +4,6 @@ */ package org.mockito.quality; -import org.mockito.Incubating; import org.mockito.MockitoSession; import org.mockito.exceptions.misusing.PotentialStubbingProblem; import org.mockito.exceptions.misusing.UnnecessaryStubbingException; @@ -38,7 +37,6 @@ * * @since 2.3.0 */ -@Incubating public enum Strictness { /** @@ -49,7 +47,6 @@ public enum Strictness { * * @since 2.3.0 */ - @Incubating LENIENT, /** @@ -62,7 +59,6 @@ public enum Strictness { * * @since 2.3.0 */ - @Incubating WARN, /** @@ -88,6 +84,5 @@ public enum Strictness { * * @since 2.3.0 */ - @Incubating STRICT_STUBS; } diff --git a/src/main/java/org/mockito/session/MockitoSessionBuilder.java b/src/main/java/org/mockito/session/MockitoSessionBuilder.java index 648ca9d41e..6a84205670 100644 --- a/src/main/java/org/mockito/session/MockitoSessionBuilder.java +++ b/src/main/java/org/mockito/session/MockitoSessionBuilder.java @@ -4,7 +4,6 @@ */ package org.mockito.session; -import org.mockito.Incubating; import org.mockito.MockitoAnnotations; import org.mockito.MockitoSession; import org.mockito.NotExtensible; @@ -17,7 +16,6 @@ * * @since 2.7.0 */ -@Incubating @NotExtensible public interface MockitoSessionBuilder { @@ -41,7 +39,6 @@ public interface MockitoSessionBuilder { * @return the same builder instance for fluent configuration of {@code MockitoSession}. * @since 2.7.0 */ - @Incubating MockitoSessionBuilder initMocks(Object testClassInstance); /** @@ -59,7 +56,6 @@ public interface MockitoSessionBuilder { * @see #initMocks(Object) * @since 2.15.0 */ - @Incubating MockitoSessionBuilder initMocks(Object... testClassInstances); /** @@ -81,7 +77,6 @@ public interface MockitoSessionBuilder { * @see org.mockito.quality.MockitoHint * @since 2.15.0 */ - @Incubating MockitoSessionBuilder name(String name); /** @@ -95,7 +90,6 @@ public interface MockitoSessionBuilder { * @return the same builder instance for fluent configuration of {@code MockitoSession}. * @since 2.7.0 */ - @Incubating MockitoSessionBuilder strictness(Strictness strictness); /** @@ -114,7 +108,6 @@ public interface MockitoSessionBuilder { * @see org.mockito.quality.MockitoHint * @since 2.15.0 */ - @Incubating MockitoSessionBuilder logger(MockitoSessionLogger logger); /** @@ -136,6 +129,5 @@ public interface MockitoSessionBuilder { * @throws UnfinishedMockingSessionException * when previous session was not concluded with {@link MockitoSession#finishMocking()} */ - @Incubating MockitoSession startMocking() throws UnfinishedMockingSessionException; } diff --git a/src/main/java/org/mockito/session/MockitoSessionLogger.java b/src/main/java/org/mockito/session/MockitoSessionLogger.java index bf365d5707..7d2e1350cd 100644 --- a/src/main/java/org/mockito/session/MockitoSessionLogger.java +++ b/src/main/java/org/mockito/session/MockitoSessionLogger.java @@ -4,7 +4,6 @@ */ package org.mockito.session; -import org.mockito.Incubating; import org.mockito.MockitoSession; import org.mockito.NotExtensible; @@ -17,7 +16,6 @@ * * @since 2.15.0 */ -@Incubating @NotExtensible public interface MockitoSessionLogger { @@ -26,6 +24,5 @@ public interface MockitoSessionLogger { * * @param hint to log; never {@code null} */ - @Incubating void log(String hint); } diff --git a/src/main/java/org/mockito/stubbing/Answer1.java b/src/main/java/org/mockito/stubbing/Answer1.java index afc2a5e424..e370dca419 100644 --- a/src/main/java/org/mockito/stubbing/Answer1.java +++ b/src/main/java/org/mockito/stubbing/Answer1.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a single argument invocation. * @@ -31,7 +29,6 @@ * @param type of the single argument * @see Answer */ -@Incubating public interface Answer1 { /** * @param argument0 the single argument. diff --git a/src/main/java/org/mockito/stubbing/Answer2.java b/src/main/java/org/mockito/stubbing/Answer2.java index 77944b7366..71b5a03d03 100644 --- a/src/main/java/org/mockito/stubbing/Answer2.java +++ b/src/main/java/org/mockito/stubbing/Answer2.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a two argument invocation. * @@ -32,7 +30,6 @@ * @param type of the second argument * @see Answer */ -@Incubating public interface Answer2 { /** * @param argument0 the first argument. diff --git a/src/main/java/org/mockito/stubbing/Answer3.java b/src/main/java/org/mockito/stubbing/Answer3.java index e80f06eadc..1aa4abfb03 100644 --- a/src/main/java/org/mockito/stubbing/Answer3.java +++ b/src/main/java/org/mockito/stubbing/Answer3.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a three argument invocation. * @@ -33,7 +31,6 @@ * @param type of the third argument * @see Answer */ -@Incubating public interface Answer3 { /** * @param argument0 the first argument. diff --git a/src/main/java/org/mockito/stubbing/Answer4.java b/src/main/java/org/mockito/stubbing/Answer4.java index f89a2019f9..bfc6c3185e 100644 --- a/src/main/java/org/mockito/stubbing/Answer4.java +++ b/src/main/java/org/mockito/stubbing/Answer4.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a four argument invocation. * @@ -34,7 +32,6 @@ * @param type of the fourth argument * @see Answer */ -@Incubating public interface Answer4 { /** * @param argument0 the first argument. diff --git a/src/main/java/org/mockito/stubbing/Answer5.java b/src/main/java/org/mockito/stubbing/Answer5.java index 3e83968b4c..d5e12e10f4 100644 --- a/src/main/java/org/mockito/stubbing/Answer5.java +++ b/src/main/java/org/mockito/stubbing/Answer5.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a five argument invocation. * @@ -34,7 +32,6 @@ * @param type of the fourth argument * @see Answer */ -@Incubating public interface Answer5 { /** * @param argument0 the first argument. diff --git a/src/main/java/org/mockito/stubbing/Answer6.java b/src/main/java/org/mockito/stubbing/Answer6.java index 11a95c1977..b3248db449 100644 --- a/src/main/java/org/mockito/stubbing/Answer6.java +++ b/src/main/java/org/mockito/stubbing/Answer6.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a six argument invocation. * @@ -36,7 +34,6 @@ * @param type of the sixth argument * @see Answer */ -@Incubating public interface Answer6 { /** * @param argument0 the first argument. diff --git a/src/main/java/org/mockito/stubbing/Stubbing.java b/src/main/java/org/mockito/stubbing/Stubbing.java index cba0917f97..48b5ee4dad 100644 --- a/src/main/java/org/mockito/stubbing/Stubbing.java +++ b/src/main/java/org/mockito/stubbing/Stubbing.java @@ -4,7 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; import org.mockito.MockingDetails; import org.mockito.Mockito; import org.mockito.NotExtensible; @@ -60,6 +59,5 @@ public interface Stubbing extends Answer { * * @since 2.20.0 */ - @Incubating Strictness getStrictness(); } diff --git a/src/main/java/org/mockito/stubbing/ValidableAnswer.java b/src/main/java/org/mockito/stubbing/ValidableAnswer.java index 14d148e1dc..a5dacaa46c 100644 --- a/src/main/java/org/mockito/stubbing/ValidableAnswer.java +++ b/src/main/java/org/mockito/stubbing/ValidableAnswer.java @@ -4,7 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; import org.mockito.invocation.InvocationOnMock; /** @@ -68,7 +67,6 @@ * * @since 2.3.8 */ -@Incubating public interface ValidableAnswer { /** diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer1.java b/src/main/java/org/mockito/stubbing/VoidAnswer1.java index 9f75bf5b9e..df563a92f5 100644 --- a/src/main/java/org/mockito/stubbing/VoidAnswer1.java +++ b/src/main/java/org/mockito/stubbing/VoidAnswer1.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a single argument invocation that returns nothing. * @@ -30,7 +28,6 @@ * @param type of the single argument * @see Answer */ -@Incubating public interface VoidAnswer1 { /** * @param argument0 the single argument. diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer2.java b/src/main/java/org/mockito/stubbing/VoidAnswer2.java index 8d062f163d..a9b6ef47ab 100644 --- a/src/main/java/org/mockito/stubbing/VoidAnswer2.java +++ b/src/main/java/org/mockito/stubbing/VoidAnswer2.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a two argument invocation that returns nothing. * @@ -31,7 +29,6 @@ * @param type of the second argument * @see Answer */ -@Incubating public interface VoidAnswer2 { /** * @param argument0 the first argument. diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer3.java b/src/main/java/org/mockito/stubbing/VoidAnswer3.java index b56498297b..a2c6a072a0 100644 --- a/src/main/java/org/mockito/stubbing/VoidAnswer3.java +++ b/src/main/java/org/mockito/stubbing/VoidAnswer3.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a three argument invocation that returns nothing. * @@ -32,7 +30,6 @@ * @param type of the third argument * @see Answer */ -@Incubating public interface VoidAnswer3 { /** * @param argument0 the first argument. diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer4.java b/src/main/java/org/mockito/stubbing/VoidAnswer4.java index c34abee33b..aec382be9a 100644 --- a/src/main/java/org/mockito/stubbing/VoidAnswer4.java +++ b/src/main/java/org/mockito/stubbing/VoidAnswer4.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a four argument invocation that returns nothing. * @@ -33,7 +31,6 @@ * @param type of the fourth argument * @see Answer */ -@Incubating public interface VoidAnswer4 { /** * @param argument0 the first argument. diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer5.java b/src/main/java/org/mockito/stubbing/VoidAnswer5.java index 87db6136ad..fc4b8b280a 100644 --- a/src/main/java/org/mockito/stubbing/VoidAnswer5.java +++ b/src/main/java/org/mockito/stubbing/VoidAnswer5.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a five argument invocation that returns nothing. * @@ -34,7 +32,6 @@ * @param type of the fifth argument * @see Answer */ -@Incubating public interface VoidAnswer5 { /** * @param argument0 the first argument. diff --git a/src/main/java/org/mockito/stubbing/VoidAnswer6.java b/src/main/java/org/mockito/stubbing/VoidAnswer6.java index 545ca3f591..879b516c1c 100644 --- a/src/main/java/org/mockito/stubbing/VoidAnswer6.java +++ b/src/main/java/org/mockito/stubbing/VoidAnswer6.java @@ -4,8 +4,6 @@ */ package org.mockito.stubbing; -import org.mockito.Incubating; - /** * Generic interface to be used for configuring mock's answer for a six argument invocation that returns nothing. * @@ -35,7 +33,6 @@ * @param type of the sixth argument * @see Answer */ -@Incubating public interface VoidAnswer6 { /** * @param argument0 the first argument. diff --git a/src/main/java/org/mockito/verification/VerificationEvent.java b/src/main/java/org/mockito/verification/VerificationEvent.java index fad511b6ff..0469bd2fa7 100644 --- a/src/main/java/org/mockito/verification/VerificationEvent.java +++ b/src/main/java/org/mockito/verification/VerificationEvent.java @@ -4,13 +4,11 @@ */ package org.mockito.verification; -import org.mockito.Incubating; import org.mockito.internal.verification.api.VerificationData; /** * Contains all information about a verification that has happened. */ -@Incubating public interface VerificationEvent { /** * @return The mock that a verification happened on.