Skip to content

Commit e6b64d0

Browse files
Cleanup Duplicate Constants in Snapshot XContent Params (#74114) (#74191)
No need to have duplicate versions of these in `SnapshotInfo`.
1 parent d2ed697 commit e6b64d0

File tree

2 files changed

+9
-18
lines changed

2 files changed

+9
-18
lines changed

server/src/main/java/org/elasticsearch/repositories/blobstore/ChecksumBlobStoreFormat.java

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,34 +34,26 @@
3434
import org.elasticsearch.core.CheckedConsumer;
3535
import org.elasticsearch.core.CheckedFunction;
3636
import org.elasticsearch.gateway.CorruptStateException;
37-
import org.elasticsearch.snapshots.SnapshotInfo;
3837

3938
import java.io.FilterInputStream;
4039
import java.io.IOException;
4140
import java.io.InputStream;
4241
import java.io.OutputStream;
43-
import java.util.HashMap;
42+
import java.util.Collections;
4443
import java.util.Locale;
45-
import java.util.Map;
4644
import java.util.zip.CRC32;
4745

4846
/**
4947
* Snapshot metadata file format used in v2.0 and above
5048
*/
5149
public final class ChecksumBlobStoreFormat<T extends ToXContent> {
5250

53-
// Serialization parameters to specify correct context for metadata serialization
54-
public static final ToXContent.Params SNAPSHOT_ONLY_FORMAT_PARAMS;
55-
56-
static {
57-
Map<String, String> snapshotOnlyParams = new HashMap<>();
58-
// when metadata is serialized certain elements of the metadata shouldn't be included into snapshot
59-
// exclusion of these elements is done by setting Metadata.CONTEXT_MODE_PARAM to Metadata.CONTEXT_MODE_SNAPSHOT
60-
snapshotOnlyParams.put(Metadata.CONTEXT_MODE_PARAM, Metadata.CONTEXT_MODE_SNAPSHOT);
61-
// serialize SnapshotInfo using the SNAPSHOT mode
62-
snapshotOnlyParams.put(SnapshotInfo.CONTEXT_MODE_PARAM, SnapshotInfo.CONTEXT_MODE_SNAPSHOT);
63-
SNAPSHOT_ONLY_FORMAT_PARAMS = new ToXContent.MapParams(snapshotOnlyParams);
64-
}
51+
// Serialization parameters to specify correct context for metadata serialization.
52+
// When metadata is serialized certain elements of the metadata shouldn't be included into snapshot
53+
// exclusion of these elements is done by setting Metadata.CONTEXT_MODE_PARAM to Metadata.CONTEXT_MODE_SNAPSHOT
54+
public static final ToXContent.Params SNAPSHOT_ONLY_FORMAT_PARAMS = new ToXContent.MapParams(
55+
Collections.singletonMap(Metadata.CONTEXT_MODE_PARAM, Metadata.CONTEXT_MODE_SNAPSHOT)
56+
);
6557

6658
// The format version
6759
public static final int VERSION = 1;

server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.elasticsearch.action.ShardOperationFailedException;
1212
import org.elasticsearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest;
1313
import org.elasticsearch.cluster.SnapshotsInProgress;
14+
import org.elasticsearch.cluster.metadata.Metadata;
1415
import org.elasticsearch.common.io.stream.StreamInput;
1516
import org.elasticsearch.common.io.stream.StreamOutput;
1617
import org.elasticsearch.common.io.stream.Writeable;
@@ -50,8 +51,6 @@ public final class SnapshotInfo implements Comparable<SnapshotInfo>, ToXContent,
5051

5152
public static final Version METADATA_FIELD_INTRODUCED = Version.V_7_3_0;
5253

53-
public static final String CONTEXT_MODE_PARAM = "context_mode";
54-
public static final String CONTEXT_MODE_SNAPSHOT = "SNAPSHOT";
5554
public static final String INDEX_DETAILS_XCONTENT_PARAM = "index_details";
5655

5756
private static final DateFormatter DATE_TIME_FORMATTER = DateFormatter.forPattern("strict_date_optional_time");
@@ -720,7 +719,7 @@ public RestStatus status() {
720719
@Override
721720
public XContentBuilder toXContent(final XContentBuilder builder, final Params params) throws IOException {
722721
// write snapshot info to repository snapshot blob format
723-
if (CONTEXT_MODE_SNAPSHOT.equals(params.param(CONTEXT_MODE_PARAM))) {
722+
if (Metadata.CONTEXT_MODE_SNAPSHOT.equals(params.param(Metadata.CONTEXT_MODE_PARAM))) {
724723
return toXContentInternal(builder, params);
725724
}
726725

0 commit comments

Comments
 (0)