From 82484cbb6f6e23bbf33300a4ee1ccaf160f32eae Mon Sep 17 00:00:00 2001 From: Artem Prigoda Date: Mon, 17 Feb 2025 11:58:52 +0100 Subject: [PATCH 1/2] Remove `@UpdateForV9` from `RepositoryConflictException` https://github.com/elastic/elasticsearch/pull/122730 added checks in 9.1.0 that `backwardCompatibleMessage` won't be serialized --- .../elasticsearch/repositories/RepositoryConflictException.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/repositories/RepositoryConflictException.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryConflictException.java index 15a6b0d3791d8..a3c09dab8096d 100644 --- a/server/src/main/java/org/elasticsearch/repositories/RepositoryConflictException.java +++ b/server/src/main/java/org/elasticsearch/repositories/RepositoryConflictException.java @@ -29,14 +29,12 @@ public RestStatus status() { return RestStatus.CONFLICT; } - @UpdateForV9(owner = UpdateForV9.Owner.DISTRIBUTED_COORDINATION) // drop unneeded string from wire format public RepositoryConflictException(StreamInput in) throws IOException { super(in); in.readString(); } @Override - @UpdateForV9(owner = UpdateForV9.Owner.DISTRIBUTED_COORDINATION) // drop unneeded string from wire format protected void writeTo(StreamOutput out, Writer nestedExceptionsWriter) throws IOException { super.writeTo(out, nestedExceptionsWriter); out.writeString(""); From ed920ca2f8686e2c7363a60df15cfec27245d30c Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Mon, 17 Feb 2025 11:05:38 +0000 Subject: [PATCH 2/2] [CI] Auto commit changes from spotless --- .../elasticsearch/repositories/RepositoryConflictException.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/repositories/RepositoryConflictException.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryConflictException.java index a3c09dab8096d..03baad7aa67dd 100644 --- a/server/src/main/java/org/elasticsearch/repositories/RepositoryConflictException.java +++ b/server/src/main/java/org/elasticsearch/repositories/RepositoryConflictException.java @@ -11,7 +11,6 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.core.UpdateForV9; import org.elasticsearch.rest.RestStatus; import java.io.IOException;