Deprecate Map, List, and Set in org.opensearch.common.collect (#6609) (…

…#6631) (#6687)

* Deprecate Map, List, and Set in org.opensearch.common.collect (#6609)

Signed-off-by: Dilip Roshitha <diliproshitha@gmail.com>

* Deprecate Map, List, and Set in org.opensearch.common.collect - PR review points (#6609)

Signed-off-by: Dilip Roshitha <diliproshitha@gmail.com>

* Deprecate Map, List, and Set in org.opensearch.common.collect - removed associated tests (#6609)

Signed-off-by: Dilip Roshitha <diliproshitha@gmail.com>

---------

Signed-off-by: Dilip Roshitha <diliproshitha@gmail.com>
(cherry picked from commit defcdf9)

Co-authored-by: Dilip Roshitha <diliproshitha@gmail.com>

CHANGELOG.md

@@ -97,6 +97,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [Refactor] XContent base classes from xcontent to core library ([#5902](https://github.com/opensearch-project/OpenSearch/pull/5902))
 
 ### Deprecated
+- Map, List, and Set in org.opensearch.common.collect ([#6609](https://github.com/opensearch-project/OpenSearch/pull/6609))
 
 ### Removed
 

benchmarks/src/main/java/org/opensearch/benchmark/search/aggregations/bucket/terms/StringTermsSerializationBenchmark.java

@@ -64,9 +64,7 @@
 @State(Scope.Benchmark)
 public class StringTermsSerializationBenchmark {
     private static final NamedWriteableRegistry REGISTRY = new NamedWriteableRegistry(
-        org.opensearch.common.collect.List.of(
-            new NamedWriteableRegistry.Entry(InternalAggregation.class, StringTerms.NAME, StringTerms::new)
-        )
+        List.of(new NamedWriteableRegistry.Entry(InternalAggregation.class, StringTerms.NAME, StringTerms::new))
     );
     @Param(value = { "1000" })
     private int buckets;
@@ -75,15 +73,13 @@ public class StringTermsSerializationBenchmark {
 
     @Setup
     public void initResults() {
-        results = DelayableWriteable.referencing(InternalAggregations.from(org.opensearch.common.collect.List.of(newTerms(true))));
+        results = DelayableWriteable.referencing(InternalAggregations.from(List.of(newTerms(true))));
     }
 
     private StringTerms newTerms(boolean withNested) {
         List<StringTerms.Bucket> resultBuckets = new ArrayList<>(buckets);
         for (int i = 0; i < buckets; i++) {
-            InternalAggregations inner = withNested
-                ? InternalAggregations.from(org.opensearch.common.collect.List.of(newTerms(false)))
-                : InternalAggregations.EMPTY;
+            InternalAggregations inner = withNested ? InternalAggregations.from(List.of(newTerms(false))) : InternalAggregations.EMPTY;
             resultBuckets.add(new StringTerms.Bucket(new BytesRef("test" + i), i, inner, false, 0, DocValueFormat.RAW));
         }
         return new StringTerms(

client/rest-high-level/src/test/java/org/opensearch/client/IndicesClientIT.java

@@ -2031,8 +2031,8 @@ public void testSimulateIndexTemplate() throws Exception {
         Settings settings = Settings.builder().put("index.number_of_shards", 1).build();
         CompressedXContent mappings = new CompressedXContent("{\"properties\":{\"host_name\":{\"type\":\"keyword\"}}}");
         AliasMetadata alias = AliasMetadata.builder("alias").writeIndex(true).build();
-        Template template = new Template(settings, mappings, org.opensearch.common.collect.Map.of("alias", alias));
-        List<String> pattern = org.opensearch.common.collect.List.of("pattern");
+        Template template = new Template(settings, mappings, Map.of("alias", alias));
+        List<String> pattern = List.of("pattern");
         ComposableIndexTemplate indexTemplate = new ComposableIndexTemplate(
             pattern,
             template,
@@ -2057,7 +2057,7 @@ public void testSimulateIndexTemplate() throws Exception {
         AliasMetadata simulationAlias = AliasMetadata.builder("simulation-alias").writeIndex(true).build();
         ComposableIndexTemplate simulationTemplate = new ComposableIndexTemplate(
             pattern,
-            new Template(null, null, org.opensearch.common.collect.Map.of("simulation-alias", simulationAlias)),
+            new Template(null, null, Map.of("simulation-alias", simulationAlias)),
             Collections.emptyList(),
             2L,
             1L,

libs/common/src/main/java/org/opensearch/common/collect/List.java

@@ -37,10 +37,10 @@
 /**
  * Java 9 List
  *
- * todo: deprecate and remove w/ min jdk upgrade to 11?
  *
  * @opensearch.internal
  */
+@Deprecated(forRemoval = true)
 public class List {
 
     /**

libs/common/src/main/java/org/opensearch/common/collect/Map.java

@@ -35,10 +35,10 @@
 /**
  * Java 9 Map
  *
- * todo: deprecate and remove w/ min jdk upgrade to 11?
  *
  * @opensearch.internal
  */
+@Deprecated(forRemoval = true)
 public class Map {
 
     /**

libs/common/src/main/java/org/opensearch/common/collect/Set.java

@@ -37,10 +37,10 @@
 /**
  * Java 9 Set
  *
- * todo: deprecate and remove w/ min jdk upgrade to 11?
  *
  * @opensearch.internal
  */
+@Deprecated(forRemoval = true)
 public class Set {
 
     /**