Promote beta features (#2278)

Promote `@Beta` features that existed before 2.4

Author: leonard84

spock-core/src/main/java/org/spockframework/lang/ConditionBlock.java

@@ -14,9 +14,10 @@
 
 package org.spockframework.lang;
 
-import org.spockframework.util.Beta;
-
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Indicates that the closure argument(s) of the annotated method are code blocks
@@ -30,7 +31,6 @@
  * - the annotated method is called on object of type known at compilation time (no "def").
  * If the annotated method is overloaded, the closure arguments of all overloads are considered code blocks.
  */
-@Beta
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ConditionBlock {}

spock-core/src/main/java/org/spockframework/lang/ISpecificationContext.java

@@ -14,17 +14,16 @@
 
 package org.spockframework.lang;
 
+import org.spockframework.mock.IMockController;
 import org.spockframework.mock.IThreadAwareMockController;
 import org.spockframework.runtime.extension.IStoreProvider;
 import org.spockframework.runtime.model.BlockInfo;
 import org.spockframework.runtime.model.FeatureInfo;
+import org.spockframework.runtime.model.IterationInfo;
 import org.spockframework.runtime.model.SpecInfo;
 import org.spockframework.util.Beta;
-import org.spockframework.mock.IMockController;
-import org.spockframework.runtime.model.IterationInfo;
 import org.spockframework.util.Nullable;
 
-@Beta
 public interface ISpecificationContext extends IStoreProvider {
   @Nullable
   SpecInfo getCurrentSpec();
@@ -33,6 +32,7 @@ public interface ISpecificationContext extends IStoreProvider {
 
   IterationInfo getCurrentIteration();
 
+  @Beta
   @Nullable
   BlockInfo getCurrentBlock();
 
@@ -41,5 +41,6 @@ public interface ISpecificationContext extends IStoreProvider {
 
   IMockController getMockController();
 
+  @Beta
   IThreadAwareMockController getThreadAwareMockController();
 }

spock-core/src/main/java/org/spockframework/mock/CallRealMethodResponse.java

@@ -14,15 +14,13 @@
 
 package org.spockframework.mock;
 
-import org.spockframework.util.Beta;
-import org.spockframework.util.ThreadSafe;
-
 import java.util.function.Supplier;
 
+import org.spockframework.util.ThreadSafe;
+
 /**
  * A response strategy that delegates method calls to the real object underlying the mock (if any).
  */
-@Beta
 @ThreadSafe
 public class CallRealMethodResponse implements IDefaultResponse {
   public static final CallRealMethodResponse INSTANCE = new CallRealMethodResponse();

spock-core/src/main/java/org/spockframework/mock/IMockConfiguration.java

@@ -1,13 +1,15 @@
 package org.spockframework.mock;
 
-import org.spockframework.mock.runtime.IMockMaker;
 import spock.mock.IMockMakerSettings;
-import org.spockframework.util.*;
 import spock.mock.MockingApi;
 
 import java.lang.reflect.Type;
 import java.util.List;
 
+import org.spockframework.mock.runtime.IMockMaker;
+import org.spockframework.util.Beta;
+import org.spockframework.util.Nullable;
+
 /**
  * Configuration options for mock objects. Once a mock object has been created, its configuration cannot be changed.
  *
@@ -19,7 +21,6 @@
  * {@link #getConstructorArgs()} corresponds to the {@code constructorArgs:} named argument,
  * {@link #isGlobal()} to the {@code global:} named argument, etc.
  */
-@Beta
 public interface IMockConfiguration {
   /**
    * Returns the name of the mock object.
@@ -95,6 +96,7 @@ public interface IMockConfiguration {
    *
    * @return the custom settings to use for the creation of the mock, or {@code null}
    */
+  @Beta
   @Nullable
   IMockMakerSettings getMockMaker();
 

spock-core/src/main/java/org/spockframework/mock/MockImplementation.java

@@ -14,14 +14,12 @@
 
 package org.spockframework.mock;
 
-import org.spockframework.util.Beta;
 import spock.mock.MockingApi;
 
 /**
  * Determines how method calls are processed and matched against interactions. A mock implementation
  * is chosen at mock creation time, typically by selecting the appropriate {@link MockingApi} factory method.
  */
-@Beta
 public enum MockImplementation {
   /**
    * A generic implementation targeting any callers. Used by the {@link MockingApi#Mock},

spock-core/src/main/java/org/spockframework/mock/MockNature.java

@@ -14,14 +14,12 @@
 
 package org.spockframework.mock;
 
-import org.spockframework.util.Beta;
 import spock.mock.MockingApi;
 
 /**
  * A named set of defaults for a mock's configuration options. A mock nature is chosen at
  * mock creation time, typically by selecting the appropriate {@link MockingApi} factory method.
  */
-@Beta
 public enum MockNature {
   /**
    * A mock object whose method calls are verified, which instantiates class-based mock objects with Objenesis,

spock-core/src/main/java/org/spockframework/mock/MockUtil.java

@@ -14,18 +14,21 @@
 
 package org.spockframework.mock;
 
-import org.spockframework.mock.runtime.*;
-import org.spockframework.runtime.RunContext;
-import org.spockframework.util.*;
 import spock.lang.Specification;
 
 import java.lang.reflect.Type;
 import java.util.Map;
 
+import org.spockframework.mock.runtime.CompositeMockFactory;
+import org.spockframework.mock.runtime.MockConfiguration;
+import org.spockframework.mock.runtime.MockMakerRegistry;
+import org.spockframework.runtime.RunContext;
+import org.spockframework.util.Beta;
+import org.spockframework.util.Nullable;
+
 /**
  * Detects mock objects and provides information about them.
  */
-@Beta
 public class MockUtil {
   /**
    * Tells whether the given object is a (Spock) mock object.
@@ -44,6 +47,7 @@ public boolean isMock(Object object) {
    * @param clazz the class to check
    * @return {@code true} if this class is a Spock static mock currently active on the current {@code Thread}
    */
+  @Beta
   public boolean isStaticMock(Class<?> clazz) {
     return getMockMakerRegistry().isStaticMock(clazz);
   }
@@ -75,6 +79,7 @@ public IMockObject asMock(Object object) {
    * @param object a mock object
    * @return information about the mock object or {@code null}, if the object is not a mock.
    */
+  @Beta
   @Nullable
   public IMockObject asMockOrNull(Object object) {
     return getMockMakerRegistry().asMockOrNull(object);
@@ -110,7 +115,6 @@ public void detachMock(Object object) {
    * @param classloader the classloader to use
    * @return the mock
    */
-  @Beta
   public Object createDetachedMock(@Nullable String name, Type type, MockNature nature,
       MockImplementation implementation, Map<String, Object> options,  ClassLoader classloader) {
 
@@ -130,7 +134,6 @@ public Object createDetachedMock(@Nullable String name, Type type, MockNature na
    * @param classloader the classloader to use
    * @return the mock
    */
-  @Beta
   public Object createDetachedMock(@Nullable String name, Object obj, MockNature nature,
       MockImplementation implementation, Map<String, Object> options,  ClassLoader classloader) {
 

spock-core/src/main/java/org/spockframework/mock/ZeroOrNullResponse.java

@@ -14,12 +14,12 @@
 
 package org.spockframework.mock;
 
-import org.spockframework.util.*;
+import org.spockframework.util.ReflectionUtil;
+import org.spockframework.util.ThreadSafe;
 
 /**
  * A response strategy that returns zero, false, or null, depending on the method's return type.
  */
-@Beta
 @ThreadSafe
 public class ZeroOrNullResponse implements IDefaultResponse {
   public static final ZeroOrNullResponse INSTANCE = new ZeroOrNullResponse();

spock-core/src/main/java/org/spockframework/mock/runtime/MockConfiguration.java

@@ -14,17 +14,23 @@
 
 package org.spockframework.mock.runtime;
 
-import org.spockframework.mock.*;
-import org.spockframework.util.*;
 import spock.mock.IMockMakerSettings;
 
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+
+import org.spockframework.mock.IDefaultResponse;
+import org.spockframework.mock.IMockConfiguration;
+import org.spockframework.mock.MockImplementation;
+import org.spockframework.mock.MockNature;
+import org.spockframework.util.Beta;
+import org.spockframework.util.GenericTypeReflectorUtil;
+import org.spockframework.util.Nullable;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
-@Beta
 public class MockConfiguration implements IMockConfiguration {
   private final String name;
   private final Type type;
@@ -123,6 +129,7 @@ public boolean isUseObjenesis() {
     return useObjenesis;
   }
 
+  @Beta
   @Override
   public IMockMakerSettings getMockMaker() {
     return mockMakerSettings;

spock-core/src/main/java/org/spockframework/mock/runtime/MockCreationSettings.java

@@ -16,20 +16,20 @@
 
 package org.spockframework.mock.runtime;
 
-import org.spockframework.mock.IMockConfiguration;
-import org.spockframework.mock.MockNature;
-import org.spockframework.util.Beta;
-import org.spockframework.util.Nullable;
 import spock.mock.IMockMakerSettings;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.spockframework.mock.IMockConfiguration;
+import org.spockframework.mock.MockNature;
+import org.spockframework.util.Beta;
+import org.spockframework.util.Nullable;
+
 import static java.util.Objects.requireNonNull;
 import static org.spockframework.util.ObjectUtil.uncheckedCast;
 
-@Beta
 public class MockCreationSettings implements IMockMaker.IMockCreationSettings {
 
   private final IMockMakerSettings mockMakerSettings;
@@ -47,6 +47,7 @@ public static MockCreationSettings settingsFromMockConfiguration(IMockConfigurat
     return new MockCreationSettings(mockConfig.getMockMaker(), mockConfig.getType(), mockConfig.getNature(), new ArrayList<>(mockConfig.getAdditionalInterfaces()), mockConfig.getConstructorArgs(), interceptor, classLoader, mockConfig.isUseObjenesis(), false);
   }
 
+  @Beta
   public static MockCreationSettings settingsFromMockConfigurationForStaticMock(IMockConfiguration mockConfig, IProxyBasedMockInterceptor interceptor, ClassLoader classLoader) {
     return new MockCreationSettings(mockConfig.getMockMaker(), mockConfig.getType(), mockConfig.getNature(), Collections.emptyList(), null, interceptor, classLoader, false, true);
   }