Move getMetadataFields to IndexService

Signed-off-by: Craig Perkins <[email protected]>
opensearch-project · Jun 27, 2024 · 4e21c9d · 4e21c9d
1 parent bb9819c
commit 4e21c9d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/server/src/main/java/org/opensearch/index/IndexService.java b/server/src/main/java/org/opensearch/index/IndexService.java
@@ -156,6 +156,7 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust
     private final CheckedFunction<DirectoryReader, DirectoryReader, IOException> readerWrapper;
     private final IndexCache indexCache;
     private final MapperService mapperService;
+    private final MapperRegistry mapperRegistry;
     private final NamedXContentRegistry xContentRegistry;
     private final NamedWriteableRegistry namedWriteableRegistry;
     private final SimilarityService similarityService;
@@ -239,6 +240,7 @@ public IndexService(
         this.circuitBreakerService = circuitBreakerService;
         this.expressionResolver = expressionResolver;
         this.valuesSourceRegistry = valuesSourceRegistry;
+        this.mapperRegistry = mapperRegistry;
         if (needsMapperService(indexSettings, indexCreationContext)) {
             assert indexAnalyzers != null;
             this.mapperService = new MapperService(
@@ -1233,6 +1235,13 @@ private TimeValue getRefreshInterval() {
         return clusterDefaultRefreshIntervalSupplier.get();
     }
 
+    /**
+     * Returns a set containing the registered metadata fields
+     */
+    public Set<String> getMetadataFields() {
+        return Collections.unmodifiableSet(mapperRegistry.getMetadataMapperParsers().keySet());
+    }
+
     /**
      * Base asynchronous task
      *

diff --git a/server/src/main/java/org/opensearch/index/mapper/MapperService.java b/server/src/main/java/org/opensearch/index/mapper/MapperService.java
@@ -714,13 +714,6 @@ public boolean isMetadataField(String field) {
         return mapperRegistry.isMetadataField(field);
     }
 
-    /**
-     * Returns a set containing the registered metadata fields
-     */
-    public Set<String> getMetadataFields() {
-        return Collections.unmodifiableSet(mapperRegistry.getMetadataMapperParsers().keySet());
-    }
-
     /**
      * An analyzer wrapper that can lookup fields within the index mappings
      */

diff --git a/server/src/test/java/org/opensearch/index/mapper/MapperServiceTests.java b/server/src/test/java/org/opensearch/index/mapper/MapperServiceTests.java
@@ -92,8 +92,8 @@ public void testTypeValidation() {
     }
 
     public void testGetMetadataFieldsReturnsExpectedSet() throws Throwable {
-        final MapperService mapperService = createIndex("test1").mapperService();
-        assertEquals(mapperService.getMetadataFields(), IndicesModule.getBuiltInMetadataFields());
+        final IndexService indexService = createIndex("test1");
+        assertEquals(indexService.getMetadataFields(), IndicesModule.getBuiltInMetadataFields());
     }
 
     public void testPreflightUpdateDoesNotChangeMapping() throws Throwable {