Skip to content

Commit 0f0f7a4

Browse files
ChrisHegartycbuescher
authored andcommitted
Fix JDK 21 lint warnings (elastic#112249)
This commit fixes lint warnings that arise when compiling with javac from JDK 21. This change is in preparation for an eventual bump of Elasticsearch to a minimum of JDK 21, in ES 9.0.
1 parent c26892f commit 0f0f7a4

File tree

15 files changed

+18
-3
lines changed

15 files changed

+18
-3
lines changed

server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetAllocationStatsAction.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public static class Request extends MasterNodeReadRequest<Request> {
108108

109109
private final EnumSet<Metric> metrics;
110110

111+
@SuppressWarnings("this-escape")
111112
public Request(TimeValue masterNodeTimeout, TaskId parentTaskId, EnumSet<Metric> metrics) {
112113
super(masterNodeTimeout);
113114
setParentTask(parentTaskId);

server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,14 @@ public ResolveClusterActionRequest(String[] names) {
5454
this(names, DEFAULT_INDICES_OPTIONS);
5555
}
5656

57+
@SuppressWarnings("this-escape")
5758
public ResolveClusterActionRequest(String[] names, IndicesOptions indicesOptions) {
5859
this.names = names;
5960
this.localIndicesRequested = localIndicesPresent(names);
6061
this.indicesOptions = indicesOptions;
6162
}
6263

64+
@SuppressWarnings("this-escape")
6365
public ResolveClusterActionRequest(StreamInput in) throws IOException {
6466
super(in);
6567
if (in.getTransportVersion().before(TransportVersions.V_8_13_0)) {

server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public class DeleteRequestBuilder extends ReplicationRequestBuilder<DeleteReques
3030
private Long term;
3131
private WriteRequest.RefreshPolicy refreshPolicy;
3232

33+
@SuppressWarnings("this-escape")
3334
public DeleteRequestBuilder(ElasticsearchClient client, @Nullable String index) {
3435
super(client, TransportDeleteAction.TYPE);
3536
setIndex(index);

server/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public IndexRequestBuilder(ElasticsearchClient client) {
5454
this(client, null);
5555
}
5656

57+
@SuppressWarnings("this-escape")
5758
public IndexRequestBuilder(ElasticsearchClient client, @Nullable String index) {
5859
super(client, TransportIndexAction.TYPE);
5960
setIndex(index);

server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public UpdateRequestBuilder(ElasticsearchClient client) {
6868
this(client, null, null);
6969
}
7070

71+
@SuppressWarnings("this-escape")
7172
public UpdateRequestBuilder(ElasticsearchClient client, String index, String id) {
7273
super(client, TransportUpdateAction.TYPE);
7374
setIndex(index);

server/src/main/java/org/elasticsearch/client/internal/support/AbstractClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public abstract class AbstractClient implements Client {
9393
private final ThreadPool threadPool;
9494
private final AdminClient admin;
9595

96+
@SuppressWarnings("this-escape")
9697
public AbstractClient(Settings settings, ThreadPool threadPool) {
9798
this.settings = settings;
9899
this.threadPool = threadPool;

server/src/main/java/org/elasticsearch/index/codec/CodecService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public static class DeduplicateFieldInfosCodec extends FilterCodec {
9797

9898
private final DeduplicatingFieldInfosFormat deduplicatingFieldInfosFormat;
9999

100+
@SuppressWarnings("this-escape")
100101
protected DeduplicateFieldInfosCodec(String name, Codec delegate) {
101102
super(name, delegate);
102103
this.deduplicatingFieldInfosFormat = new DeduplicatingFieldInfosFormat(super.fieldInfosFormat());

server/src/main/java/org/elasticsearch/index/mapper/Mapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public abstract static class Builder {
2626

2727
private String leafName;
2828

29+
@SuppressWarnings("this-escape")
2930
protected Builder(String leafName) {
3031
setLeafName(leafName);
3132
}
@@ -55,6 +56,7 @@ default boolean supportsVersion(IndexVersion indexCreatedVersion) {
5556

5657
private final String leafName;
5758

59+
@SuppressWarnings("this-escape")
5860
public Mapper(String leafName) {
5961
Objects.requireNonNull(leafName);
6062
this.leafName = internFieldName(leafName);

server/src/main/java/org/elasticsearch/index/reindex/DeleteByQueryRequestBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public DeleteByQueryRequestBuilder(ElasticsearchClient client) {
2020
this(client, new SearchRequestBuilder(client));
2121
}
2222

23+
@SuppressWarnings("this-escape")
2324
private DeleteByQueryRequestBuilder(ElasticsearchClient client, SearchRequestBuilder search) {
2425
super(client, DeleteByQueryAction.INSTANCE, search);
2526
source().setFetchSource(false);

server/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalStats.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public static boolean hasMetric(String name) {
5656
protected final double max;
5757
protected final double sum;
5858

59+
@SuppressWarnings("this-escape")
5960
public InternalStats(
6061
String name,
6162
long count,

0 commit comments

Comments
 (0)