You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/09/22 11:58:24 UTC

[lucene-solr] branch branch_8x updated: SOLR-14656: Add code deprecations to the autoscaling API.

This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new 8d8869e  SOLR-14656: Add code deprecations to the autoscaling API.
8d8869e is described below

commit 8d8869edc684f36b66d588931fe39543d8f86757
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Sep 22 13:56:50 2020 +0200

    SOLR-14656: Add code deprecations to the autoscaling API.
---
 .../src/java/org/apache/solr/cloud/autoscaling/ActionContext.java   | 4 +++-
 .../apache/solr/cloud/autoscaling/AutoAddReplicasPlanAction.java    | 2 ++
 .../src/java/org/apache/solr/cloud/autoscaling/AutoScaling.java     | 5 +++++
 .../java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java  | 4 +++-
 .../java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java   | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/ExecutePlanAction.java   | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/HttpTriggerListener.java | 2 ++
 .../apache/solr/cloud/autoscaling/InactiveMarkersPlanAction.java    | 2 ++
 .../org/apache/solr/cloud/autoscaling/InactiveShardPlanAction.java  | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/IndexSizeTrigger.java    | 2 +-
 .../src/java/org/apache/solr/cloud/autoscaling/LoggingListener.java | 2 ++
 .../src/java/org/apache/solr/cloud/autoscaling/MetricTrigger.java   | 4 ++++
 .../java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java    | 2 ++
 .../src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java | 2 ++
 .../org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java    | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java    | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java   | 4 +++-
 .../java/org/apache/solr/cloud/autoscaling/SearchRateTrigger.java   | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/SystemLogListener.java   | 2 ++
 .../src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java   | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/TriggerActionBase.java   | 2 ++
 .../org/apache/solr/cloud/autoscaling/TriggerActionException.java   | 2 ++
 .../src/java/org/apache/solr/cloud/autoscaling/TriggerBase.java     | 2 ++
 .../src/java/org/apache/solr/cloud/autoscaling/TriggerEvent.java    | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/TriggerEventQueue.java   | 1 +
 .../src/java/org/apache/solr/cloud/autoscaling/TriggerListener.java | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/TriggerListenerBase.java | 2 ++
 .../src/java/org/apache/solr/cloud/autoscaling/TriggerUtils.java    | 1 +
 .../apache/solr/cloud/autoscaling/TriggerValidationException.java   | 2 ++
 .../src/java/org/apache/solr/cloud/autoscaling/package-info.java    | 4 +++-
 .../src/java/org/apache/solr/cloud/autoscaling/sim/ActionError.java | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/sim/FakeDocIterator.java | 2 ++
 .../apache/solr/cloud/autoscaling/sim/GenericDistributedQueue.java  | 2 ++
 .../solr/cloud/autoscaling/sim/GenericDistributedQueueFactory.java  | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/sim/LiveNodesSet.java    | 2 ++
 .../solr/cloud/autoscaling/sim/NoopDistributedQueueFactory.java     | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java | 2 ++
 .../apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java  | 2 ++
 .../apache/solr/cloud/autoscaling/sim/SimDistribStateManager.java   | 2 ++
 .../solr/cloud/autoscaling/sim/SimDistributedQueueFactory.java      | 2 ++
 .../org/apache/solr/cloud/autoscaling/sim/SimNodeStateProvider.java | 2 ++
 .../src/java/org/apache/solr/cloud/autoscaling/sim/SimScenario.java | 2 ++
 .../src/java/org/apache/solr/cloud/autoscaling/sim/SimUtils.java    | 2 ++
 .../org/apache/solr/cloud/autoscaling/sim/SnapshotCloudManager.java | 2 ++
 .../solr/cloud/autoscaling/sim/SnapshotClusterStateProvider.java    | 2 ++
 .../solr/cloud/autoscaling/sim/SnapshotDistribStateManager.java     | 2 ++
 .../solr/cloud/autoscaling/sim/SnapshotNodeStateProvider.java       | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/sim/package-info.java    | 1 +
 .../org/apache/solr/handler/admin/AutoscalingHistoryHandler.java    | 2 ++
 .../solr/client/solrj/cloud/autoscaling/AddReplicaSuggester.java    | 4 ++++
 .../solr/client/solrj/cloud/autoscaling/AlreadyExistsException.java | 1 +
 .../solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java      | 2 ++
 .../solr/client/solrj/cloud/autoscaling/BadVersionException.java    | 1 +
 .../java/org/apache/solr/client/solrj/cloud/autoscaling/Cell.java   | 1 +
 .../java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java | 2 ++
 .../apache/solr/client/solrj/cloud/autoscaling/ComputedType.java    | 4 ++++
 .../org/apache/solr/client/solrj/cloud/autoscaling/Condition.java   | 4 ++++
 .../apache/solr/client/solrj/cloud/autoscaling/CoresVariable.java   | 4 ++++
 .../solr/client/solrj/cloud/autoscaling/DelegatingCloudManager.java | 2 ++
 .../solrj/cloud/autoscaling/DelegatingClusterStateProvider.java     | 2 ++
 .../solrj/cloud/autoscaling/DelegatingDistribStateManager.java      | 4 ++++
 .../client/solrj/cloud/autoscaling/DelegatingNodeStateProvider.java | 2 ++
 .../solr/client/solrj/cloud/autoscaling/DeleteNodeSuggester.java    | 2 ++
 .../solr/client/solrj/cloud/autoscaling/DeleteReplicaSuggester.java | 2 ++
 .../solr/client/solrj/cloud/autoscaling/FreeDiskVariable.java       | 4 ++++
 .../solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java   | 4 ++++
 .../apache/solr/client/solrj/cloud/autoscaling/NodeVariable.java    | 4 ++++
 .../apache/solr/client/solrj/cloud/autoscaling/NoneSuggester.java   | 4 ++++
 .../solr/client/solrj/cloud/autoscaling/NotEmptyException.java      | 1 +
 .../org/apache/solr/client/solrj/cloud/autoscaling/Operand.java     | 5 ++++-
 .../java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java | 6 ++++--
 .../apache/solr/client/solrj/cloud/autoscaling/PolicyHelper.java    | 4 ++++
 .../org/apache/solr/client/solrj/cloud/autoscaling/Preference.java  | 4 ++++
 .../org/apache/solr/client/solrj/cloud/autoscaling/RangeVal.java    | 4 ++++
 .../apache/solr/client/solrj/cloud/autoscaling/ReplicaCount.java    | 4 ++++
 .../org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java | 4 ++++
 .../apache/solr/client/solrj/cloud/autoscaling/ReplicaVariable.java | 4 ++++
 .../java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java    | 2 ++
 .../apache/solr/client/solrj/cloud/autoscaling/SealedClause.java    | 2 ++
 .../solr/client/solrj/cloud/autoscaling/SplitShardSuggester.java    | 2 ++
 .../org/apache/solr/client/solrj/cloud/autoscaling/Suggester.java   | 5 ++++-
 .../org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java  | 4 ++++
 .../client/solrj/cloud/autoscaling/TriggerEventProcessorStage.java  | 2 ++
 .../solr/client/solrj/cloud/autoscaling/TriggerEventType.java       | 2 ++
 .../solr/client/solrj/cloud/autoscaling/UnsupportedSuggester.java   | 2 ++
 .../org/apache/solr/client/solrj/cloud/autoscaling/Variable.java    | 2 ++
 .../apache/solr/client/solrj/cloud/autoscaling/VariableBase.java    | 4 ++++
 .../apache/solr/client/solrj/cloud/autoscaling/VersionedData.java   | 2 ++
 .../org/apache/solr/client/solrj/cloud/autoscaling/Violation.java   | 4 ++++
 .../solr/client/solrj/cloud/autoscaling/WithCollectionVariable.java | 2 ++
 .../apache/solr/client/solrj/cloud/autoscaling/package-info.java    | 2 ++
 .../src/java/org/apache/solr/common/params/AutoScalingParams.java   | 2 ++
 92 files changed, 227 insertions(+), 9 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ActionContext.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ActionContext.java
index 8487d3d..d8f6a3b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ActionContext.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ActionContext.java
@@ -26,7 +26,9 @@ import org.apache.solr.common.MapWriter;
 /**
  * Provides additional context for the TriggerAction such as the trigger instance on
  * which the action is being executed as well as helper methods to pass computed information along
- * to the next action
+ * to the next action.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class ActionContext implements MapWriter {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoAddReplicasPlanAction.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoAddReplicasPlanAction.java
index d129fdb..1e81138 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoAddReplicasPlanAction.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoAddReplicasPlanAction.java
@@ -29,6 +29,8 @@ import static org.apache.solr.common.cloud.ZkStateReader.AUTO_ADD_REPLICAS;
 /**
  * This class configures the parent ComputePlanAction to compute plan
  * only for collections which have autoAddReplicas=true.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class AutoAddReplicasPlanAction extends ComputePlanAction {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScaling.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScaling.java
index 1a191ee..b905f47 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScaling.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScaling.java
@@ -29,6 +29,11 @@ import org.apache.solr.client.solrj.cloud.autoscaling.TriggerEventType;
 import org.apache.solr.common.util.Utils;
 import org.apache.solr.core.SolrResourceLoader;
 
+/**
+ * Common autoscaling interfaces.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class AutoScaling {
 
   /**
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
index dee5feb..665f692 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
@@ -76,7 +76,9 @@ import static org.apache.solr.common.params.AutoScalingParams.*;
 import static org.apache.solr.common.params.CommonParams.JSON;
 
 /**
- * Handler for /cluster/autoscaling
+ * Handler for /cluster/autoscaling.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class AutoScalingHandler extends RequestHandlerBase implements PermissionNameProvider {
   public static final String HANDLER_PATH = "/admin/autoscaling";
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
index 33bf6b0..07cbb38 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
@@ -47,6 +47,8 @@ import static org.apache.solr.cloud.autoscaling.TriggerEvent.NODE_NAMES;
  * <p>
  * The cluster operations computed here are put into the {@link ActionContext}'s properties
  * with the key name "operations". The value is a List of SolrRequest objects.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class ComputePlanAction extends TriggerActionBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ExecutePlanAction.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ExecutePlanAction.java
index 1dfc3b1..b22e055 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ExecutePlanAction.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ExecutePlanAction.java
@@ -50,6 +50,8 @@ import org.slf4j.LoggerFactory;
 /**
  * This class is responsible for executing cluster operations read from the {@link ActionContext}'s properties
  * with the key name "operations".
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class ExecutePlanAction extends TriggerActionBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/HttpTriggerListener.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/HttpTriggerListener.java
index 139efe0..17d4137 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/HttpTriggerListener.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/HttpTriggerListener.java
@@ -55,6 +55,8 @@ import org.slf4j.LoggerFactory;
  *   <li>timeout - int, optional connection and socket timeout in milliseconds. Default is 60 seconds.</li>
  *   <li>followRedirects - boolean, optional setting to follow redirects. Default is false.</li>
  * </ul>
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class HttpTriggerListener extends TriggerListenerBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/InactiveMarkersPlanAction.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/InactiveMarkersPlanAction.java
index 6482542..16a4583 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/InactiveMarkersPlanAction.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/InactiveMarkersPlanAction.java
@@ -44,6 +44,8 @@ import static org.apache.solr.cloud.autoscaling.OverseerTriggerThread.MARKER_STA
  * This plan simply removes nodeAdded and nodeLost markers from Zookeeper if their TTL has
  * expired. These markers are used by {@link NodeAddedTrigger} and {@link NodeLostTrigger} to
  * ensure fault tolerance in case of Overseer leader crash.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class InactiveMarkersPlanAction extends TriggerActionBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/InactiveShardPlanAction.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/InactiveShardPlanAction.java
index d3de649..bd58877 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/InactiveShardPlanAction.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/InactiveShardPlanAction.java
@@ -42,6 +42,8 @@ import org.slf4j.LoggerFactory;
  * after their cleanup TTL period elapsed.
  * <p>Shard delete requests are put into the {@link ActionContext}'s properties
  * with the key name "operations". The value is a List of SolrRequest objects.</p>
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class InactiveShardPlanAction extends TriggerActionBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/IndexSizeTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/IndexSizeTrigger.java
index da40366..eb0ce52 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/IndexSizeTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/IndexSizeTrigger.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
 import static org.apache.solr.client.solrj.cloud.autoscaling.Variable.Type.CORE_IDX;
 
 /**
- *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class IndexSizeTrigger extends TriggerBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/LoggingListener.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/LoggingListener.java
index a7dcf63..62dacbb 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/LoggingListener.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/LoggingListener.java
@@ -26,6 +26,8 @@ import org.slf4j.LoggerFactory;
 /**
  * Implementation of {@link TriggerListener} that reports
  * events to a log.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class LoggingListener extends TriggerListenerBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/MetricTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/MetricTrigger.java
index 573ac77..8c34c8b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/MetricTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/MetricTrigger.java
@@ -50,6 +50,10 @@ import static org.apache.solr.common.params.AutoScalingParams.BELOW;
 import static org.apache.solr.common.params.AutoScalingParams.METRIC;
 import static org.apache.solr.common.params.AutoScalingParams.PREFERRED_OP;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class MetricTrigger extends TriggerBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
index 42188e4..c404f07 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
@@ -51,6 +51,8 @@ import static org.apache.solr.common.params.AutoScalingParams.REPLICA_TYPE;
 
 /**
  * Trigger for the {@link TriggerEventType#NODEADDED} event
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class NodeAddedTrigger extends TriggerBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
index b1c5818..d0b467a 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
@@ -50,6 +50,8 @@ import static org.apache.solr.common.params.AutoScalingParams.PREFERRED_OP;
 
 /**
  * Trigger for the {@link TriggerEventType#NODELOST} event
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class NodeLostTrigger extends TriggerBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
index 81780ec..75f3b89 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
@@ -52,6 +52,8 @@ import static org.apache.solr.common.cloud.ZkStateReader.SOLR_AUTOSCALING_CONF_P
 /**
  * Overseer thread responsible for reading triggers from zookeeper and
  * adding/removing them from {@link ScheduledTriggers}
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class OverseerTriggerThread implements Runnable, SolrCloseable {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
index 98a367c..b48778d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTrigger.java
@@ -46,6 +46,8 @@ import static org.apache.solr.common.params.AutoScalingParams.PREFERRED_OP;
 
 /**
  * A trigger which creates {@link TriggerEventType#SCHEDULED} events as per the configured schedule
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class ScheduledTrigger extends TriggerBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
index 73552ed..76aeefd 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java
@@ -71,7 +71,9 @@ import static org.apache.solr.common.util.ExecutorUtil.awaitTermination;
 
 /**
  * Responsible for scheduling active triggers, starting and stopping them and
- * performing actions when they fire
+ * performing actions when they fire.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class ScheduledTriggers implements Closeable {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/SearchRateTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/SearchRateTrigger.java
index efd5b24..03c6164 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/SearchRateTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/SearchRateTrigger.java
@@ -53,6 +53,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Trigger for the {@link org.apache.solr.client.solrj.cloud.autoscaling.TriggerEventType#SEARCHRATE} event.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SearchRateTrigger extends TriggerBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/SystemLogListener.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/SystemLogListener.java
index b841478..74bf993 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/SystemLogListener.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/SystemLogListener.java
@@ -55,6 +55,8 @@ import org.slf4j.LoggerFactory;
  *   <li>collection - optional string, specifies what collection should be used for storing events. Default value
  *   is {@link CollectionAdminParams#SYSTEM_COLL}.</li>
  * </ul>
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SystemLogListener extends TriggerListenerBase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java
index b873ee6..d652729 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerAction.java
@@ -25,6 +25,8 @@ import org.apache.solr.core.SolrResourceLoader;
 
 /**
  * Interface for actions performed in response to a trigger being activated
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public interface TriggerAction extends Closeable {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerActionBase.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerActionBase.java
index 7a9f34b..192d939 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerActionBase.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerActionBase.java
@@ -27,6 +27,8 @@ import org.apache.solr.core.SolrResourceLoader;
 
 /**
  * Base class for {@link TriggerAction} implementations.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public abstract class TriggerActionBase implements TriggerAction {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerActionException.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerActionException.java
index 624ce68..baa8c1f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerActionException.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerActionException.java
@@ -19,6 +19,8 @@ package org.apache.solr.cloud.autoscaling;
 
 /**
  * Trigger action-specific exception.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class TriggerActionException extends Exception {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerBase.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerBase.java
index d045f6a..70d75bd 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerBase.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerBase.java
@@ -48,6 +48,8 @@ import org.slf4j.LoggerFactory;
 /**
  * Base class for {@link org.apache.solr.cloud.autoscaling.AutoScaling.Trigger} implementations.
  * It handles state snapshot / restore in ZK.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public abstract class TriggerBase implements AutoScaling.Trigger {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerEvent.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerEvent.java
index 91482e5..b1a178c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerEvent.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerEvent.java
@@ -36,6 +36,8 @@ import org.apache.solr.util.IdUtils;
 
 /**
  * Trigger event.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class TriggerEvent implements MapWriter {
   public static final String IGNORED = "ignored";
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerEventQueue.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerEventQueue.java
index ec41495..97ee908 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerEventQueue.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerEventQueue.java
@@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class TriggerEventQueue {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerListener.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerListener.java
index 234387f..d2100cd 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerListener.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerListener.java
@@ -26,6 +26,8 @@ import org.apache.solr.core.SolrResourceLoader;
 /**
  * Implementations of this interface are notified of stages in event processing that they were
  * registered for. Note: instances may be closed and re-created on each auto-scaling config update.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public interface TriggerListener extends Closeable {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerListenerBase.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerListenerBase.java
index 7a323c7..5a00287 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerListenerBase.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerListenerBase.java
@@ -28,6 +28,8 @@ import org.apache.solr.core.SolrResourceLoader;
 
 /**
  * Base class for implementations of {@link TriggerListener}.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public abstract class TriggerListenerBase implements TriggerListener {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerUtils.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerUtils.java
index cecd933..61e2d74 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerUtils.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerUtils.java
@@ -23,6 +23,7 @@ import java.util.Set;
 
 /**
  *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class TriggerUtils {
   // validation helper methods
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerValidationException.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerValidationException.java
index 648e1e4..5be3fec 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerValidationException.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/TriggerValidationException.java
@@ -21,6 +21,8 @@ import java.util.Map;
 
 /**
  * This class represents errors found when validating trigger configuration.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class TriggerValidationException extends Exception {
   private final Map<String, String> details = new HashMap<>();
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/package-info.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/package-info.java
index d3447aa..ebbb65b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/package-info.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/package-info.java
@@ -16,6 +16,8 @@
  */
 
 /**
- * Package for classes related to autoscaling
+ * Package for classes related to autoscaling.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 package org.apache.solr.cloud.autoscaling;
\ No newline at end of file
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/ActionError.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/ActionError.java
index c1c070d..6430ba3 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/ActionError.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/ActionError.java
@@ -18,6 +18,8 @@ package org.apache.solr.cloud.autoscaling.sim;
 
 /**
  * Interface that helps simulating action errors.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public interface ActionError {
   boolean shouldFail(String... args);
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/FakeDocIterator.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/FakeDocIterator.java
index fbe66ac..f30e699 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/FakeDocIterator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/FakeDocIterator.java
@@ -25,6 +25,8 @@ import org.apache.solr.common.SolrInputField;
  * Lightweight generator of fake documents
  * NOTE: this iterator only ever returns the same document N times, which works ok
  * for our "bulk index update" simulation. Obviously don't use this for real indexing.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class FakeDocIterator implements Iterator<SolrInputDocument> {
   final SolrInputDocument doc = new SolrInputDocument();
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/GenericDistributedQueue.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/GenericDistributedQueue.java
index 109c516..7ca15ca 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/GenericDistributedQueue.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/GenericDistributedQueue.java
@@ -55,6 +55,8 @@ import org.slf4j.LoggerFactory;
 /**
  * A distributed queue that uses {@link DistribStateManager} as the underlying distributed store.
  * Implementation based on {@link org.apache.solr.cloud.ZkDistributedQueue}
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class GenericDistributedQueue implements DistributedQueue {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/GenericDistributedQueueFactory.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/GenericDistributedQueueFactory.java
index d4d7e2f..483d66e 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/GenericDistributedQueueFactory.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/GenericDistributedQueueFactory.java
@@ -24,6 +24,8 @@ import org.apache.solr.client.solrj.cloud.DistribStateManager;
 
 /**
  * Factory for {@link GenericDistributedQueue}.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class GenericDistributedQueueFactory implements DistributedQueueFactory {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/LiveNodesSet.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/LiveNodesSet.java
index 5f12004..d5b2497 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/LiveNodesSet.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/LiveNodesSet.java
@@ -28,6 +28,8 @@ import org.apache.solr.common.cloud.LiveNodesListener;
 
 /**
  * This class represents a set of live nodes and allows adding listeners to track their state.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class LiveNodesSet implements Iterable<String> {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/NoopDistributedQueueFactory.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/NoopDistributedQueueFactory.java
index b04d38e..6a0ee5d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/NoopDistributedQueueFactory.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/NoopDistributedQueueFactory.java
@@ -28,6 +28,8 @@ import org.apache.solr.common.util.Pair;
 
 /**
  * A queue factory implementation that does nothing.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class NoopDistributedQueueFactory implements DistributedQueueFactory {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
index f1a6666..361c1a3 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
@@ -109,6 +109,8 @@ import static org.apache.solr.cloud.api.collections.OverseerCollectionMessageHan
 
 /**
  * Simulated {@link SolrCloudManager}.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SimCloudManager implements SolrCloudManager {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
index 08abfb8..13ad560 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
@@ -124,6 +124,8 @@ import static org.apache.solr.common.params.CommonParams.NAME;
  *     <li>maintaining an up-to-date /clusterprops.json. Note: this file is only written, but never read by the
  *     framework!</li>
  *   </ul>
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SimClusterStateProvider implements ClusterStateProvider {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimDistribStateManager.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimDistribStateManager.java
index ea9fa55..fe94fa3 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimDistribStateManager.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimDistribStateManager.java
@@ -66,6 +66,8 @@ import org.slf4j.LoggerFactory;
  * Simulated {@link DistribStateManager} that keeps all data locally in a static structure. Instances of this
  * class are identified by their id in order to simulate the deletion of ephemeral nodes when {@link #close()} is
  * invoked.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SimDistribStateManager implements DistribStateManager {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimDistributedQueueFactory.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimDistributedQueueFactory.java
index fb17881..0c92b61 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimDistributedQueueFactory.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimDistributedQueueFactory.java
@@ -49,6 +49,8 @@ import org.slf4j.LoggerFactory;
  * Simulated {@link DistributedQueueFactory} that keeps all data in memory. Unlike
  * the {@link GenericDistributedQueueFactory} this queue implementation data is not
  * exposed anywhere.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SimDistributedQueueFactory implements DistributedQueueFactory {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimNodeStateProvider.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimNodeStateProvider.java
index b37bd22..8aa046c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimNodeStateProvider.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimNodeStateProvider.java
@@ -46,6 +46,8 @@ import org.slf4j.LoggerFactory;
  * Simulated {@link NodeStateProvider}.
  * Note: in order to setup node-level metrics use {@link #simSetNodeValues(String, Map)}. However, in order
  * to setup core-level metrics use {@link SimClusterStateProvider#simSetCollectionValue(String, String, Object, boolean, boolean)}.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SimNodeStateProvider implements NodeStateProvider {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimScenario.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimScenario.java
index 11aa3bf..1fbc59f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimScenario.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimScenario.java
@@ -83,6 +83,8 @@ import org.slf4j.LoggerFactory;
 /**
  * This class represents an autoscaling scenario consisting of a series of autoscaling
  * operations on a simulated cluster.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SimScenario implements AutoCloseable {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimUtils.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimUtils.java
index 6c72bc4..af22ac3 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimUtils.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimUtils.java
@@ -53,6 +53,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Various utility methods useful for autoscaling simulations and snapshots.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SimUtils {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotCloudManager.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotCloudManager.java
index 9dc0b4a..7f21332 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotCloudManager.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotCloudManager.java
@@ -58,6 +58,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Read-only snapshot of another {@link SolrCloudManager}.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SnapshotCloudManager implements SolrCloudManager {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotClusterStateProvider.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotClusterStateProvider.java
index 4289b28..294a57f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotClusterStateProvider.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotClusterStateProvider.java
@@ -37,6 +37,8 @@ import org.noggit.JSONWriter;
 
 /**
  * Read-only snapshot of another {@link ClusterStateProvider}.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SnapshotClusterStateProvider implements ClusterStateProvider {
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotDistribStateManager.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotDistribStateManager.java
index 9ec07ba..059b227 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotDistribStateManager.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotDistribStateManager.java
@@ -50,6 +50,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Read-only snapshot of another {@link DistribStateManager}
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SnapshotDistribStateManager implements DistribStateManager {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotNodeStateProvider.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotNodeStateProvider.java
index e8b7828..9bd3e7f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotNodeStateProvider.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SnapshotNodeStateProvider.java
@@ -35,6 +35,8 @@ import org.apache.solr.client.solrj.cloud.autoscaling.Variable;
 
 /**
  * Read-only snapshot of another {@link NodeStateProvider}.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SnapshotNodeStateProvider implements NodeStateProvider {
   private Map<String, Map<String, Object>> nodeValues = new LinkedHashMap<>();
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/package-info.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/package-info.java
index 9d7378a..3bfb527 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/package-info.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/package-info.java
@@ -88,6 +88,7 @@
  *    <li>Any component that uses ShardHandler (eg. CollectionsHandler Cmd-s)</li>
  *  </ul>
  *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 package org.apache.solr.cloud.autoscaling.sim;
 
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java
index 5fb618e..c29cf32 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java
@@ -47,6 +47,8 @@ import org.slf4j.LoggerFactory;
 /**
  * This handler makes it easier to retrieve a history of autoscaling events from the .system
  * collection.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class AutoscalingHistoryHandler extends RequestHandlerBase implements PermissionNameProvider {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AddReplicaSuggester.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AddReplicaSuggester.java
index 58ddb5c..a908784 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AddReplicaSuggester.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AddReplicaSuggester.java
@@ -29,6 +29,10 @@ import org.apache.solr.common.util.Pair;
 
 import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICA;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 class AddReplicaSuggester extends Suggester {
 
   @SuppressWarnings({"rawtypes"})
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AlreadyExistsException.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AlreadyExistsException.java
index e29bd6f..e842cc9 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AlreadyExistsException.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AlreadyExistsException.java
@@ -18,6 +18,7 @@ package org.apache.solr.client.solrj.cloud.autoscaling;
 
 /**
  *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class AlreadyExistsException extends Exception {
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java
index 0c19da6..3933a7c 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java
@@ -42,6 +42,8 @@ import static java.util.stream.Collectors.toList;
 /**
  * Bean representation of <code>autoscaling.json</code>, which parses data
  * lazily.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class AutoScalingConfig implements MapWriter {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/BadVersionException.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/BadVersionException.java
index 757d979..e24f40f 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/BadVersionException.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/BadVersionException.java
@@ -18,6 +18,7 @@ package org.apache.solr.client.solrj.cloud.autoscaling;
 
 /**
  *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class BadVersionException extends Exception {
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Cell.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Cell.java
index e222541..13be020 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Cell.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Cell.java
@@ -26,6 +26,7 @@ import org.apache.solr.common.util.Utils;
 
 /**Each instance represents an attribute that is being tracked by the framework such as , freedisk, cores etc
  *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class Cell implements MapWriter {
   final int index;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java
index 4109eea..48b6dc8 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java
@@ -55,6 +55,8 @@ import static org.apache.solr.common.util.Utils.toJSONString;
 
 /**
  * Represents a set of conditions in the policy
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class Clause implements MapWriter, Comparable<Clause> {
   public static final String NODESET = "nodeset";
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ComputedType.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ComputedType.java
index 73bca1f..437a736 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ComputedType.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ComputedType.java
@@ -17,6 +17,10 @@
 
 package org.apache.solr.client.solrj.cloud.autoscaling;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public enum ComputedType {
   NULL(),
   EQUAL() {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Condition.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Condition.java
index dd59087..c4f0b9a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Condition.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Condition.java
@@ -25,6 +25,10 @@ import org.apache.solr.common.MapWriter;
 import static org.apache.solr.client.solrj.cloud.autoscaling.Operand.GREATER_THAN;
 import static org.apache.solr.client.solrj.cloud.autoscaling.Operand.LESS_THAN;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class Condition implements MapWriter {
   final String name;
   final Object val;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/CoresVariable.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/CoresVariable.java
index a468385..37e7c27 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/CoresVariable.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/CoresVariable.java
@@ -23,6 +23,10 @@ import java.util.function.Consumer;
 
 import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOVEREPLICA;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class CoresVariable extends VariableBase {
   public CoresVariable(Type type) {
     super(type);
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingCloudManager.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingCloudManager.java
index aa0e62e..6c518b5 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingCloudManager.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingCloudManager.java
@@ -31,6 +31,8 @@ import org.apache.solr.common.util.TimeSource;
 
 /**
  * Base class for overriding some behavior of {@link SolrCloudManager}.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class DelegatingCloudManager implements SolrCloudManager {
   protected final SolrCloudManager delegate;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingClusterStateProvider.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingClusterStateProvider.java
index 827b198..d2d8163 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingClusterStateProvider.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingClusterStateProvider.java
@@ -28,6 +28,8 @@ import org.apache.solr.common.cloud.DocCollection;
 
 /**
  * Base class for overriding some behavior of {@link ClusterStateProvider}
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class DelegatingClusterStateProvider implements ClusterStateProvider {
   protected ClusterStateProvider delegate;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingDistribStateManager.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingDistribStateManager.java
index 40655fb..a37b91a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingDistribStateManager.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingDistribStateManager.java
@@ -28,6 +28,10 @@ import org.apache.zookeeper.Op;
 import org.apache.zookeeper.OpResult;
 import org.apache.zookeeper.Watcher;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class DelegatingDistribStateManager implements DistribStateManager {
   private final DistribStateManager delegate;
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingNodeStateProvider.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingNodeStateProvider.java
index 72b2819..91748e9 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingNodeStateProvider.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingNodeStateProvider.java
@@ -26,6 +26,8 @@ import org.apache.solr.client.solrj.cloud.NodeStateProvider;
 
 /**
  * Base class for overriding some behavior of {@link NodeStateProvider}.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class DelegatingNodeStateProvider implements NodeStateProvider {
   private final NodeStateProvider delegate;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DeleteNodeSuggester.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DeleteNodeSuggester.java
index 62bfbde..b740f53 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DeleteNodeSuggester.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DeleteNodeSuggester.java
@@ -24,6 +24,8 @@ import org.apache.solr.common.params.CollectionParams;
 
 /**
  * This suggester produces a DELETENODE request using provided {@link org.apache.solr.client.solrj.cloud.autoscaling.Suggester.Hint#SRC_NODE}.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 class DeleteNodeSuggester extends Suggester {
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DeleteReplicaSuggester.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DeleteReplicaSuggester.java
index 20f3827..65ba435 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DeleteReplicaSuggester.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DeleteReplicaSuggester.java
@@ -27,6 +27,8 @@ import org.apache.solr.common.util.Pair;
 /**
  * This suggester produces a DELETEREPLICA request using provided {@link org.apache.solr.client.solrj.cloud.autoscaling.Suggester.Hint#COLL_SHARD} and
  * {@link org.apache.solr.client.solrj.cloud.autoscaling.Suggester.Hint#NUMBER} hints to specify the collection, shard and number of replicas to delete.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 class DeleteReplicaSuggester extends Suggester {
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/FreeDiskVariable.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/FreeDiskVariable.java
index 2193ea3..5b8189a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/FreeDiskVariable.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/FreeDiskVariable.java
@@ -35,6 +35,10 @@ import static org.apache.solr.client.solrj.cloud.autoscaling.Variable.Type.TOTAL
 import static org.apache.solr.common.cloud.rule.ImplicitSnitch.DISK;
 import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOVEREPLICA;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class FreeDiskVariable extends VariableBase {
 
   public FreeDiskVariable(Type type) {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
index 49be0e3..c3038ba 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
@@ -30,6 +30,10 @@ import org.slf4j.LoggerFactory;
 
 import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOVEREPLICA;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class MoveReplicaSuggester extends Suggester {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NodeVariable.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NodeVariable.java
index 48dcd5e..b5d857a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NodeVariable.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NodeVariable.java
@@ -22,6 +22,10 @@ import org.apache.solr.common.util.Pair;
 import static org.apache.solr.client.solrj.cloud.autoscaling.Policy.ANY;
 import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOVEREPLICA;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class NodeVariable extends VariableBase {
   public NodeVariable(Type type) {
     super(type);
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NoneSuggester.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NoneSuggester.java
index 51bfc70..b801569 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NoneSuggester.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NoneSuggester.java
@@ -19,6 +19,10 @@ package org.apache.solr.client.solrj.cloud.autoscaling;
 
 import org.apache.solr.client.solrj.SolrRequest;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class NoneSuggester extends Suggester {
 
   public static NoneSuggester get(Policy.Session session) {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NotEmptyException.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NotEmptyException.java
index 1480cd9..19def9f 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NotEmptyException.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/NotEmptyException.java
@@ -18,6 +18,7 @@ package org.apache.solr.client.solrj.cloud.autoscaling;
 
 /**
  *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class NotEmptyException extends Exception {
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Operand.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Operand.java
index dac28c6..2468621 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Operand.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Operand.java
@@ -27,7 +27,10 @@ import static org.apache.solr.client.solrj.cloud.autoscaling.Clause.TestStatus.N
 import static org.apache.solr.client.solrj.cloud.autoscaling.Clause.TestStatus.PASS;
 import static org.apache.solr.client.solrj.cloud.autoscaling.Policy.ANY;
 
-
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public enum Operand {
   WILDCARD(ANY, Integer.MAX_VALUE) {
     @Override
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
index 64aa1f7..89355e5 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
@@ -60,14 +60,16 @@ import static java.util.stream.Collectors.toList;
 import static org.apache.solr.client.solrj.cloud.autoscaling.Variable.Type.NODE;
 import static org.apache.solr.client.solrj.cloud.autoscaling.Variable.Type.WITH_COLLECTION;
 
-/*The class that reads, parses and applies policies specified in
+/**
+ * The class that reads, parses and applies policies specified in
  * autoscaling.json
  *
  * Create one instance of this class per unique autoscaling.json.
  * This is immutable and is thread-safe
  *
- * Create a fresh new session for each use
+ * Create a fresh new session for each use.
  *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class Policy implements MapWriter {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/PolicyHelper.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/PolicyHelper.java
index a1e9fad..593caae 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/PolicyHelper.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/PolicyHelper.java
@@ -71,6 +71,10 @@ import static org.apache.solr.common.util.Utils.handleExp;
 import static org.apache.solr.common.util.Utils.time;
 import static org.apache.solr.common.util.Utils.timeElapsed;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class PolicyHelper {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Preference.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Preference.java
index 18f39a1..4986af9 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Preference.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Preference.java
@@ -30,6 +30,10 @@ import org.apache.solr.common.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class Preference implements MapWriter {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/RangeVal.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/RangeVal.java
index 11c5ab3..1044778 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/RangeVal.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/RangeVal.java
@@ -21,6 +21,10 @@ import java.io.IOException;
 
 import org.apache.solr.common.MapWriter;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 class RangeVal implements MapWriter {
   final Number min, max, actual;
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaCount.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaCount.java
index 642b565..ba3fc35 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaCount.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaCount.java
@@ -25,6 +25,10 @@ import org.apache.solr.common.MapWriter;
 import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.util.Utils;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 class ReplicaCount  implements MapWriter {
   long nrt, tlog, pull;
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
index 9b1f78c..14830cb 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
@@ -35,6 +35,10 @@ import static org.apache.solr.common.ConditionalMapWriter.NON_NULL_VAL;
 import static org.apache.solr.common.ConditionalMapWriter.dedupeKeyPredicate;
 import static org.apache.solr.common.cloud.ZkStateReader.LEADER_PROP;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class ReplicaInfo implements MapWriter {
   private final String name;
   private final String core, collection, shard;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaVariable.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaVariable.java
index 5163d3a..4f0c480 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaVariable.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaVariable.java
@@ -24,6 +24,10 @@ import java.util.Set;
 
 import org.apache.solr.common.util.StrUtils;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 class ReplicaVariable extends VariableBase {
 
   public ReplicaVariable(Type type) {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java
index f93b50e..a4e40c2 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java
@@ -48,6 +48,8 @@ import static org.apache.solr.common.params.CoreAdminParams.NODE;
 
 /**
  * Each instance represents a node in the cluster
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class Row implements MapWriter {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SealedClause.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SealedClause.java
index 495bcb4..92ad59a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SealedClause.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SealedClause.java
@@ -21,6 +21,8 @@ import java.util.function.Function;
 
 /**
  * This clause is an instance with no conditions with computed value. every value is computed just in time
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class SealedClause extends Clause {
   SealedClause(Clause clause, Function<Condition, Object> computedValueEvaluator) {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SplitShardSuggester.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SplitShardSuggester.java
index b483033..7022a63 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SplitShardSuggester.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SplitShardSuggester.java
@@ -28,6 +28,8 @@ import org.apache.solr.common.util.Pair;
 
 /**
  * This suggester produces a SPLITSHARD request using provided {@link org.apache.solr.client.solrj.cloud.autoscaling.Suggester.Hint#COLL_SHARD} value.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 class SplitShardSuggester extends Suggester {
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggester.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggester.java
index b9d5faf..2ba5d4d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggester.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggester.java
@@ -50,12 +50,15 @@ import org.slf4j.LoggerFactory;
 import static org.apache.solr.client.solrj.cloud.autoscaling.Variable.Type.FREEDISK;
 import static org.apache.solr.common.params.CollectionAdminParams.WITH_COLLECTION;
 
-/* A suggester is capable of suggesting a collection operation
+/**
+ * A suggester is capable of suggesting a collection operation
  * given a particular session. Before it suggests a new operation,
  * it ensures that ,
  *  a) load is reduced on the most loaded node
  *  b) it causes no new violations
  *
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public abstract class Suggester implements MapWriter {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
index 6259435..44d47a6 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
@@ -30,6 +30,10 @@ import org.apache.solr.common.util.Pair;
 
 import static org.apache.solr.common.params.CollectionParams.CollectionAction.MOVEREPLICA;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class Suggestion {
 
   public enum Type {
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/TriggerEventProcessorStage.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/TriggerEventProcessorStage.java
index f8648e1..e47f26b 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/TriggerEventProcessorStage.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/TriggerEventProcessorStage.java
@@ -18,6 +18,8 @@ package org.apache.solr.client.solrj.cloud.autoscaling;
 
 /**
  * Enum that represents the stages of trigger event processing.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public enum TriggerEventProcessorStage {
   STARTED,
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/TriggerEventType.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/TriggerEventType.java
index a983bf0..50660e2 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/TriggerEventType.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/TriggerEventType.java
@@ -18,6 +18,8 @@ package org.apache.solr.client.solrj.cloud.autoscaling;
 
 /**
  * Enum that represents trigger event types.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public enum TriggerEventType {
   NODEADDED,
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/UnsupportedSuggester.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/UnsupportedSuggester.java
index 0ba49ba..ca626ba 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/UnsupportedSuggester.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/UnsupportedSuggester.java
@@ -25,6 +25,8 @@ import org.slf4j.LoggerFactory;
 
 /**
  * This suggester simply logs the request but does not produce any suggestions.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class UnsupportedSuggester extends Suggester {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Variable.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Variable.java
index 0a37634..e6bd5e7 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Variable.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Variable.java
@@ -37,6 +37,8 @@ import static java.util.Collections.unmodifiableSet;
 /**
  * A Variable Type used in Autoscaling policy rules. Each variable type may have unique implementation
  * of functionalities
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public interface Variable {
   String NULL = "";
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java
index 746faca..269f276 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java
@@ -28,6 +28,10 @@ import static org.apache.solr.client.solrj.cloud.autoscaling.Suggestion.suggestN
 import static org.apache.solr.client.solrj.cloud.autoscaling.Suggestion.suggestPositiveViolations;
 import static org.apache.solr.client.solrj.cloud.autoscaling.Variable.Type.FREEDISK;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class VariableBase implements Variable {
   final Type varType;
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VersionedData.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VersionedData.java
index 010beb7..4c233bc 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VersionedData.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VersionedData.java
@@ -27,6 +27,8 @@ import org.apache.zookeeper.CreateMode;
 
 /**
  * Immutable representation of binary data with version.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class VersionedData implements MapWriter {
   private final int version;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Violation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Violation.java
index e0d2048..f219666 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Violation.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Violation.java
@@ -29,6 +29,10 @@ import org.apache.solr.common.IteratorWriter;
 import org.apache.solr.common.MapWriter;
 import org.apache.solr.common.util.Utils;
 
+/**
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
+ */
 public class Violation implements MapWriter {
   final String shard, coll, node;
   final Object actualVal;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/WithCollectionVariable.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/WithCollectionVariable.java
index 8cab901..e7364a8 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/WithCollectionVariable.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/WithCollectionVariable.java
@@ -33,6 +33,8 @@ import static org.apache.solr.common.params.CollectionParams.CollectionAction.MO
 
 /**
  * Implements the 'withCollection' variable type
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public class WithCollectionVariable extends VariableBase {
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/package-info.java
index 620f57d..f257da0 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/package-info.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/package-info.java
@@ -17,6 +17,8 @@
 
 /**
  * Common classes for autoscaling parsing filtering nodes and sorting
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 
 package org.apache.solr.client.solrj.cloud.autoscaling;
diff --git a/solr/solrj/src/java/org/apache/solr/common/params/AutoScalingParams.java b/solr/solrj/src/java/org/apache/solr/common/params/AutoScalingParams.java
index e626fef..f88734c 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/AutoScalingParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/AutoScalingParams.java
@@ -18,6 +18,8 @@ package org.apache.solr.common.params;
 
 /**
  * Requests parameters for autoscaling.
+ *
+ * @deprecated to be removed in Solr 9.0 (see SOLR-14656)
  */
 public interface AutoScalingParams {