improve: remove deprecated APIs (#2375)

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

micrometer-support/src/main/java/io/javaoperatorsdk/operator/monitoring/micrometer/MicrometerMetrics.java

@@ -59,20 +59,6 @@ public class MicrometerMetrics implements Metrics {
   private final Map<String, AtomicInteger> gauges = new ConcurrentHashMap<>();
   private final Cleaner cleaner;
 
-  /**
-   * Creates a default micrometer-based Metrics implementation, collecting metrics on a per resource
-   * basis and not dealing with cleaning these after these resources are deleted. Note that this
-   * probably will change in a future release. If you want more control over what the implementation
-   * actually does, please use the static factory methods instead.
-   *
-   * @param registry the {@link MeterRegistry} instance to use for metrics recording
-   * @deprecated Use the factory methods / builders instead
-   */
-  @Deprecated
-  public MicrometerMetrics(MeterRegistry registry) {
-    this(registry, Cleaner.NOOP, true);
-  }
-
   /**
    * Creates a MicrometerMetrics instance configured to not collect per-resource metrics, just
    * aggregates per resource **type**

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -35,7 +35,7 @@ public Operator() {
   }
 
   Operator(KubernetesClient kubernetesClient) {
-    this(kubernetesClient, null);
+    this(initConfigurationService(kubernetesClient, null));
   }
 
   /**
@@ -63,19 +63,7 @@ public Operator(ConfigurationService configurationService) {
    *        {@link ConfigurationService} values
    */
   public Operator(Consumer<ConfigurationServiceOverrider> overrider) {
-    this(null, overrider);
-  }
-
-  /**
-   * @param client client to use to all Kubernetes related operations
-   * @param overrider a {@link ConfigurationServiceOverrider} consumer used to override the default
-   *        {@link ConfigurationService} values
-   * @deprecated Use {@link Operator#Operator(Consumer)} instead, passing your custom client with
-   *             {@link ConfigurationServiceOverrider#withKubernetesClient(KubernetesClient)}
-   */
-  @Deprecated(since = "4.4.0")
-  public Operator(KubernetesClient client, Consumer<ConfigurationServiceOverrider> overrider) {
-    this(initConfigurationService(client, overrider));
+    this(initConfigurationService(null, overrider));
   }
 
   private static ConfigurationService initConfigurationService(KubernetesClient client,

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java

@@ -132,11 +132,6 @@ default boolean checkCRDAndValidateLocalModel() {
   }
 
   int DEFAULT_RECONCILIATION_THREADS_NUMBER = 50;
-  /**
-   * @deprecated Not used anymore in the default implementation
-   */
-  @Deprecated(forRemoval = true)
-  int MIN_DEFAULT_RECONCILIATION_THREADS_NUMBER = 10;
 
   /**
    * The number of threads the operator can spin out to dispatch reconciliation requests to
@@ -148,23 +143,7 @@ default int concurrentReconciliationThreads() {
     return DEFAULT_RECONCILIATION_THREADS_NUMBER;
   }
 
-  /**
-   * The minimum number of threads the operator starts in the thread pool for reconciliations.
-   *
-   * @deprecated not used anymore by default executor implementation
-   * @return the minimum number of concurrent reconciliation threads
-   */
-  @Deprecated(forRemoval = true)
-  default int minConcurrentReconciliationThreads() {
-    return MIN_DEFAULT_RECONCILIATION_THREADS_NUMBER;
-  }
-
   int DEFAULT_WORKFLOW_EXECUTOR_THREAD_NUMBER = DEFAULT_RECONCILIATION_THREADS_NUMBER;
-  /**
-   * @deprecated Not used anymore in the default implementation
-   */
-  @Deprecated(forRemoval = true)
-  int MIN_DEFAULT_WORKFLOW_EXECUTOR_THREAD_NUMBER = MIN_DEFAULT_RECONCILIATION_THREADS_NUMBER;
 
   /**
    * Number of threads the operator can spin out to be used in the workflows with the default
@@ -176,17 +155,6 @@ default int concurrentWorkflowExecutorThreads() {
     return DEFAULT_WORKFLOW_EXECUTOR_THREAD_NUMBER;
   }
 
-  /**
-   * The minimum number of threads the operator starts in the thread pool for workflows.
-   *
-   * @deprecated not used anymore by default executor implementation
-   * @return the minimum number of concurrent workflow threads
-   */
-  @Deprecated(forRemoval = true)
-  default int minConcurrentWorkflowExecutorThreads() {
-    return MIN_DEFAULT_WORKFLOW_EXECUTOR_THREAD_NUMBER;
-  }
-
   default Metrics getMetrics() {
     return Metrics.NOOP;
   }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java

@@ -4,7 +4,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
-import java.util.function.Consumer;
 import java.util.function.Function;
 
 import org.slf4j.Logger;
@@ -24,9 +23,7 @@ public class ConfigurationServiceOverrider {
   private Metrics metrics;
   private Boolean checkCR;
   private Integer concurrentReconciliationThreads;
-  private Integer minConcurrentReconciliationThreads;
   private Integer concurrentWorkflowExecutorThreads;
-  private Integer minConcurrentWorkflowExecutorThreads;
   private Cloner cloner;
   private Boolean closeClientOnStop;
   private KubernetesClient client;
@@ -65,24 +62,6 @@ public ConfigurationServiceOverrider withConcurrentWorkflowExecutorThreads(int t
     return this;
   }
 
-  private int minimumMaxValueFor(Integer minValue) {
-    return minValue != null ? (minValue < 0 ? 0 : minValue) + 1 : 1;
-  }
-
-  public ConfigurationServiceOverrider withMinConcurrentReconciliationThreads(int threadNumber) {
-    this.minConcurrentReconciliationThreads = Utils.ensureValid(threadNumber,
-        "minimum reconciliation threads", ExecutorServiceManager.MIN_THREAD_NUMBER,
-        original.minConcurrentReconciliationThreads());
-    return this;
-  }
-
-  public ConfigurationServiceOverrider withMinConcurrentWorkflowExecutorThreads(int threadNumber) {
-    this.minConcurrentWorkflowExecutorThreads = Utils.ensureValid(threadNumber,
-        "minimum workflow execution threads", ExecutorServiceManager.MIN_THREAD_NUMBER,
-        original.minConcurrentWorkflowExecutorThreads());
-    return this;
-  }
-
   @SuppressWarnings("rawtypes")
   public ConfigurationServiceOverrider withDependentResourceFactory(
       DependentResourceFactory dependentResourceFactory) {
@@ -243,7 +222,7 @@ public int concurrentReconciliationThreads() {
             overriddenValueOrDefault(concurrentReconciliationThreads,
                 ConfigurationService::concurrentReconciliationThreads),
             "maximum reconciliation threads",
-            minimumMaxValueFor(minConcurrentReconciliationThreads),
+            1,
             original.concurrentReconciliationThreads());
       }
 
@@ -253,30 +232,10 @@ public int concurrentWorkflowExecutorThreads() {
             overriddenValueOrDefault(concurrentWorkflowExecutorThreads,
                 ConfigurationService::concurrentWorkflowExecutorThreads),
             "maximum workflow execution threads",
-            minimumMaxValueFor(minConcurrentWorkflowExecutorThreads),
+            1,
             original.concurrentWorkflowExecutorThreads());
       }
 
-      /**
-       * @deprecated Not used anymore in the default implementation
-       */
-      @Deprecated(forRemoval = true)
-      @Override
-      public int minConcurrentReconciliationThreads() {
-        return overriddenValueOrDefault(minConcurrentReconciliationThreads,
-            ConfigurationService::minConcurrentReconciliationThreads);
-      }
-
-      /**
-       * @deprecated Not used anymore in the default implementation
-       */
-      @Override
-      @Deprecated(forRemoval = true)
-      public int minConcurrentWorkflowExecutorThreads() {
-        return overriddenValueOrDefault(minConcurrentWorkflowExecutorThreads,
-            ConfigurationService::minConcurrentWorkflowExecutorThreads);
-      }
-
       @Override
       public Metrics getMetrics() {
         return overriddenValueOrDefault(metrics, ConfigurationService::getMetrics);
@@ -365,15 +324,4 @@ public boolean cloneSecondaryResourcesWhenGettingFromCache() {
     };
   }
 
-  /**
-   * @deprecated Use
-   *             {@link ConfigurationService#newOverriddenConfigurationService(ConfigurationService, Consumer)}
-   *             instead
-   * @param original that will be overridden
-   * @return current overrider
-   */
-  @Deprecated(since = "2.2.0")
-  public static ConfigurationServiceOverrider override(ConfigurationService original) {
-    return new ConfigurationServiceOverrider(original);
-  }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ExecutorServiceManager.java

@@ -22,7 +22,6 @@
 public class ExecutorServiceManager {
 
   private static final Logger log = LoggerFactory.getLogger(ExecutorServiceManager.class);
-  public static final int MIN_THREAD_NUMBER = 0;
   private ExecutorService executor;
   private ExecutorService workflowExecutor;
   private ExecutorService cachingExecutorService;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/monitoring/Metrics.java

@@ -1,6 +1,5 @@
 package io.javaoperatorsdk.operator.api.monitoring;
 
-import java.util.Collections;
 import java.util.Map;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -37,16 +36,6 @@ default void controllerRegistered(Controller<? extends HasMetadata> controller)
    */
   default void receivedEvent(Event event, Map<String, Object> metadata) {}
 
-  /**
-   * @param metadata additional metadata
-   * @param resourceID of primary resource
-   * @param retryInfo for current execution
-   * @deprecated Use {@link #reconcileCustomResource(HasMetadata, RetryInfo, Map)} instead
-   */
-  @Deprecated(forRemoval = true)
-  @SuppressWarnings("unused")
-  default void reconcileCustomResource(ResourceID resourceID, RetryInfo retryInfo,
-      Map<String, Object> metadata) {}
 
   /**
    * Called right before a resource is dispatched to the ExecutorService for reconciliation.
@@ -56,19 +45,6 @@ default void reconcileCustomResource(ResourceID resourceID, RetryInfo retryInfo,
    * @param metadata metadata associated with the resource being processed
    */
   default void reconcileCustomResource(HasMetadata resource, RetryInfo retryInfo,
-      Map<String, Object> metadata) {
-    reconcileCustomResource(ResourceID.fromResource(resource), retryInfo, metadata);
-  }
-
-  /**
-   * @param exception actual exception
-   * @param metadata additional metadata
-   * @param resourceID of primary resource
-   * @deprecated Use {@link #failedReconciliation(HasMetadata, Exception, Map)} instead
-   */
-  @Deprecated(forRemoval = true)
-  @SuppressWarnings("unused")
-  default void failedReconciliation(ResourceID resourceID, Exception exception,
       Map<String, Object> metadata) {}
 
   /**
@@ -81,24 +57,14 @@ default void failedReconciliation(ResourceID resourceID, Exception exception,
    * @param metadata metadata associated with the resource being processed
    */
   default void failedReconciliation(HasMetadata resource, Exception exception,
-      Map<String, Object> metadata) {
-    failedReconciliation(ResourceID.fromResource(resource), exception, metadata);
-  }
+      Map<String, Object> metadata) {}
 
 
   default void reconciliationExecutionStarted(HasMetadata resource, Map<String, Object> metadata) {}
 
   default void reconciliationExecutionFinished(HasMetadata resource,
       Map<String, Object> metadata) {}
 
-  /**
-   * @param resourceID of primary resource
-   * @deprecated Use (and implement) {@link #cleanupDoneFor(ResourceID, Map)} instead
-   */
-  @Deprecated
-  default void cleanupDoneFor(ResourceID resourceID) {
-    cleanupDoneFor(resourceID, Collections.emptyMap());
-  }
 
   /**
    * Called when the resource associated with the specified {@link ResourceID} has been successfully
@@ -109,24 +75,6 @@ default void cleanupDoneFor(ResourceID resourceID) {
    */
   default void cleanupDoneFor(ResourceID resourceID, Map<String, Object> metadata) {}
 
-  /**
-   * @param resourceID of primary resource
-   * @deprecated Use (and implement) {@link #finishedReconciliation(ResourceID, Map)} instead
-   */
-  @Deprecated
-  default void finishedReconciliation(ResourceID resourceID) {
-    finishedReconciliation(resourceID, Collections.emptyMap());
-  }
-
-  /**
-   * @param resourceID of primary resource
-   * @param metadata additional metadata
-   * @deprecated Use {@link #finishedReconciliation(HasMetadata, Map)} instead
-   */
-  @Deprecated(forRemoval = true)
-  @SuppressWarnings("unused")
-  default void finishedReconciliation(ResourceID resourceID, Map<String, Object> metadata) {}
-
   /**
    * Called when the
    * {@link io.javaoperatorsdk.operator.api.reconciler.Reconciler#reconcile(HasMetadata, Context)}
@@ -136,9 +84,7 @@ default void finishedReconciliation(ResourceID resourceID, Map<String, Object> m
    * @param resource the {@link ResourceID} associated with the resource being processed
    * @param metadata metadata associated with the resource being processed
    */
-  default void finishedReconciliation(HasMetadata resource, Map<String, Object> metadata) {
-    finishedReconciliation(ResourceID.fromResource(resource), metadata);
-  }
+  default void finishedReconciliation(HasMetadata resource, Map<String, Object> metadata) {}
 
   /**
    * Encapsulates the information about a controller execution i.e. a call to either

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/managed/KubernetesClientAware.java

@@ -52,21 +52,6 @@ public KubernetesDependentResourceConfig(Set<String> namespaces,
     this.useSSA = useSSA;
   }
 
-  // use builder instead
-  @Deprecated(forRemoval = true)
-  public KubernetesDependentResourceConfig(Set<String> namespaces, String labelSelector) {
-    this(namespaces, labelSelector, true, DEFAULT_CREATE_RESOURCE_ONLY_IF_NOT_EXISTING_WITH_SSA,
-        null, null,
-        null, null, null);
-  }
-
-  // use builder instead
-  @Deprecated(forRemoval = true)
-  public KubernetesDependentResourceConfig<R> setLabelSelector(String labelSelector) {
-    this.labelSelector = labelSelector;
-    return this;
-  }
-
   public Set<String> namespaces() {
     return namespaces;
   }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java

@@ -13,7 +13,6 @@
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.EventSourceReferencer;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.NameSetter;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.KubernetesClientAware;
 
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.NO_VALUE_SET;
 
@@ -112,10 +111,6 @@ private <R> DependentResource<R, P> resolve(DependentResourceSpec<R, P> spec,
       ((NameSetter) dependentResource).setName(name);
     }
 
-    if (dependentResource instanceof KubernetesClientAware) {
-      ((KubernetesClientAware) dependentResource).setKubernetesClient(client);
-    }
-
     spec.getUseEventSourceWithName()
         .ifPresent(esName -> {
           if (dependentResource instanceof EventSourceReferencer) {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DefaultManagedWorkflow.java

@@ -21,15 +21,6 @@ public Map<DependentResource, Exception> getErroredDependents() {
     return erroredDependents;
   }
 
-  /**
-   * @deprecated Use {@link #erroredDependentsExist()} instead
-   * @return if any dependents are in error state
-   */
-  @Deprecated(forRemoval = true)
-  public boolean erroredDependentsExists() {
-    return !erroredDependents.isEmpty();
-  }
-
   @SuppressWarnings("unused")
   public boolean erroredDependentsExist() {
     return !erroredDependents.isEmpty();