rebase and update

Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Oct 6, 2022 · 524c433 · 524c433
1 parent e4a72ea
commit 524c433
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -79,6 +79,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Removed
 - Remove deprecated code to add node name into log pattern of log4j property file ([#4568](https://github.com/opensearch-project/OpenSearch/pull/4568))
 - Unused object and import within TransportClusterAllocationExplainAction ([#4639](https://github.com/opensearch-project/OpenSearch/pull/4639))
+- Remove LegacyESVersion.V_7_0_* and V_7_1_* Constants ([#2768](https://https://github.com/opensearch-project/OpenSearch/pull/2768))
 
 ### Fixed
 

diff --git a/server/src/main/java/org/opensearch/common/joda/Joda.java b/server/src/main/java/org/opensearch/common/joda/Joda.java
@@ -386,17 +386,6 @@ public DateTimeField getField(Chronology chronology) {
         }
     };
 
-    /**
-     * Checks if a pattern is Joda-style.
-     * Joda style patterns are not always compatible with java.time patterns.
-     * @param version - creation version of the index where pattern was used
-     * @param pattern - the pattern to check
-     * @return - true if pattern is joda style, otherwise false
-     */
-    public static boolean isJodaPattern(Version version, String pattern) {
-        return version.before(LegacyESVersion.V_7_0_0) && pattern.startsWith("8") == false;
-    }
-
     /**
      * parses epcoch timers
      *

diff --git a/server/src/test/java/org/opensearch/indices/IndicesModuleTests.java b/server/src/test/java/org/opensearch/indices/IndicesModuleTests.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.indices;
 
-import org.opensearch.Version;
 import org.opensearch.index.mapper.DocCountFieldMapper;
 import org.opensearch.index.mapper.DataStreamFieldMapper;
 import org.opensearch.index.mapper.FieldNamesFieldMapper;
@@ -104,7 +103,6 @@ public Map<String, MetadataFieldMapper.TypeParser> getMetadataMappers() {
     public void testBuiltinMappers() {
         IndicesModule module = new IndicesModule(Collections.emptyList());
         {
-            Version version = VersionUtils.randomVersionBetween(random(), Version.V_2_0_0, Version.CURRENT);
             assertFalse(module.getMapperRegistry().getMapperParsers().isEmpty());
             assertFalse(module.getMapperRegistry().getMetadataMapperParsers().isEmpty());
             Map<String, MetadataFieldMapper.TypeParser> metadataMapperParsers = module.getMapperRegistry().getMetadataMapperParsers();
@@ -115,12 +113,7 @@ public void testBuiltinMappers() {
             }
         }
         {
-            Version version = VersionUtils.randomVersionBetween(
-                random(),
-                Version.V_1_0_0,
-                VersionUtils.getPreviousVersion(Version.V_2_0_0)
-            );
-            assertEquals(EXPECTED_METADATA_FIELDS.length - 1, module.getMapperRegistry().getMetadataMapperParsers(version).size());
+            assertEquals(EXPECTED_METADATA_FIELDS.length - 1, module.getMapperRegistry().getMetadataMapperParsers().size());
         }
     }
 

diff --git a/server/src/test/java/org/opensearch/indices/IndicesServiceTests.java b/server/src/test/java/org/opensearch/indices/IndicesServiceTests.java
@@ -66,7 +66,6 @@
 import org.opensearch.index.mapper.KeywordFieldMapper;
 import org.opensearch.index.mapper.Mapper;
 import org.opensearch.index.mapper.MapperService;
-import org.opensearch.index.mapper.NestedPathFieldMapper;
 import org.opensearch.index.shard.IllegalIndexShardStateException;
 import org.opensearch.index.shard.IndexShard;
 import org.opensearch.index.shard.IndexShardState;