Skip to content

Commit 97c207c

Browse files
authored
Remove all replaced-in-v8 REST endpoints (#114800)
These endpoints were deprecated in v7 and are replaced in v8 with different endpoints so we can remove the v7 endpoint names in v9.
1 parent 81976b2 commit 97c207c

File tree

112 files changed

+211
-725
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

+211
-725
lines changed

qa/system-indices/src/main/java/org/elasticsearch/system/indices/SystemIndicesQA.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public String getName() {
150150

151151
@Override
152152
public List<Route> routes() {
153-
return List.of(Route.builder(Method.PUT, "/_net_new_sys_index/_create").build());
153+
return List.of(new Route(Method.PUT, "/_net_new_sys_index/_create"));
154154
}
155155

156156
@Override

server/src/internalClusterTest/java/org/elasticsearch/common/network/ThreadWatchdogIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public Collection<RestHandler> getRestHandlers(
8888
return List.of(new RestHandler() {
8989
@Override
9090
public List<Route> routes() {
91-
return List.of(Route.builder(RestRequest.Method.POST, "_slow").build());
91+
return List.of(new Route(RestRequest.Method.POST, "_slow"));
9292
}
9393

9494
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java

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

1010
import org.elasticsearch.action.support.master.AcknowledgedRequest;
1111
import org.elasticsearch.client.internal.node.NodeClient;
12-
import org.elasticsearch.core.RestApiVersion;
1312
import org.elasticsearch.rest.BaseRestHandler;
1413
import org.elasticsearch.rest.RestRequest;
1514
import org.elasticsearch.rest.action.RestToXContentListener;
@@ -27,7 +26,7 @@ public RestDeleteLicenseAction() {}
2726

2827
@Override
2928
public List<Route> routes() {
30-
return List.of(Route.builder(DELETE, "/_license").replaces(DELETE, "/_xpack/license", RestApiVersion.V_7).build());
29+
return List.of(new Route(DELETE, "/_license"));
3130
}
3231

3332
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/license/RestGetBasicStatus.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.license;
99

1010
import org.elasticsearch.client.internal.node.NodeClient;
11-
import org.elasticsearch.core.RestApiVersion;
1211
import org.elasticsearch.rest.BaseRestHandler;
1312
import org.elasticsearch.rest.RestRequest;
1413
import org.elasticsearch.rest.RestUtils;
@@ -24,9 +23,7 @@ public RestGetBasicStatus() {}
2423

2524
@Override
2625
public List<Route> routes() {
27-
return List.of(
28-
Route.builder(GET, "/_license/basic_status").replaces(GET, "/_xpack/license/basic_status", RestApiVersion.V_7).build()
29-
);
26+
return List.of(new Route(GET, "/_license/basic_status"));
3027
}
3128

3229
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/license/RestGetLicenseAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.elasticsearch.common.logging.DeprecationCategory;
1212
import org.elasticsearch.common.logging.DeprecationLogger;
1313
import org.elasticsearch.common.util.Maps;
14-
import org.elasticsearch.core.RestApiVersion;
1514
import org.elasticsearch.protocol.xpack.license.GetLicenseRequest;
1615
import org.elasticsearch.rest.BaseRestHandler;
1716
import org.elasticsearch.rest.RestRequest;
@@ -43,7 +42,7 @@ public RestGetLicenseAction() {}
4342

4443
@Override
4544
public List<Route> routes() {
46-
return List.of(Route.builder(GET, "/_license").replaces(GET, "/_xpack/license", RestApiVersion.V_7).build());
45+
return List.of(new Route(GET, "/_license"));
4746
}
4847

4948
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/license/RestGetTrialStatus.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.license;
99

1010
import org.elasticsearch.client.internal.node.NodeClient;
11-
import org.elasticsearch.core.RestApiVersion;
1211
import org.elasticsearch.rest.BaseRestHandler;
1312
import org.elasticsearch.rest.RestRequest;
1413
import org.elasticsearch.rest.RestUtils;
@@ -24,9 +23,7 @@ public RestGetTrialStatus() {}
2423

2524
@Override
2625
public List<Route> routes() {
27-
return List.of(
28-
Route.builder(GET, "/_license/trial_status").replaces(GET, "/_xpack/license/trial_status", RestApiVersion.V_7).build()
29-
);
26+
return List.of(new Route(GET, "/_license/trial_status"));
3027
}
3128

3229
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/license/RestPostStartBasicLicense.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.license;
99

1010
import org.elasticsearch.client.internal.node.NodeClient;
11-
import org.elasticsearch.core.RestApiVersion;
1211
import org.elasticsearch.rest.BaseRestHandler;
1312
import org.elasticsearch.rest.RestRequest;
1413
import org.elasticsearch.rest.action.RestToXContentListener;
@@ -26,9 +25,7 @@ public RestPostStartBasicLicense() {}
2625

2726
@Override
2827
public List<Route> routes() {
29-
return List.of(
30-
Route.builder(POST, "/_license/start_basic").replaces(POST, "/_xpack/license/start_basic", RestApiVersion.V_7).build()
31-
);
28+
return List.of(new Route(POST, "/_license/start_basic"));
3229
}
3330

3431
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/license/RestPostStartTrialLicense.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.license;
99

1010
import org.elasticsearch.client.internal.node.NodeClient;
11-
import org.elasticsearch.core.RestApiVersion;
1211
import org.elasticsearch.rest.BaseRestHandler;
1312
import org.elasticsearch.rest.RestRequest;
1413
import org.elasticsearch.rest.RestResponse;
@@ -28,9 +27,7 @@ public RestPostStartTrialLicense() {}
2827

2928
@Override
3029
public List<Route> routes() {
31-
return List.of(
32-
Route.builder(POST, "/_license/start_trial").replaces(POST, "/_xpack/license/start_trial", RestApiVersion.V_7).build()
33-
);
30+
return List.of(new Route(POST, "/_license/start_trial"));
3431
}
3532

3633
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/license/RestPutLicenseAction.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.license;
99

1010
import org.elasticsearch.client.internal.node.NodeClient;
11-
import org.elasticsearch.core.RestApiVersion;
1211
import org.elasticsearch.rest.BaseRestHandler;
1312
import org.elasticsearch.rest.RestRequest;
1413
import org.elasticsearch.rest.action.RestToXContentListener;
@@ -28,10 +27,7 @@ public RestPutLicenseAction() {}
2827
@Override
2928
public List<Route> routes() {
3029
// TODO: remove POST endpoint?
31-
return List.of(
32-
Route.builder(POST, "/_license").replaces(POST, "/_xpack/license", RestApiVersion.V_7).build(),
33-
Route.builder(PUT, "/_license").replaces(PUT, "/_xpack/license", RestApiVersion.V_7).build()
34-
);
30+
return List.of(new Route(POST, "/_license"), new Route(PUT, "/_license"));
3531
}
3632

3733
@Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/rest/RestGetCertificateInfoAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
package org.elasticsearch.xpack.core.ssl.rest;
88

99
import org.elasticsearch.client.internal.node.NodeClient;
10-
import org.elasticsearch.core.RestApiVersion;
1110
import org.elasticsearch.rest.BaseRestHandler;
1211
import org.elasticsearch.rest.RestRequest;
1312
import org.elasticsearch.rest.RestResponse;
@@ -32,7 +31,7 @@ public class RestGetCertificateInfoAction extends BaseRestHandler {
3231

3332
@Override
3433
public List<Route> routes() {
35-
return List.of(Route.builder(GET, "/_ssl/certificates").replaces(GET, "/_xpack/ssl/certificates", RestApiVersion.V_7).build());
34+
return List.of(new Route(GET, "/_ssl/certificates"));
3635
}
3736

3837
@Override

0 commit comments

Comments
 (0)