pr fixes

Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Apr 25, 2022 · 478a61e · 478a61e
1 parent 8fc692e
commit 478a61e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/server/src/main/java/org/opensearch/index/mapper/MapperService.java b/server/src/main/java/org/opensearch/index/mapper/MapperService.java
@@ -162,19 +162,7 @@ public enum MergeReason {
     // Deprecated set of meta-fields, for checking if a field is meta, use an instance method isMetadataField instead
     @Deprecated
     public static final Set<String> META_FIELDS_BEFORE_7DOT8 = Collections.unmodifiableSet(
-        new HashSet<>(
-            Arrays.asList(
-                "_id",
-                IgnoredFieldMapper.NAME,
-                NestedPathFieldMapper.NAME,
-                "_index",
-                "_routing",
-                "_size",
-                "_timestamp",
-                "_ttl",
-                "_type"
-            )
-        )
+        new HashSet<>(Arrays.asList("_id", IgnoredFieldMapper.NAME, "_index", "_routing", "_size", "_timestamp", "_ttl", "_type"))
     );
 
     private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(MapperService.class);

diff --git a/server/src/main/java/org/opensearch/indices/mapper/MapperRegistry.java b/server/src/main/java/org/opensearch/indices/mapper/MapperRegistry.java
@@ -80,7 +80,7 @@ public Map<String, Mapper.TypeParser> getMapperParsers() {
      * returned map uses the name of the field as a key.
      */
     public Map<String, MetadataFieldMapper.TypeParser> getMetadataMapperParsers(Version indexCreatedVersion) {
-        return indexCreatedVersion.onOrAfter(LegacyESVersion.V_2_0_0) ? metadataMapperParsers : metadataMapperParsersPre20;
+        return indexCreatedVersion.onOrAfter(Version.V_2_0_0) ? metadataMapperParsers : metadataMapperParsersPre20;
     }
 
     /**