Skip to content

Commit 99ffd48

Browse files
committed
Remove type casts in logging in server component (#28807)
This commit removes type-casts in logging in the server component (other components will be done later). This also adds a parameterized message test which would catch breaking-changes related to lambdas in Log4J.
1 parent e5d10ac commit 99ffd48

File tree

112 files changed

+450
-655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+450
-655
lines changed

server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.action.admin.cluster.health;
2121

2222
import org.apache.logging.log4j.message.ParameterizedMessage;
23-
import org.apache.logging.log4j.util.Supplier;
2423
import org.elasticsearch.action.ActionListener;
2524
import org.elasticsearch.action.support.ActionFilters;
2625
import org.elasticsearch.action.support.ActiveShardCount;
@@ -104,7 +103,7 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS
104103

105104
@Override
106105
public void onFailure(String source, Exception e) {
107-
logger.error((Supplier<?>) () -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
106+
logger.error(() -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
108107
listener.onFailure(e);
109108
}
110109
});
@@ -132,7 +131,7 @@ public void onNoLongerMaster(String source) {
132131

133132
@Override
134133
public void onFailure(String source, Exception e) {
135-
logger.error((Supplier<?>) () -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
134+
logger.error(() -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
136135
listener.onFailure(e);
137136
}
138137
});

server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.apache.logging.log4j.Logger;
2323
import org.apache.logging.log4j.message.ParameterizedMessage;
24-
import org.apache.logging.log4j.util.Supplier;
2524
import org.elasticsearch.action.ActionListener;
2625
import org.elasticsearch.action.support.ActionFilters;
2726
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -112,7 +111,7 @@ public void onAckTimeout() {
112111

113112
@Override
114113
public void onFailure(String source, Exception e) {
115-
logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to perform [{}]", source), e);
114+
logger.debug(() -> new ParameterizedMessage("failed to perform [{}]", source), e);
116115
super.onFailure(source, e);
117116
}
118117

server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.action.admin.cluster.settings;
2121

2222
import org.apache.logging.log4j.message.ParameterizedMessage;
23-
import org.apache.logging.log4j.util.Supplier;
2423
import org.elasticsearch.ElasticsearchException;
2524
import org.elasticsearch.action.ActionListener;
2625
import org.elasticsearch.action.support.ActionFilters;
@@ -160,7 +159,7 @@ public void onNoLongerMaster(String source) {
160159
@Override
161160
public void onFailure(String source, Exception e) {
162161
//if the reroute fails we only log
163-
logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to perform [{}]", source), e);
162+
logger.debug(() -> new ParameterizedMessage("failed to perform [{}]", source), e);
164163
listener.onFailure(new ElasticsearchException("reroute after update settings failed", e));
165164
}
166165

@@ -174,7 +173,7 @@ public ClusterState execute(final ClusterState currentState) {
174173

175174
@Override
176175
public void onFailure(String source, Exception e) {
177-
logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to perform [{}]", source), e);
176+
logger.debug(() -> new ParameterizedMessage("failed to perform [{}]", source), e);
178177
super.onFailure(source, e);
179178
}
180179

server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.action.admin.indices.close;
2121

2222
import org.apache.logging.log4j.message.ParameterizedMessage;
23-
import org.apache.logging.log4j.util.Supplier;
2423
import org.elasticsearch.action.ActionListener;
2524
import org.elasticsearch.action.support.ActionFilters;
2625
import org.elasticsearch.action.support.DestructiveOperations;
@@ -114,7 +113,7 @@ public void onResponse(ClusterStateUpdateResponse response) {
114113

115114
@Override
116115
public void onFailure(Exception t) {
117-
logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to close indices [{}]", (Object) concreteIndices), t);
116+
logger.debug(() -> new ParameterizedMessage("failed to close indices [{}]", (Object) concreteIndices), t);
118117
listener.onFailure(t);
119118
}
120119
});

server/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.action.admin.indices.delete;
2121

2222
import org.apache.logging.log4j.message.ParameterizedMessage;
23-
import org.apache.logging.log4j.util.Supplier;
2423
import org.elasticsearch.action.ActionListener;
2524
import org.elasticsearch.action.support.ActionFilters;
2625
import org.elasticsearch.action.support.DestructiveOperations;
@@ -102,7 +101,7 @@ public void onResponse(ClusterStateUpdateResponse response) {
102101

103102
@Override
104103
public void onFailure(Exception t) {
105-
logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to delete indices [{}]", concreteIndices), t);
104+
logger.debug(() -> new ParameterizedMessage("failed to delete indices [{}]", concreteIndices), t);
106105
listener.onFailure(t);
107106
}
108107
});

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.action.admin.indices.mapping.put;
2121

2222
import org.apache.logging.log4j.message.ParameterizedMessage;
23-
import org.apache.logging.log4j.util.Supplier;
2423
import org.elasticsearch.action.ActionListener;
2524
import org.elasticsearch.action.support.ActionFilters;
2625
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -94,12 +93,12 @@ public void onResponse(ClusterStateUpdateResponse response) {
9493

9594
@Override
9695
public void onFailure(Exception t) {
97-
logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to put mappings on indices [{}], type [{}]", concreteIndices, request.type()), t);
96+
logger.debug(() -> new ParameterizedMessage("failed to put mappings on indices [{}], type [{}]", concreteIndices, request.type()), t);
9897
listener.onFailure(t);
9998
}
10099
});
101100
} catch (IndexNotFoundException ex) {
102-
logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to put mappings on indices [{}], type [{}]", request.indices(), request.type()), ex);
101+
logger.debug(() -> new ParameterizedMessage("failed to put mappings on indices [{}], type [{}]", request.indices(), request.type()), ex);
103102
throw ex;
104103
}
105104
}

server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.action.admin.indices.open;
2121

2222
import org.apache.logging.log4j.message.ParameterizedMessage;
23-
import org.apache.logging.log4j.util.Supplier;
2423
import org.elasticsearch.action.ActionListener;
2524
import org.elasticsearch.action.support.ActionFilters;
2625
import org.elasticsearch.action.support.DestructiveOperations;
@@ -99,7 +98,7 @@ public void onResponse(OpenIndexClusterStateUpdateResponse response) {
9998

10099
@Override
101100
public void onFailure(Exception t) {
102-
logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to open indices [{}]", (Object) concreteIndices), t);
101+
logger.debug(() -> new ParameterizedMessage("failed to open indices [{}]", (Object) concreteIndices), t);
103102
listener.onFailure(t);
104103
}
105104
});

server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.action.admin.indices.settings.put;
2121

2222
import org.apache.logging.log4j.message.ParameterizedMessage;
23-
import org.apache.logging.log4j.util.Supplier;
2423
import org.elasticsearch.action.ActionListener;
2524
import org.elasticsearch.action.support.ActionFilters;
2625
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -94,7 +93,7 @@ public void onResponse(ClusterStateUpdateResponse response) {
9493

9594
@Override
9695
public void onFailure(Exception t) {
97-
logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to update settings on indices [{}]", (Object) concreteIndices), t);
96+
logger.debug(() -> new ParameterizedMessage("failed to update settings on indices [{}]", (Object) concreteIndices), t);
9897
listener.onFailure(t);
9998
}
10099
});

server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.elasticsearch.action.admin.indices.template.delete;
2020

2121
import org.apache.logging.log4j.message.ParameterizedMessage;
22-
import org.apache.logging.log4j.util.Supplier;
2322
import org.elasticsearch.action.ActionListener;
2423
import org.elasticsearch.action.support.ActionFilters;
2524
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -75,7 +74,7 @@ public void onResponse(MetaDataIndexTemplateService.RemoveResponse response) {
7574

7675
@Override
7776
public void onFailure(Exception e) {
78-
logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to delete templates [{}]", request.name()), e);
77+
logger.debug(() -> new ParameterizedMessage("failed to delete templates [{}]", request.name()), e);
7978
listener.onFailure(e);
8079
}
8180
});

server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.elasticsearch.action.admin.indices.template.put;
2020

2121
import org.apache.logging.log4j.message.ParameterizedMessage;
22-
import org.apache.logging.log4j.util.Supplier;
2322
import org.elasticsearch.action.ActionListener;
2423
import org.elasticsearch.action.support.ActionFilters;
2524
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -97,7 +96,7 @@ public void onResponse(MetaDataIndexTemplateService.PutResponse response) {
9796

9897
@Override
9998
public void onFailure(Exception e) {
100-
logger.debug((Supplier<?>) () -> new ParameterizedMessage("failed to put template [{}]", request.name()), e);
99+
logger.debug(() -> new ParameterizedMessage("failed to put template [{}]", request.name()), e);
101100
listener.onFailure(e);
102101
}
103102
});

0 commit comments

Comments
 (0)