496: Added one extra line in changelog. Removed method for getting th…

…e filters as string Signed-off-by: Stevan Buzejic <[email protected]>
opensearch-project · Sep 20, 2022 · b7ad349 · b7ad349
1 parent 0b2f42d
commit b7ad349
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -66,6 +66,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Fixed flaky test `ResourceAwareTasksTests.testTaskIdPersistsInThreadContext` ([#4484](https://github.com/opensearch-project/OpenSearch/pull/4484))
 - Fixed the ignore_malformed setting to also ignore objects ([#4494](https://github.com/opensearch-project/OpenSearch/pull/4494))
 - [Bug]: Alias filter lost after rollover ([#4499](https://github.com/opensearch-project/OpenSearch/pull/4499))
+
 ### Security
 - CVE-2022-25857 org.yaml:snakeyaml DOS vulnerability ([#4341](https://github.com/opensearch-project/OpenSearch/pull/4341))
 

diff --git a/...r/src/main/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverService.java b/...r/src/main/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverService.java
@@ -312,13 +312,15 @@ static List<AliasAction> rolloverAliasToNewIndex(
         AliasMetadata aliasMetada,
         String alias
     ) {
+        String filterAsString = aliasMetada.getFilter() != null ? aliasMetada.getFilter().string() : null;
+
         if (explicitWriteIndex) {
             return Collections.unmodifiableList(
                 Arrays.asList(
                     new AliasAction.Add(
                         newIndex,
                         alias,
-                        aliasMetada.getFilterAsString(),
+                        filterAsString,
                         aliasMetada.getIndexRouting(),
                         aliasMetada.getSearchRouting(),
                         true,
@@ -327,7 +329,7 @@ static List<AliasAction> rolloverAliasToNewIndex(
                     new AliasAction.Add(
                         oldIndex,
                         alias,
-                        aliasMetada.getFilterAsString(),
+                        filterAsString,
                         aliasMetada.getIndexRouting(),
                         aliasMetada.getSearchRouting(),
                         false,
@@ -341,7 +343,7 @@ static List<AliasAction> rolloverAliasToNewIndex(
                     new AliasAction.Add(
                         newIndex,
                         alias,
-                        aliasMetada.getFilterAsString(),
+                        filterAsString,
                         aliasMetada.getIndexRouting(),
                         aliasMetada.getSearchRouting(),
                         null,

diff --git a/server/src/main/java/org/opensearch/cluster/metadata/AliasMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/AliasMetadata.java
@@ -129,13 +129,6 @@ public CompressedXContent getFilter() {
         return filter();
     }
 
-    public String getFilterAsString() {
-        if (filter == null) {
-            return null;
-        }
-        return filter.string();
-    }
-
     public boolean filteringRequired() {
         return filter != null;
     }

diff --git a/.../test/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java b/.../test/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java
@@ -213,7 +213,7 @@ public void testRolloverAliasActionsWithFilterAndExplicitWriteIndex() {
             AliasAction.Add addAction = (AliasAction.Add) action;
             if (action.getIndex().equals(targetIndex)) {
                 assertEquals(sourceAlias, addAction.getAlias());
-                assertEquals(aliasMetadata.getFilterAsString(), addAction.getFilter());
+                assertEquals(aliasMetadata.filter().string(), addAction.getFilter());
                 assertEquals(indexRouting, addAction.getIndexRouting());
                 assertEquals(sourceRouting, addAction.getSearchRouting());
 
@@ -299,7 +299,7 @@ public void testRolloverAliasActionsWithFilterAndHiddenAliasAndImplicitWriteInde
                 assertEquals(sourceAlias, addAction.getAlias());
                 assertThat(addAction.writeIndex(), nullValue());
                 assertTrue(addAction.isHidden());
-                assertEquals(aliasMetadata.getFilterAsString(), addAction.getFilter());
+                assertEquals(aliasMetadata.filter().string(), addAction.getFilter());
                 assertEquals(indexRouting, addAction.getIndexRouting());
                 assertEquals(sourceRouting, addAction.getSearchRouting());
                 foundAddWrite = true;