Change to correct version since this has been backported (opensearch-project#16472) (opensearch-project#16477)

opensearch-trigger-bot[bot] · github-actions[bot] · web-flow · commit 5094f9264d5e · 2024-11-07T09:01:03.000-08:00
(cherry picked from commit 936cdb9) Signed-off-by: Spencer G. Jones <spencer.jones2@tylertech.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
@@ -172,11 +172,10 @@ public RestoreSnapshotRequest(StreamInput in) throws IOException {
         if (in.getVersion().onOrAfter(Version.V_2_17_0)) {
             sourceRemoteTranslogRepository = in.readOptionalString();
         }
-        // TODO: change to V_2_18_0 once this is backported into that version
-        if (in.getVersion().onOrAfter(Version.CURRENT)) {
+        if (in.getVersion().onOrAfter(Version.V_2_18_0)) {
             renameAliasPattern = in.readOptionalString();
         }
-        if (in.getVersion().onOrAfter(Version.CURRENT)) {
+        if (in.getVersion().onOrAfter(Version.V_2_18_0)) {
             renameAliasReplacement = in.readOptionalString();
         }
     }
@@ -215,11 +214,10 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getVersion().onOrAfter(Version.V_2_17_0)) {
             out.writeOptionalString(sourceRemoteTranslogRepository);
         }
-        // TODO: change to V_2_18_0 once this is backported into that version
-        if (out.getVersion().onOrAfter(Version.CURRENT)) {
+        if (out.getVersion().onOrAfter(Version.V_2_18_0)) {
             out.writeOptionalString(renameAliasPattern);
         }
-        if (out.getVersion().onOrAfter(Version.CURRENT)) {
+        if (out.getVersion().onOrAfter(Version.V_2_18_0)) {
             out.writeOptionalString(renameAliasReplacement);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -172,11 +172,10 @@ public RestoreSnapshotRequest(StreamInput in) throws IOException {`
`172`	`172`	`if (in.getVersion().onOrAfter(Version.V_2_17_0)) {`
`173`	`173`	`sourceRemoteTranslogRepository = in.readOptionalString();`
`174`	`174`	`}`
`175`		`- // TODO: change to V_2_18_0 once this is backported into that version`
`176`		`- if (in.getVersion().onOrAfter(Version.CURRENT)) {`
	`175`	`+ if (in.getVersion().onOrAfter(Version.V_2_18_0)) {`
`177`	`176`	`renameAliasPattern = in.readOptionalString();`
`178`	`177`	`}`
`179`		`- if (in.getVersion().onOrAfter(Version.CURRENT)) {`
	`178`	`+ if (in.getVersion().onOrAfter(Version.V_2_18_0)) {`
`180`	`179`	`renameAliasReplacement = in.readOptionalString();`
`181`	`180`	`}`
`182`	`181`	`}`
`@@ -215,11 +214,10 @@ public void writeTo(StreamOutput out) throws IOException {`
`215`	`214`	`if (out.getVersion().onOrAfter(Version.V_2_17_0)) {`
`216`	`215`	`out.writeOptionalString(sourceRemoteTranslogRepository);`
`217`	`216`	`}`
`218`		`- // TODO: change to V_2_18_0 once this is backported into that version`
`219`		`- if (out.getVersion().onOrAfter(Version.CURRENT)) {`
	`217`	`+ if (out.getVersion().onOrAfter(Version.V_2_18_0)) {`
`220`	`218`	`out.writeOptionalString(renameAliasPattern);`
`221`	`219`	`}`
`222`		`- if (out.getVersion().onOrAfter(Version.CURRENT)) {`
	`220`	`+ if (out.getVersion().onOrAfter(Version.V_2_18_0)) {`
`223`	`221`	`out.writeOptionalString(renameAliasReplacement);`
`224`	`222`	`}`
`225`	`223`	`}`