Skip to content

Commit 6b672f5

Browse files
committed
Remove the constructor with a single return200ForServerTimeout
1 parent 7bc6f0c commit 6b672f5

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,6 @@ public class ClusterHealthResponse extends ActionResponse implements StatusToXCo
140140
private ClusterHealthStatus clusterHealthStatus;
141141
private boolean return200ForClusterHealthTimeout;
142142

143-
public ClusterHealthResponse(boolean return200ForServerTimeout) {
144-
this.return200ForClusterHealthTimeout = return200ForServerTimeout;
145-
}
146-
147143
public ClusterHealthResponse(StreamInput in) throws IOException {
148144
super(in);
149145
clusterName = in.readString();

server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponsesTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class ClusterHealthResponsesTests extends AbstractSerializingTestCase<Clu
4343
private final ClusterHealthRequest.Level level = randomFrom(ClusterHealthRequest.Level.values());
4444

4545
public void testIsTimeout() {
46-
ClusterHealthResponse res = new ClusterHealthResponse(false);
46+
ClusterHealthResponse res = new ClusterHealthResponse("", new String[]{}, ClusterState.EMPTY_STATE, false);
4747
for (int i = 0; i < 5; i++) {
4848
res.setTimedOut(randomBoolean());
4949
if (res.isTimedOut()) {
@@ -56,7 +56,7 @@ public void testIsTimeout() {
5656
}
5757

5858
public void testTimeoutReturns200IfOptedIn() {
59-
ClusterHealthResponse res = new ClusterHealthResponse(true);
59+
ClusterHealthResponse res = new ClusterHealthResponse("", new String[]{}, ClusterState.EMPTY_STATE, true);
6060
for (int i = 0; i < 5; i++) {
6161
res.setTimedOut(randomBoolean());
6262
assertEquals(RestStatus.OK, res.status());

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/utils/MlIndexAndAliasTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void setUpMocks() {
108108
clusterAdminClient = mock(ClusterAdminClient.class);
109109
doAnswer(invocationOnMock -> {
110110
ActionListener<ClusterHealthResponse> listener = (ActionListener<ClusterHealthResponse>) invocationOnMock.getArguments()[1];
111-
listener.onResponse(new ClusterHealthResponse(false));
111+
listener.onResponse(new ClusterHealthResponse("", new String[]{}, ClusterState.EMPTY_STATE, false));
112112
return null;
113113
}).when(clusterAdminClient).health(any(ClusterHealthRequest.class), any(ActionListener.class));
114114

x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/persistence/TransformInternalIndexTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public void testCreateLatestVersionedIndexIfRequired_GivenShardInitializationPen
188188
doAnswer(invocationOnMock -> {
189189
@SuppressWarnings("unchecked")
190190
ActionListener<ClusterHealthResponse> listener = (ActionListener<ClusterHealthResponse>) invocationOnMock.getArguments()[1];
191-
listener.onResponse(new ClusterHealthResponse(false));
191+
listener.onResponse(new ClusterHealthResponse("", new String[]{}, ClusterState.EMPTY_STATE, false));
192192
return null;
193193
}).when(clusterClient).health(any(), any());
194194

@@ -272,7 +272,7 @@ public void testCreateLatestVersionedIndexIfRequired_GivenConcurrentCreationShar
272272
doAnswer(invocationOnMock -> {
273273
@SuppressWarnings("unchecked")
274274
ActionListener<ClusterHealthResponse> listener = (ActionListener<ClusterHealthResponse>) invocationOnMock.getArguments()[1];
275-
listener.onResponse(new ClusterHealthResponse(false));
275+
listener.onResponse(new ClusterHealthResponse("", new String[]{}, ClusterState.EMPTY_STATE, false));
276276
return null;
277277
}).when(clusterClient).health(any(), any());
278278

0 commit comments

Comments
 (0)