diff --git a/libs/common/src/main/java/org/opensearch/common/Explicit.java b/libs/common/src/main/java/org/opensearch/common/Explicit.java
index e060baf6f187e..da44c6fd4dcef 100644
--- a/libs/common/src/main/java/org/opensearch/common/Explicit.java
+++ b/libs/common/src/main/java/org/opensearch/common/Explicit.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.common;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.util.Objects;
 
 /**
@@ -43,8 +45,9 @@
  * field mapping settings it is preferable to preserve an explicit
  * choice rather than a choice made only made implicitly by defaults.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class Explicit<T> {
 
     private final T value;
diff --git a/libs/common/src/main/java/org/opensearch/common/lease/Releasable.java b/libs/common/src/main/java/org/opensearch/common/lease/Releasable.java
index 30bea6185febc..dfc4fefb9ee55 100644
--- a/libs/common/src/main/java/org/opensearch/common/lease/Releasable.java
+++ b/libs/common/src/main/java/org/opensearch/common/lease/Releasable.java
@@ -32,13 +32,16 @@
 
 package org.opensearch.common.lease;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.io.Closeable;
 
 /**
  * Specialization of {@link AutoCloseable} for calls that might not throw a checked exception.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface Releasable extends Closeable {
 
     @Override
diff --git a/libs/core/src/main/java/org/opensearch/core/action/ActionResponse.java b/libs/core/src/main/java/org/opensearch/core/action/ActionResponse.java
index 041d8b1bffb4a..7525bfb243aae 100644
--- a/libs/core/src/main/java/org/opensearch/core/action/ActionResponse.java
+++ b/libs/core/src/main/java/org/opensearch/core/action/ActionResponse.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.core.action;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.transport.TransportResponse;
 
@@ -42,6 +43,7 @@
  *
  * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class ActionResponse extends TransportResponse {
 
     public ActionResponse() {}
diff --git a/libs/core/src/main/java/org/opensearch/core/common/io/stream/Writeable.java b/libs/core/src/main/java/org/opensearch/core/common/io/stream/Writeable.java
index af9df51655414..960f4bec5eeb5 100644
--- a/libs/core/src/main/java/org/opensearch/core/common/io/stream/Writeable.java
+++ b/libs/core/src/main/java/org/opensearch/core/common/io/stream/Writeable.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.core.common.io.stream;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -41,8 +43,9 @@
  * across the wire" using OpenSearch's internal protocol. If the implementer also implements equals and hashCode then a copy made by
  * serializing and deserializing must be equal and have the same hashCode. It isn't required that such a copy be entirely unchanged.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.8.0")
 public interface Writeable {
     /**
      * A WriteableRegistry registers {@link Writer} methods for writing data types over a
@@ -135,8 +138,11 @@ public static Class<?> getCustomClassFromInstance(final Object value) {
      *     out.writeMapOfLists(someMap, StreamOutput::writeString, StreamOutput::writeString);
      * }
      * </code></pre>
+     *
+     * @opensearch.api
      */
     @FunctionalInterface
+    @PublicApi(since = "2.8.0")
     interface Writer<V> {
 
         /**
@@ -161,8 +167,11 @@ interface Writer<V> {
      *     this.someMap = in.readMapOfLists(StreamInput::readString, StreamInput::readString);
      * }
      * </code></pre>
+     *
+     * @opensearch.api
      */
     @FunctionalInterface
+    @PublicApi(since = "2.8.0")
     interface Reader<V> {
 
         /**
diff --git a/libs/core/src/main/java/org/opensearch/core/common/util/ByteArray.java b/libs/core/src/main/java/org/opensearch/core/common/util/ByteArray.java
index e50f24417f8bc..f4d81c4ca4363 100644
--- a/libs/core/src/main/java/org/opensearch/core/common/util/ByteArray.java
+++ b/libs/core/src/main/java/org/opensearch/core/common/util/ByteArray.java
@@ -33,14 +33,16 @@
 package org.opensearch.core.common.util;
 
 import org.apache.lucene.util.BytesRef;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.nio.ByteBuffer;
 
 /**
  * Abstraction of an array of byte values.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface ByteArray extends BigArray {
 
     /**
diff --git a/libs/core/src/main/java/org/opensearch/core/indices/breaker/AllCircuitBreakerStats.java b/libs/core/src/main/java/org/opensearch/core/indices/breaker/AllCircuitBreakerStats.java
index 3ce8b4953b9d6..992655efec8f0 100644
--- a/libs/core/src/main/java/org/opensearch/core/indices/breaker/AllCircuitBreakerStats.java
+++ b/libs/core/src/main/java/org/opensearch/core/indices/breaker/AllCircuitBreakerStats.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.core.indices.breaker;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -43,8 +44,9 @@
 /**
  * Stats class encapsulating all of the different circuit breaker stats
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class AllCircuitBreakerStats implements Writeable, ToXContentFragment {
 
     /** An array of all the circuit breaker stats */
diff --git a/libs/core/src/main/java/org/opensearch/core/indices/breaker/CircuitBreakerService.java b/libs/core/src/main/java/org/opensearch/core/indices/breaker/CircuitBreakerService.java
index ee9c94f432a36..dedeb0803271f 100644
--- a/libs/core/src/main/java/org/opensearch/core/indices/breaker/CircuitBreakerService.java
+++ b/libs/core/src/main/java/org/opensearch/core/indices/breaker/CircuitBreakerService.java
@@ -32,8 +32,7 @@
 
 package org.opensearch.core.indices.breaker;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lifecycle.AbstractLifecycleComponent;
 import org.opensearch.core.common.breaker.CircuitBreaker;
 
@@ -41,11 +40,10 @@
  * Interface for Circuit Breaker services, which provide breakers to classes
  * that load field data.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class CircuitBreakerService extends AbstractLifecycleComponent {
-    private static final Logger logger = LogManager.getLogger(CircuitBreakerService.class);
-
     protected CircuitBreakerService() {}
 
     /**
diff --git a/libs/core/src/main/java/org/opensearch/core/indices/breaker/CircuitBreakerStats.java b/libs/core/src/main/java/org/opensearch/core/indices/breaker/CircuitBreakerStats.java
index 9207d3ea77227..ee71cf8d2ac0e 100644
--- a/libs/core/src/main/java/org/opensearch/core/indices/breaker/CircuitBreakerStats.java
+++ b/libs/core/src/main/java/org/opensearch/core/indices/breaker/CircuitBreakerStats.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.core.indices.breaker;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -45,8 +46,9 @@
 /**
  * Class encapsulating stats about the {@link org.opensearch.core.common.breaker.CircuitBreaker}
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class CircuitBreakerStats implements Writeable, ToXContentObject {
 
     /** The name of the circuit breaker */
diff --git a/libs/core/src/main/java/org/opensearch/core/xcontent/ObjectParser.java b/libs/core/src/main/java/org/opensearch/core/xcontent/ObjectParser.java
index 365b36c755dd2..04d0bce27c04f 100644
--- a/libs/core/src/main/java/org/opensearch/core/xcontent/ObjectParser.java
+++ b/libs/core/src/main/java/org/opensearch/core/xcontent/ObjectParser.java
@@ -32,6 +32,7 @@
 package org.opensearch.core.xcontent;
 
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 
 import java.io.IOException;
@@ -83,8 +84,9 @@
  * It's highly recommended to use the high level declare methods like {@link #declareString(BiConsumer, ParseField)} instead of
  * {@link #declareField} which can be used to implement exceptional parsing operations not covered by the high level methods.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class ObjectParser<Value, Context> extends AbstractObjectParser<Value, Context>
     implements
         BiFunction<XContentParser, Context, Value>,
diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBackpressureAndResiliencyIT.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBackpressureAndResiliencyIT.java
index f19c9db7874db..6b6a96dc42a84 100644
--- a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBackpressureAndResiliencyIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBackpressureAndResiliencyIT.java
@@ -14,7 +14,6 @@
 import org.opensearch.action.admin.indices.flush.FlushResponse;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
-import org.opensearch.common.util.concurrent.AbstractAsyncTask;
 import org.opensearch.common.util.concurrent.UncategorizedExecutionException;
 import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.core.common.bytes.BytesReference;
@@ -22,6 +21,7 @@
 import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.core.xcontent.MediaTypeRegistry;
 import org.opensearch.index.IndexService;
+import org.opensearch.index.IndexServiceTestUtils;
 import org.opensearch.index.remote.RemoteSegmentTransferTracker;
 import org.opensearch.index.shard.IndexShard;
 import org.opensearch.indices.IndicesService;
@@ -175,7 +175,7 @@ public void testAsyncTrimTaskSucceeds() {
 
         logger.info("Increasing the frequency of async trim task to ensure it runs in background while indexing");
         IndexService indexService = internalCluster().getInstance(IndicesService.class, dataNodeName).iterator().next();
-        ((AbstractAsyncTask) indexService.getTrimTranslogTask()).setInterval(TimeValue.timeValueMillis(100));
+        IndexServiceTestUtils.setTrimTranslogTaskInterval(indexService, TimeValue.timeValueMillis(100));
 
         logger.info("--> Indexing data");
         indexData(randomIntBetween(2, 5), true);
diff --git a/server/src/main/java/org/opensearch/action/AliasesRequest.java b/server/src/main/java/org/opensearch/action/AliasesRequest.java
index 3632ba2d7304f..8fe6f49c08af0 100644
--- a/server/src/main/java/org/opensearch/action/AliasesRequest.java
+++ b/server/src/main/java/org/opensearch/action/AliasesRequest.java
@@ -32,14 +32,17 @@
 
 package org.opensearch.action;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * Needs to be implemented by all {@link org.opensearch.action.ActionRequest} subclasses that relate to
  * one or more indices and one or more aliases. Meant to be used for aliases management requests (e.g. add/remove alias,
  * get aliases) that hold aliases and indices in separate fields.
  * Allows to retrieve which indices and aliases the action relates to.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface AliasesRequest extends IndicesRequest.Replaceable {
 
     /**
diff --git a/server/src/main/java/org/opensearch/action/OriginalIndices.java b/server/src/main/java/org/opensearch/action/OriginalIndices.java
index 1e24c64bc60fc..1c26bf9d416f5 100644
--- a/server/src/main/java/org/opensearch/action/OriginalIndices.java
+++ b/server/src/main/java/org/opensearch/action/OriginalIndices.java
@@ -33,6 +33,7 @@
 package org.opensearch.action;
 
 import org.opensearch.action.support.IndicesOptions;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 
@@ -42,8 +43,9 @@
 /**
  * Used to keep track of original indices within internal (e.g. shard level) requests
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class OriginalIndices implements IndicesRequest {
 
     // constant to use when original indices are not applicable and will not be serialized across the wire
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java b/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java
index f4705a21f5014..3c8f07613561d 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java
@@ -40,6 +40,7 @@
 import org.opensearch.cluster.routing.allocation.AllocationDecision;
 import org.opensearch.cluster.routing.allocation.ShardAllocationDecision;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -58,8 +59,9 @@
  * or if it is not unassigned, then which nodes it could possibly be relocated to.
  * It is an immutable class.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class ClusterAllocationExplanation implements ToXContentObject, Writeable {
 
     private final ShardRouting shardRouting;
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStatus.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStatus.java
index 0b101070db478..e0f380b3ebbe6 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStatus.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStatus.java
@@ -35,6 +35,7 @@
 import org.opensearch.cluster.SnapshotsInProgress;
 import org.opensearch.cluster.SnapshotsInProgress.State;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -68,8 +69,9 @@
 /**
  * Status of a snapshot
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class SnapshotStatus implements ToXContentObject, Writeable {
 
     private final Snapshot snapshot;
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverInfo.java b/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverInfo.java
index 475e44e1820d5..75c68350e2204 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverInfo.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverInfo.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.cluster.AbstractDiffable;
 import org.opensearch.cluster.Diff;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -52,8 +53,9 @@
 /**
  * Class for holding Rollover related information within an index
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class RolloverInfo extends AbstractDiffable<RolloverInfo> implements Writeable, ToXContentFragment {
 
     public static final ParseField CONDITION_FIELD = new ParseField("met_conditions");
diff --git a/server/src/main/java/org/opensearch/action/search/ParsedScrollId.java b/server/src/main/java/org/opensearch/action/search/ParsedScrollId.java
index 70be9a0b19e08..b723b97b5c413 100644
--- a/server/src/main/java/org/opensearch/action/search/ParsedScrollId.java
+++ b/server/src/main/java/org/opensearch/action/search/ParsedScrollId.java
@@ -32,13 +32,16 @@
 
 package org.opensearch.action.search;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.util.Arrays;
 
 /**
  * Search scroll id that has been parsed
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ParsedScrollId {
 
     public static final String QUERY_THEN_FETCH_TYPE = "queryThenFetch";
diff --git a/server/src/main/java/org/opensearch/action/search/SearchContextIdForNode.java b/server/src/main/java/org/opensearch/action/search/SearchContextIdForNode.java
index 59c0e54bb6cbc..7c702c16030b7 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchContextIdForNode.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchContextIdForNode.java
@@ -33,6 +33,7 @@
 package org.opensearch.action.search;
 
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -43,8 +44,9 @@
 /**
  * Id for a search context per node.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class SearchContextIdForNode implements Writeable {
     private final String node;
     private final ShardSearchContextId searchContextId;
diff --git a/server/src/main/java/org/opensearch/action/search/SearchPhase.java b/server/src/main/java/org/opensearch/action/search/SearchPhase.java
index 1c7b3c1f1563c..0890e9f5de8d4 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchPhase.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchPhase.java
@@ -32,6 +32,7 @@
 package org.opensearch.action.search;
 
 import org.opensearch.common.CheckedRunnable;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.io.IOException;
 import java.util.Locale;
@@ -40,8 +41,9 @@
 /**
  * Base class for all individual search phases like collecting distributed frequencies, fetching documents, querying shards.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class SearchPhase implements CheckedRunnable<IOException> {
     private final String name;
     private long startTimeInNanos;
diff --git a/server/src/main/java/org/opensearch/action/search/SearchPhaseContext.java b/server/src/main/java/org/opensearch/action/search/SearchPhaseContext.java
index 45d39a6f85ea2..0fa8569413eaf 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchPhaseContext.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchPhaseContext.java
@@ -34,6 +34,7 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.OriginalIndices;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.common.util.concurrent.AtomicArray;
 import org.opensearch.search.SearchPhaseResult;
@@ -48,8 +49,9 @@
 /**
  * This class provide contextual state and access to resources across multiple search phases.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface SearchPhaseContext extends Executor {
     // TODO maybe we can make this concrete later - for now we just implement this in the base class for all initial phases
 
diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequestOperationsListener.java b/server/src/main/java/org/opensearch/action/search/SearchRequestOperationsListener.java
index 89d725b56bded..ecf48b4a9f633 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchRequestOperationsListener.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchRequestOperationsListener.java
@@ -10,14 +10,16 @@
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.util.List;
 
 /**
  * A listener for search, fetch and context events at the coordinator node level
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface SearchRequestOperationsListener {
 
     void onPhaseStart(SearchPhaseContext context);
diff --git a/server/src/main/java/org/opensearch/action/search/SearchShardIterator.java b/server/src/main/java/org/opensearch/action/search/SearchShardIterator.java
index fbd85a3fc0b8f..33d9bf70021a0 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchShardIterator.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchShardIterator.java
@@ -36,6 +36,7 @@
 import org.opensearch.cluster.routing.PlainShardIterator;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.Countable;
 import org.opensearch.common.util.PlainIterator;
@@ -54,8 +55,9 @@
  * the cluster alias.
  * @see OriginalIndices
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class SearchShardIterator implements Comparable<SearchShardIterator>, Countable {
 
     private final OriginalIndices originalIndices;
diff --git a/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java b/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java
index 4d3f9b71a919c..ef490844db692 100644
--- a/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java
+++ b/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java
@@ -37,6 +37,7 @@
 import org.opensearch.action.OriginalIndices;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.action.ShardOperationFailedException;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -56,8 +57,9 @@
 /**
  * Represents a failure to search on a specific shard.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ShardSearchFailure extends ShardOperationFailedException {
 
     private static final String REASON_FIELD = "reason";
diff --git a/server/src/main/java/org/opensearch/action/support/ActiveShardCount.java b/server/src/main/java/org/opensearch/action/support/ActiveShardCount.java
index 15275ba48fc6e..e91342a7ce4b8 100644
--- a/server/src/main/java/org/opensearch/action/support/ActiveShardCount.java
+++ b/server/src/main/java/org/opensearch/action/support/ActiveShardCount.java
@@ -36,6 +36,7 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.routing.IndexRoutingTable;
 import org.opensearch.cluster.routing.IndexShardRoutingTable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -48,8 +49,9 @@
  * A class whose instances represent a value for counting the number
  * of active shard copies for a given shard in an index.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class ActiveShardCount implements Writeable {
 
     private static final int ACTIVE_SHARD_COUNT_DEFAULT = -2;
diff --git a/server/src/main/java/org/opensearch/action/support/replication/ReplicationMode.java b/server/src/main/java/org/opensearch/action/support/replication/ReplicationMode.java
index f9b85cc4bd7aa..dd3a38c1398ab 100644
--- a/server/src/main/java/org/opensearch/action/support/replication/ReplicationMode.java
+++ b/server/src/main/java/org/opensearch/action/support/replication/ReplicationMode.java
@@ -8,11 +8,14 @@
 
 package org.opensearch.action.support.replication;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * The type of replication used for inter-node replication.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.4.0")
 public enum ReplicationMode {
     /**
      * In this mode, a {@code TransportReplicationAction} is fanned out to underlying concerned shard and is replicated logically.
diff --git a/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java b/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java
index 825405cb68549..67480976c500f 100644
--- a/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java
+++ b/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java
@@ -36,6 +36,7 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.action.ActionResponse;
 import org.opensearch.core.action.ShardOperationFailedException;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -57,8 +58,9 @@
 /**
  * Base class for write action responses.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ReplicationResponse extends ActionResponse {
 
     public static final ReplicationResponse.ShardInfo.Failure[] EMPTY = new ReplicationResponse.ShardInfo.Failure[0];
@@ -88,8 +90,9 @@ public void setShardInfo(ShardInfo shardInfo) {
     /**
      * Holds shard information
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class ShardInfo implements Writeable, ToXContentObject {
 
         private static final String TOTAL = "total";
@@ -235,8 +238,9 @@ public String toString() {
         /**
          * Holds failure information
          *
-         * @opensearch.internal
+         * @opensearch.api
          */
+        @PublicApi(since = "1.0.0")
         public static class Failure extends ShardOperationFailedException implements ToXContentObject {
 
             private static final String _INDEX = "_index";
diff --git a/server/src/main/java/org/opensearch/cluster/ClusterState.java b/server/src/main/java/org/opensearch/cluster/ClusterState.java
index 1b87a60c2ccf5..9e63f961d241d 100644
--- a/server/src/main/java/org/opensearch/cluster/ClusterState.java
+++ b/server/src/main/java/org/opensearch/cluster/ClusterState.java
@@ -49,6 +49,7 @@
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.UUIDs;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.common.Strings;
@@ -97,8 +98,9 @@
  * throws the {@link IncompatibleClusterStateVersionException}, which causes the publishing mechanism to send
  * a full version of the cluster state to the node on which this exception was thrown.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ClusterState implements ToXContentFragment, Diffable<ClusterState> {
 
     public static final ClusterState EMPTY_STATE = builder(ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY)).build();
@@ -139,8 +141,9 @@ static <T extends VersionedNamedWriteable & FeatureAware> boolean shouldSerializ
     /**
      * Custom cluster state.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface Custom extends NamedDiffable<Custom>, ToXContentFragment, FeatureAware {
 
         /**
@@ -596,8 +599,9 @@ public static Builder builder(ClusterState state) {
     /**
      * Builder for cluster state.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
 
         private final ClusterName clusterName;
diff --git a/server/src/main/java/org/opensearch/cluster/NamedDiff.java b/server/src/main/java/org/opensearch/cluster/NamedDiff.java
index ce971aa723394..e994cfb224386 100644
--- a/server/src/main/java/org/opensearch/cluster/NamedDiff.java
+++ b/server/src/main/java/org/opensearch/cluster/NamedDiff.java
@@ -33,13 +33,15 @@
 package org.opensearch.cluster;
 
 import org.opensearch.Version;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.NamedWriteable;
 
 /**
  * Diff that also support NamedWriteable interface
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface NamedDiff<T extends Diffable<T>> extends Diff<T>, NamedWriteable {
     /**
      * The minimal version of the recipient this custom object can be sent to
diff --git a/server/src/main/java/org/opensearch/cluster/RestoreInProgress.java b/server/src/main/java/org/opensearch/cluster/RestoreInProgress.java
index 3e0c78099e6b4..769f97373f7b7 100644
--- a/server/src/main/java/org/opensearch/cluster/RestoreInProgress.java
+++ b/server/src/main/java/org/opensearch/cluster/RestoreInProgress.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.Version;
 import org.opensearch.cluster.ClusterState.Custom;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -54,8 +55,9 @@
 /**
  * Meta data about restore processes that are currently executing
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class RestoreInProgress extends AbstractNamedDiffable<Custom> implements Custom, Iterable<RestoreInProgress.Entry> {
 
     /**
@@ -139,8 +141,9 @@ public RestoreInProgress build() {
     /**
      * Restore metadata
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Entry {
         private final String uuid;
         private final State state;
@@ -238,8 +241,9 @@ public int hashCode() {
     /**
      * Represents status of a restored shard
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class ShardRestoreStatus implements Writeable {
         private State state;
         private String nodeId;
@@ -363,8 +367,9 @@ public int hashCode() {
     /**
      * Shard restore process state
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum State {
         /**
          * Initializing state
diff --git a/server/src/main/java/org/opensearch/cluster/SnapshotsInProgress.java b/server/src/main/java/org/opensearch/cluster/SnapshotsInProgress.java
index 952591f346536..3de23d2490c63 100644
--- a/server/src/main/java/org/opensearch/cluster/SnapshotsInProgress.java
+++ b/server/src/main/java/org/opensearch/cluster/SnapshotsInProgress.java
@@ -35,6 +35,7 @@
 import org.opensearch.Version;
 import org.opensearch.cluster.ClusterState.Custom;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -928,8 +929,9 @@ public String toString() {
     /**
      * State of the snapshots.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum State {
         INIT((byte) 0, false),
         STARTED((byte) 1, false),
diff --git a/server/src/main/java/org/opensearch/cluster/ack/ClusterStateUpdateResponse.java b/server/src/main/java/org/opensearch/cluster/ack/ClusterStateUpdateResponse.java
index db26496c6f263..837bf8af449ad 100644
--- a/server/src/main/java/org/opensearch/cluster/ack/ClusterStateUpdateResponse.java
+++ b/server/src/main/java/org/opensearch/cluster/ack/ClusterStateUpdateResponse.java
@@ -32,11 +32,14 @@
 
 package org.opensearch.cluster.ack;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * Base response returned after a cluster state update
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ClusterStateUpdateResponse {
 
     private final boolean acknowledged;
diff --git a/server/src/main/java/org/opensearch/cluster/block/ClusterBlockException.java b/server/src/main/java/org/opensearch/cluster/block/ClusterBlockException.java
index 4673f075e8439..ea6c0c69c523d 100644
--- a/server/src/main/java/org/opensearch/cluster/block/ClusterBlockException.java
+++ b/server/src/main/java/org/opensearch/cluster/block/ClusterBlockException.java
@@ -33,6 +33,7 @@
 package org.opensearch.cluster.block;
 
 import org.opensearch.OpenSearchException;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.rest.RestStatus;
@@ -49,8 +50,9 @@
 /**
  * Internal exception on obtaining a cluster block
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ClusterBlockException extends OpenSearchException {
     private final Set<ClusterBlock> blocks;
 
diff --git a/server/src/main/java/org/opensearch/cluster/block/ClusterBlocks.java b/server/src/main/java/org/opensearch/cluster/block/ClusterBlocks.java
index bcb4f7f71268e..304136166d515 100644
--- a/server/src/main/java/org/opensearch/cluster/block/ClusterBlocks.java
+++ b/server/src/main/java/org/opensearch/cluster/block/ClusterBlocks.java
@@ -37,6 +37,7 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.MetadataIndexStateService;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.set.Sets;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -59,8 +60,9 @@
 /**
  * Represents current cluster level blocks to block dirty operations done against the cluster.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ClusterBlocks extends AbstractDiffable<ClusterBlocks> {
     public static final ClusterBlocks EMPTY_CLUSTER_BLOCK = new ClusterBlocks(emptySet(), Map.of());
 
@@ -355,8 +357,9 @@ public static Builder builder() {
     /**
      * Builder for cluster blocks.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
 
         private final Set<ClusterBlock> global = new HashSet<>();
diff --git a/server/src/main/java/org/opensearch/cluster/block/IndexCreateBlockException.java b/server/src/main/java/org/opensearch/cluster/block/IndexCreateBlockException.java
index 729d76c72e99e..3e9fa3e23a12f 100644
--- a/server/src/main/java/org/opensearch/cluster/block/IndexCreateBlockException.java
+++ b/server/src/main/java/org/opensearch/cluster/block/IndexCreateBlockException.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.cluster.block;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 
 import java.io.IOException;
@@ -16,8 +17,9 @@
 /**
  * Internal exception on obtaining an index create block
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class IndexCreateBlockException extends ClusterBlockException {
 
     public IndexCreateBlockException(Set<ClusterBlock> globalLevelBlocks) {
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/CoordinationMetadata.java b/server/src/main/java/org/opensearch/cluster/coordination/CoordinationMetadata.java
index 869c86ae75b90..53398d6f3f98f 100644
--- a/server/src/main/java/org/opensearch/cluster/coordination/CoordinationMetadata.java
+++ b/server/src/main/java/org/opensearch/cluster/coordination/CoordinationMetadata.java
@@ -32,6 +32,7 @@
 package org.opensearch.cluster.coordination;
 
 import org.opensearch.cluster.node.DiscoveryNode;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.set.Sets;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -55,8 +56,9 @@
 /**
  * Metadata for cluster coordination
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class CoordinationMetadata implements Writeable, ToXContentFragment {
 
     public static final CoordinationMetadata EMPTY_METADATA = builder().build();
@@ -214,8 +216,9 @@ public String toString() {
     /**
      * Builder for coordination metadata.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
         private long term = 0;
         private VotingConfiguration lastCommittedConfiguration = VotingConfiguration.EMPTY_CONFIG;
@@ -266,8 +269,9 @@ public CoordinationMetadata build() {
     /**
      * Excluded nodes from voting config.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class VotingConfigExclusion implements Writeable, ToXContentFragment {
         public static final String MISSING_VALUE_MARKER = "_absent_";
         private final String nodeId;
@@ -362,8 +366,9 @@ public String toString() {
     /**
      * A collection of persistent node ids, denoting the voting configuration for cluster state changes.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class VotingConfiguration implements Writeable, ToXContentFragment {
 
         public static final VotingConfiguration EMPTY_CONFIG = new VotingConfiguration(Collections.emptySet());
diff --git a/server/src/main/java/org/opensearch/cluster/decommission/DecommissionAttributeMetadata.java b/server/src/main/java/org/opensearch/cluster/decommission/DecommissionAttributeMetadata.java
index 3df807a4f94d3..254d70b0422d7 100644
--- a/server/src/main/java/org/opensearch/cluster/decommission/DecommissionAttributeMetadata.java
+++ b/server/src/main/java/org/opensearch/cluster/decommission/DecommissionAttributeMetadata.java
@@ -14,6 +14,7 @@
 import org.opensearch.cluster.NamedDiff;
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.metadata.Metadata.Custom;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -30,8 +31,9 @@
 /**
  * Contains metadata about decommission attribute
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.4.0")
 public class DecommissionAttributeMetadata extends AbstractNamedDiffable<Custom> implements Custom {
 
     public static final String TYPE = "decommissionedAttribute";
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/ComponentTemplate.java b/server/src/main/java/org/opensearch/cluster/metadata/ComponentTemplate.java
index cab1b75afe3e1..abc3712ee07e3 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/ComponentTemplate.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/ComponentTemplate.java
@@ -35,6 +35,7 @@
 import org.opensearch.cluster.AbstractDiffable;
 import org.opensearch.cluster.Diff;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -55,8 +56,9 @@
  * contains a field "foo", it's expected to contain all the necessary settings/mappings/etc for the
  * "foo" field. These component templates make up the individual pieces composing an index template.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ComponentTemplate extends AbstractDiffable<ComponentTemplate> implements ToXContentObject {
     private static final ParseField TEMPLATE = new ParseField("template");
     private static final ParseField VERSION = new ParseField("version");
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/ComposableIndexTemplate.java b/server/src/main/java/org/opensearch/cluster/metadata/ComposableIndexTemplate.java
index 5f1291f6c6d82..e7f1b97f28842 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/ComposableIndexTemplate.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/ComposableIndexTemplate.java
@@ -36,6 +36,7 @@
 import org.opensearch.cluster.Diff;
 import org.opensearch.cluster.metadata.DataStream.TimestampField;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -63,8 +64,9 @@
  * ids corresponding to component templates that should be composed in order when creating a new
  * index.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ComposableIndexTemplate extends AbstractDiffable<ComposableIndexTemplate> implements ToXContentObject {
     private static final ParseField INDEX_PATTERNS = new ParseField("index_patterns");
     private static final ParseField TEMPLATE = new ParseField("template");
@@ -284,8 +286,9 @@ public String toString() {
     /**
      * Template for data stream.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class DataStreamTemplate implements Writeable, ToXContentObject {
 
         private static final ParseField TIMESTAMP_FIELD_FIELD = new ParseField("timestamp_field");
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/DiffableStringMap.java b/server/src/main/java/org/opensearch/cluster/metadata/DiffableStringMap.java
index 8209c7bb56ad8..a8102182576ff 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/DiffableStringMap.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/DiffableStringMap.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.cluster.Diff;
 import org.opensearch.cluster.Diffable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 
@@ -50,8 +51,9 @@
  * This is a {@code Map<String, String>} that implements AbstractDiffable so it
  * can be used for cluster state purposes
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class DiffableStringMap extends AbstractMap<String, String> implements Diffable<DiffableStringMap> {
 
     public static final DiffableStringMap EMPTY = new DiffableStringMap(Collections.emptyMap());
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstraction.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstraction.java
index 0c316373e484f..0f3ee894a7f63 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstraction.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstraction.java
@@ -33,6 +33,7 @@
 
 import org.opensearch.common.Nullable;
 import org.opensearch.common.SetOnce;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.core.common.Strings;
 
@@ -52,8 +53,9 @@
  * An index abstraction has a unique name and encapsulates all the  {@link IndexMetadata} instances it is pointing to.
  * Also depending on type it may refer to a single or many concrete indices and may or may not have a write index.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface IndexAbstraction {
 
     /**
@@ -102,7 +104,10 @@ public interface IndexAbstraction {
 
     /**
      * An index abstraction type.
+     *
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     enum Type {
 
         /**
@@ -335,8 +340,9 @@ private boolean isNonEmpty(List<IndexMetadata> idxMetas) {
     /**
      * A data stream.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     class DataStream implements IndexAbstraction {
 
         private final org.opensearch.cluster.metadata.DataStream dataStream;
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexGraveyard.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexGraveyard.java
index 85a203e5e059a..b4f8b6b188531 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/IndexGraveyard.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexGraveyard.java
@@ -35,6 +35,7 @@
 import org.opensearch.Version;
 import org.opensearch.cluster.Diff;
 import org.opensearch.cluster.NamedDiff;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.time.DateFormatter;
@@ -68,8 +69,9 @@
  * tombstones remain in the cluster state for a fixed period of time, after which
  * they are purged.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class IndexGraveyard implements Metadata.Custom {
 
     /**
@@ -191,8 +193,9 @@ public static IndexGraveyard.Builder builder(final IndexGraveyard graveyard) {
     /**
      * A class to build an IndexGraveyard.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class Builder {
         private List<Tombstone> tombstones;
         private int numPurged = -1;
@@ -367,8 +370,9 @@ public String getWriteableName() {
     /**
      * An individual tombstone entry for representing a deleted index.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class Tombstone implements ToXContentObject, Writeable {
 
         private static final String INDEX_KEY = "index";
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java
index 2e1421c278879..03784df509ed6 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java
@@ -97,8 +97,9 @@
 /**
  * Index metadata information
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class IndexMetadata implements Diffable<IndexMetadata>, ToXContentFragment {
 
     public static final ClusterBlock INDEX_READ_ONLY_BLOCK = new ClusterBlock(
@@ -160,8 +161,9 @@ public class IndexMetadata implements Diffable<IndexMetadata>, ToXContentFragmen
     /**
      * The state of the index.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum State {
         OPEN((byte) 0),
         CLOSE((byte) 1);
@@ -1211,8 +1213,9 @@ public static Builder builder(IndexMetadata indexMetadata) {
     /**
      * Builder of index metadata.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
 
         private String index;
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/Metadata.java b/server/src/main/java/org/opensearch/cluster/metadata/Metadata.java
index 70c1d059a1b9e..1871ed24973c2 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/Metadata.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/Metadata.java
@@ -49,6 +49,7 @@
 import org.opensearch.cluster.decommission.DecommissionAttributeMetadata;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.UUIDs;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
@@ -98,8 +99,9 @@
 /**
  * Metadata information
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class Metadata implements Iterable<IndexMetadata>, Diffable<Metadata>, ToXContentFragment {
 
     private static final Logger logger = LogManager.getLogger(Metadata.class);
@@ -127,8 +129,9 @@ public boolean isSegmentReplicationEnabled(String indexName) {
     /**
      * Context of the XContent.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum XContentContext {
         /* Custom metadata should be returns as part of API call */
         API,
@@ -166,8 +169,9 @@ public enum XContentContext {
     /**
      * Custom metadata.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface Custom extends NamedDiffable<Custom>, ToXContentFragment, ClusterState.FeatureAware {
 
         EnumSet<XContentContext> context();
@@ -1129,8 +1133,9 @@ public static Builder builder(Metadata metadata) {
     /**
      * Builder of metadata.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
 
         private String clusterUUID;
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/Template.java b/server/src/main/java/org/opensearch/cluster/metadata/Template.java
index 8e367c71ed166..bd110c6af8975 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/Template.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/Template.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.cluster.AbstractDiffable;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.compress.CompressedXContent;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentHelper;
@@ -58,8 +59,9 @@
  * it is entirely independent from an index. It's a building block forming part of a regular index
  * template and a {@link ComponentTemplate}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class Template extends AbstractDiffable<Template> implements ToXContentObject {
     private static final ParseField SETTINGS = new ParseField("settings");
     private static final ParseField MAPPINGS = new ParseField("mappings");
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/WeightedRoutingMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/WeightedRoutingMetadata.java
index cc56a0daf6db7..bc24dd22f5c6e 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/WeightedRoutingMetadata.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/WeightedRoutingMetadata.java
@@ -8,13 +8,12 @@
 
 package org.opensearch.cluster.metadata;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.opensearch.OpenSearchParseException;
 import org.opensearch.Version;
 import org.opensearch.cluster.AbstractNamedDiffable;
 import org.opensearch.cluster.NamedDiff;
 import org.opensearch.cluster.routing.WeightedRouting;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -31,10 +30,10 @@
 /**
  * Contains metadata for weighted routing
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class WeightedRoutingMetadata extends AbstractNamedDiffable<Metadata.Custom> implements Metadata.Custom {
-    private static final Logger logger = LogManager.getLogger(WeightedRoutingMetadata.class);
     public static final String TYPE = "weighted_shard_routing";
     public static final String AWARENESS = "awareness";
     public static final String VERSION = "_version";
diff --git a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java
index 0c58aabf95207..5226e9570ac14 100644
--- a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java
+++ b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java
@@ -44,7 +44,6 @@
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.node.Node;
-import org.opensearch.node.remotestore.RemoteStoreNodeService;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -283,27 +282,6 @@ public static DiscoveryNode createLocal(Settings settings, TransportAddress publ
         return new DiscoveryNode(Node.NODE_NAME_SETTING.get(settings), nodeId, publishAddress, attributes, roles, Version.CURRENT);
     }
 
-    /** Creates a DiscoveryNode representing the local node and verifies the repository. */
-    public static DiscoveryNode createRemoteNodeLocal(
-        Settings settings,
-        TransportAddress publishAddress,
-        String nodeId,
-        RemoteStoreNodeService remoteStoreNodeService
-    ) {
-        Map<String, String> attributes = Node.NODE_ATTRIBUTES.getAsMap(settings);
-        Set<DiscoveryNodeRole> roles = getRolesFromSettings(settings);
-        DiscoveryNode discoveryNode = new DiscoveryNode(
-            Node.NODE_NAME_SETTING.get(settings),
-            nodeId,
-            publishAddress,
-            attributes,
-            roles,
-            Version.CURRENT
-        );
-        remoteStoreNodeService.createAndVerifyRepositories(discoveryNode);
-        return discoveryNode;
-    }
-
     /** extract node roles from the given settings */
     public static Set<DiscoveryNodeRole> getRolesFromSettings(final Settings settings) {
         if (NODE_ROLES_SETTING.exists(settings)) {
diff --git a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeFilters.java b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeFilters.java
index 54f30690f18e1..b27e1aa49a803 100644
--- a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeFilters.java
+++ b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeFilters.java
@@ -33,6 +33,7 @@
 package org.opensearch.cluster.node;
 
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.network.InetAddresses;
 import org.opensearch.common.network.NetworkAddress;
 import org.opensearch.common.regex.Regex;
@@ -48,15 +49,17 @@
 /**
  * Filters Discovery nodes
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class DiscoveryNodeFilters {
 
     /**
      * Operation type.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum OpType {
         AND,
         OR
diff --git a/server/src/main/java/org/opensearch/cluster/routing/AllocationId.java b/server/src/main/java/org/opensearch/cluster/routing/AllocationId.java
index 6e6ea3919c813..ade3afa4a500c 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/AllocationId.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/AllocationId.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.common.Nullable;
 import org.opensearch.common.UUIDs;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -55,8 +56,9 @@
  * relocationId. Once relocation is done, the new allocation id is set to the relocationId. This is similar
  * behavior to how ShardRouting#currentNodeId is used.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class AllocationId implements ToXContentObject, Writeable {
     private static final String ID_KEY = "id";
     private static final String RELOCATION_ID_KEY = "relocation_id";
diff --git a/server/src/main/java/org/opensearch/cluster/routing/GroupShardsIterator.java b/server/src/main/java/org/opensearch/cluster/routing/GroupShardsIterator.java
index 8e9371e6a714c..dcb60e79358e3 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/GroupShardsIterator.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/GroupShardsIterator.java
@@ -33,6 +33,7 @@
 package org.opensearch.cluster.routing;
 
 import org.apache.lucene.util.CollectionUtil;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.Countable;
 
 import java.util.Iterator;
@@ -44,8 +45,9 @@
  * ShardsIterators are always returned in ascending order independently of their order at construction
  * time. The incoming iterators are sorted to ensure consistent iteration behavior across Nodes / JVMs.
  *
- * @opensearch.internal
+ * @opensearch.api
 */
+@PublicApi(since = "1.0.0")
 public final class GroupShardsIterator<ShardIt extends Comparable<ShardIt> & Countable> implements Iterable<ShardIt> {
 
     private final List<ShardIt> iterators;
diff --git a/server/src/main/java/org/opensearch/cluster/routing/IndexRoutingTable.java b/server/src/main/java/org/opensearch/cluster/routing/IndexRoutingTable.java
index d77d44580798a..faadc3f7583fb 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/IndexRoutingTable.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/IndexRoutingTable.java
@@ -44,6 +44,7 @@
 import org.opensearch.cluster.routing.RecoverySource.RemoteStoreRecoverySource;
 import org.opensearch.cluster.routing.RecoverySource.SnapshotRecoverySource;
 import org.opensearch.common.Randomness;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.index.Index;
@@ -75,8 +76,9 @@
  * represented as {@link ShardRouting}.
  * </p>
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class IndexRoutingTable extends AbstractDiffable<IndexRoutingTable> implements Iterable<IndexShardRoutingTable> {
 
     private final Index index;
@@ -367,8 +369,9 @@ public static Builder builder(Index index) {
     /**
      * Builder of a routing table.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
 
         private final Index index;
diff --git a/server/src/main/java/org/opensearch/cluster/routing/IndexShardRoutingTable.java b/server/src/main/java/org/opensearch/cluster/routing/IndexShardRoutingTable.java
index 2dd57431d0375..36149d014ea84 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/IndexShardRoutingTable.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/IndexShardRoutingTable.java
@@ -39,6 +39,7 @@
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.Randomness;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.collect.MapBuilder;
 import org.opensearch.common.util.set.Sets;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -73,8 +74,9 @@
  * referred to as replicas of a shard. Given that, this class encapsulates all
  * replicas (instances) for a single index shard.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class IndexShardRoutingTable implements Iterable<ShardRouting> {
 
     final ShardShuffler shuffler;
@@ -921,8 +923,9 @@ public int shardsMatchingPredicateCount(Predicate<ShardRouting> predicate) {
     /**
      * Key for WeightedRouting Shard Iterator
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "2.4.0")
     public static class WeightedRoutingKey {
         private final WeightedRouting weightedRouting;
 
diff --git a/server/src/main/java/org/opensearch/cluster/routing/RecoverySource.java b/server/src/main/java/org/opensearch/cluster/routing/RecoverySource.java
index 3dcf4ae3c9b99..8d407c6aff5b6 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/RecoverySource.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/RecoverySource.java
@@ -250,8 +250,9 @@ public String toString() {
     /**
      * recovery from a snapshot
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class SnapshotRecoverySource extends RecoverySource {
 
         public static final String NO_API_RESTORE_UUID = "_no_api_";
@@ -415,8 +416,9 @@ public int hashCode() {
     /**
      * Recovery from remote store
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class RemoteStoreRecoverySource extends RecoverySource {
 
         private final String restoreUUID;
diff --git a/server/src/main/java/org/opensearch/cluster/routing/RoutingChangesObserver.java b/server/src/main/java/org/opensearch/cluster/routing/RoutingChangesObserver.java
index 1ec572f7f8cc4..614cccb069048 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/RoutingChangesObserver.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/RoutingChangesObserver.java
@@ -32,11 +32,14 @@
 
 package org.opensearch.cluster.routing;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * Records changes made to {@link RoutingNodes} during an allocation round.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface RoutingChangesObserver {
     /**
      * Called when unassigned shard is initialized. Does not include initializing relocation target shards.
diff --git a/server/src/main/java/org/opensearch/cluster/routing/RoutingNode.java b/server/src/main/java/org/opensearch/cluster/routing/RoutingNode.java
index e10734eb17e0d..15ec41d5c3fbb 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/RoutingNode.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/RoutingNode.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.core.index.Index;
 import org.opensearch.core.index.shard.ShardId;
@@ -56,8 +57,9 @@
  * A {@link RoutingNode} represents a cluster node associated with a single {@link DiscoveryNode} including all shards
  * that are hosted on that nodes. Each {@link RoutingNode} has a unique node id that can be used to identify the node.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class RoutingNode implements Iterable<ShardRouting> {
 
     static class BucketedShards implements Iterable<ShardRouting> {
diff --git a/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java b/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java
index 5a4352653cc89..a406552f854da 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java
@@ -42,6 +42,7 @@
 import org.opensearch.cluster.routing.allocation.ExistingShardsAllocator;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.Randomness;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.core.Assertions;
 import org.opensearch.core.index.Index;
@@ -79,8 +80,9 @@
  * <li> {@link #failShard} fails/cancels an assigned shard.
  * </ul>
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class RoutingNodes implements Iterable<RoutingNode> {
     private final Metadata metadata;
 
@@ -943,8 +945,9 @@ public int size() {
     /**
      * Unassigned shard list.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class UnassignedShards implements Iterable<ShardRouting> {
 
         private final RoutingNodes nodes;
@@ -1044,8 +1047,9 @@ public void ignoreShard(ShardRouting shard, AllocationStatus allocationStatus, R
         /**
          * An unassigned iterator.
          *
-         * @opensearch.internal
+         * @opensearch.api
          */
+        @PublicApi(since = "1.0.0")
         public class UnassignedIterator implements Iterator<ShardRouting>, ExistingShardsAllocator.UnassignedAllocationHandler {
 
             private final ListIterator<ShardRouting> iterator;
diff --git a/server/src/main/java/org/opensearch/cluster/routing/RoutingTable.java b/server/src/main/java/org/opensearch/cluster/routing/RoutingTable.java
index 2b56163f852e8..7f2382f8b4910 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/RoutingTable.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/RoutingTable.java
@@ -40,6 +40,7 @@
 import org.opensearch.cluster.routing.RecoverySource.RemoteStoreRecoverySource;
 import org.opensearch.cluster.routing.RecoverySource.SnapshotRecoverySource;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.iterable.Iterables;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -66,8 +67,9 @@
  *
  * @see IndexRoutingTable
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class RoutingTable implements Iterable<IndexRoutingTable>, Diffable<RoutingTable> {
 
     public static final RoutingTable EMPTY_ROUTING_TABLE = builder().build();
@@ -433,8 +435,9 @@ public static Builder builder(RoutingTable routingTable) {
     /**
      * Builder for the routing table. Note that build can only be called one time.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
 
         private long version;
diff --git a/server/src/main/java/org/opensearch/cluster/routing/ShardIterator.java b/server/src/main/java/org/opensearch/cluster/routing/ShardIterator.java
index 623846b6e1dda..95055d2ffe2ad 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/ShardIterator.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/ShardIterator.java
@@ -32,13 +32,15 @@
 
 package org.opensearch.cluster.routing;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.index.shard.ShardId;
 
 /**
  * Allows to iterate over a set of shard instances (routing) within a shard id group.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface ShardIterator extends ShardsIterator, Comparable<ShardIterator> {
 
     /**
diff --git a/server/src/main/java/org/opensearch/cluster/routing/ShardMovementStrategy.java b/server/src/main/java/org/opensearch/cluster/routing/ShardMovementStrategy.java
index 7f5109416494e..d1ed94087e20d 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/ShardMovementStrategy.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/ShardMovementStrategy.java
@@ -9,6 +9,7 @@
 package org.opensearch.cluster.routing;
 
 import org.opensearch.cluster.routing.allocation.allocator.BalancedShardsAllocator;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.util.Locale;
 
@@ -18,8 +19,9 @@
  * ShardMovementStrategy values or rather their string representation to be used with
  * {@link BalancedShardsAllocator#SHARD_MOVEMENT_STRATEGY_SETTING} via cluster settings.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.9.0")
 public enum ShardMovementStrategy {
     /**
      * default behavior in which order of shard movement doesn't matter.
diff --git a/server/src/main/java/org/opensearch/cluster/routing/ShardRouting.java b/server/src/main/java/org/opensearch/cluster/routing/ShardRouting.java
index 666046d97f8d0..45de045a8fc69 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/ShardRouting.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/ShardRouting.java
@@ -36,6 +36,7 @@
 import org.opensearch.cluster.routing.RecoverySource.PeerRecoverySource;
 import org.opensearch.cluster.routing.allocation.allocator.BalancedShardsAllocator;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -52,8 +53,9 @@
  * {@link ShardRouting} immutably encapsulates information about shard
  * indexRoutings like id, state, version, etc.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ShardRouting implements Writeable, ToXContentObject {
 
     /**
diff --git a/server/src/main/java/org/opensearch/cluster/routing/ShardsIterator.java b/server/src/main/java/org/opensearch/cluster/routing/ShardsIterator.java
index e715be1676c6f..fc3fefbc3836c 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/ShardsIterator.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/ShardsIterator.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.cluster.routing;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.Countable;
 
 import java.util.List;
@@ -38,8 +39,9 @@
 /**
  * Allows to iterate over unrelated shards.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface ShardsIterator extends Iterable<ShardRouting>, Countable {
 
     /**
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocateUnassignedDecision.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocateUnassignedDecision.java
index 2afdd930cda1f..4e77ab772f390 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocateUnassignedDecision.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocateUnassignedDecision.java
@@ -37,6 +37,7 @@
 import org.opensearch.cluster.routing.allocation.decider.Decision;
 import org.opensearch.cluster.routing.allocation.decider.Decision.Type;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -52,8 +53,9 @@
 /**
  * Represents the allocation decision by an allocator for an unassigned shard.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class AllocateUnassignedDecision extends AbstractAllocationDecision {
     /** a constant representing a shard decision where no decision was taken */
     public static final AllocateUnassignedDecision NOT_TAKEN = new AllocateUnassignedDecision(
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocationDecision.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocationDecision.java
index 3f1c025fce405..6aeb904fed66f 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocationDecision.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocationDecision.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.cluster.routing.UnassignedInfo.AllocationStatus;
 import org.opensearch.cluster.routing.allocation.decider.Decision;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -45,8 +46,9 @@
  * An enum which represents the various decision types that can be taken by the
  * allocators and deciders for allocating a shard to a node.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public enum AllocationDecision implements Writeable {
     /**
      * The shard can be allocated to a node.
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/MoveDecision.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/MoveDecision.java
index fc39f813ca181..13578d1a11472 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/MoveDecision.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/MoveDecision.java
@@ -36,6 +36,7 @@
 import org.opensearch.cluster.routing.allocation.decider.Decision;
 import org.opensearch.cluster.routing.allocation.decider.Decision.Type;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.XContentBuilder;
@@ -48,8 +49,9 @@
  * Represents a decision to move a started shard, either because it is no longer allowed to remain on its current node
  * or because moving it to another node will form a better cluster balance.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class MoveDecision extends AbstractAllocationDecision {
     /** a constant representing no decision taken */
     public static final MoveDecision NOT_TAKEN = new MoveDecision(null, null, AllocationDecision.NO_ATTEMPT, null, null, 0);
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/NodeAllocationResult.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/NodeAllocationResult.java
index ad568fc5ffa57..4163a5fd4c16f 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/NodeAllocationResult.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/NodeAllocationResult.java
@@ -36,6 +36,7 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.routing.allocation.decider.Decision;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -52,8 +53,9 @@
 /**
  * This class represents the shard allocation decision and its explanation for a single node.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class NodeAllocationResult implements ToXContentObject, Writeable, Comparable<NodeAllocationResult> {
 
     private static final Comparator<NodeAllocationResult> nodeResultComparator = Comparator.comparing(NodeAllocationResult::getNodeDecision)
@@ -191,8 +193,9 @@ public int compareTo(NodeAllocationResult other) {
     /**
      * A class that captures metadata about a shard store on a node.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class ShardStoreInfo implements ToXContentFragment, Writeable {
         private final boolean inSync;
         @Nullable
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/RoutingAllocation.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/RoutingAllocation.java
index 9e8e399384467..bf2db57128517 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/RoutingAllocation.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/RoutingAllocation.java
@@ -43,6 +43,7 @@
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders;
 import org.opensearch.cluster.routing.allocation.decider.Decision;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.snapshots.RestoreService.RestoreInProgressUpdater;
 import org.opensearch.snapshots.SnapshotShardSizeInfo;
@@ -60,8 +61,9 @@
  * of shards and holds the {@link AllocationDeciders} which are responsible
  *  for the current routing state.
  *
- *  @opensearch.internal
+ *  @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class RoutingAllocation {
 
     private final AllocationDeciders deciders;
@@ -317,8 +319,9 @@ public void setHasPendingAsyncFetch() {
     /**
      * Debug mode.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum DebugMode {
         /**
          * debug mode is off
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/ShardAllocationDecision.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/ShardAllocationDecision.java
index e1a7fb43827f3..49e8d82c6eb97 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/ShardAllocationDecision.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/ShardAllocationDecision.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.cluster.routing.allocation;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -53,8 +54,9 @@
  * then both {@link #getAllocateDecision()} and {@link #getMoveDecision()} will return
  * objects whose {@code isDecisionTaken()} method returns {@code false}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class ShardAllocationDecision implements ToXContentFragment, Writeable {
     public static final ShardAllocationDecision NOT_TAKEN = new ShardAllocationDecision(
         AllocateUnassignedDecision.NOT_TAKEN,
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AllocationCommand.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AllocationCommand.java
index def0411853643..bce3191240323 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AllocationCommand.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AllocationCommand.java
@@ -35,6 +35,7 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.cluster.routing.allocation.RerouteExplanation;
 import org.opensearch.cluster.routing.allocation.RoutingAllocation;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.network.NetworkModule;
 import org.opensearch.core.common.io.stream.NamedWriteable;
 import org.opensearch.core.xcontent.ToXContentObject;
@@ -46,8 +47,9 @@
  * <p>
  * Commands are registered in {@link NetworkModule}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface AllocationCommand extends NamedWriteable, ToXContentObject {
 
     /**
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AllocationCommands.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AllocationCommands.java
index ac804819443a5..2ee4124e9d909 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AllocationCommands.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AllocationCommands.java
@@ -36,6 +36,7 @@
 import org.opensearch.OpenSearchParseException;
 import org.opensearch.cluster.routing.allocation.RoutingAllocation;
 import org.opensearch.cluster.routing.allocation.RoutingExplanations;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -54,8 +55,9 @@
  * A simple {@link AllocationCommand} composite managing several
  * {@link AllocationCommand} implementations
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class AllocationCommands implements ToXContentFragment {
     private final List<AllocationCommand> commands = new ArrayList<>();
 
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AllocationDecider.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AllocationDecider.java
index 85f193c8c5580..19faacc3a3ae1 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AllocationDecider.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AllocationDecider.java
@@ -38,14 +38,16 @@
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.routing.allocation.RoutingAllocation;
 import org.opensearch.cluster.routing.allocation.decider.Decision.Type;
+import org.opensearch.common.annotation.PublicApi;
 
 /**
  * {@link AllocationDecider} is an abstract base class that allows to make
  * dynamic cluster- or index-wide shard allocation decisions on a per-node
  * basis.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class AllocationDecider {
     /**
      * Returns a {@link Decision} whether the given shard routing can be
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AllocationDeciders.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AllocationDeciders.java
index dca82f75d6fb5..22c3156fb3537 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AllocationDeciders.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AllocationDeciders.java
@@ -39,6 +39,7 @@
 import org.opensearch.cluster.routing.RoutingNode;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.routing.allocation.RoutingAllocation;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -47,8 +48,9 @@
  * A composite {@link AllocationDecider} combining the "decision" of multiple
  * {@link AllocationDecider} implementations into a single allocation decision.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class AllocationDeciders extends AllocationDecider {
 
     private static final Logger logger = LogManager.getLogger(AllocationDeciders.class);
diff --git a/server/src/main/java/org/opensearch/common/Rounding.java b/server/src/main/java/org/opensearch/common/Rounding.java
index 667eb4529fe38..861cdf78cc056 100644
--- a/server/src/main/java/org/opensearch/common/Rounding.java
+++ b/server/src/main/java/org/opensearch/common/Rounding.java
@@ -38,6 +38,7 @@
 import org.opensearch.common.LocalTimeOffset.Gap;
 import org.opensearch.common.LocalTimeOffset.Overlap;
 import org.opensearch.common.annotation.InternalApi;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.time.DateUtils;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -76,16 +77,18 @@
  * blog for some background reading. Its super interesting and the links are
  * a comedy gold mine. If you like time zones. Or hate them.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class Rounding implements Writeable {
     private static final Logger logger = LogManager.getLogger(Rounding.class);
 
     /**
      * A Date Time Unit
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum DateTimeUnit {
         WEEK_OF_WEEKYEAR((byte) 1, "week", IsoFields.WEEK_OF_WEEK_BASED_YEAR, true, TimeUnit.DAYS.toMillis(7)) {
             private final long extraLocalOffsetLookup = TimeUnit.DAYS.toMillis(7);
@@ -268,8 +271,9 @@ public void writeTo(StreamOutput out) throws IOException {
     /**
      * A strategy for rounding milliseconds since epoch.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface Prepared {
         /**
          * Rounds the given value.
@@ -359,8 +363,9 @@ public static Builder builder(TimeValue interval) {
     /**
      * Builder for rounding
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
 
         private final DateTimeUnit unit;
diff --git a/server/src/main/java/org/opensearch/common/cache/Cache.java b/server/src/main/java/org/opensearch/common/cache/Cache.java
index 0b2b608b55df0..30e7c014a2ec0 100644
--- a/server/src/main/java/org/opensearch/common/cache/Cache.java
+++ b/server/src/main/java/org/opensearch/common/cache/Cache.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.common.cache;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.util.concurrent.ReleasableLock;
 
@@ -80,8 +81,9 @@
  * @param <K> The type of the keys
  * @param <V> The type of the values
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class Cache<K, V> {
 
     // positive if entries have an expiration
@@ -732,8 +734,9 @@ public CacheStats stats() {
     /**
      * Cache statistics
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class CacheStats {
         private long hits;
         private long misses;
diff --git a/server/src/main/java/org/opensearch/common/cache/CacheLoader.java b/server/src/main/java/org/opensearch/common/cache/CacheLoader.java
index 3c80fe5d66d5d..9fd43a03e7f9d 100644
--- a/server/src/main/java/org/opensearch/common/cache/CacheLoader.java
+++ b/server/src/main/java/org/opensearch/common/cache/CacheLoader.java
@@ -32,12 +32,15 @@
 
 package org.opensearch.common.cache;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * An interface for a cache loader.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
 @FunctionalInterface
+@PublicApi(since = "1.0.0")
 public interface CacheLoader<K, V> {
     V load(K key) throws Exception;
 }
diff --git a/server/src/main/java/org/opensearch/common/cache/RemovalNotification.java b/server/src/main/java/org/opensearch/common/cache/RemovalNotification.java
index 6d355b2122460..42303b8cfdc73 100644
--- a/server/src/main/java/org/opensearch/common/cache/RemovalNotification.java
+++ b/server/src/main/java/org/opensearch/common/cache/RemovalNotification.java
@@ -32,11 +32,14 @@
 
 package org.opensearch.common.cache;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * Notification when an element is removed from the cache
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class RemovalNotification<K, V> {
 
     private final K key;
diff --git a/server/src/main/java/org/opensearch/common/cache/RemovalReason.java b/server/src/main/java/org/opensearch/common/cache/RemovalReason.java
index e5d795c093547..514b84a7823ca 100644
--- a/server/src/main/java/org/opensearch/common/cache/RemovalReason.java
+++ b/server/src/main/java/org/opensearch/common/cache/RemovalReason.java
@@ -8,11 +8,14 @@
 
 package org.opensearch.common.cache;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * Reason for notification removal
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public enum RemovalReason {
     REPLACED,
     INVALIDATED,
diff --git a/server/src/main/java/org/opensearch/common/compress/CompressedXContent.java b/server/src/main/java/org/opensearch/common/compress/CompressedXContent.java
index 550bc5b3fd524..23fc6353dbad3 100644
--- a/server/src/main/java/org/opensearch/common/compress/CompressedXContent.java
+++ b/server/src/main/java/org/opensearch/common/compress/CompressedXContent.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.common.compress;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.io.Streams;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.xcontent.XContentFactory;
@@ -57,8 +58,9 @@
  * memory. Note that the compressed string might still sometimes need to be
  * decompressed in order to perform equality checks or to compute hash codes.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class CompressedXContent {
 
     private static int crc32(BytesReference data) {
diff --git a/server/src/main/java/org/opensearch/common/io/stream/DelayableWriteable.java b/server/src/main/java/org/opensearch/common/io/stream/DelayableWriteable.java
index 200f3e9225834..f345a5d3a804f 100644
--- a/server/src/main/java/org/opensearch/common/io/stream/DelayableWriteable.java
+++ b/server/src/main/java/org/opensearch/common/io/stream/DelayableWriteable.java
@@ -35,6 +35,7 @@
 import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.RamUsageEstimator;
 import org.opensearch.Version;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.common.io.stream.NamedWriteableAwareStreamInput;
 import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
@@ -62,8 +63,9 @@
  * to force their buffering in serialized format by calling
  * {@link #asSerialized(Reader, NamedWriteableRegistry)}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class DelayableWriteable<T extends Writeable> implements Writeable {
     /**
      * Build a {@linkplain DelayableWriteable} that wraps an existing object
@@ -151,8 +153,9 @@ private BytesStreamOutput writeToBuffer(Version version) throws IOException {
     /**
      * A {@link Writeable} stored in serialized form.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Serialized<T extends Writeable> extends DelayableWriteable<T> implements Accountable {
         private final Writeable.Reader<T> reader;
         private final Version serializedAtVersion;
diff --git a/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java b/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java
index 77609822d3d90..d6b2bb239b2a1 100644
--- a/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java
+++ b/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java
@@ -36,6 +36,7 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.LeafReader;
 import org.opensearch.common.SuppressForbidden;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.index.shard.ShardId;
 
 import java.io.IOException;
@@ -44,8 +45,9 @@
  * A {@link org.apache.lucene.index.FilterDirectoryReader} that exposes
  * OpenSearch internal per shard / index information like the shard ID.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class OpenSearchDirectoryReader extends FilterDirectoryReader {
 
     private final ShardId shardId;
diff --git a/server/src/main/java/org/opensearch/common/lucene/search/TopDocsAndMaxScore.java b/server/src/main/java/org/opensearch/common/lucene/search/TopDocsAndMaxScore.java
index 5f8c52676b481..5b7bae54a6fad 100644
--- a/server/src/main/java/org/opensearch/common/lucene/search/TopDocsAndMaxScore.java
+++ b/server/src/main/java/org/opensearch/common/lucene/search/TopDocsAndMaxScore.java
@@ -33,13 +33,15 @@
 package org.opensearch.common.lucene.search;
 
 import org.apache.lucene.search.TopDocs;
+import org.opensearch.common.annotation.PublicApi;
 
 /**
  * Wrapper around a {@link TopDocs} instance and the maximum score.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
 // TODO: Remove this class when https://github.com/elastic/elasticsearch/issues/32981 is addressed.
+@PublicApi(since = "1.0.0")
 public final class TopDocsAndMaxScore {
 
     public final TopDocs topDocs;
diff --git a/server/src/main/java/org/opensearch/common/time/DateFormatter.java b/server/src/main/java/org/opensearch/common/time/DateFormatter.java
index c98bd853dfced..0712b7b050bec 100644
--- a/server/src/main/java/org/opensearch/common/time/DateFormatter.java
+++ b/server/src/main/java/org/opensearch/common/time/DateFormatter.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.common.time;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.Strings;
 import org.joda.time.DateTime;
 
@@ -49,8 +50,9 @@
 /**
  * Base Date formatter
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface DateFormatter {
 
     /**
diff --git a/server/src/main/java/org/opensearch/common/time/DateMathParser.java b/server/src/main/java/org/opensearch/common/time/DateMathParser.java
index 7088d6cb7a498..8c123d7d2ebc9 100644
--- a/server/src/main/java/org/opensearch/common/time/DateMathParser.java
+++ b/server/src/main/java/org/opensearch/common/time/DateMathParser.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.common.time;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.joda.time.DateTimeZone;
 
 import java.time.Instant;
@@ -41,8 +42,9 @@
 /**
  * An abstraction over date math parsing to allow different implementation for joda and java time.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface DateMathParser {
 
     /**
diff --git a/server/src/main/java/org/opensearch/common/util/BigArrays.java b/server/src/main/java/org/opensearch/common/util/BigArrays.java
index 59c84ea45a65a..cbe8ab76797ce 100644
--- a/server/src/main/java/org/opensearch/common/util/BigArrays.java
+++ b/server/src/main/java/org/opensearch/common/util/BigArrays.java
@@ -36,6 +36,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.RamUsageEstimator;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.common.lease.Releasables;
 import org.opensearch.common.recycler.Recycler;
@@ -48,6 +49,7 @@
 import java.util.Arrays;
 
 /** Utility class to work with arrays. */
+@PublicApi(since = "1.0.0")
 public class BigArrays {
 
     public static final BigArrays NON_RECYCLING_INSTANCE = new BigArrays(null, null, CircuitBreaker.REQUEST);
diff --git a/server/src/main/java/org/opensearch/common/util/Countable.java b/server/src/main/java/org/opensearch/common/util/Countable.java
index 1adf6d2fb015c..925d1b6066a99 100644
--- a/server/src/main/java/org/opensearch/common/util/Countable.java
+++ b/server/src/main/java/org/opensearch/common/util/Countable.java
@@ -32,11 +32,14 @@
 
 package org.opensearch.common.util;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * Base countable interface.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface Countable {
     int size();
 }
diff --git a/server/src/main/java/org/opensearch/common/util/DoubleArray.java b/server/src/main/java/org/opensearch/common/util/DoubleArray.java
index ae66902f6f795..aa9238634f2c7 100644
--- a/server/src/main/java/org/opensearch/common/util/DoubleArray.java
+++ b/server/src/main/java/org/opensearch/common/util/DoubleArray.java
@@ -32,13 +32,15 @@
 
 package org.opensearch.common.util;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.util.BigArray;
 
 /**
  * Abstraction of an array of double values.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface DoubleArray extends BigArray {
 
     /**
diff --git a/server/src/main/java/org/opensearch/common/util/FloatArray.java b/server/src/main/java/org/opensearch/common/util/FloatArray.java
index 81f6bebb7508c..bda7324d19273 100644
--- a/server/src/main/java/org/opensearch/common/util/FloatArray.java
+++ b/server/src/main/java/org/opensearch/common/util/FloatArray.java
@@ -32,13 +32,15 @@
 
 package org.opensearch.common.util;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.util.BigArray;
 
 /**
  * Abstraction of an array of double values.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface FloatArray extends BigArray {
 
     /**
diff --git a/server/src/main/java/org/opensearch/common/util/IntArray.java b/server/src/main/java/org/opensearch/common/util/IntArray.java
index eb43e013f3758..ad0173904f74a 100644
--- a/server/src/main/java/org/opensearch/common/util/IntArray.java
+++ b/server/src/main/java/org/opensearch/common/util/IntArray.java
@@ -32,13 +32,15 @@
 
 package org.opensearch.common.util;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.util.BigArray;
 
 /**
  * Abstraction of an array of integer values.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface IntArray extends BigArray {
 
     /**
diff --git a/server/src/main/java/org/opensearch/common/util/LongArray.java b/server/src/main/java/org/opensearch/common/util/LongArray.java
index 0c32effd04cdc..c2f649e49f470 100644
--- a/server/src/main/java/org/opensearch/common/util/LongArray.java
+++ b/server/src/main/java/org/opensearch/common/util/LongArray.java
@@ -32,13 +32,15 @@
 
 package org.opensearch.common.util;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.util.BigArray;
 
 /**
  * Abstraction of an array of long values.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface LongArray extends BigArray {
 
     /**
diff --git a/server/src/main/java/org/opensearch/common/util/ObjectArray.java b/server/src/main/java/org/opensearch/common/util/ObjectArray.java
index 9c882742b56ab..f3f73b7e37485 100644
--- a/server/src/main/java/org/opensearch/common/util/ObjectArray.java
+++ b/server/src/main/java/org/opensearch/common/util/ObjectArray.java
@@ -32,13 +32,15 @@
 
 package org.opensearch.common.util;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.util.BigArray;
 
 /**
  * Abstraction of an array of object values.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface ObjectArray<T> extends BigArray {
 
     /**
diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/AtomicArray.java b/server/src/main/java/org/opensearch/common/util/concurrent/AtomicArray.java
index dd1f71a7d2166..4c599aeae7a7c 100644
--- a/server/src/main/java/org/opensearch/common/util/concurrent/AtomicArray.java
+++ b/server/src/main/java/org/opensearch/common/util/concurrent/AtomicArray.java
@@ -33,6 +33,7 @@
 package org.opensearch.common.util.concurrent;
 
 import org.opensearch.OpenSearchGenerationException;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -43,8 +44,9 @@
  * A list backed by an {@link AtomicReferenceArray} with potential null values, easily allowing
  * to get the concrete values as a list using {@link #asList()}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class AtomicArray<E> {
     private final AtomicReferenceArray<E> array;
     private volatile List<E> nonNullList;
diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java b/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java
index fc2e4217bae79..3da21a6777456 100644
--- a/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java
+++ b/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java
@@ -35,6 +35,7 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.support.ContextPreservingActionListener;
 import org.opensearch.client.OriginSettingClient;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.collect.MapBuilder;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.Setting;
@@ -97,8 +98,9 @@
  *     // previous context is restored on StoredContext#close()
  * </pre>
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class ThreadContext implements Writeable {
 
     public static final String PREFIX = "request.headers";
@@ -545,9 +547,10 @@ public boolean isSystemContext() {
     /**
      * A stored context
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
     @FunctionalInterface
+    @PublicApi(since = "1.0.0")
     public interface StoredContext extends AutoCloseable {
         @Override
         void close();
diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContextStatePropagator.java b/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContextStatePropagator.java
index b3fc79c5446db..dac70b0e8124e 100644
--- a/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContextStatePropagator.java
+++ b/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContextStatePropagator.java
@@ -8,12 +8,17 @@
 
 package org.opensearch.common.util.concurrent;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.util.Map;
 
 /**
  * The propagator for {@link ThreadContext} that helps to carry-over the state from one
  * thread to another (tasks, tracing context, etc).
+ *
+ * @opensearch.api
  */
+@PublicApi(since = "2.8.0")
 public interface ThreadContextStatePropagator {
     /**
      * Returns the list of transient headers that needs to be propagated from current context to new thread context.
diff --git a/server/src/main/java/org/opensearch/env/NodeEnvironment.java b/server/src/main/java/org/opensearch/env/NodeEnvironment.java
index 40c5722308b79..c7ba5eb040a1f 100644
--- a/server/src/main/java/org/opensearch/env/NodeEnvironment.java
+++ b/server/src/main/java/org/opensearch/env/NodeEnvironment.java
@@ -770,8 +770,11 @@ public void setDetails(String details) {
 
     /**
      * A functional interface that people can use to reference {@link #shardLock(ShardId, String, long)}
+     *
+     * @opensearch.api
      */
     @FunctionalInterface
+    @PublicApi(since = "1.0.0")
     public interface ShardLocker {
         ShardLock lock(ShardId shardId, String lockDetails, long lockTimeoutMS) throws ShardLockObtainFailedException;
     }
diff --git a/server/src/main/java/org/opensearch/index/IndexService.java b/server/src/main/java/org/opensearch/index/IndexService.java
index 84e8e2f41aaf1..0909e2d5c8ff0 100644
--- a/server/src/main/java/org/opensearch/index/IndexService.java
+++ b/server/src/main/java/org/opensearch/index/IndexService.java
@@ -48,6 +48,7 @@
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.CheckedFunction;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.settings.Settings;
@@ -130,8 +131,9 @@
 /**
  * The main OpenSearch index service
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class IndexService extends AbstractIndexComponent implements IndicesClusterStateService.AllocatedIndex<IndexShard> {
 
     private final IndexEventListener eventListener;
@@ -304,8 +306,9 @@ static boolean needsMapperService(IndexSettings indexSettings, IndexCreationCont
     /**
      * Context for index creation
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum IndexCreationContext {
         CREATE_INDEX,
         METADATA_VERIFICATION
@@ -979,8 +982,9 @@ private void rescheduleRefreshTasks() {
     /**
      * Shard Store Deleter Interface
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface ShardStoreDeleter {
         void deleteShardStore(String reason, ShardLock lock, IndexSettings indexSettings) throws IOException;
 
@@ -1289,7 +1293,7 @@ AsyncTranslogFSync getFsyncTask() { // for tests
         return fsyncTask;
     }
 
-    public AsyncTrimTranslogTask getTrimTranslogTask() { // for tests
+    AsyncTrimTranslogTask getTrimTranslogTask() { // for tests
         return trimTranslogTask;
     }
 
diff --git a/server/src/main/java/org/opensearch/index/IndexWarmer.java b/server/src/main/java/org/opensearch/index/IndexWarmer.java
index b62afe6b6dcfc..81063cb9b9c38 100644
--- a/server/src/main/java/org/opensearch/index/IndexWarmer.java
+++ b/server/src/main/java/org/opensearch/index/IndexWarmer.java
@@ -35,6 +35,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.index.OpenSearchDirectoryReader;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.index.fielddata.IndexFieldData;
@@ -111,8 +112,9 @@ void warm(OpenSearchDirectoryReader reader, IndexShard shard, IndexSettings sett
     /**
      * A handle on the execution of  warm-up action.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface TerminationHandle {
 
         TerminationHandle NO_WAIT = () -> {};
@@ -124,8 +126,9 @@ public interface TerminationHandle {
     /**
      * Listener for the index warmer
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface Listener {
         /** Queue tasks to warm-up the given segments and return handles that allow to wait for termination of the
          *  execution of those tasks. */
diff --git a/server/src/main/java/org/opensearch/index/analysis/AnalysisRegistry.java b/server/src/main/java/org/opensearch/index/analysis/AnalysisRegistry.java
index 3b1f6af8a0030..793cdcd5c5c1a 100644
--- a/server/src/main/java/org/opensearch/index/analysis/AnalysisRegistry.java
+++ b/server/src/main/java/org/opensearch/index/analysis/AnalysisRegistry.java
@@ -38,6 +38,7 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.env.Environment;
@@ -67,8 +68,9 @@
  * An internal registry for tokenizer, token filter, char filter and analyzer.
  * This class exists per node and allows to create per-index {@link IndexAnalyzers} via {@link #build(IndexSettings)}
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class AnalysisRegistry implements Closeable {
     public static final String INDEX_ANALYSIS_CHAR_FILTER = "index.analysis.char_filter";
     public static final String INDEX_ANALYSIS_FILTER = "index.analysis.filter";
diff --git a/server/src/main/java/org/opensearch/index/analysis/AnalyzerProvider.java b/server/src/main/java/org/opensearch/index/analysis/AnalyzerProvider.java
index 24ddabca16f1e..db0b3e8d288d6 100644
--- a/server/src/main/java/org/opensearch/index/analysis/AnalyzerProvider.java
+++ b/server/src/main/java/org/opensearch/index/analysis/AnalyzerProvider.java
@@ -33,13 +33,15 @@
 package org.opensearch.index.analysis;
 
 import org.apache.lucene.analysis.Analyzer;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.inject.Provider;
 
 /**
  * Base interface for all analyzer providers
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface AnalyzerProvider<T extends Analyzer> extends Provider<T> {
 
     String name();
diff --git a/server/src/main/java/org/opensearch/index/analysis/CharFilterFactory.java b/server/src/main/java/org/opensearch/index/analysis/CharFilterFactory.java
index dc9d3704b1a3c..938932280a52a 100644
--- a/server/src/main/java/org/opensearch/index/analysis/CharFilterFactory.java
+++ b/server/src/main/java/org/opensearch/index/analysis/CharFilterFactory.java
@@ -32,13 +32,16 @@
 
 package org.opensearch.index.analysis;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.io.Reader;
 
 /**
  * Base character filter factory behavior used in analysis chain
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface CharFilterFactory {
 
     String name();
diff --git a/server/src/main/java/org/opensearch/index/analysis/IndexAnalyzers.java b/server/src/main/java/org/opensearch/index/analysis/IndexAnalyzers.java
index 4d72ee48cf33a..fe06504c71333 100644
--- a/server/src/main/java/org/opensearch/index/analysis/IndexAnalyzers.java
+++ b/server/src/main/java/org/opensearch/index/analysis/IndexAnalyzers.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.index.analysis;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.io.IOUtils;
 
 import java.io.Closeable;
@@ -52,8 +53,9 @@
  *
  * @see AnalysisRegistry
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class IndexAnalyzers implements Closeable {
     private final Map<String, NamedAnalyzer> analyzers;
     private final Map<String, NamedAnalyzer> normalizers;
diff --git a/server/src/main/java/org/opensearch/index/analysis/TokenFilterFactory.java b/server/src/main/java/org/opensearch/index/analysis/TokenFilterFactory.java
index 6708db8571b2a..af18927de8a98 100644
--- a/server/src/main/java/org/opensearch/index/analysis/TokenFilterFactory.java
+++ b/server/src/main/java/org/opensearch/index/analysis/TokenFilterFactory.java
@@ -34,6 +34,7 @@
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.search.fetch.subphase.highlight.FastVectorHighlighter;
 
 import java.util.List;
@@ -42,8 +43,9 @@
 /**
  * Base token filter factory used in analysis chain
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface TokenFilterFactory {
     String name();
 
diff --git a/server/src/main/java/org/opensearch/index/analysis/TokenizerFactory.java b/server/src/main/java/org/opensearch/index/analysis/TokenizerFactory.java
index b667175e89b4a..a1a9c4966865d 100644
--- a/server/src/main/java/org/opensearch/index/analysis/TokenizerFactory.java
+++ b/server/src/main/java/org/opensearch/index/analysis/TokenizerFactory.java
@@ -33,14 +33,16 @@
 package org.opensearch.index.analysis;
 
 import org.apache.lucene.analysis.Tokenizer;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.util.function.Supplier;
 
 /**
  * Base tokenizer factory used in analysis chain
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface TokenizerFactory {
 
     String name();
diff --git a/server/src/main/java/org/opensearch/index/cache/IndexCache.java b/server/src/main/java/org/opensearch/index/cache/IndexCache.java
index 90462e9919970..1067863fe9675 100644
--- a/server/src/main/java/org/opensearch/index/cache/IndexCache.java
+++ b/server/src/main/java/org/opensearch/index/cache/IndexCache.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.index.cache;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.index.AbstractIndexComponent;
 import org.opensearch.index.IndexSettings;
@@ -44,8 +45,9 @@
 /**
  * Wrapping class for the index cache
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class IndexCache extends AbstractIndexComponent implements Closeable {
 
     private final QueryCache queryCache;
diff --git a/server/src/main/java/org/opensearch/index/cache/bitset/BitsetFilterCache.java b/server/src/main/java/org/opensearch/index/cache/bitset/BitsetFilterCache.java
index bd9074f77c196..88d20bca7b6d4 100644
--- a/server/src/main/java/org/opensearch/index/cache/bitset/BitsetFilterCache.java
+++ b/server/src/main/java/org/opensearch/index/cache/bitset/BitsetFilterCache.java
@@ -48,6 +48,7 @@
 import org.apache.lucene.util.BitDocIdSet;
 import org.apache.lucene.util.BitSet;
 import org.opensearch.ExceptionsHelper;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.cache.Cache;
 import org.opensearch.common.cache.CacheBuilder;
 import org.opensearch.common.cache.RemovalListener;
@@ -85,8 +86,9 @@
  * and require that it should always be around should use this cache, otherwise the
  * {@link org.opensearch.index.cache.query.QueryCache} should be used instead.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class BitsetFilterCache extends AbstractIndexComponent
     implements
         IndexReader.ClosedListener,
@@ -195,8 +197,9 @@ public void onRemoval(RemovalNotification<IndexReader.CacheKey, Cache<Query, Val
     /**
      * Value for bitset filter cache
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class Value {
 
         final BitSet bitset;
diff --git a/server/src/main/java/org/opensearch/index/cache/query/QueryCache.java b/server/src/main/java/org/opensearch/index/cache/query/QueryCache.java
index 384f66fcfc132..2c8188a523ade 100644
--- a/server/src/main/java/org/opensearch/index/cache/query/QueryCache.java
+++ b/server/src/main/java/org/opensearch/index/cache/query/QueryCache.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.index.cache.query;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.IndexComponent;
 
 import java.io.Closeable;
@@ -39,8 +40,9 @@
 /**
  * Base interface for a query cache
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface QueryCache extends IndexComponent, Closeable, org.apache.lucene.search.QueryCache {
 
     void clear(String reason);
diff --git a/server/src/main/java/org/opensearch/index/engine/Engine.java b/server/src/main/java/org/opensearch/index/engine/Engine.java
index 9b0e1b70a8e05..01b6cfd7c5d4e 100644
--- a/server/src/main/java/org/opensearch/index/engine/Engine.java
+++ b/server/src/main/java/org/opensearch/index/engine/Engine.java
@@ -62,6 +62,7 @@
 import org.opensearch.action.index.IndexRequest;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.SetOnce;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.concurrent.GatedCloseable;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.common.lease.Releasables;
@@ -593,8 +594,9 @@ public enum Type {
     /**
      * Index result
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class IndexResult extends Result {
 
         private final boolean created;
@@ -630,8 +632,9 @@ public boolean isCreated() {
     /**
      * The delete result
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class DeleteResult extends Result {
 
         private final boolean found;
@@ -1421,8 +1424,9 @@ public final void close() {
     /**
      * The engine searcher
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class Searcher extends IndexSearcher implements Releasable {
         private final String source;
         private final Closeable onClose;
@@ -1480,8 +1484,9 @@ public abstract static class Operation {
         /**
          * type of operation (index, delete), subclasses use static types
          *
-         * @opensearch.internal
+         * @opensearch.api
          */
+        @PublicApi(since = "1.0.0")
         public enum TYPE {
             INDEX,
             DELETE,
@@ -1578,8 +1583,9 @@ public long startTime() {
     /**
      * Index operation
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Index extends Operation {
 
         private final ParsedDocument doc;
@@ -1696,8 +1702,9 @@ public long getIfPrimaryTerm() {
     /**
      * Delete operation
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Delete extends Operation {
 
         private final String id;
diff --git a/server/src/main/java/org/opensearch/index/fielddata/DocValueBits.java b/server/src/main/java/org/opensearch/index/fielddata/DocValueBits.java
index 18fa26bd10623..cf62688b88b65 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/DocValueBits.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/DocValueBits.java
@@ -32,13 +32,16 @@
 
 package org.opensearch.index.fielddata;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.io.IOException;
 
 /**
  * Base class for doc value bit sets
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class DocValueBits {
 
     /**
diff --git a/server/src/main/java/org/opensearch/index/fielddata/IndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/IndexFieldData.java
index 81d4ce2dd8772..6a79679cc2f09 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/IndexFieldData.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/IndexFieldData.java
@@ -48,6 +48,7 @@
 import org.apache.lucene.util.BitSet;
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.core.indices.breaker.CircuitBreakerService;
 import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
@@ -64,8 +65,9 @@
  * Thread-safe utility class that allows to get per-segment values via the
  * {@link #load(LeafReaderContext)} method.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface IndexFieldData<FD extends LeafFieldData> {
 
     /**
@@ -154,7 +156,10 @@ public void disableSkipping() {
          * R will be in the parent filter and its children documents will be the
          * documents that are contained in the inner set between the previous
          * parent + 1, or 0 if there is no previous parent, and R (excluded).
+         *
+         * @opensearch.api
          */
+        @PublicApi(since = "1.0.0")
         public static class Nested {
 
             private final BitSetProducer rootFilter;
@@ -293,8 +298,9 @@ public abstract BucketedSort newBucketedSort(
     /**
      * Base builder interface
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     interface Builder {
 
         IndexFieldData<?> build(IndexFieldDataCache cache, CircuitBreakerService breakerService);
@@ -303,8 +309,9 @@ interface Builder {
     /**
      * Base Global field data class
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     interface Global<FD extends LeafFieldData> extends IndexFieldData<FD> {
 
         IndexFieldData<FD> loadGlobal(DirectoryReader indexReader);
diff --git a/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataCache.java b/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataCache.java
index 72df2453fc7fd..5cdcc3f82879f 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataCache.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataCache.java
@@ -35,13 +35,15 @@
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.util.Accountable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.index.shard.ShardId;
 
 /**
  * A simple field data cache abstraction on the *index* level.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface IndexFieldDataCache {
 
     <FD extends LeafFieldData, IFD extends IndexFieldData<FD>> FD load(LeafReaderContext context, IFD indexFieldData) throws Exception;
@@ -62,8 +64,9 @@ <FD extends LeafFieldData, IFD extends IndexFieldData.Global<FD>> IFD load(Direc
     /**
      * The listener interface
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     interface Listener {
 
         /**
diff --git a/server/src/main/java/org/opensearch/index/fielddata/LeafFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/LeafFieldData.java
index 2982363937710..da7179254d70f 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/LeafFieldData.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/LeafFieldData.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.fielddata;
 
 import org.apache.lucene.util.Accountable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.index.mapper.DocValueFetcher;
 import org.opensearch.search.DocValueFormat;
@@ -42,8 +43,9 @@
 /**
  * The thread safe {@link org.apache.lucene.index.LeafReader} level cache of the data.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface LeafFieldData extends Accountable, Releasable {
 
     /**
diff --git a/server/src/main/java/org/opensearch/index/fielddata/NumericDoubleValues.java b/server/src/main/java/org/opensearch/index/fielddata/NumericDoubleValues.java
index 94ea91849ff12..b0f3400acfb3d 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/NumericDoubleValues.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/NumericDoubleValues.java
@@ -34,14 +34,16 @@
 
 import org.apache.lucene.index.NumericDocValues;
 import org.apache.lucene.search.DoubleValues;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.io.IOException;
 
 /**
  * A per-document numeric value.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class NumericDoubleValues extends DoubleValues {
 
     /** Sole constructor. (For invocation by subclass
diff --git a/server/src/main/java/org/opensearch/index/fielddata/SortedNumericDoubleValues.java b/server/src/main/java/org/opensearch/index/fielddata/SortedNumericDoubleValues.java
index 91d28113ae783..dce1aff9cc94f 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/SortedNumericDoubleValues.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/SortedNumericDoubleValues.java
@@ -33,14 +33,16 @@
 package org.opensearch.index.fielddata;
 
 import org.apache.lucene.index.SortedNumericDocValues;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.io.IOException;
 
 /**
  * Clone of {@link SortedNumericDocValues} for double values.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class SortedNumericDoubleValues {
 
     /** Sole constructor. (For invocation by subclass
diff --git a/server/src/main/java/org/opensearch/index/mapper/ContentPath.java b/server/src/main/java/org/opensearch/index/mapper/ContentPath.java
index 8b0d5e24056d3..63e5731e2681b 100644
--- a/server/src/main/java/org/opensearch/index/mapper/ContentPath.java
+++ b/server/src/main/java/org/opensearch/index/mapper/ContentPath.java
@@ -32,11 +32,14 @@
 
 package org.opensearch.index.mapper;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * JSON Path for a document / field
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class ContentPath {
 
     private static final char DELIMITER = '.';
diff --git a/server/src/main/java/org/opensearch/index/mapper/DocValueFetcher.java b/server/src/main/java/org/opensearch/index/mapper/DocValueFetcher.java
index bf14af809fbfd..827792cdb1091 100644
--- a/server/src/main/java/org/opensearch/index/mapper/DocValueFetcher.java
+++ b/server/src/main/java/org/opensearch/index/mapper/DocValueFetcher.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.mapper;
 
 import org.apache.lucene.index.LeafReaderContext;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.search.DocValueFormat;
 import org.opensearch.search.lookup.SourceLookup;
@@ -77,8 +78,9 @@ public List<Object> fetchValues(SourceLookup lookup) throws IOException {
     /**
      * Leaf interface
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface Leaf {
         /**
          * Advance the doc values reader to the provided doc.
diff --git a/server/src/main/java/org/opensearch/index/mapper/DocumentMapper.java b/server/src/main/java/org/opensearch/index/mapper/DocumentMapper.java
index 84ef3dde24dc3..3ada04b41abd2 100644
--- a/server/src/main/java/org/opensearch/index/mapper/DocumentMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/DocumentMapper.java
@@ -40,6 +40,7 @@
 import org.apache.lucene.search.Weight;
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.OpenSearchGenerationException;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.compress.CompressedXContent;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.common.bytes.BytesArray;
@@ -65,15 +66,17 @@
 /**
  * The OpenSearch DocumentMapper
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class DocumentMapper implements ToXContentFragment {
 
     /**
      * Builder for the Document Field Mapper
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
 
         private final Map<Class<? extends MetadataFieldMapper>, MetadataFieldMapper> metadataMappers = new LinkedHashMap<>();
@@ -236,7 +239,7 @@ public MappingLookup mappers() {
         return this.fieldMappers;
     }
 
-    public FieldTypeLookup fieldTypes() {
+    FieldTypeLookup fieldTypes() {
         return mappers().fieldTypes();
     }
 
diff --git a/server/src/main/java/org/opensearch/index/mapper/DocumentMapperForType.java b/server/src/main/java/org/opensearch/index/mapper/DocumentMapperForType.java
index b26c3f3645433..565817a450f56 100644
--- a/server/src/main/java/org/opensearch/index/mapper/DocumentMapperForType.java
+++ b/server/src/main/java/org/opensearch/index/mapper/DocumentMapperForType.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.index.mapper;
 
+import org.opensearch.common.annotation.DeprecatedApi;
+
 /**
  * Document mapper used for types
  *
@@ -40,6 +42,7 @@
  * @deprecated types are being removed
  */
 @Deprecated
+@DeprecatedApi(since = "2.0.0")
 public class DocumentMapperForType {
     private final DocumentMapper documentMapper;
     private final Mapping mapping;
diff --git a/server/src/main/java/org/opensearch/index/mapper/DocumentMapperParser.java b/server/src/main/java/org/opensearch/index/mapper/DocumentMapperParser.java
index db58c5e02e176..fa736f84895eb 100644
--- a/server/src/main/java/org/opensearch/index/mapper/DocumentMapperParser.java
+++ b/server/src/main/java/org/opensearch/index/mapper/DocumentMapperParser.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.Version;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.compress.CompressedXContent;
 import org.opensearch.common.time.DateFormatter;
@@ -56,8 +57,9 @@
 /**
  * Parser for a document mapper
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class DocumentMapperParser {
 
     final MapperService mapperService;
diff --git a/server/src/main/java/org/opensearch/index/mapper/DynamicTemplate.java b/server/src/main/java/org/opensearch/index/mapper/DynamicTemplate.java
index a20ad43bd70af..da62b20c98563 100644
--- a/server/src/main/java/org/opensearch/index/mapper/DynamicTemplate.java
+++ b/server/src/main/java/org/opensearch/index/mapper/DynamicTemplate.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.index.mapper;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
@@ -47,8 +48,9 @@
 /**
  * A template that is dynamic based on field types
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class DynamicTemplate implements ToXContentObject {
 
     /**
@@ -96,8 +98,9 @@ public static MatchType fromString(String value) {
     /**
      * The type of a field as detected while parsing a json document.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum XContentFieldType {
         OBJECT {
             @Override
diff --git a/server/src/main/java/org/opensearch/index/mapper/FieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/FieldMapper.java
index f6178a8284945..4e495c68fd822 100644
--- a/server/src/main/java/org/opensearch/index/mapper/FieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/FieldMapper.java
@@ -35,6 +35,7 @@
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.settings.Settings;
@@ -61,8 +62,9 @@
 /**
  * The base OpenSearch Field Mapper
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class FieldMapper extends Mapper implements Cloneable {
     public static final Setting<Boolean> IGNORE_MALFORMED_SETTING = Setting.boolSetting(
         "index.mapping.ignore_malformed",
@@ -572,8 +574,9 @@ protected static String indexOptionToString(IndexOptions indexOption) {
     /**
      * Multi field implementation used across field mappers
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class MultiFields implements Iterable<Mapper> {
 
         public static MultiFields empty() {
@@ -702,8 +705,9 @@ public int compare(Mapper o1, Mapper o2) {
     /**
      * Represents a list of fields with optional boost factor where the current field should be copied to
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class CopyTo {
 
         private static final CopyTo EMPTY = new CopyTo(Collections.emptyList());
diff --git a/server/src/main/java/org/opensearch/index/mapper/FieldTypeLookup.java b/server/src/main/java/org/opensearch/index/mapper/FieldTypeLookup.java
index 549ab0403e5dc..7a9a0c5fb5428 100644
--- a/server/src/main/java/org/opensearch/index/mapper/FieldTypeLookup.java
+++ b/server/src/main/java/org/opensearch/index/mapper/FieldTypeLookup.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.index.mapper;
 
+import org.opensearch.common.annotation.InternalApi;
 import org.opensearch.common.collect.Iterators;
 import org.opensearch.common.regex.Regex;
 
@@ -48,6 +49,7 @@
  *
  * @opensearch.internal
  */
+@InternalApi
 class FieldTypeLookup implements Iterable<MappedFieldType> {
 
     private final Map<String, MappedFieldType> fullNameToFieldType = new HashMap<>();
diff --git a/server/src/main/java/org/opensearch/index/mapper/IdFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/IdFieldMapper.java
index 38d25de8ff808..658f4228cb0c6 100644
--- a/server/src/main/java/org/opensearch/index/mapper/IdFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/IdFieldMapper.java
@@ -41,6 +41,7 @@
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.TermInSetQuery;
 import org.apache.lucene.util.BytesRef;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.lucene.Lucene;
 import org.opensearch.common.util.BigArrays;
@@ -74,8 +75,9 @@
  * stored, but we need to keep it so that its FieldType can be used to generate
  * queries.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class IdFieldMapper extends MetadataFieldMapper {
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(IdFieldMapper.class);
     static final String ID_FIELD_DATA_DEPRECATION_MESSAGE =
diff --git a/server/src/main/java/org/opensearch/index/mapper/IndexFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/IndexFieldMapper.java
index 982b0eb909443..22fcb66848ed1 100644
--- a/server/src/main/java/org/opensearch/index/mapper/IndexFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/IndexFieldMapper.java
@@ -34,6 +34,7 @@
 
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.Strings;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.fielddata.plain.ConstantIndexFieldData;
@@ -47,8 +48,9 @@
 /**
  * Index specific field mapper
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class IndexFieldMapper extends MetadataFieldMapper {
 
     public static final String NAME = "_index";
diff --git a/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java b/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java
index 62acad99074c2..da62ddfd7017d 100644
--- a/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java
+++ b/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java
@@ -54,6 +54,7 @@
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.OpenSearchParseException;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.geo.ShapeRelation;
 import org.opensearch.common.time.DateMathParser;
 import org.opensearch.common.unit.Fuzziness;
@@ -79,8 +80,9 @@
 /**
  * This defines the core properties and functions to operate on a field.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class MappedFieldType {
 
     private final String name;
@@ -400,8 +402,9 @@ public IntervalsSource intervals(String query, int max_gaps, IntervalMode mode,
      * An enum used to describe the relation between the range of terms in a
      * shard when compared with a query range
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum Relation {
         WITHIN,
         INTERSECTS,
diff --git a/server/src/main/java/org/opensearch/index/mapper/Mapper.java b/server/src/main/java/org/opensearch/index/mapper/Mapper.java
index 9c0e3ef72549a..bd5d3f15c0706 100644
--- a/server/src/main/java/org/opensearch/index/mapper/Mapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/Mapper.java
@@ -35,6 +35,7 @@
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.time.DateFormatter;
 import org.opensearch.core.xcontent.ToXContentFragment;
@@ -51,15 +52,17 @@
 /**
  * The foundation OpenSearch mapper
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class Mapper implements ToXContentFragment, Iterable<Mapper> {
 
     /**
      * The builder context used in field mappings
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class BuilderContext {
         private final Settings indexSettings;
         private final ContentPath contentPath;
@@ -94,8 +97,9 @@ public Version indexCreatedVersionOrDefault(@Nullable Version defaultValue) {
     /**
      * Base mapper builder
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public abstract static class Builder<T extends Builder> {
 
         public String name;
@@ -117,15 +121,17 @@ public String name() {
     /**
      * Type parser for the mapper
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface TypeParser {
 
         /**
          * Parser context for the type parser
          *
-         * @opensearch.internal
+         * @opensearch.api
          */
+        @PublicApi(since = "1.0.0")
         class ParserContext {
 
             private final Function<String, SimilarityProvider> similarityLookupService;
diff --git a/server/src/main/java/org/opensearch/index/mapper/MapperParsingException.java b/server/src/main/java/org/opensearch/index/mapper/MapperParsingException.java
index 7dff82e2e3167..881e8c78b919d 100644
--- a/server/src/main/java/org/opensearch/index/mapper/MapperParsingException.java
+++ b/server/src/main/java/org/opensearch/index/mapper/MapperParsingException.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.index.mapper;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.rest.RestStatus;
 
@@ -40,8 +41,9 @@
 /**
  * Exception thrown if there are any errors parsing mappings
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class MapperParsingException extends MapperException {
 
     public MapperParsingException(StreamInput in) throws IOException {
diff --git a/server/src/main/java/org/opensearch/index/mapper/MapperService.java b/server/src/main/java/org/opensearch/index/mapper/MapperService.java
index ecb965061a828..8ebb007787828 100644
--- a/server/src/main/java/org/opensearch/index/mapper/MapperService.java
+++ b/server/src/main/java/org/opensearch/index/mapper/MapperService.java
@@ -38,6 +38,7 @@
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.MappingMetadata;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.compress.CompressedXContent;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.regex.Regex;
@@ -89,8 +90,9 @@
 /**
  * The core field mapping service
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class MapperService extends AbstractIndexComponent implements Closeable {
 
     /**
@@ -98,6 +100,7 @@ public class MapperService extends AbstractIndexComponent implements Closeable {
      *
      * @opensearch.internal
      */
+    @PublicApi(since = "1.0.0")
     public enum MergeReason {
         /**
          * Pre-flight check before sending a mapping update to the cluster-manager
diff --git a/server/src/main/java/org/opensearch/index/mapper/Mapping.java b/server/src/main/java/org/opensearch/index/mapper/Mapping.java
index d68d1e62e2f92..20bd290ec8af4 100644
--- a/server/src/main/java/org/opensearch/index/mapper/Mapping.java
+++ b/server/src/main/java/org/opensearch/index/mapper/Mapping.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.mapper;
 
 import org.opensearch.Version;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.core.xcontent.ToXContent;
@@ -54,8 +55,9 @@
  * Wrapper around everything that defines a mapping, without references to
  * utility classes like MapperService, ...
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class Mapping implements ToXContentFragment {
 
     final Version indexCreated;
diff --git a/server/src/main/java/org/opensearch/index/mapper/MappingLookup.java b/server/src/main/java/org/opensearch/index/mapper/MappingLookup.java
index 1c608fc52c1f5..fdebe24327ca0 100644
--- a/server/src/main/java/org/opensearch/index/mapper/MappingLookup.java
+++ b/server/src/main/java/org/opensearch/index/mapper/MappingLookup.java
@@ -34,6 +34,7 @@
 
 import org.apache.lucene.analysis.Analyzer;
 import org.opensearch.cluster.metadata.DataStream;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.analysis.FieldNameAnalyzer;
 
@@ -49,8 +50,9 @@
 /**
  * Looks up a mapping for a field
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class MappingLookup implements Iterable<Mapper> {
 
     /** Full field name to mapper */
@@ -164,7 +166,7 @@ public Mapper getMapper(String field) {
         return fieldMappers.get(field);
     }
 
-    public FieldTypeLookup fieldTypes() {
+    FieldTypeLookup fieldTypes() {
         return fieldTypeLookup;
     }
 
diff --git a/server/src/main/java/org/opensearch/index/mapper/MetadataFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/MetadataFieldMapper.java
index 5a45ab72994ee..c98d0c8242078 100644
--- a/server/src/main/java/org/opensearch/index/mapper/MetadataFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/MetadataFieldMapper.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.mapper;
 
 import org.opensearch.common.Explicit;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.xcontent.support.XContentMapValues;
 import org.opensearch.core.xcontent.XContentBuilder;
 
@@ -43,15 +44,17 @@
 /**
  * A mapper for a builtin field containing metadata about a document.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class MetadataFieldMapper extends ParametrizedFieldMapper {
 
     /**
      * Type parser for the field mapper
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface TypeParser extends Mapper.TypeParser {
 
         @Override
@@ -152,8 +155,9 @@ public MetadataFieldMapper getDefault(MappedFieldType defaultFieldType, ParserCo
     /**
      * Base builder for internal metadata fields
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public abstract static class Builder extends ParametrizedFieldMapper.Builder {
 
         protected Builder(String name) {
diff --git a/server/src/main/java/org/opensearch/index/mapper/ObjectMapper.java b/server/src/main/java/org/opensearch/index/mapper/ObjectMapper.java
index 1731d80585d43..39b0ec224b57c 100644
--- a/server/src/main/java/org/opensearch/index/mapper/ObjectMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/ObjectMapper.java
@@ -38,6 +38,7 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.Explicit;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.collect.CopyOnWriteHashMap;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
@@ -60,8 +61,9 @@
 /**
  * Field mapper for object field types
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ObjectMapper extends Mapper implements Cloneable {
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ObjectMapper.class);
 
@@ -82,8 +84,9 @@ public static class Defaults {
     /**
      * Dynamic field mapping specification
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum Dynamic {
         TRUE,
         FALSE,
@@ -93,8 +96,9 @@ public enum Dynamic {
     /**
      * Nested objects
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Nested {
 
         public static final Nested NO = new Nested(false, new Explicit<>(false, false), new Explicit<>(false, false));
diff --git a/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java
index 93b929a82f095..a8e04aac45963 100644
--- a/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/ParametrizedFieldMapper.java
@@ -36,6 +36,8 @@
 import org.opensearch.Version;
 import org.opensearch.common.Explicit;
 import org.opensearch.common.TriFunction;
+import org.opensearch.common.annotation.InternalApi;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.support.XContentMapValues;
@@ -71,8 +73,9 @@
  * Subclasses should implement a {@link Builder} that is returned from the
  * {@link #getMergeBuilder()} method, initialised with the existing builder.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class ParametrizedFieldMapper extends FieldMapper {
 
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ParametrizedFieldMapper.class);
@@ -152,6 +155,7 @@ protected void doXContentBody(XContentBuilder builder, boolean includeDefaults,
     /**
      * Serializes a parameter
      */
+    @InternalApi
     protected interface Serializer<T> {
         void serialize(XContentBuilder builder, String name, T value) throws IOException;
     }
@@ -159,6 +163,7 @@ protected interface Serializer<T> {
     /**
      * Check on whether or not a parameter should be serialized
      */
+    @InternalApi
     protected interface SerializerCheck<T> {
         /**
          * Check on whether or not a parameter should be serialized
@@ -174,8 +179,9 @@ protected interface SerializerCheck<T> {
      * A configurable parameter for a field mapper
      * @param <T> the type of the value the parameter holds
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class Parameter<T> implements Supplier<T> {
 
         public final String name;
@@ -276,7 +282,7 @@ public Parameter<T> setValidator(Consumer<T> validator) {
         /**
          * Configure a custom serializer for this parameter
          */
-        public Parameter<T> setSerializer(Serializer<T> serializer, Function<T, String> conflictSerializer) {
+        protected Parameter<T> setSerializer(Serializer<T> serializer, Function<T, String> conflictSerializer) {
             this.serializer = serializer;
             this.conflictSerializer = conflictSerializer;
             return this;
@@ -285,7 +291,7 @@ public Parameter<T> setSerializer(Serializer<T> serializer, Function<T, String>
         /**
          * Configure a custom serialization check for this parameter
          */
-        public Parameter<T> setSerializerCheck(SerializerCheck<T> check) {
+        protected Parameter<T> setSerializerCheck(SerializerCheck<T> check) {
             this.serializerCheck = check;
             return this;
         }
@@ -577,8 +583,9 @@ void check() {
     /**
      * A Builder for a ParametrizedFieldMapper
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public abstract static class Builder extends Mapper.Builder<Builder> {
 
         protected final MultiFields.Builder multiFieldsBuilder = new MultiFields.Builder();
diff --git a/server/src/main/java/org/opensearch/index/mapper/ParseContext.java b/server/src/main/java/org/opensearch/index/mapper/ParseContext.java
index 0a0c62a9b47be..5d382ff28bcf9 100644
--- a/server/src/main/java/org/opensearch/index/mapper/ParseContext.java
+++ b/server/src/main/java/org/opensearch/index/mapper/ParseContext.java
@@ -36,6 +36,7 @@
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.OpenSearchParseException;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.IndexSettings;
 
@@ -53,15 +54,17 @@
 /**
  * Holds the context at parse time
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class ParseContext implements Iterable<ParseContext.Document> {
 
     /**
      * Fork of {@link org.apache.lucene.document.Document} with additional functionality.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Document implements Iterable<IndexableField> {
 
         private final Document parent;
diff --git a/server/src/main/java/org/opensearch/index/mapper/ParsedDocument.java b/server/src/main/java/org/opensearch/index/mapper/ParsedDocument.java
index 378781151d610..16e38980f8600 100644
--- a/server/src/main/java/org/opensearch/index/mapper/ParsedDocument.java
+++ b/server/src/main/java/org/opensearch/index/mapper/ParsedDocument.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.mapper;
 
 import org.apache.lucene.document.Field;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.xcontent.MediaType;
@@ -44,8 +45,9 @@
 /**
  * The result of parsing a document.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ParsedDocument {
 
     private final Field version;
diff --git a/server/src/main/java/org/opensearch/index/mapper/RangeFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/RangeFieldMapper.java
index 05ca7dee0fe4b..10f179c964591 100644
--- a/server/src/main/java/org/opensearch/index/mapper/RangeFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/RangeFieldMapper.java
@@ -95,7 +95,7 @@ public class RangeFieldMapper extends ParametrizedFieldMapper {
      */
     public static class Defaults {
         public static final Explicit<Boolean> COERCE = new Explicit<>(true, false);
-        public static final DateFormatter DATE_FORMATTER = DateFieldMapper.getDefaultDateTimeFormatter();
+        public static final DateFormatter DATE_FORMATTER = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER;
     }
 
     // this is private since it has a different default
diff --git a/server/src/main/java/org/opensearch/index/mapper/RootObjectMapper.java b/server/src/main/java/org/opensearch/index/mapper/RootObjectMapper.java
index 9d1ccc9e795ba..9504e6eafc046 100644
--- a/server/src/main/java/org/opensearch/index/mapper/RootObjectMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/RootObjectMapper.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.common.Explicit;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.time.DateFormatter;
@@ -60,8 +61,9 @@
 /**
  * The root object mapper for a document
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class RootObjectMapper extends ObjectMapper {
     private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(RootObjectMapper.class);
 
diff --git a/server/src/main/java/org/opensearch/index/mapper/RoutingFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/RoutingFieldMapper.java
index 222ba70a5ce0c..60decc56e0db2 100644
--- a/server/src/main/java/org/opensearch/index/mapper/RoutingFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/RoutingFieldMapper.java
@@ -35,6 +35,7 @@
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.Lucene;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.search.lookup.SearchLookup;
@@ -45,8 +46,9 @@
 /**
  * Internal field mapper for _routing fields
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class RoutingFieldMapper extends MetadataFieldMapper {
 
     public static final String NAME = "_routing";
diff --git a/server/src/main/java/org/opensearch/index/mapper/SeqNoFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/SeqNoFieldMapper.java
index 038066773a360..c7e9bed7577c5 100644
--- a/server/src/main/java/org/opensearch/index/mapper/SeqNoFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/SeqNoFieldMapper.java
@@ -39,6 +39,7 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.fielddata.IndexNumericFieldData.NumericType;
 import org.opensearch.index.fielddata.plain.SortedNumericIndexFieldData;
@@ -74,8 +75,9 @@ public class SeqNoFieldMapper extends MetadataFieldMapper {
      * A sequence ID, which is made up of a sequence number (both the searchable
      * and doc_value version of the field) and the primary term.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class SequenceIDFields {
 
         public final Field seqNo;
diff --git a/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java
index c13a0b5cec62c..a2d769d486a0f 100644
--- a/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java
@@ -39,6 +39,7 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.xcontent.XContentHelper;
@@ -63,8 +64,9 @@
 /**
  * Internal field mapper for storing source (and recovery source)
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class SourceFieldMapper extends MetadataFieldMapper {
 
     public static final String NAME = "_source";
diff --git a/server/src/main/java/org/opensearch/index/mapper/SourceToParse.java b/server/src/main/java/org/opensearch/index/mapper/SourceToParse.java
index adacd6c450f7a..c8bb4dbefbbb1 100644
--- a/server/src/main/java/org/opensearch/index/mapper/SourceToParse.java
+++ b/server/src/main/java/org/opensearch/index/mapper/SourceToParse.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.mapper;
 
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.xcontent.MediaType;
@@ -42,8 +43,9 @@
 /**
  * Stores the document source
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class SourceToParse {
 
     private final BytesReference source;
diff --git a/server/src/main/java/org/opensearch/index/mapper/TextSearchInfo.java b/server/src/main/java/org/opensearch/index/mapper/TextSearchInfo.java
index 535fba6c39371..a3f5eed479b8f 100644
--- a/server/src/main/java/org/opensearch/index/mapper/TextSearchInfo.java
+++ b/server/src/main/java/org/opensearch/index/mapper/TextSearchInfo.java
@@ -34,6 +34,7 @@
 
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.Lucene;
 import org.opensearch.index.analysis.NamedAnalyzer;
 import org.opensearch.index.similarity.SimilarityProvider;
@@ -41,8 +42,9 @@
 /**
  * Encapsulates information about how to perform text searches over a field
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class TextSearchInfo {
 
     private static final FieldType SIMPLE_MATCH_ONLY_FIELD_TYPE = new FieldType();
@@ -145,8 +147,9 @@ public boolean isTokenized() {
     /**
      * What sort of term vectors are available
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum TermVector {
         NONE,
         DOCS,
diff --git a/server/src/main/java/org/opensearch/index/mapper/ValueFetcher.java b/server/src/main/java/org/opensearch/index/mapper/ValueFetcher.java
index 96237b16ea5a4..c6bdad8b8653c 100644
--- a/server/src/main/java/org/opensearch/index/mapper/ValueFetcher.java
+++ b/server/src/main/java/org/opensearch/index/mapper/ValueFetcher.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.mapper;
 
 import org.apache.lucene.index.LeafReaderContext;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.search.fetch.subphase.FetchFieldsPhase;
 import org.opensearch.search.lookup.SourceLookup;
 
@@ -43,8 +44,9 @@
  * A helper class for fetching field values during the {@link FetchFieldsPhase}. Each {@link MappedFieldType}
  * is in charge of defining a value fetcher through {@link MappedFieldType#valueFetcher}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface ValueFetcher {
     /**
      * Given access to a document's _source, return this field's values.
diff --git a/server/src/main/java/org/opensearch/index/query/InnerHitBuilder.java b/server/src/main/java/org/opensearch/index/query/InnerHitBuilder.java
index 4cd042cac6fbf..1a2a554526e15 100644
--- a/server/src/main/java/org/opensearch/index/query/InnerHitBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/InnerHitBuilder.java
@@ -32,6 +32,7 @@
 package org.opensearch.index.query;
 
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.ParsingException;
 import org.opensearch.core.common.Strings;
@@ -66,7 +67,10 @@
 
 /**
  * Query builder for inner hits
+ *
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class InnerHitBuilder implements Writeable, ToXContentObject {
 
     public static final ParseField NAME_FIELD = new ParseField("name");
diff --git a/server/src/main/java/org/opensearch/index/query/ParsedQuery.java b/server/src/main/java/org/opensearch/index/query/ParsedQuery.java
index 5d9f67ac365b9..1a4d45178e826 100644
--- a/server/src/main/java/org/opensearch/index/query/ParsedQuery.java
+++ b/server/src/main/java/org/opensearch/index/query/ParsedQuery.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.query;
 
 import org.apache.lucene.search.Query;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.search.Queries;
 
 import java.util.Map;
@@ -42,8 +43,9 @@
 /**
  * The result of parsing a query.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ParsedQuery {
     private final Query query;
     private final Map<String, Query> namedFilters;
diff --git a/server/src/main/java/org/opensearch/index/query/QueryShardContext.java b/server/src/main/java/org/opensearch/index/query/QueryShardContext.java
index 7b248c2a6f3c3..eba3ed076e82b 100644
--- a/server/src/main/java/org/opensearch/index/query/QueryShardContext.java
+++ b/server/src/main/java/org/opensearch/index/query/QueryShardContext.java
@@ -43,6 +43,7 @@
 import org.opensearch.common.CheckedFunction;
 import org.opensearch.common.SetOnce;
 import org.opensearch.common.TriFunction;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.search.Queries;
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.core.action.ActionListener;
@@ -90,8 +91,9 @@
 /**
  * Context object used to create lucene queries on the shard level.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class QueryShardContext extends QueryRewriteContext {
 
     private final ScriptService scriptService;
diff --git a/server/src/main/java/org/opensearch/index/query/Rewriteable.java b/server/src/main/java/org/opensearch/index/query/Rewriteable.java
index 3ed779b52debf..bca719c6fe857 100644
--- a/server/src/main/java/org/opensearch/index/query/Rewriteable.java
+++ b/server/src/main/java/org/opensearch/index/query/Rewriteable.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.index.query;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.common.ParsingException;
 
@@ -41,8 +42,9 @@
 /**
  * A basic interface for rewriteable classes.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface Rewriteable<T> {
 
     int MAX_REWRITE_ROUNDS = 16;
diff --git a/server/src/main/java/org/opensearch/index/query/support/NestedScope.java b/server/src/main/java/org/opensearch/index/query/support/NestedScope.java
index 4a09b11666c18..51abe389ad686 100644
--- a/server/src/main/java/org/opensearch/index/query/support/NestedScope.java
+++ b/server/src/main/java/org/opensearch/index/query/support/NestedScope.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.index.query.support;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.mapper.ObjectMapper;
 
 import java.util.Deque;
@@ -40,8 +41,9 @@
 /**
  * During query parsing this keeps track of the current nested level.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class NestedScope {
 
     private final Deque<ObjectMapper> levelStack = new LinkedList<>();
diff --git a/server/src/main/java/org/opensearch/index/remote/RemoteStoreStatsTrackerFactory.java b/server/src/main/java/org/opensearch/index/remote/RemoteStoreStatsTrackerFactory.java
index 6058fcc7345d2..9a146be96c9de 100644
--- a/server/src/main/java/org/opensearch/index/remote/RemoteStoreStatsTrackerFactory.java
+++ b/server/src/main/java/org/opensearch/index/remote/RemoteStoreStatsTrackerFactory.java
@@ -11,6 +11,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
@@ -24,8 +25,9 @@
 /**
  * Factory to manage stats trackers for Remote Store operations
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.10.0")
 public class RemoteStoreStatsTrackerFactory implements IndexEventListener {
     static class Defaults {
         static final int MOVING_AVERAGE_WINDOW_SIZE = 20;
diff --git a/server/src/main/java/org/opensearch/index/seqno/RetentionLeaseSyncer.java b/server/src/main/java/org/opensearch/index/seqno/RetentionLeaseSyncer.java
index cefab995847b7..ece0ac2b7bf6b 100644
--- a/server/src/main/java/org/opensearch/index/seqno/RetentionLeaseSyncer.java
+++ b/server/src/main/java/org/opensearch/index/seqno/RetentionLeaseSyncer.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.seqno;
 
 import org.opensearch.action.support.replication.ReplicationResponse;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.index.shard.ShardId;
@@ -44,6 +45,7 @@
  *
  * @opensearch.internal
  */
+@PublicApi(since = "1.0.0")
 public class RetentionLeaseSyncer {
     private final SyncAction syncAction;
     private final BackgroundSyncAction backgroundSyncAction;
diff --git a/server/src/main/java/org/opensearch/index/seqno/SequenceNumbers.java b/server/src/main/java/org/opensearch/index/seqno/SequenceNumbers.java
index 210976ffba58a..b9959941d843f 100644
--- a/server/src/main/java/org/opensearch/index/seqno/SequenceNumbers.java
+++ b/server/src/main/java/org/opensearch/index/seqno/SequenceNumbers.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.index.seqno;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.util.Map;
 
 /**
@@ -132,8 +134,9 @@ public static long max(final long maxSeqNo, final long seqNo) {
     /**
      * Commit information
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class CommitInfo {
         public final long maxSeqNo;
         public final long localCheckpoint;
diff --git a/server/src/main/java/org/opensearch/index/shard/IndexEventListener.java b/server/src/main/java/org/opensearch/index/shard/IndexEventListener.java
index 3017c3ce6dcff..693686ec228e9 100644
--- a/server/src/main/java/org/opensearch/index/shard/IndexEventListener.java
+++ b/server/src/main/java/org/opensearch/index/shard/IndexEventListener.java
@@ -33,6 +33,7 @@
 
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.index.Index;
 import org.opensearch.core.index.shard.ShardId;
@@ -51,8 +52,9 @@
  * modify local state without sufficient synchronization.
  * </p>
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface IndexEventListener {
 
     /**
diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShardState.java b/server/src/main/java/org/opensearch/index/shard/IndexShardState.java
index dc6f2fc3a86d9..deadf1db8314f 100644
--- a/server/src/main/java/org/opensearch/index/shard/IndexShardState.java
+++ b/server/src/main/java/org/opensearch/index/shard/IndexShardState.java
@@ -32,11 +32,14 @@
 
 package org.opensearch.index.shard;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * Index Shard States
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public enum IndexShardState {
     CREATED((byte) 0),
     RECOVERING((byte) 1),
diff --git a/server/src/main/java/org/opensearch/index/shard/IndexingOperationListener.java b/server/src/main/java/org/opensearch/index/shard/IndexingOperationListener.java
index ccc4cd336cff7..edce676b7c81e 100644
--- a/server/src/main/java/org/opensearch/index/shard/IndexingOperationListener.java
+++ b/server/src/main/java/org/opensearch/index/shard/IndexingOperationListener.java
@@ -33,6 +33,7 @@
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.index.engine.Engine;
 
@@ -41,8 +42,9 @@
 /**
  * An indexing listener for indexing, delete, events.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface IndexingOperationListener {
 
     /**
diff --git a/server/src/main/java/org/opensearch/index/shard/SearchOperationListener.java b/server/src/main/java/org/opensearch/index/shard/SearchOperationListener.java
index e9206731058db..849a4f9c15318 100644
--- a/server/src/main/java/org/opensearch/index/shard/SearchOperationListener.java
+++ b/server/src/main/java/org/opensearch/index/shard/SearchOperationListener.java
@@ -34,6 +34,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.ExceptionsHelper;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.search.internal.ReaderContext;
 import org.opensearch.search.internal.SearchContext;
 import org.opensearch.transport.TransportRequest;
@@ -43,8 +44,9 @@
 /**
  * An listener for search, fetch and context events.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface SearchOperationListener {
 
     /**
diff --git a/server/src/main/java/org/opensearch/index/shard/ShardPath.java b/server/src/main/java/org/opensearch/index/shard/ShardPath.java
index b7bb4283eca32..d16e5707b2e0e 100644
--- a/server/src/main/java/org/opensearch/index/shard/ShardPath.java
+++ b/server/src/main/java/org/opensearch/index/shard/ShardPath.java
@@ -34,6 +34,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.util.Strings;
 import org.opensearch.cluster.metadata.IndexMetadata;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
@@ -54,8 +55,9 @@
 /**
  * Path for a shard
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class ShardPath {
     public static final String INDEX_FOLDER_NAME = "index";
     public static final String TRANSLOG_FOLDER_NAME = "translog";
diff --git a/server/src/main/java/org/opensearch/index/similarity/SimilarityProvider.java b/server/src/main/java/org/opensearch/index/similarity/SimilarityProvider.java
index 085e93c794fb7..33065dc1739a3 100644
--- a/server/src/main/java/org/opensearch/index/similarity/SimilarityProvider.java
+++ b/server/src/main/java/org/opensearch/index/similarity/SimilarityProvider.java
@@ -33,14 +33,16 @@
 package org.opensearch.index.similarity;
 
 import org.apache.lucene.search.similarities.Similarity;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.util.Objects;
 
 /**
  * Wrapper around a {@link Similarity} and its name.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class SimilarityProvider {
 
     private final String name;
diff --git a/server/src/main/java/org/opensearch/index/snapshots/IndexShardSnapshotStatus.java b/server/src/main/java/org/opensearch/index/snapshots/IndexShardSnapshotStatus.java
index d48da6f462502..d844a7d2d25c4 100644
--- a/server/src/main/java/org/opensearch/index/snapshots/IndexShardSnapshotStatus.java
+++ b/server/src/main/java/org/opensearch/index/snapshots/IndexShardSnapshotStatus.java
@@ -32,21 +32,25 @@
 
 package org.opensearch.index.snapshots;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Represent shard snapshot status
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class IndexShardSnapshotStatus {
 
     /**
      * Snapshot stage
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum Stage {
         /**
          * Snapshot hasn't started yet
@@ -248,8 +252,9 @@ public static IndexShardSnapshotStatus newDone(
     /**
      * Returns an immutable state of {@link IndexShardSnapshotStatus} at a given point in time.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Copy {
 
         private final Stage stage;
diff --git a/server/src/main/java/org/opensearch/index/snapshots/blobstore/RemoteStoreShardShallowCopySnapshot.java b/server/src/main/java/org/opensearch/index/snapshots/blobstore/RemoteStoreShardShallowCopySnapshot.java
index aa5d90cc65803..d54e9686ab951 100644
--- a/server/src/main/java/org/opensearch/index/snapshots/blobstore/RemoteStoreShardShallowCopySnapshot.java
+++ b/server/src/main/java/org/opensearch/index/snapshots/blobstore/RemoteStoreShardShallowCopySnapshot.java
@@ -9,6 +9,7 @@
 package org.opensearch.index.snapshots.blobstore;
 
 import org.opensearch.OpenSearchParseException;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
@@ -22,8 +23,9 @@
 /**
  * Remote Store based Shard snapshot metadata
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.9.0")
 public class RemoteStoreShardShallowCopySnapshot implements ToXContentFragment, IndexShardSnapshot {
 
     private final String snapshot;
diff --git a/server/src/main/java/org/opensearch/index/store/Store.java b/server/src/main/java/org/opensearch/index/store/Store.java
index b822742de6e97..11505e82d5ccb 100644
--- a/server/src/main/java/org/opensearch/index/store/Store.java
+++ b/server/src/main/java/org/opensearch/index/store/Store.java
@@ -67,6 +67,7 @@
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.annotation.InternalApi;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.logging.Loggers;
 import org.opensearch.common.lucene.Lucene;
@@ -145,8 +146,9 @@
  *      }
  * </pre>
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class Store extends AbstractIndexShardComponent implements Closeable, RefCounted {
     /**
      * This is an escape hatch for lucenes internal optimization that checks if the IndexInput is an instance of ByteBufferIndexInput
@@ -1022,8 +1024,9 @@ private void downloadFailed(long fileSize, long startTimeInMs) {
      *
      * @see StoreFileMetadata
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class MetadataSnapshot implements Iterable<StoreFileMetadata>, Writeable {
         private final Map<String, StoreFileMetadata> metadata;
 
@@ -1429,8 +1432,9 @@ public String getSyncId() {
      *
      * @see MetadataSnapshot#recoveryDiff(org.opensearch.index.store.Store.MetadataSnapshot)
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class RecoveryDiff {
         /**
          * Files that exist in both snapshots and they can be considered the same ie. they don't need to be recovered
diff --git a/server/src/main/java/org/opensearch/index/store/StoreFileMetadata.java b/server/src/main/java/org/opensearch/index/store/StoreFileMetadata.java
index f8c4df50afc8f..c286a5bdbd9d8 100644
--- a/server/src/main/java/org/opensearch/index/store/StoreFileMetadata.java
+++ b/server/src/main/java/org/opensearch/index/store/StoreFileMetadata.java
@@ -35,6 +35,7 @@
 import org.apache.lucene.codecs.CodecUtil;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.Version;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.store.ByteArrayIndexInput;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -47,8 +48,9 @@
 /**
  * Metadata for the store file
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class StoreFileMetadata implements Writeable {
 
     private final String name;
diff --git a/server/src/main/java/org/opensearch/index/store/lockmanager/LockInfo.java b/server/src/main/java/org/opensearch/index/store/lockmanager/LockInfo.java
index 1470969540d36..6aab518808a3f 100644
--- a/server/src/main/java/org/opensearch/index/store/lockmanager/LockInfo.java
+++ b/server/src/main/java/org/opensearch/index/store/lockmanager/LockInfo.java
@@ -8,11 +8,15 @@
 
 package org.opensearch.index.store.lockmanager;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * An Interface that defines Remote Store Lock Information.
  * Individual Implemented Classes of this interface can decide how the lock should look like and its contents.
- * @opensearch.internal
+ *
+ * @opensearch.api
  */
+@PublicApi(since = "2.8.0")
 public interface LockInfo {
     /**
      * A function which generates the lock name on the basis of given information.
diff --git a/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreLockManager.java b/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreLockManager.java
index 9eb066d9e955e..4fa23dfe9dc3a 100644
--- a/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreLockManager.java
+++ b/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreLockManager.java
@@ -8,14 +8,18 @@
 
 package org.opensearch.index.store.lockmanager;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.io.IOException;
 
 /**
  * An Interface that defines Remote Store Lock Manager.
  * This will provide the functionality to acquire lock, release lock or to check if a lock is acquired on a specific
  * file in remote store.
- * @opensearch.internal
+ *
+ * @opensearch.api
  */
+@PublicApi(since = "2.8.0")
 public interface RemoteStoreLockManager {
     /**
      *
diff --git a/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreLockManagerFactory.java b/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreLockManagerFactory.java
index 1a306f3261094..00666ada11983 100644
--- a/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreLockManagerFactory.java
+++ b/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreLockManagerFactory.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.index.store.lockmanager;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.blobstore.BlobContainer;
 import org.opensearch.common.blobstore.BlobPath;
 import org.opensearch.index.store.RemoteBufferedOutputDirectory;
@@ -22,8 +23,9 @@
 /**
  * Factory for remote store lock manager
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.8.0")
 public class RemoteStoreLockManagerFactory {
     private static final String SEGMENTS = "segments";
     private static final String LOCK_FILES = "lock_files";
diff --git a/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java b/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java
index 756905d02229a..5ebd00f59ef49 100644
--- a/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java
+++ b/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java
@@ -12,6 +12,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IndexOutput;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.store.RemoteBufferedOutputDirectory;
 
 import java.io.FileNotFoundException;
@@ -28,8 +29,9 @@
  * It uses {@code LockFileInfo} instance to get the information about the lock file on which operations need to
  * be executed.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.8.0")
 public class RemoteStoreMetadataLockManager implements RemoteStoreLockManager {
     private static final Logger logger = LogManager.getLogger(RemoteStoreMetadataLockManager.class);
     private final RemoteBufferedOutputDirectory lockDirectory;
diff --git a/server/src/main/java/org/opensearch/index/store/remote/filecache/CachedIndexInput.java b/server/src/main/java/org/opensearch/index/store/remote/filecache/CachedIndexInput.java
index a29598dbee505..b7dacb3761c33 100644
--- a/server/src/main/java/org/opensearch/index/store/remote/filecache/CachedIndexInput.java
+++ b/server/src/main/java/org/opensearch/index/store/remote/filecache/CachedIndexInput.java
@@ -9,6 +9,7 @@
 package org.opensearch.index.store.remote.filecache;
 
 import org.apache.lucene.store.IndexInput;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.io.IOException;
 
@@ -17,8 +18,9 @@
  * {@link IndexInput}. Exactly how the IndexInput is created is determined by
  * the implementations.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.7.0")
 public interface CachedIndexInput extends AutoCloseable {
     /**
      * Gets the {@link IndexInput} this cache entry represents.
diff --git a/server/src/main/java/org/opensearch/index/store/remote/filecache/FileCache.java b/server/src/main/java/org/opensearch/index/store/remote/filecache/FileCache.java
index dbbbbecbc6afd..2029b461674c7 100644
--- a/server/src/main/java/org/opensearch/index/store/remote/filecache/FileCache.java
+++ b/server/src/main/java/org/opensearch/index/store/remote/filecache/FileCache.java
@@ -9,6 +9,7 @@
 package org.opensearch.index.store.remote.filecache;
 
 import org.apache.lucene.store.IndexInput;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.core.common.breaker.CircuitBreaker;
 import org.opensearch.core.common.breaker.CircuitBreakingException;
@@ -43,8 +44,9 @@
  * items from cache tail and triggers a callback to clean up the file from disk. The
  * cleanup process also includes closing file’s descriptor.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.7.0")
 public class FileCache implements RefCountedCache<Path, CachedIndexInput> {
     private final SegmentedCache<Path, CachedIndexInput> theCache;
 
diff --git a/server/src/main/java/org/opensearch/index/store/remote/utils/cache/CacheUsage.java b/server/src/main/java/org/opensearch/index/store/remote/utils/cache/CacheUsage.java
index 1cb9242926046..0b5480d3ca978 100644
--- a/server/src/main/java/org/opensearch/index/store/remote/utils/cache/CacheUsage.java
+++ b/server/src/main/java/org/opensearch/index/store/remote/utils/cache/CacheUsage.java
@@ -8,11 +8,14 @@
 
 package org.opensearch.index.store.remote.utils.cache;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * Usage metrics for {@link RefCountedCache}
  *
  * @opensearch.internal
  */
+@PublicApi(since = "2.7.0")
 public class CacheUsage {
     /**
      * Cache usage of the system
diff --git a/server/src/main/java/org/opensearch/index/store/remote/utils/cache/stats/CacheStats.java b/server/src/main/java/org/opensearch/index/store/remote/utils/cache/stats/CacheStats.java
index f0a7154effb1d..55893752669a8 100644
--- a/server/src/main/java/org/opensearch/index/store/remote/utils/cache/stats/CacheStats.java
+++ b/server/src/main/java/org/opensearch/index/store/remote/utils/cache/stats/CacheStats.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.index.store.remote.utils.cache.stats;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.store.remote.utils.cache.RefCountedCache;
 
 import java.util.Objects;
@@ -15,8 +16,9 @@
 /**
  * Statistics about the performance of a {@link RefCountedCache}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.7.0")
 public final class CacheStats {
     private final long hitCount;
     private final long missCount;
diff --git a/server/src/main/java/org/opensearch/index/translog/BaseTranslogReader.java b/server/src/main/java/org/opensearch/index/translog/BaseTranslogReader.java
index ea817c4b0932a..d6fa2a2e53de3 100644
--- a/server/src/main/java/org/opensearch/index/translog/BaseTranslogReader.java
+++ b/server/src/main/java/org/opensearch/index/translog/BaseTranslogReader.java
@@ -108,7 +108,7 @@ protected final int readSize(ByteBuffer reusableBuffer, long position) throws IO
         return size;
     }
 
-    public TranslogSnapshot newSnapshot() {
+    TranslogSnapshot newSnapshot() {
         return new TranslogSnapshot(this, sizeInBytes());
     }
 
diff --git a/server/src/main/java/org/opensearch/index/translog/BufferedChecksumStreamOutput.java b/server/src/main/java/org/opensearch/index/translog/BufferedChecksumStreamOutput.java
index eaf9ac0893f1b..9e96664c79cc5 100644
--- a/server/src/main/java/org/opensearch/index/translog/BufferedChecksumStreamOutput.java
+++ b/server/src/main/java/org/opensearch/index/translog/BufferedChecksumStreamOutput.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.translog;
 
 import org.apache.lucene.store.BufferedChecksum;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamOutput;
 
 import java.io.IOException;
@@ -43,8 +44,9 @@
  * Similar to Lucene's BufferedChecksumIndexOutput, however this wraps a
  * {@link StreamOutput} so anything written will update the checksum
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class BufferedChecksumStreamOutput extends StreamOutput {
     private final StreamOutput out;
     private final Checksum digest;
diff --git a/server/src/main/java/org/opensearch/index/translog/ChannelFactory.java b/server/src/main/java/org/opensearch/index/translog/ChannelFactory.java
index f86b9dea0a5f7..4fba85b9d224d 100644
--- a/server/src/main/java/org/opensearch/index/translog/ChannelFactory.java
+++ b/server/src/main/java/org/opensearch/index/translog/ChannelFactory.java
@@ -31,6 +31,8 @@
 
 package org.opensearch.index.translog;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.io.IOException;
 import java.nio.channels.FileChannel;
 import java.nio.file.OpenOption;
@@ -40,9 +42,10 @@
 /**
  * only for testing until we have a disk-full FileSystem
  *
- * @opensearch.internal
+ * @opensearch.api
  */
 @FunctionalInterface
+@PublicApi(since = "1.0.0")
 public interface ChannelFactory {
     default FileChannel open(Path path) throws IOException {
         return open(path, StandardOpenOption.WRITE, StandardOpenOption.READ, StandardOpenOption.CREATE_NEW);
diff --git a/server/src/main/java/org/opensearch/index/translog/Checkpoint.java b/server/src/main/java/org/opensearch/index/translog/Checkpoint.java
index a9f905f52bc3a..d309564ef5d32 100644
--- a/server/src/main/java/org/opensearch/index/translog/Checkpoint.java
+++ b/server/src/main/java/org/opensearch/index/translog/Checkpoint.java
@@ -44,6 +44,7 @@
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.NIOFSDirectory;
 import org.apache.lucene.store.OutputStreamIndexOutput;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.io.Channels;
 import org.opensearch.index.seqno.SequenceNumbers;
 
@@ -57,9 +58,10 @@
 /**
  * A checkpoint for OpenSearch operations
  *
- * @opensearch.internal
+ * @opensearch.api
  */
-final public class Checkpoint {
+@PublicApi(since = "1.0.0")
+public final class Checkpoint {
 
     final long offset;
     final int numOps;
diff --git a/server/src/main/java/org/opensearch/index/translog/TragicExceptionHolder.java b/server/src/main/java/org/opensearch/index/translog/TragicExceptionHolder.java
index 818d840cb11fd..023e277edfd6c 100644
--- a/server/src/main/java/org/opensearch/index/translog/TragicExceptionHolder.java
+++ b/server/src/main/java/org/opensearch/index/translog/TragicExceptionHolder.java
@@ -34,14 +34,16 @@
 
 import org.apache.lucene.store.AlreadyClosedException;
 import org.opensearch.ExceptionsHelper;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Exception thrown if there are any massive OpenSearch failures
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class TragicExceptionHolder {
     private final AtomicReference<Exception> tragedy = new AtomicReference<>();
 
diff --git a/server/src/main/java/org/opensearch/index/translog/Translog.java b/server/src/main/java/org/opensearch/index/translog/Translog.java
index 9f80bc38a8222..8b4662238ed25 100644
--- a/server/src/main/java/org/opensearch/index/translog/Translog.java
+++ b/server/src/main/java/org/opensearch/index/translog/Translog.java
@@ -111,8 +111,9 @@
  * operation etc. are still preserved.
  * </p>
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class Translog extends AbstractIndexShardComponent implements IndexShardComponent, Closeable {
 
     /*
@@ -895,8 +896,9 @@ public TranslogDeletionPolicy getDeletionPolicy() {
     /**
      * Location in the translot
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Location implements Comparable<Location> {
 
         public final long generation;
@@ -954,8 +956,9 @@ public int hashCode() {
     /**
      * A snapshot of the transaction log, allows to iterate over all the transaction log operations.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface Snapshot extends Closeable {
 
         /**
@@ -1040,14 +1043,16 @@ public void close() throws IOException {
      * A generic interface representing an operation performed on the transaction log.
      * Each is associated with a type.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface Operation {
         /**
          * The type of operation
          *
-         * @opensearch.internal
+         * @opensearch.api
          */
+        @PublicApi(since = "1.0.0")
         enum Type {
             @Deprecated
             CREATE((byte) 1),
@@ -1138,8 +1143,9 @@ static void writeOperation(final StreamOutput output, final Operation operation)
     /**
      * The source in the translog
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Source {
 
         public final BytesReference source;
@@ -1835,8 +1841,9 @@ void closeFilesIfNoPendingRetentionLocks() throws IOException {
     /**
      * References a transaction log generation
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class TranslogGeneration {
         public final String translogUUID;
         public final long translogFileGeneration;
diff --git a/server/src/main/java/org/opensearch/index/translog/TranslogConfig.java b/server/src/main/java/org/opensearch/index/translog/TranslogConfig.java
index 6e75ebd847b5e..2f00773075d41 100644
--- a/server/src/main/java/org/opensearch/index/translog/TranslogConfig.java
+++ b/server/src/main/java/org/opensearch/index/translog/TranslogConfig.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.index.translog;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.core.common.unit.ByteSizeUnit;
 import org.opensearch.core.common.unit.ByteSizeValue;
@@ -45,8 +46,9 @@
  * Once {@link Translog} has been created with this object, changes to this
  * object will affect the {@link Translog} instance.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class TranslogConfig {
 
     public static final ByteSizeValue DEFAULT_BUFFER_SIZE = new ByteSizeValue(1, ByteSizeUnit.MB);
diff --git a/server/src/main/java/org/opensearch/index/translog/TranslogDeletionPolicy.java b/server/src/main/java/org/opensearch/index/translog/TranslogDeletionPolicy.java
index 99784b77c61f5..972b19a029a8b 100644
--- a/server/src/main/java/org/opensearch/index/translog/TranslogDeletionPolicy.java
+++ b/server/src/main/java/org/opensearch/index/translog/TranslogDeletionPolicy.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.translog;
 
 import org.apache.lucene.util.Counter;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.core.Assertions;
 import org.opensearch.index.seqno.SequenceNumbers;
@@ -47,8 +48,9 @@
 /**
  * Defines a translog deletion policy
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class TranslogDeletionPolicy {
 
     private final Map<Object, RuntimeException> openTranslogRef;
diff --git a/server/src/main/java/org/opensearch/index/translog/TranslogFactory.java b/server/src/main/java/org/opensearch/index/translog/TranslogFactory.java
index ab8e2b7752e66..a139b10f563b2 100644
--- a/server/src/main/java/org/opensearch/index/translog/TranslogFactory.java
+++ b/server/src/main/java/org/opensearch/index/translog/TranslogFactory.java
@@ -8,6 +8,8 @@
 
 package org.opensearch.index.translog;
 
+import org.opensearch.common.annotation.PublicApi;
+
 import java.io.IOException;
 import java.util.function.BooleanSupplier;
 import java.util.function.LongConsumer;
@@ -17,9 +19,10 @@
  * Translog Factory to enable creation of various local on-disk
  * and remote store flavors of {@link Translog}
  *
- * @opensearch.internal
+ * @opensearch.api
  */
 @FunctionalInterface
+@PublicApi(since = "1.0.0")
 public interface TranslogFactory {
 
     Translog newTranslog(
diff --git a/server/src/main/java/org/opensearch/index/translog/TranslogReader.java b/server/src/main/java/org/opensearch/index/translog/TranslogReader.java
index 9ea3328587645..d590663670b28 100644
--- a/server/src/main/java/org/opensearch/index/translog/TranslogReader.java
+++ b/server/src/main/java/org/opensearch/index/translog/TranslogReader.java
@@ -34,6 +34,7 @@
 
 import org.apache.lucene.store.AlreadyClosedException;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.io.Channels;
 import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.index.seqno.SequenceNumbers;
@@ -52,8 +53,9 @@
 /**
  * an immutable translog filereader
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class TranslogReader extends BaseTranslogReader implements Closeable {
     protected final long length;
     private final int totalOperations;
diff --git a/server/src/main/java/org/opensearch/index/translog/TranslogWriter.java b/server/src/main/java/org/opensearch/index/translog/TranslogWriter.java
index 3f33c155be15e..86f7567f3333d 100644
--- a/server/src/main/java/org/opensearch/index/translog/TranslogWriter.java
+++ b/server/src/main/java/org/opensearch/index/translog/TranslogWriter.java
@@ -37,6 +37,7 @@
 import org.apache.lucene.util.BytesRefIterator;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.SuppressForbidden;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.bytes.ReleasableBytesReference;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.Channels;
@@ -73,8 +74,9 @@
 /**
  * Writer that writes operations to the translog
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class TranslogWriter extends BaseTranslogReader implements Closeable {
 
     private final ShardId shardId;
@@ -471,7 +473,7 @@ public TranslogReader closeIntoReader() throws IOException {
     }
 
     @Override
-    public TranslogSnapshot newSnapshot() {
+    TranslogSnapshot newSnapshot() {
         // make sure to acquire the sync lock first, to prevent dead locks with threads calling
         // syncUpTo() , where the sync lock is acquired first, following by the synchronize(this)
         // After the sync lock we acquire the write lock to avoid deadlocks with threads writing where
diff --git a/server/src/main/java/org/opensearch/indices/IndicesQueryCache.java b/server/src/main/java/org/opensearch/indices/IndicesQueryCache.java
index 228723045d8cc..48fe717de8ae7 100644
--- a/server/src/main/java/org/opensearch/indices/IndicesQueryCache.java
+++ b/server/src/main/java/org/opensearch/indices/IndicesQueryCache.java
@@ -44,6 +44,7 @@
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.ScorerSupplier;
 import org.apache.lucene.search.Weight;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.ShardCoreKeyMap;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
@@ -65,8 +66,9 @@
 /**
  * The query cache for indices
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class IndicesQueryCache implements QueryCache, Closeable {
 
     private static final Logger logger = LogManager.getLogger(IndicesQueryCache.class);
diff --git a/server/src/main/java/org/opensearch/indices/cluster/IndicesClusterStateService.java b/server/src/main/java/org/opensearch/indices/cluster/IndicesClusterStateService.java
index dc538a03de595..7fb8b172ae352 100644
--- a/server/src/main/java/org/opensearch/indices/cluster/IndicesClusterStateService.java
+++ b/server/src/main/java/org/opensearch/indices/cluster/IndicesClusterStateService.java
@@ -51,6 +51,7 @@
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.lifecycle.AbstractLifecycleComponent;
 import org.opensearch.common.settings.Settings;
@@ -1059,8 +1060,9 @@ void processPendingDeletes(Index index, IndexSettings indexSettings, TimeValue t
         /**
          * Why the index was removed
          *
-         * @opensearch.internal
+         * @opensearch.api
          */
+        @PublicApi(since = "1.0.0")
         enum IndexRemovalReason {
             /**
              * Shard of this index were previously assigned to this node but all shards have been relocated.
diff --git a/server/src/main/java/org/opensearch/indices/fielddata/cache/IndicesFieldDataCache.java b/server/src/main/java/org/opensearch/indices/fielddata/cache/IndicesFieldDataCache.java
index e2fac15f44604..e78f05831d7ac 100644
--- a/server/src/main/java/org/opensearch/indices/fielddata/cache/IndicesFieldDataCache.java
+++ b/server/src/main/java/org/opensearch/indices/fielddata/cache/IndicesFieldDataCache.java
@@ -40,6 +40,7 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.util.Accountable;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.cache.Cache;
 import org.opensearch.common.cache.CacheBuilder;
 import org.opensearch.common.cache.RemovalListener;
@@ -67,8 +68,9 @@
 /**
  * The field data cache for multiple indices
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class IndicesFieldDataCache implements RemovalListener<IndicesFieldDataCache.Key, Accountable>, Releasable {
 
     private static final Logger logger = LogManager.getLogger(IndicesFieldDataCache.class);
@@ -252,8 +254,9 @@ public void clear(String fieldName) {
     /**
      * Key for the indices field data cache
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Key {
         public final IndexFieldCache indexCache;
         public final IndexReader.CacheKey readerKey;
diff --git a/server/src/main/java/org/opensearch/indices/mapper/MapperRegistry.java b/server/src/main/java/org/opensearch/indices/mapper/MapperRegistry.java
index c26428309aec5..7974de3514ce3 100644
--- a/server/src/main/java/org/opensearch/indices/mapper/MapperRegistry.java
+++ b/server/src/main/java/org/opensearch/indices/mapper/MapperRegistry.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.indices.mapper;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.mapper.Mapper;
 import org.opensearch.index.mapper.MetadataFieldMapper;
 import org.opensearch.plugins.MapperPlugin;
@@ -45,8 +46,9 @@
 /**
  * A registry for all field mappers.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class MapperRegistry {
 
     private final Map<String, Mapper.TypeParser> mapperParsers;
diff --git a/server/src/main/java/org/opensearch/indices/replication/checkpoint/PublishCheckpointAction.java b/server/src/main/java/org/opensearch/indices/replication/checkpoint/PublishCheckpointAction.java
index 11b01965c4af5..821ae42e31881 100644
--- a/server/src/main/java/org/opensearch/indices/replication/checkpoint/PublishCheckpointAction.java
+++ b/server/src/main/java/org/opensearch/indices/replication/checkpoint/PublishCheckpointAction.java
@@ -20,6 +20,7 @@
 import org.opensearch.action.support.replication.TransportReplicationAction;
 import org.opensearch.cluster.action.shard.ShardStateAction;
 import org.opensearch.cluster.service.ClusterService;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.concurrent.ThreadContext;
@@ -45,9 +46,9 @@
 /**
  * Replication action responsible for publishing checkpoint to a replica shard.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
-
+@PublicApi(since = "2.2.0")
 public class PublishCheckpointAction extends TransportReplicationAction<
     PublishCheckpointRequest,
     PublishCheckpointRequest,
diff --git a/server/src/main/java/org/opensearch/indices/replication/checkpoint/ReplicationCheckpoint.java b/server/src/main/java/org/opensearch/indices/replication/checkpoint/ReplicationCheckpoint.java
index 521522803c726..29410159a4955 100644
--- a/server/src/main/java/org/opensearch/indices/replication/checkpoint/ReplicationCheckpoint.java
+++ b/server/src/main/java/org/opensearch/indices/replication/checkpoint/ReplicationCheckpoint.java
@@ -10,6 +10,7 @@
 
 import org.opensearch.Version;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -25,8 +26,9 @@
 /**
  * Represents a Replication Checkpoint which is sent to a replica shard.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.2.0")
 public class ReplicationCheckpoint implements Writeable, Comparable<ReplicationCheckpoint> {
 
     private final ShardId shardId;
diff --git a/server/src/main/java/org/opensearch/indices/replication/checkpoint/SegmentReplicationCheckpointPublisher.java b/server/src/main/java/org/opensearch/indices/replication/checkpoint/SegmentReplicationCheckpointPublisher.java
index b4bcdc92e539a..a35d6fd103dc0 100644
--- a/server/src/main/java/org/opensearch/indices/replication/checkpoint/SegmentReplicationCheckpointPublisher.java
+++ b/server/src/main/java/org/opensearch/indices/replication/checkpoint/SegmentReplicationCheckpointPublisher.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.indices.replication.checkpoint;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.index.shard.IndexShard;
 
@@ -16,8 +17,9 @@
 /**
  * Publish Segment Replication Checkpoint.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "2.2.0")
 public class SegmentReplicationCheckpointPublisher {
 
     private final PublishAction publishAction;
@@ -39,7 +41,10 @@ public void publish(IndexShard indexShard, ReplicationCheckpoint checkpoint) {
 
     /**
      * Represents an action that is invoked to publish segment replication checkpoint to replica shard
+     *
+     * @opensearch.api
      */
+    @PublicApi(since = "2.2.0")
     public interface PublishAction {
         void publish(IndexShard indexShard, ReplicationCheckpoint checkpoint);
     }
diff --git a/server/src/main/java/org/opensearch/node/AdaptiveSelectionStats.java b/server/src/main/java/org/opensearch/node/AdaptiveSelectionStats.java
index 0241f5f6191d4..eea3e63830227 100644
--- a/server/src/main/java/org/opensearch/node/AdaptiveSelectionStats.java
+++ b/server/src/main/java/org/opensearch/node/AdaptiveSelectionStats.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.node;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.set.Sets;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -52,8 +53,9 @@
  * EWMA of queue size, service time, and response time, as well as outgoing
  * searches to each node and the "rank" based on the ARS formula.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class AdaptiveSelectionStats implements Writeable, ToXContentFragment {
 
     private final Map<String, Long> clientOutgoingConnections;
diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java
index e80b768074fc7..03138b933896a 100644
--- a/server/src/main/java/org/opensearch/node/Node.java
+++ b/server/src/main/java/org/opensearch/node/Node.java
@@ -1850,18 +1850,17 @@ private LocalNodeFactory(Settings settings, String persistentNodeId, RemoteStore
 
         @Override
         public DiscoveryNode apply(BoundTransportAddress boundTransportAddress) {
+            final DiscoveryNode discoveryNode = DiscoveryNode.createLocal(
+                settings,
+                boundTransportAddress.publishAddress(),
+                persistentNodeId
+            );
+
             if (isRemoteStoreAttributePresent(settings)) {
-                localNode.set(
-                    DiscoveryNode.createRemoteNodeLocal(
-                        settings,
-                        boundTransportAddress.publishAddress(),
-                        persistentNodeId,
-                        remoteStoreNodeService
-                    )
-                );
-            } else {
-                localNode.set(DiscoveryNode.createLocal(settings, boundTransportAddress.publishAddress(), persistentNodeId));
+                remoteStoreNodeService.createAndVerifyRepositories(discoveryNode);
             }
+
+            localNode.set(discoveryNode);
             return localNode.get();
         }
 
diff --git a/server/src/main/java/org/opensearch/node/ResponseCollectorService.java b/server/src/main/java/org/opensearch/node/ResponseCollectorService.java
index 3451e50d27b5d..7bd3c2d8d8ec6 100644
--- a/server/src/main/java/org/opensearch/node/ResponseCollectorService.java
+++ b/server/src/main/java/org/opensearch/node/ResponseCollectorService.java
@@ -37,6 +37,7 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.ExponentiallyWeightedMovingAverage;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.concurrent.ConcurrentCollections;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -54,8 +55,9 @@
  * tasks executed on each node, making the EWMA of the values available to the
  * coordinating node.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class ResponseCollectorService implements ClusterStateListener {
 
     private static final double ALPHA = 0.3;
@@ -120,7 +122,10 @@ public Optional<ComputedNodeStats> getNodeStatistics(final String nodeId) {
      * Struct-like class encapsulating a point-in-time snapshot of a particular
      * node's statistics. This includes the EWMA of queue size, response time,
      * and service time.
+     *
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class ComputedNodeStats implements Writeable {
         // We store timestamps with nanosecond precision, however, the
         // formula specifies milliseconds, therefore we need to convert
diff --git a/server/src/main/java/org/opensearch/plugins/IndexStorePlugin.java b/server/src/main/java/org/opensearch/plugins/IndexStorePlugin.java
index 2f549fec54759..ebd5717a00319 100644
--- a/server/src/main/java/org/opensearch/plugins/IndexStorePlugin.java
+++ b/server/src/main/java/org/opensearch/plugins/IndexStorePlugin.java
@@ -36,6 +36,7 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.shard.ShardPath;
 import org.opensearch.indices.recovery.RecoveryState;
@@ -49,12 +50,16 @@
  *
  * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface IndexStorePlugin {
 
     /**
      * An interface that describes how to create a new directory instance per shard.
+     *
+     * @opensearch.api
      */
     @FunctionalInterface
+    @PublicApi(since = "1.0.0")
     interface DirectoryFactory {
         /**
          * Creates a new directory per shard. This method is called once per shard on shard creation.
@@ -77,8 +82,11 @@ interface DirectoryFactory {
 
     /**
      * An interface that allows to create a new {@link RecoveryState} per shard.
+     *
+     * @opensearch.api
      */
     @FunctionalInterface
+    @PublicApi(since = "1.0.0")
     interface RecoveryStateFactory {
         /**
          * Creates a new {@link RecoveryState} per shard. This method is called once per shard on shard creation.
diff --git a/server/src/main/java/org/opensearch/repositories/IndexId.java b/server/src/main/java/org/opensearch/repositories/IndexId.java
index d88eeb5aa9c49..87a0063e8c21b 100644
--- a/server/src/main/java/org/opensearch/repositories/IndexId.java
+++ b/server/src/main/java/org/opensearch/repositories/IndexId.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.repositories;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -46,8 +47,9 @@
 /**
  * Represents a single snapshotted index in the repository.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class IndexId implements Writeable, ToXContentObject {
     protected static final String NAME = "name";
     protected static final String ID = "id";
diff --git a/server/src/main/java/org/opensearch/repositories/IndexMetaDataGenerations.java b/server/src/main/java/org/opensearch/repositories/IndexMetaDataGenerations.java
index 25cb0eaf43455..41f77e6830f5f 100644
--- a/server/src/main/java/org/opensearch/repositories/IndexMetaDataGenerations.java
+++ b/server/src/main/java/org/opensearch/repositories/IndexMetaDataGenerations.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.snapshots.SnapshotId;
 
 import java.util.Collection;
@@ -50,8 +51,9 @@
  * {@link IndexMetadata} should be computed and then used to check if it already exists in the repository via
  * {@link #getIndexMetaBlobId(String)}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class IndexMetaDataGenerations {
 
     public static final IndexMetaDataGenerations EMPTY = new IndexMetaDataGenerations(Collections.emptyMap(), Collections.emptyMap());
diff --git a/server/src/main/java/org/opensearch/repositories/Repository.java b/server/src/main/java/org/opensearch/repositories/Repository.java
index 74cda9bcc3393..b3f1e9ce2eed9 100644
--- a/server/src/main/java/org/opensearch/repositories/Repository.java
+++ b/server/src/main/java/org/opensearch/repositories/Repository.java
@@ -41,6 +41,7 @@
 import org.opensearch.cluster.metadata.RepositoryMetadata;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lifecycle.LifecycleComponent;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.core.action.ActionListener;
@@ -75,14 +76,18 @@
  * <li>When all shard calls return cluster-manager calls {@link #finalizeSnapshot} with possible list of failures</li>
  * </ul>
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface Repository extends LifecycleComponent {
 
     /**
      * An factory interface for constructing repositories.
      * See {@link org.opensearch.plugins.RepositoryPlugin}.
+     *
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     interface Factory {
         /**
          * Constructs a repository.
diff --git a/server/src/main/java/org/opensearch/repositories/RepositoryData.java b/server/src/main/java/org/opensearch/repositories/RepositoryData.java
index 90d7b404d089a..ea48d9b1a49fe 100644
--- a/server/src/main/java/org/opensearch/repositories/RepositoryData.java
+++ b/server/src/main/java/org/opensearch/repositories/RepositoryData.java
@@ -37,6 +37,7 @@
 import org.opensearch.Version;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.UUIDs;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.core.xcontent.XContentParserUtils;
@@ -60,8 +61,9 @@
  * A class that represents the data in a repository, as captured in the
  * repository's index blob.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class RepositoryData {
 
     /**
diff --git a/server/src/main/java/org/opensearch/repositories/RepositoryInfo.java b/server/src/main/java/org/opensearch/repositories/RepositoryInfo.java
index 387a685bd6526..c947ff19bbca8 100644
--- a/server/src/main/java/org/opensearch/repositories/RepositoryInfo.java
+++ b/server/src/main/java/org/opensearch/repositories/RepositoryInfo.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.repositories;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -47,8 +48,9 @@
 /**
  * Information about a repository
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class RepositoryInfo implements Writeable, ToXContentFragment {
     public final String name;
     public final String type;
diff --git a/server/src/main/java/org/opensearch/repositories/RepositoryShardId.java b/server/src/main/java/org/opensearch/repositories/RepositoryShardId.java
index 4799f36156a73..5b16ffcdf83a4 100644
--- a/server/src/main/java/org/opensearch/repositories/RepositoryShardId.java
+++ b/server/src/main/java/org/opensearch/repositories/RepositoryShardId.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.repositories;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -42,8 +43,9 @@
 /**
  * Represents a shard snapshot in a repository.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class RepositoryShardId implements Writeable {
 
     private final IndexId index;
diff --git a/server/src/main/java/org/opensearch/repositories/RepositoryStats.java b/server/src/main/java/org/opensearch/repositories/RepositoryStats.java
index ab97c5eaa1f7a..a0cc1637af00e 100644
--- a/server/src/main/java/org/opensearch/repositories/RepositoryStats.java
+++ b/server/src/main/java/org/opensearch/repositories/RepositoryStats.java
@@ -33,6 +33,7 @@
 package org.opensearch.repositories;
 
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.blobstore.BlobStore;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -49,8 +50,9 @@
 /**
  * Stats about a repository
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class RepositoryStats implements Writeable, ToXContentFragment {
 
     public static final RepositoryStats EMPTY_STATS = new RepositoryStats(Collections.emptyMap());
diff --git a/server/src/main/java/org/opensearch/repositories/RepositoryStatsSnapshot.java b/server/src/main/java/org/opensearch/repositories/RepositoryStatsSnapshot.java
index 0a727980fad0d..3340defffc90f 100644
--- a/server/src/main/java/org/opensearch/repositories/RepositoryStatsSnapshot.java
+++ b/server/src/main/java/org/opensearch/repositories/RepositoryStatsSnapshot.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.repositories;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -46,8 +47,9 @@
 /**
  * Stats snapshot about a repository
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class RepositoryStatsSnapshot implements Writeable, ToXContentObject {
     public static final long UNKNOWN_CLUSTER_VERSION = -1;
     private final RepositoryInfo repositoryInfo;
diff --git a/server/src/main/java/org/opensearch/repositories/ShardGenerations.java b/server/src/main/java/org/opensearch/repositories/ShardGenerations.java
index d918eb7e1e476..3591e683e58c1 100644
--- a/server/src/main/java/org/opensearch/repositories/ShardGenerations.java
+++ b/server/src/main/java/org/opensearch/repositories/ShardGenerations.java
@@ -33,6 +33,7 @@
 package org.opensearch.repositories;
 
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -48,8 +49,9 @@
 /**
  * Generations of shards for snapshots
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class ShardGenerations {
 
     public static final ShardGenerations EMPTY = new ShardGenerations(Collections.emptyMap());
@@ -177,8 +179,9 @@ public static Builder builder() {
     /**
      * Builder for the shard generations.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class Builder {
 
         private final Map<IndexId, Map<Integer, String>> generations = new HashMap<>();
diff --git a/server/src/main/java/org/opensearch/script/AggregationScript.java b/server/src/main/java/org/opensearch/script/AggregationScript.java
index ef300e9473d3e..2e2f4af027e1b 100644
--- a/server/src/main/java/org/opensearch/script/AggregationScript.java
+++ b/server/src/main/java/org/opensearch/script/AggregationScript.java
@@ -34,6 +34,7 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.Scorable;
 import org.opensearch.OpenSearchException;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.lucene.ScorerAware;
 import org.opensearch.index.fielddata.ScriptDocValues;
@@ -49,8 +50,9 @@
 /**
  * Scripts for aggregations
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class AggregationScript implements ScorerAware {
 
     public static final String[] PARAMETERS = {};
@@ -168,8 +170,9 @@ public double runAsDouble() {
     /**
      * A factory to construct {@link AggregationScript} instances.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface LeafFactory {
         AggregationScript newInstance(LeafReaderContext ctx) throws IOException;
 
diff --git a/server/src/main/java/org/opensearch/search/DocValueFormat.java b/server/src/main/java/org/opensearch/search/DocValueFormat.java
index 7be51643eeb7d..9fae14f69b0af 100644
--- a/server/src/main/java/org/opensearch/search/DocValueFormat.java
+++ b/server/src/main/java/org/opensearch/search/DocValueFormat.java
@@ -36,6 +36,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.Version;
 import org.opensearch.common.Numbers;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.network.InetAddresses;
 import org.opensearch.common.network.NetworkAddress;
 import org.opensearch.common.time.DateFormatter;
@@ -64,8 +65,9 @@
 /**
  * A formatter for values as returned by the fielddata/doc-values APIs.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface DocValueFormat extends NamedWriteable {
     long MASK_2_63 = 0x8000000000000000L;
     BigInteger BIGINTEGER_2_64_MINUS_ONE = BigInteger.ONE.shiftLeft(64).subtract(BigInteger.ONE); // 2^64 -1
diff --git a/server/src/main/java/org/opensearch/search/MultiValueMode.java b/server/src/main/java/org/opensearch/search/MultiValueMode.java
index d812f1290efe3..ca088203733c6 100644
--- a/server/src/main/java/org/opensearch/search/MultiValueMode.java
+++ b/server/src/main/java/org/opensearch/search/MultiValueMode.java
@@ -42,6 +42,7 @@
 import org.apache.lucene.util.BitSet;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefBuilder;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -59,8 +60,9 @@
 /**
  * Defines what values to pick in the case a document contains multiple values for a particular field.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public enum MultiValueMode implements Writeable {
     /**
      * Pick the sum of all the values.
diff --git a/server/src/main/java/org/opensearch/search/RescoreDocIds.java b/server/src/main/java/org/opensearch/search/RescoreDocIds.java
index 880f34a924f2a..a916e96638366 100644
--- a/server/src/main/java/org/opensearch/search/RescoreDocIds.java
+++ b/server/src/main/java/org/opensearch/search/RescoreDocIds.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -46,8 +47,9 @@
  * (i.e., documents that will be rescored by query rescorers) need to be serialized/ deserialized between search phases.
  * A {@link RescoreDocIds} encapsulates the top K results for each rescorer by its ordinal index.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class RescoreDocIds implements Writeable {
     public static final RescoreDocIds EMPTY = new RescoreDocIds(Collections.emptyMap());
 
diff --git a/server/src/main/java/org/opensearch/search/SearchHit.java b/server/src/main/java/org/opensearch/search/SearchHit.java
index 5649ec383a9e9..10e65fca3afb5 100644
--- a/server/src/main/java/org/opensearch/search/SearchHit.java
+++ b/server/src/main/java/org/opensearch/search/SearchHit.java
@@ -37,6 +37,7 @@
 import org.opensearch.Version;
 import org.opensearch.action.OriginalIndices;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.document.DocumentField;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.core.ParseField;
@@ -92,8 +93,9 @@
  *
  * @see SearchHits
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class SearchHit implements Writeable, ToXContentObject, Iterable<DocumentField> {
 
     private final transient int docId;
@@ -995,8 +997,9 @@ public int hashCode() {
     /**
      * Encapsulates the nested identity of a hit.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class NestedIdentity implements Writeable, ToXContentFragment {
 
         private static final String _NESTED = "_nested";
diff --git a/server/src/main/java/org/opensearch/search/SearchHits.java b/server/src/main/java/org/opensearch/search/SearchHits.java
index 1d497840bd12b..8232643b353f5 100644
--- a/server/src/main/java/org/opensearch/search/SearchHits.java
+++ b/server/src/main/java/org/opensearch/search/SearchHits.java
@@ -36,6 +36,7 @@
 import org.apache.lucene.search.TotalHits;
 import org.apache.lucene.search.TotalHits.Relation;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.Lucene;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -57,8 +58,9 @@
 /**
  * Encapsulates the results of a search operation
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class SearchHits implements Writeable, ToXContentFragment, Iterable<SearchHit> {
     public static SearchHits empty() {
         return empty(true);
diff --git a/server/src/main/java/org/opensearch/search/SearchPhaseResult.java b/server/src/main/java/org/opensearch/search/SearchPhaseResult.java
index 9eda278a40268..a351b3bd2dda6 100644
--- a/server/src/main/java/org/opensearch/search/SearchPhaseResult.java
+++ b/server/src/main/java/org/opensearch/search/SearchPhaseResult.java
@@ -33,6 +33,7 @@
 package org.opensearch.search;
 
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.transport.TransportResponse;
@@ -51,8 +52,9 @@
  * across search phases to ensure the same point in time snapshot is used for querying and
  * fetching etc.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class SearchPhaseResult extends TransportResponse {
 
     private SearchShardTarget searchShardTarget;
diff --git a/server/src/main/java/org/opensearch/search/SearchShardTarget.java b/server/src/main/java/org/opensearch/search/SearchShardTarget.java
index 882ba8e069c2e..80b4feda374c6 100644
--- a/server/src/main/java/org/opensearch/search/SearchShardTarget.java
+++ b/server/src/main/java/org/opensearch/search/SearchShardTarget.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.action.OriginalIndices;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -47,8 +48,9 @@
 /**
  * The target that the search request was executed on.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class SearchShardTarget implements Writeable, Comparable<SearchShardTarget> {
 
     private final Text nodeId;
diff --git a/server/src/main/java/org/opensearch/search/SearchSortValues.java b/server/src/main/java/org/opensearch/search/SearchSortValues.java
index c1f6b45ded7a5..cbc3900f72f79 100644
--- a/server/src/main/java/org/opensearch/search/SearchSortValues.java
+++ b/server/src/main/java/org/opensearch/search/SearchSortValues.java
@@ -33,6 +33,7 @@
 package org.opensearch.search;
 
 import org.apache.lucene.util.BytesRef;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.Lucene;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -50,8 +51,9 @@
 /**
  * Values to sort during search
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class SearchSortValues implements ToXContentFragment, Writeable {
 
     private static final Object[] EMPTY_ARRAY = new Object[0];
diff --git a/server/src/main/java/org/opensearch/search/SearchSortValuesAndFormats.java b/server/src/main/java/org/opensearch/search/SearchSortValuesAndFormats.java
index c2e9ea2a35a3e..f9174e92b79e8 100644
--- a/server/src/main/java/org/opensearch/search/SearchSortValuesAndFormats.java
+++ b/server/src/main/java/org/opensearch/search/SearchSortValuesAndFormats.java
@@ -33,6 +33,7 @@
 package org.opensearch.search;
 
 import org.apache.lucene.util.BytesRef;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.Lucene;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -45,8 +46,9 @@
 /**
  * Doc value and formats to sort during search
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class SearchSortValuesAndFormats implements Writeable {
     private final Object[] rawSortValues;
     private final Object[] formattedSortValues;
diff --git a/server/src/main/java/org/opensearch/search/aggregations/Aggregation.java b/server/src/main/java/org/opensearch/search/aggregations/Aggregation.java
index b723e14a84cbe..b41da3910030a 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/Aggregation.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/Aggregation.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.search.aggregations;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.ToXContentFragment;
@@ -40,8 +41,9 @@
 /**
  * An aggregation. Extends {@link ToXContent} as it makes it easier to print out its content.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface Aggregation extends ToXContentFragment {
 
     /**
diff --git a/server/src/main/java/org/opensearch/search/aggregations/AggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/AggregationBuilder.java
index 0d4d4bd7d67b2..878f81001344c 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/AggregationBuilder.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/AggregationBuilder.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.search.aggregations;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.NamedWriteable;
@@ -50,8 +51,9 @@
 /**
  * A factory that knows how to create an {@link Aggregator} of a specific type.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class AggregationBuilder
     implements
         NamedWriteable,
@@ -168,8 +170,9 @@ public PipelineTree buildPipelineTree() {
      * Unlike {@link CardinalityUpperBound} which is <strong>total</strong>
      * instead of <strong>per parent bucket</strong>.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum BucketCardinality {
         NONE,
         ONE,
diff --git a/server/src/main/java/org/opensearch/search/aggregations/Aggregations.java b/server/src/main/java/org/opensearch/search/aggregations/Aggregations.java
index b75ec7fe531a8..90d77d5516415 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/Aggregations.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/Aggregations.java
@@ -32,6 +32,7 @@
 package org.opensearch.search.aggregations;
 
 import org.opensearch.common.SetOnce;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.ParsingException;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
@@ -54,8 +55,9 @@
 /**
  * Represents a set of {@link Aggregation}s
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class Aggregations implements Iterable<Aggregation>, ToXContentFragment {
 
     public static final String AGGREGATIONS_FIELD = "aggregations";
diff --git a/server/src/main/java/org/opensearch/search/aggregations/Aggregator.java b/server/src/main/java/org/opensearch/search/aggregations/Aggregator.java
index b2ac0fdef04ef..8744d1f6a07d3 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/Aggregator.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/Aggregator.java
@@ -33,6 +33,7 @@
 package org.opensearch.search.aggregations;
 
 import org.opensearch.OpenSearchParseException;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -57,6 +58,7 @@
  *
  * @opensearch.internal
  */
+@PublicApi(since = "1.0.0")
 public abstract class Aggregator extends BucketCollector implements Releasable {
 
     /**
@@ -64,9 +66,10 @@ public abstract class Aggregator extends BucketCollector implements Releasable {
      *
      * @see AggregationBuilder
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
     @FunctionalInterface
+    @PublicApi(since = "1.0.0")
     public interface Parser {
         /**
          * Returns the aggregator factory with which this parser is associated, may return {@code null} indicating the
@@ -160,9 +163,10 @@ public BucketComparator bucketComparator(String key, SortOrder order) {
     /**
      * Compare two buckets by their ordinal.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
     @FunctionalInterface
+    @PublicApi(since = "1.0.0")
     public interface BucketComparator {
         /**
          * Compare two buckets by their ordinal.
diff --git a/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactories.java b/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactories.java
index 9b8ebe0b4e5e4..eeb0c606694b0 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactories.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactories.java
@@ -32,6 +32,7 @@
 package org.opensearch.search.aggregations;
 
 import org.opensearch.action.ActionRequestValidationException;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.xcontent.SuggestingErrorOnUnknown;
 import org.opensearch.core.common.ParsingException;
 import org.opensearch.core.common.Strings;
@@ -82,8 +83,9 @@
 /**
  * An immutable collection of {@link AggregatorFactories}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class AggregatorFactories {
     public static final Pattern VALID_AGG_NAME = Pattern.compile("[^\\[\\]>]+");
 
@@ -340,8 +342,9 @@ public int countAggregators() {
      * A mutable collection of {@link AggregationBuilder}s and
      * {@link PipelineAggregationBuilder}s.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder implements Writeable, ToXContentObject {
         private final Set<String> names = new HashSet<>();
 
diff --git a/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactory.java b/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactory.java
index 759d043743978..6cc3a78fb1e36 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactory.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactory.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.aggregations;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.search.internal.SearchContext;
 
@@ -43,8 +44,9 @@
 /**
  * Base factory to instantiate an internal aggregator
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class AggregatorFactory {
     protected final String name;
     protected final AggregatorFactory parent;
diff --git a/server/src/main/java/org/opensearch/search/aggregations/CardinalityUpperBound.java b/server/src/main/java/org/opensearch/search/aggregations/CardinalityUpperBound.java
index 15beeac82930a..8407a5eb6d3c0 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/CardinalityUpperBound.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/CardinalityUpperBound.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.aggregations;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.search.aggregations.bucket.BucketsAggregator;
 import org.opensearch.search.aggregations.bucket.filter.FilterAggregator;
 import org.opensearch.search.aggregations.bucket.range.RangeAggregator;
@@ -42,8 +43,9 @@
  * Upper bound of how many {@code owningBucketOrds} that an {@link Aggregator}
  * will have to collect into.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class CardinalityUpperBound {
     /**
      * {@link Aggregator}s with this cardinality won't collect any data at
diff --git a/server/src/main/java/org/opensearch/search/aggregations/InternalAggregation.java b/server/src/main/java/org/opensearch/search/aggregations/InternalAggregation.java
index 04c300658cb1c..49b85ccaea2a8 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/InternalAggregation.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/InternalAggregation.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.search.aggregations;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.NamedWriteable;
@@ -61,14 +62,16 @@
 /**
  * An internal implementation of {@link Aggregation}. Serves as a base class for all aggregation implementations.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class InternalAggregation implements Aggregation, NamedWriteable {
     /**
      * Builds {@link ReduceContext}.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface ReduceContextBuilder {
         /**
          * Build a {@linkplain ReduceContext} to perform a partial reduction.
@@ -84,8 +87,9 @@ public interface ReduceContextBuilder {
     /**
      * The reduce context
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class ReduceContext {
         private final BigArrays bigArrays;
         private final ScriptService scriptService;
diff --git a/server/src/main/java/org/opensearch/search/aggregations/InternalAggregations.java b/server/src/main/java/org/opensearch/search/aggregations/InternalAggregations.java
index 288c7a64ba795..9d55ee4a04506 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/InternalAggregations.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/InternalAggregations.java
@@ -32,6 +32,7 @@
 package org.opensearch.search.aggregations;
 
 import org.opensearch.Version;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -53,8 +54,9 @@
 /**
  * An internal implementation of {@link Aggregations}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class InternalAggregations extends Aggregations implements Writeable {
 
     public static final InternalAggregations EMPTY = new InternalAggregations(Collections.emptyList());
diff --git a/server/src/main/java/org/opensearch/search/aggregations/PipelineAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/PipelineAggregationBuilder.java
index 9754498841159..7ff823dbe57f0 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/PipelineAggregationBuilder.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/PipelineAggregationBuilder.java
@@ -33,6 +33,7 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.ValidateActions;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.NamedWriteable;
 import org.opensearch.core.xcontent.MediaTypeRegistry;
@@ -54,8 +55,9 @@
  * A factory that knows how to create an {@link PipelineAggregator} of a
  * specific type.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class PipelineAggregationBuilder
     implements
         NamedWriteable,
diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/LocalBucketCountThresholds.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/LocalBucketCountThresholds.java
index 98dc07cec49ab..9d8654565b391 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/bucket/LocalBucketCountThresholds.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/LocalBucketCountThresholds.java
@@ -8,14 +8,16 @@
 
 package org.opensearch.search.aggregations.bucket;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.search.aggregations.bucket.terms.TermsAggregator;
 
 /**
  * BucketCountThresholds type that holds the local (either shard level or request level) bucket count thresholds in minDocCount and requireSize fields.
  * Similar to {@link TermsAggregator.BucketCountThresholds} however only provides getters for the local members and no setters.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class LocalBucketCountThresholds {
 
     private final long minDocCount;
diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregator.java
index 845149d894aad..918cc0276ed13 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregator.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregator.java
@@ -33,6 +33,7 @@
 package org.opensearch.search.aggregations.bucket.terms;
 
 import org.opensearch.OpenSearchException;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -67,8 +68,9 @@ public abstract class TermsAggregator extends DeferableBucketAggregator {
     /**
      * Bucket count thresholds
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class BucketCountThresholds implements Writeable, ToXContentFragment {
         private long minDocCount;
         private long shardMinDocCount;
diff --git a/server/src/main/java/org/opensearch/search/aggregations/pipeline/PipelineAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/pipeline/PipelineAggregator.java
index 859eba1f1aaff..151051a21f610 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/pipeline/PipelineAggregator.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/pipeline/PipelineAggregator.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.aggregations.pipeline;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.aggregations.InternalAggregation;
@@ -48,8 +49,9 @@
 /**
  * Base aggregator for pipline aggs
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class PipelineAggregator {
     /**
      * Parse the {@link PipelineAggregationBuilder} from a {@link XContentParser}.
@@ -80,8 +82,9 @@ public interface Parser {
      * Tree of {@link PipelineAggregator}s to modify a tree of aggregations
      * after their final reduction.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class PipelineTree {
         /**
          * An empty tree of {@link PipelineAggregator}s.
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/AggregationInfo.java b/server/src/main/java/org/opensearch/search/aggregations/support/AggregationInfo.java
index 7d920ee2e9d56..c0aebb49af5ec 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/support/AggregationInfo.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/support/AggregationInfo.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.aggregations.support;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.service.ReportingService;
@@ -49,8 +50,9 @@
 /**
  * Data describing an agg
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class AggregationInfo implements ReportingService.Info {
 
     private final Map<String, Set<String>> aggs;
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/AggregationPath.java b/server/src/main/java/org/opensearch/search/aggregations/support/AggregationPath.java
index 4cfd2070211d7..78180ff08fea9 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/support/AggregationPath.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/support/AggregationPath.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.aggregations.support;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.Strings;
 import org.opensearch.search.aggregations.AggregationExecutionException;
 import org.opensearch.search.aggregations.Aggregator;
@@ -131,8 +132,9 @@ public static AggregationPath parse(String path) {
     /**
      * Element in an agg path
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class PathElement {
 
         private final String fullName;
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/AggregationUsageService.java b/server/src/main/java/org/opensearch/search/aggregations/support/AggregationUsageService.java
index 7685ec5ff876f..41f03bd4da9e2 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/support/AggregationUsageService.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/support/AggregationUsageService.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.aggregations.support;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.service.ReportingService;
 
 import java.util.HashMap;
@@ -41,8 +42,9 @@
 /**
  * Service to track telemetry about aggregations
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class AggregationUsageService implements ReportingService<AggregationInfo> {
     private final Map<String, Map<String, LongAdder>> aggs;
     private final AggregationInfo info;
@@ -52,8 +54,9 @@ public class AggregationUsageService implements ReportingService<AggregationInfo
     /**
      * Builder for the Agg usage service to track telemetry
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
         private final Map<String, Map<String, LongAdder>> aggs;
 
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/FieldContext.java b/server/src/main/java/org/opensearch/search/aggregations/support/FieldContext.java
index a6207917d52ea..ec8240a5b6b94 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/support/FieldContext.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/support/FieldContext.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.search.aggregations.support;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.mapper.MappedFieldType;
 
@@ -38,8 +39,9 @@
  * Used by all field data based aggregators. This determine the context of the field data the aggregators are operating
  * in. It holds both the field names and the index field datas that are associated with them.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class FieldContext {
 
     private final String field;
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/ValueType.java b/server/src/main/java/org/opensearch/search/aggregations/support/ValueType.java
index 33fefa57d50f0..ad2ae2a41eec9 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/support/ValueType.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/support/ValueType.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.aggregations.support;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -47,8 +48,9 @@
 /**
  * Enum to signal what kind of value type is used in the aggregator
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public enum ValueType implements Writeable {
 
     STRING((byte) 1, "string", "string", CoreValuesSourceType.BYTES, DocValueFormat.RAW),
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSource.java b/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSource.java
index 67d311db964d6..1a76183ac1a2d 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSource.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSource.java
@@ -43,6 +43,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.common.Rounding;
 import org.opensearch.common.Rounding.Prepared;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.ScorerAware;
 import org.opensearch.core.common.util.CollectionUtils;
 import org.opensearch.index.fielddata.AbstractSortingNumericDocValues;
@@ -75,8 +76,9 @@
 /**
  * Base class for a ValuesSource; the primitive data for an agg
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class ValuesSource {
 
     /**
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceConfig.java b/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceConfig.java
index b5bd355bb5847..d006b15df327c 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceConfig.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceConfig.java
@@ -32,6 +32,7 @@
 package org.opensearch.search.aggregations.support;
 
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.fielddata.IndexGeoPointFieldData;
 import org.opensearch.index.fielddata.IndexNumericFieldData;
@@ -50,8 +51,9 @@
  * A configuration that tells aggregations how to retrieve data from the index
  * in order to run a specific aggregation.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ValuesSourceConfig {
 
     /**
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceRegistry.java b/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceRegistry.java
index 0cb5a12bac4af..9f084833f8093 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceRegistry.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceRegistry.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.search.aggregations.support;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.search.SearchModule;
 import org.opensearch.search.aggregations.AggregationExecutionException;
@@ -49,15 +50,17 @@
  * directly instantiate this class, instead get an already-configured copy from {@link QueryShardContext#getValuesSourceRegistry()}, or (in
  * the case of some test scenarios only) directly from {@link SearchModule#getValuesSourceRegistry()}
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ValuesSourceRegistry {
 
     /**
      * The registry key for the values source registry key
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static final class RegistryKey<T> {
         private final String name;
         private final Class<T> supplierType;
@@ -90,8 +93,9 @@ public int hashCode() {
     /**
      * Builder for the values source registry
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
         private final AggregationUsageService.Builder usageServiceBuilder;
         private Map<RegistryKey<?>, List<Map.Entry<ValuesSourceType, ?>>> aggregatorRegistry = new HashMap<>();
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceType.java b/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceType.java
index 9158e9f59cab2..ff81c08193a0b 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceType.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceType.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.aggregations.support;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.script.AggregationScript;
 import org.opensearch.search.DocValueFormat;
 
@@ -58,8 +59,9 @@
  * a sum aggregation).  When adding a new ValuesSourceType, new aggregators should be added and registered at the same time, to add support
  * for the new type to existing aggregations, as appropriate.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface ValuesSourceType {
     /**
      * Called when an aggregation is operating over a known empty set (usually because the field isn't specified), this method allows for
diff --git a/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java
index 7a2dc65765b22..434e630893f25 100644
--- a/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java
+++ b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java
@@ -36,6 +36,7 @@
 import org.opensearch.Version;
 import org.opensearch.common.Booleans;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.core.ParseField;
@@ -91,8 +92,9 @@
  *
  * @see org.opensearch.action.search.SearchRequest#source(SearchSourceBuilder)
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class SearchSourceBuilder implements Writeable, ToXContentObject, Rewriteable<SearchSourceBuilder> {
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(SearchSourceBuilder.class);
 
@@ -1493,8 +1495,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     /**
      * Boosts on an index
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class IndexBoost implements Writeable, ToXContentObject {
         private final String index;
         private final float boost;
@@ -1594,8 +1597,9 @@ public boolean equals(Object obj) {
     /**
      * Script field
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class ScriptField implements Writeable, ToXContentFragment {
 
         private final boolean ignoreFailure;
diff --git a/server/src/main/java/org/opensearch/search/fetch/FetchSearchResult.java b/server/src/main/java/org/opensearch/search/fetch/FetchSearchResult.java
index a8560863d8d98..26fa90141c2a9 100644
--- a/server/src/main/java/org/opensearch/search/fetch/FetchSearchResult.java
+++ b/server/src/main/java/org/opensearch/search/fetch/FetchSearchResult.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.fetch;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.search.SearchHit;
@@ -46,8 +47,9 @@
 /**
  * Result from a fetch
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class FetchSearchResult extends SearchPhaseResult {
 
     private SearchHits hits;
diff --git a/server/src/main/java/org/opensearch/search/fetch/StoredFieldsContext.java b/server/src/main/java/org/opensearch/search/fetch/StoredFieldsContext.java
index 8cf70b41009a3..3c22c2f9d29c4 100644
--- a/server/src/main/java/org/opensearch/search/fetch/StoredFieldsContext.java
+++ b/server/src/main/java/org/opensearch/search/fetch/StoredFieldsContext.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.fetch;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.ParsingException;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -51,8 +52,9 @@
 /**
  * Context used to fetch the {@code stored_fields}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class StoredFieldsContext implements Writeable {
     public static final String _NONE_ = "_none_";
 
diff --git a/server/src/main/java/org/opensearch/search/fetch/subphase/FieldAndFormat.java b/server/src/main/java/org/opensearch/search/fetch/subphase/FieldAndFormat.java
index f7e4b06624c76..dbdd7bca6678f 100644
--- a/server/src/main/java/org/opensearch/search/fetch/subphase/FieldAndFormat.java
+++ b/server/src/main/java/org/opensearch/search/fetch/subphase/FieldAndFormat.java
@@ -33,6 +33,7 @@
 package org.opensearch.search.fetch.subphase;
 
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -50,8 +51,9 @@
  * Wrapper around a field name and the format that should be used to
  * display values of this field.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class FieldAndFormat implements Writeable, ToXContentObject {
     private static final ParseField FIELD_FIELD = new ParseField("field");
     private static final ParseField FORMAT_FIELD = new ParseField("format");
diff --git a/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/HighlightField.java b/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/HighlightField.java
index 7a29a53304dc3..30effe2826d76 100644
--- a/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/HighlightField.java
+++ b/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/HighlightField.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.fetch.subphase.highlight;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.ParsingException;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -52,8 +53,9 @@
 /**
  * A field highlighted with its highlighted fragments.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class HighlightField implements ToXContentFragment, Writeable {
 
     private String name;
diff --git a/server/src/main/java/org/opensearch/search/internal/InternalSearchResponse.java b/server/src/main/java/org/opensearch/search/internal/InternalSearchResponse.java
index 3af8fc3854cf1..c9d7b0084c1e1 100644
--- a/server/src/main/java/org/opensearch/search/internal/InternalSearchResponse.java
+++ b/server/src/main/java/org/opensearch/search/internal/InternalSearchResponse.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.Version;
 import org.opensearch.action.search.SearchResponseSections;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -51,8 +52,9 @@
 /**
  * {@link SearchResponseSections} subclass that can be serialized over the wire.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class InternalSearchResponse extends SearchResponseSections implements Writeable, ToXContentFragment {
     public static InternalSearchResponse empty() {
         return empty(true);
diff --git a/server/src/main/java/org/opensearch/search/internal/ReaderContext.java b/server/src/main/java/org/opensearch/search/internal/ReaderContext.java
index 898aa2e2c6745..776e92d325ae4 100644
--- a/server/src/main/java/org/opensearch/search/internal/ReaderContext.java
+++ b/server/src/main/java/org/opensearch/search/internal/ReaderContext.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.internal;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.common.lease.Releasables;
 import org.opensearch.common.util.concurrent.AbstractRefCounted;
@@ -57,8 +58,9 @@
  * ie. when an index gets removed. To prevent accessing closed IndexReader / IndexSearcher instances the SearchContext
  * can be guarded by a reference count and fail if it's been closed by an external event.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ReaderContext implements Releasable {
     private final ShardSearchContextId id;
     private final IndexService indexService;
diff --git a/server/src/main/java/org/opensearch/search/internal/ScrollContext.java b/server/src/main/java/org/opensearch/search/internal/ScrollContext.java
index ae4074930e0c0..e3517756ced6e 100644
--- a/server/src/main/java/org/opensearch/search/internal/ScrollContext.java
+++ b/server/src/main/java/org/opensearch/search/internal/ScrollContext.java
@@ -34,13 +34,15 @@
 
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TotalHits;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.search.Scroll;
 
 /**
  * Wrapper around information that needs to stay around when scrolling.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class ScrollContext {
     public TotalHits totalHits = null;
     public float maxScore = Float.NaN;
diff --git a/server/src/main/java/org/opensearch/search/internal/ShardSearchContextId.java b/server/src/main/java/org/opensearch/search/internal/ShardSearchContextId.java
index 3e0d2b1d6c638..c6c09ff54241b 100644
--- a/server/src/main/java/org/opensearch/search/internal/ShardSearchContextId.java
+++ b/server/src/main/java/org/opensearch/search/internal/ShardSearchContextId.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.internal;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
@@ -42,8 +43,9 @@
 /**
  * Used to support Point in Time Searching
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class ShardSearchContextId implements Writeable {
     private final String sessionId;
     private final long id;
diff --git a/server/src/main/java/org/opensearch/search/internal/ShardSearchRequest.java b/server/src/main/java/org/opensearch/search/internal/ShardSearchRequest.java
index d46cad37e9b71..de1d5fb8b4098 100644
--- a/server/src/main/java/org/opensearch/search/internal/ShardSearchRequest.java
+++ b/server/src/main/java/org/opensearch/search/internal/ShardSearchRequest.java
@@ -43,6 +43,7 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.CheckedFunction;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.core.common.Strings;
@@ -82,8 +83,9 @@
  * It provides all the methods that the {@link SearchContext} needs.
  * Provides a cache key based on its content that can be used to cache shard level response.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class ShardSearchRequest extends TransportRequest implements IndicesRequest {
     public static final ToXContent.Params FORMAT_PARAMS = new ToXContent.MapParams(Collections.singletonMap("pretty", "false"));
 
diff --git a/server/src/main/java/org/opensearch/search/lookup/DocLookup.java b/server/src/main/java/org/opensearch/search/lookup/DocLookup.java
index 069d9dd02ce2b..8de49e8d026f6 100644
--- a/server/src/main/java/org/opensearch/search/lookup/DocLookup.java
+++ b/server/src/main/java/org/opensearch/search/lookup/DocLookup.java
@@ -32,6 +32,7 @@
 package org.opensearch.search.lookup;
 
 import org.apache.lucene.index.LeafReaderContext;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.mapper.MappedFieldType;
 import org.opensearch.index.mapper.MapperService;
@@ -41,8 +42,9 @@
 /**
  * Looks up a document
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class DocLookup {
 
     private final MapperService mapperService;
diff --git a/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java b/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java
index fe911ed799646..3bd1c5118b5fb 100644
--- a/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java
+++ b/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java
@@ -33,6 +33,7 @@
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.opensearch.ExceptionsHelper;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.fielddata.ScriptDocValues;
 import org.opensearch.index.mapper.MappedFieldType;
@@ -50,8 +51,9 @@
 /**
  * Looks up a doc from a leaf reader
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class LeafDocLookup implements Map<String, ScriptDocValues<?>> {
 
     private final Map<String, ScriptDocValues<?>> localCacheFieldData = new HashMap<>(4);
diff --git a/server/src/main/java/org/opensearch/search/lookup/LeafFieldsLookup.java b/server/src/main/java/org/opensearch/search/lookup/LeafFieldsLookup.java
index 47bb8754a5803..23b1b311f7d93 100644
--- a/server/src/main/java/org/opensearch/search/lookup/LeafFieldsLookup.java
+++ b/server/src/main/java/org/opensearch/search/lookup/LeafFieldsLookup.java
@@ -33,6 +33,7 @@
 
 import org.apache.lucene.index.LeafReader;
 import org.opensearch.OpenSearchParseException;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.fieldvisitor.SingleFieldsVisitor;
 import org.opensearch.index.mapper.MappedFieldType;
 import org.opensearch.index.mapper.MapperService;
@@ -50,8 +51,9 @@
 /**
  * looks up multiple leaf fields
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class LeafFieldsLookup implements Map {
 
     private final MapperService mapperService;
diff --git a/server/src/main/java/org/opensearch/search/lookup/LeafSearchLookup.java b/server/src/main/java/org/opensearch/search/lookup/LeafSearchLookup.java
index 1c87f26053060..33fd89a305fe1 100644
--- a/server/src/main/java/org/opensearch/search/lookup/LeafSearchLookup.java
+++ b/server/src/main/java/org/opensearch/search/lookup/LeafSearchLookup.java
@@ -33,6 +33,7 @@
 package org.opensearch.search.lookup;
 
 import org.apache.lucene.index.LeafReaderContext;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -42,8 +43,9 @@
 /**
  * Per-segment version of {@link SearchLookup}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class LeafSearchLookup {
 
     final LeafReaderContext ctx;
diff --git a/server/src/main/java/org/opensearch/search/lookup/SearchLookup.java b/server/src/main/java/org/opensearch/search/lookup/SearchLookup.java
index 898d34dc02c01..8813865a657dc 100644
--- a/server/src/main/java/org/opensearch/search/lookup/SearchLookup.java
+++ b/server/src/main/java/org/opensearch/search/lookup/SearchLookup.java
@@ -33,6 +33,7 @@
 package org.opensearch.search.lookup;
 
 import org.apache.lucene.index.LeafReaderContext;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.index.fielddata.IndexFieldData;
 import org.opensearch.index.mapper.MappedFieldType;
 import org.opensearch.index.mapper.MapperService;
@@ -47,8 +48,9 @@
 /**
  * Orchestrator class for search phase lookups
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class SearchLookup {
     /**
      * The maximum depth of field dependencies.
diff --git a/server/src/main/java/org/opensearch/search/lookup/SourceLookup.java b/server/src/main/java/org/opensearch/search/lookup/SourceLookup.java
index 734f62d048a5a..cbac29fde7932 100644
--- a/server/src/main/java/org/opensearch/search/lookup/SourceLookup.java
+++ b/server/src/main/java/org/opensearch/search/lookup/SourceLookup.java
@@ -36,6 +36,7 @@
 import org.opensearch.OpenSearchParseException;
 import org.opensearch.common.CheckedBiConsumer;
 import org.opensearch.common.Nullable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.lucene.index.SequentialStoredFieldsLeafReader;
 import org.opensearch.common.xcontent.XContentHelper;
@@ -58,8 +59,9 @@
 /**
  * Orchestrator class for source lookups
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class SourceLookup implements Map {
 
     private LeafReader reader;
diff --git a/server/src/main/java/org/opensearch/search/query/QuerySearchResult.java b/server/src/main/java/org/opensearch/search/query/QuerySearchResult.java
index f8a1e99ff585f..f3ac953ab9d1d 100644
--- a/server/src/main/java/org/opensearch/search/query/QuerySearchResult.java
+++ b/server/src/main/java/org/opensearch/search/query/QuerySearchResult.java
@@ -34,6 +34,7 @@
 
 import org.apache.lucene.search.FieldDoc;
 import org.apache.lucene.search.TotalHits;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.io.stream.DelayableWriteable;
 import org.opensearch.common.lucene.search.TopDocsAndMaxScore;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -58,8 +59,9 @@
 /**
  * The result of the query search
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class QuerySearchResult extends SearchPhaseResult {
 
     private int from;
diff --git a/server/src/main/java/org/opensearch/search/rescore/RescoreContext.java b/server/src/main/java/org/opensearch/search/rescore/RescoreContext.java
index c0e4bbb874531..d4b87f004b58f 100644
--- a/server/src/main/java/org/opensearch/search/rescore/RescoreContext.java
+++ b/server/src/main/java/org/opensearch/search/rescore/RescoreContext.java
@@ -33,6 +33,7 @@
 package org.opensearch.search.rescore;
 
 import org.apache.lucene.search.Query;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.util.Collections;
 import java.util.List;
@@ -43,8 +44,9 @@
  * implementations should extend this with any additional resources that
  * they will need while rescoring.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class RescoreContext {
     private final int windowSize;
     private final Rescorer rescorer;
diff --git a/server/src/main/java/org/opensearch/search/rescore/Rescorer.java b/server/src/main/java/org/opensearch/search/rescore/Rescorer.java
index ae025f70c95b3..c7a9b077109cf 100644
--- a/server/src/main/java/org/opensearch/search/rescore/Rescorer.java
+++ b/server/src/main/java/org/opensearch/search/rescore/Rescorer.java
@@ -35,6 +35,7 @@
 import org.apache.lucene.search.Explanation;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.TopDocs;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.io.IOException;
 
@@ -46,8 +47,9 @@
  * fairly well behaved and documents that tradeoffs that it is making. There
  * is also an {@code ExampleRescorer} that is worth looking at.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public interface Rescorer {
     /**
      * Modifies the result of the previously executed search ({@link TopDocs})
diff --git a/server/src/main/java/org/opensearch/search/rescore/RescorerBuilder.java b/server/src/main/java/org/opensearch/search/rescore/RescorerBuilder.java
index 383771306ba7b..7ac7454f02e3b 100644
--- a/server/src/main/java/org/opensearch/search/rescore/RescorerBuilder.java
+++ b/server/src/main/java/org/opensearch/search/rescore/RescorerBuilder.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.rescore;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.ParsingException;
 import org.opensearch.core.common.Strings;
@@ -51,8 +52,9 @@
 /**
  * The abstract base builder for instances of {@link RescorerBuilder}.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class RescorerBuilder<RB extends RescorerBuilder<RB>>
     implements
         NamedWriteable,
diff --git a/server/src/main/java/org/opensearch/search/sort/BucketedSort.java b/server/src/main/java/org/opensearch/search/sort/BucketedSort.java
index 3dd682eb841dc..4a7557740384b 100644
--- a/server/src/main/java/org/opensearch/search/sort/BucketedSort.java
+++ b/server/src/main/java/org/opensearch/search/sort/BucketedSort.java
@@ -34,6 +34,7 @@
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.Scorable;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.common.lease.Releasables;
 import org.opensearch.common.lucene.ScorerAware;
@@ -94,14 +95,16 @@
  * of allocations and to play well with our paged arrays.
  * </p>
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class BucketedSort implements Releasable {
     /**
      * Callbacks for storing extra data along with competitive sorts.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public interface ExtraData {
         /**
          * Swap the position of two bits of extra data.
@@ -121,9 +124,10 @@ public interface ExtraData {
         /**
          * Loader for extra data
          *
-         * @opensearch.internal
+         * @opensearch.api
          */
         @FunctionalInterface
+        @PublicApi(since = "1.0.0")
         interface Loader {
             /**
              * Load extra data from a doc.
@@ -194,9 +198,10 @@ public int getBucketSize() {
      * Used with {@link BucketedSort#getValues(long, ResultBuilder)} to
      * build results from the sorting operation.
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
     @FunctionalInterface
+    @PublicApi(since = "1.0.0")
     public interface ResultBuilder<T> {
         T build(long index, SortValue sortValue);
     }
@@ -408,7 +413,10 @@ public final void close() {
 
     /**
      * Performs the actual collection against a {@linkplain LeafReaderContext}.
+     *
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public abstract class Leaf implements ScorerAware {
         private final LeafReaderContext ctx;
         private ExtraData.Loader loader = null;
diff --git a/server/src/main/java/org/opensearch/search/sort/NestedSortBuilder.java b/server/src/main/java/org/opensearch/search/sort/NestedSortBuilder.java
index feabdfce4cd21..d101837b8734b 100644
--- a/server/src/main/java/org/opensearch/search/sort/NestedSortBuilder.java
+++ b/server/src/main/java/org/opensearch/search/sort/NestedSortBuilder.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.sort;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -50,8 +51,9 @@
 /**
  * Builds a sort on nested objects
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class NestedSortBuilder implements Writeable, ToXContentObject {
     public static final ParseField NESTED_FIELD = new ParseField("nested");
     public static final ParseField PATH_FIELD = new ParseField("path");
diff --git a/server/src/main/java/org/opensearch/search/sort/SortAndFormats.java b/server/src/main/java/org/opensearch/search/sort/SortAndFormats.java
index e65187e558aef..046faaa03f91f 100644
--- a/server/src/main/java/org/opensearch/search/sort/SortAndFormats.java
+++ b/server/src/main/java/org/opensearch/search/sort/SortAndFormats.java
@@ -33,13 +33,15 @@
 
 import org.apache.lucene.search.Sort;
 import org.opensearch.cluster.metadata.DataStream;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.search.DocValueFormat;
 
 /**
  * Utility class to hold sort and doc value format instances
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public final class SortAndFormats {
 
     public final Sort sort;
diff --git a/server/src/main/java/org/opensearch/search/sort/SortBuilder.java b/server/src/main/java/org/opensearch/search/sort/SortBuilder.java
index 49d317957cdc3..a8c21e7311061 100644
--- a/server/src/main/java/org/opensearch/search/sort/SortBuilder.java
+++ b/server/src/main/java/org/opensearch/search/sort/SortBuilder.java
@@ -36,6 +36,7 @@
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.join.ToChildBlockJoinQuery;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.lucene.search.Queries;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.common.ParsingException;
@@ -64,8 +65,9 @@
 /**
  * Base class for sort object builders
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class SortBuilder<T extends SortBuilder<T>> implements NamedWriteable, ToXContentObject, Rewriteable<SortBuilder<?>> {
 
     protected SortOrder order = SortOrder.ASC;
diff --git a/server/src/main/java/org/opensearch/search/sort/SortValue.java b/server/src/main/java/org/opensearch/search/sort/SortValue.java
index 0c46428bc02d0..f521925695a0d 100644
--- a/server/src/main/java/org/opensearch/search/sort/SortValue.java
+++ b/server/src/main/java/org/opensearch/search/sort/SortValue.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.search.sort;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.NamedWriteable;
 import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.core.common.io.stream.StreamInput;
@@ -46,8 +47,9 @@
 /**
  * A {@link Comparable}, {@link DocValueFormat} aware wrapper around a sort value.
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class SortValue implements NamedWriteable, Comparable<SortValue> {
     /**
      * Get a {@linkplain SortValue} for a double.
diff --git a/server/src/main/java/org/opensearch/snapshots/InternalSnapshotsInfoService.java b/server/src/main/java/org/opensearch/snapshots/InternalSnapshotsInfoService.java
index 3e1f231b513c6..797a58f3b0d9b 100644
--- a/server/src/main/java/org/opensearch/snapshots/InternalSnapshotsInfoService.java
+++ b/server/src/main/java/org/opensearch/snapshots/InternalSnapshotsInfoService.java
@@ -45,6 +45,7 @@
 import org.opensearch.cluster.routing.ShardRoutingState;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Priority;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
@@ -364,9 +365,9 @@ private static Set<SnapshotShard> listOfSnapshotShards(final ClusterState state)
     /**
      * A snapshot of a shard
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
-
+    @PublicApi(since = "1.0.0")
     public static class SnapshotShard {
 
         private final Snapshot snapshot;
diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotShardSizeInfo.java b/server/src/main/java/org/opensearch/snapshots/SnapshotShardSizeInfo.java
index b5818c5650b3c..6c456be8ca9e3 100644
--- a/server/src/main/java/org/opensearch/snapshots/SnapshotShardSizeInfo.java
+++ b/server/src/main/java/org/opensearch/snapshots/SnapshotShardSizeInfo.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.cluster.routing.RecoverySource;
 import org.opensearch.cluster.routing.ShardRouting;
+import org.opensearch.common.annotation.PublicApi;
 
 import java.util.Collections;
 import java.util.Map;
@@ -41,8 +42,9 @@
 /**
  * Information about a snapshot shard size
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class SnapshotShardSizeInfo {
 
     public static final SnapshotShardSizeInfo EMPTY = new SnapshotShardSizeInfo(Map.of());
diff --git a/server/src/main/java/org/opensearch/transport/Transport.java b/server/src/main/java/org/opensearch/transport/Transport.java
index f516f64d7ee26..8abedff37db14 100644
--- a/server/src/main/java/org/opensearch/transport/Transport.java
+++ b/server/src/main/java/org/opensearch/transport/Transport.java
@@ -34,6 +34,7 @@
 
 import org.opensearch.Version;
 import org.opensearch.cluster.node.DiscoveryNode;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.collect.MapBuilder;
 import org.opensearch.common.lifecycle.LifecycleComponent;
 import org.opensearch.common.unit.TimeValue;
@@ -111,7 +112,10 @@ default boolean isSecure() {
 
     /**
      * A unidirectional connection to a {@link DiscoveryNode}
+     *
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     interface Connection extends Closeable {
         /**
          * The node this connection is associated with
diff --git a/server/src/main/java/org/opensearch/transport/TransportException.java b/server/src/main/java/org/opensearch/transport/TransportException.java
index 1522f2378bca3..5e557a77ff704 100644
--- a/server/src/main/java/org/opensearch/transport/TransportException.java
+++ b/server/src/main/java/org/opensearch/transport/TransportException.java
@@ -33,6 +33,7 @@
 package org.opensearch.transport;
 
 import org.opensearch.OpenSearchException;
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 
 import java.io.IOException;
@@ -40,8 +41,9 @@
 /**
  * Thrown for any transport errors
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class TransportException extends OpenSearchException {
     public TransportException(Throwable cause) {
         super(cause);
diff --git a/server/src/main/java/org/opensearch/transport/TransportRequest.java b/server/src/main/java/org/opensearch/transport/TransportRequest.java
index f13b460dfb0c3..c62cf59d3be2f 100644
--- a/server/src/main/java/org/opensearch/transport/TransportRequest.java
+++ b/server/src/main/java/org/opensearch/transport/TransportRequest.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.transport;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.tasks.TaskId;
@@ -43,8 +44,9 @@
 /**
  * A transport request
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public abstract class TransportRequest extends TransportMessage implements TaskAwareRequest {
     /**
      * Empty transport request
diff --git a/server/src/main/java/org/opensearch/transport/TransportRequestOptions.java b/server/src/main/java/org/opensearch/transport/TransportRequestOptions.java
index fe54d8185ea5f..9f44d93f0cd71 100644
--- a/server/src/main/java/org/opensearch/transport/TransportRequestOptions.java
+++ b/server/src/main/java/org/opensearch/transport/TransportRequestOptions.java
@@ -32,13 +32,15 @@
 
 package org.opensearch.transport;
 
+import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.unit.TimeValue;
 
 /**
  * Options for transport requests
  *
- * @opensearch.internal
+ * @opensearch.api
  */
+@PublicApi(since = "1.0.0")
 public class TransportRequestOptions {
 
     private final TimeValue timeout;
@@ -62,8 +64,9 @@ public Type type() {
     /**
      * Type of transport request
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public enum Type {
         RECOVERY,
         BULK,
@@ -79,8 +82,9 @@ public static Builder builder() {
     /**
      * Builder for transport request options
      *
-     * @opensearch.internal
+     * @opensearch.api
      */
+    @PublicApi(since = "1.0.0")
     public static class Builder {
         private TimeValue timeout;
         private Type type = Type.REG;
diff --git a/server/src/test/java/org/opensearch/index/IndexServiceTestUtils.java b/server/src/test/java/org/opensearch/index/IndexServiceTestUtils.java
new file mode 100644
index 0000000000000..736c0c0786fe9
--- /dev/null
+++ b/server/src/test/java/org/opensearch/index/IndexServiceTestUtils.java
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.index;
+
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.common.util.concurrent.AbstractAsyncTask;
+
+public final class IndexServiceTestUtils {
+    private IndexServiceTestUtils() {}
+
+    public static void setTrimTranslogTaskInterval(IndexService indexService, TimeValue interval) {
+        ((AbstractAsyncTask) indexService.getTrimTranslogTask()).setInterval(interval);
+    }
+}