Skip to content

Commit 2653271

Browse files
jaymodejaymode
committed
method first then path
1 parent 2b69b84 commit 2653271

File tree

241 files changed

+482
-482
lines changed

Some content is hidden

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

241 files changed

+482
-482
lines changed

‎client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/RestNoopBulkAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ public class RestNoopBulkAction extends BaseRestHandler {
5050
@Override
5151
public List<Route> handledRoutes() {
5252
return unmodifiableList(asList(
53-
new Route("/_noop_bulk", POST),
54-
new Route("/_noop_bulk", PUT),
55-
new Route("/{index}/_noop_bulk", POST),
56-
new Route("/{index}/_noop_bulk", PUT)));
53+
new Route(POST, "/_noop_bulk"),
54+
new Route(PUT, "/_noop_bulk"),
55+
new Route(POST, "/{index}/_noop_bulk"),
56+
new Route(PUT, "/{index}/_noop_bulk")));
5757
}
5858

5959
@Override

‎client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/search/RestNoopSearchAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public class RestNoopSearchAction extends BaseRestHandler {
3636
@Override
3737
public List<Route> handledRoutes() {
3838
return unmodifiableList(asList(
39-
new Route("/_noop_search", GET),
40-
new Route("/_noop_search", POST),
41-
new Route("/{index}/_noop_search", GET),
42-
new Route("/{index}/_noop_search", POST)));
39+
new Route(GET, "/_noop_search"),
40+
new Route(POST, "/_noop_search"),
41+
new Route(GET, "/{index}/_noop_search"),
42+
new Route(POST, "/{index}/_noop_search")));
4343
}
4444

4545
@Override

‎modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static class RestAction extends BaseRestHandler {
120120

121121
@Override
122122
public List<Route> handledRoutes() {
123-
return singletonList(new Route("/_ingest/processor/grok", GET));
123+
return singletonList(new Route(GET, "/_ingest/processor/grok"));
124124
}
125125

126126
@Override

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestMultiSearchTemplateAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ public RestMultiSearchTemplateAction(Settings settings) {
5959
@Override
6060
public List<Route> handledRoutes() {
6161
return unmodifiableList(asList(
62-
new Route("/_msearch/template", GET),
63-
new Route("/_msearch/template", POST),
64-
new Route("/{index}/_msearch/template", GET),
65-
new Route("/{index}/_msearch/template", POST)));
62+
new Route(GET, "/_msearch/template"),
63+
new Route(POST, "/_msearch/template"),
64+
new Route(GET, "/{index}/_msearch/template"),
65+
new Route(POST, "/{index}/_msearch/template")));
6666
}
6767

6868
@Override

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestRenderSearchTemplateAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ public class RestRenderSearchTemplateAction extends BaseRestHandler {
3939
@Override
4040
public List<Route> handledRoutes() {
4141
return unmodifiableList(asList(
42-
new Route("/_render/template", GET),
43-
new Route("/_render/template", POST),
44-
new Route("/_render/template/{id}", GET),
45-
new Route("/_render/template/{id}", POST)));
42+
new Route(GET, "/_render/template"),
43+
new Route(POST, "/_render/template"),
44+
new Route(GET, "/_render/template/{id}"),
45+
new Route(POST, "/_render/template/{id}")));
4646
}
4747

4848
@Override

‎modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestSearchTemplateAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ public class RestSearchTemplateAction extends BaseRestHandler {
5151
@Override
5252
public List<Route> handledRoutes() {
5353
return unmodifiableList(asList(
54-
new Route("/_search/template", GET),
55-
new Route("/_search/template", POST),
56-
new Route("/{index}/_search/template", GET),
57-
new Route("/{index}/_search/template", POST)));
54+
new Route(GET, "/_search/template"),
55+
new Route(POST, "/_search/template"),
56+
new Route(GET, "/{index}/_search/template"),
57+
new Route(POST, "/{index}/_search/template")));
5858
}
5959

6060
@Override

‎modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public static class RestAction extends BaseRestHandler {
196196

197197
@Override
198198
public List<Route> handledRoutes() {
199-
return singletonList(new Route("/_scripts/painless/_context", GET));
199+
return singletonList(new Route(GET, "/_scripts/painless/_context"));
200200
}
201201

202202
@Override

‎modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,8 @@ public static class RestAction extends BaseRestHandler {
569569
@Override
570570
public List<Route> handledRoutes() {
571571
return unmodifiableList(asList(
572-
new Route("/_scripts/painless/_execute", GET),
573-
new Route("/_scripts/painless/_execute", POST)));
572+
new Route(GET, "/_scripts/painless/_execute"),
573+
new Route(POST, "/_scripts/painless/_execute")));
574574
}
575575

576576
@Override

‎modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RestRankEvalAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ public class RestRankEvalAction extends BaseRestHandler {
9595
@Override
9696
public List<Route> handledRoutes() {
9797
return unmodifiableList(asList(
98-
new Route("/" + ENDPOINT, GET),
99-
new Route("/" + ENDPOINT, POST),
100-
new Route("/{index}/" + ENDPOINT, GET),
101-
new Route("/{index}/" + ENDPOINT, POST)));
98+
new Route(GET, "/" + ENDPOINT),
99+
new Route(POST, "/" + ENDPOINT),
100+
new Route(GET, "/{index}/" + ENDPOINT),
101+
new Route(POST, "/{index}/" + ENDPOINT)));
102102
}
103103

104104
@Override

‎modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestDeleteByQueryAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public RestDeleteByQueryAction() {
3939

4040
@Override
4141
public List<Route> handledRoutes() {
42-
return singletonList(new Route("/{index}/_delete_by_query", POST));
42+
return singletonList(new Route(POST, "/{index}/_delete_by_query"));
4343
}
4444

4545
@Override

‎modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public RestReindexAction() {
4141

4242
@Override
4343
public List<Route> handledRoutes() {
44-
return singletonList(new Route("/_reindex", POST));
44+
return singletonList(new Route(POST, "/_reindex"));
4545
}
4646

4747
@Override

‎modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestRethrottleAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public RestRethrottleAction(Supplier<DiscoveryNodes> nodesInCluster) {
4343
@Override
4444
public List<Route> handledRoutes() {
4545
return unmodifiableList(asList(
46-
new Route("/_update_by_query/{taskId}/_rethrottle", POST),
47-
new Route("/_delete_by_query/{taskId}/_rethrottle", POST),
48-
new Route("/_reindex/{taskId}/_rethrottle", POST)));
46+
new Route(POST, "/_update_by_query/{taskId}/_rethrottle"),
47+
new Route(POST, "/_delete_by_query/{taskId}/_rethrottle"),
48+
new Route(POST, "/_reindex/{taskId}/_rethrottle")));
4949
}
5050

5151
@Override

‎modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestUpdateByQueryAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public RestUpdateByQueryAction() {
4646

4747
@Override
4848
public List<Route> handledRoutes() {
49-
return singletonList(new Route("/{index}/_update_by_query", POST));
49+
return singletonList(new Route(POST, "/{index}/_update_by_query"));
5050
}
5151

5252
@Override

‎plugins/examples/rest-handler/src/main/java/org/elasticsearch/example/resthandler/ExampleCatAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public class ExampleCatAction extends AbstractCatAction {
4040
@Override
4141
public List<Route> handledRoutes() {
4242
return unmodifiableList(asList(
43-
new Route("/_cat/example", GET),
44-
new Route("/_cat/example", POST)));
43+
new Route(GET, "/_cat/example"),
44+
new Route(POST, "/_cat/example")));
4545
}
4646

4747
@Override

‎qa/die-with-dignity/src/main/java/org/elasticsearch/RestDieWithDignityAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class RestDieWithDignityAction extends BaseRestHandler {
3434

3535
@Override
3636
public List<Route> handledRoutes() {
37-
return singletonList(new Route("/_die_with_dignity", GET));
37+
return singletonList(new Route(GET, "/_die_with_dignity"));
3838
}
3939

4040
@Override

‎qa/smoke-test-http/src/test/java/org/elasticsearch/http/TestDeprecationHeaderRestAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public TestDeprecationHeaderRestAction(Settings settings) {
7676
@Override
7777
public List<DeprecatedRoute> deprecatedRoutes() {
7878
return singletonList(
79-
new DeprecatedRoute("/_test_cluster/deprecated_settings", GET, DEPRECATED_ENDPOINT, deprecationLogger));
79+
new DeprecatedRoute(GET, "/_test_cluster/deprecated_settings", DEPRECATED_ENDPOINT, deprecationLogger));
8080
}
8181

8282
@Override

‎qa/smoke-test-http/src/test/java/org/elasticsearch/http/TestResponseHeaderRestAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class TestResponseHeaderRestAction extends BaseRestHandler {
3434

3535
@Override
3636
public List<Route> handledRoutes() {
37-
return singletonList(new Route("/_protected", GET));
37+
return singletonList(new Route(GET, "/_protected"));
3838
}
3939

4040
@Override

‎server/src/main/java/org/elasticsearch/rest/RestHandler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class Route {
9595
private final String path;
9696
private final Method method;
9797

98-
public Route(String path, Method method) {
98+
public Route(Method method, String path) {
9999
this.path = path;
100100
this.method = method;
101101
}
@@ -117,8 +117,8 @@ class DeprecatedRoute extends Route {
117117
private final String deprecationMessage;
118118
private final DeprecationLogger logger;
119119

120-
public DeprecatedRoute(String path, Method method, String deprecationMessage, DeprecationLogger logger) {
121-
super(path, method);
120+
public DeprecatedRoute(Method method, String path, String deprecationMessage, DeprecationLogger logger) {
121+
super(method, path);
122122
this.deprecationMessage = deprecationMessage;
123123
this.logger = logger;
124124
}
@@ -143,7 +143,7 @@ class ReplacedRoute extends Route {
143143
private final DeprecationLogger logger;
144144

145145
public ReplacedRoute(Method method, String path, Method deprecatedMethod, String deprecatedPath, DeprecationLogger logger) {
146-
super(path, method);
146+
super(method, path);
147147
this.deprecatedMethod = deprecatedMethod;
148148
this.deprecatedPath = deprecatedPath;
149149
this.logger = logger;

‎server/src/main/java/org/elasticsearch/rest/action/RestFieldCapabilitiesAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ public class RestFieldCapabilitiesAction extends BaseRestHandler {
3939
@Override
4040
public List<Route> handledRoutes() {
4141
return unmodifiableList(asList(
42-
new Route("/_field_caps", GET),
43-
new Route("/_field_caps", POST),
44-
new Route("/{index}/_field_caps", GET),
45-
new Route("/{index}/_field_caps", POST)));
42+
new Route(GET, "/_field_caps"),
43+
new Route(POST, "/_field_caps"),
44+
new Route(GET, "/{index}/_field_caps"),
45+
new Route(POST, "/{index}/_field_caps")));
4646
}
4747

4848
@Override

‎server/src/main/java/org/elasticsearch/rest/action/RestMainAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public class RestMainAction extends BaseRestHandler {
4343
@Override
4444
public List<Route> handledRoutes() {
4545
return unmodifiableList(asList(
46-
new Route("/", GET),
47-
new Route("/", HEAD)));
46+
new Route(GET, "/"),
47+
new Route(HEAD, "/")));
4848
}
4949

5050
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java

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

4646
@Override
4747
public List<Route> handledRoutes() {
48-
return singletonList(new Route("/_cluster/voting_config_exclusions/{node_name}", POST));
48+
return singletonList(new Route(POST, "/_cluster/voting_config_exclusions/{node_name}"));
4949
}
5050

5151
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public String getName() {
5151

5252
@Override
5353
public List<Route> handledRoutes() {
54-
return unmodifiableList(asList(new Route("/_tasks/_cancel", POST),
55-
new Route("/_tasks/{task_id}/_cancel", POST)));
54+
return unmodifiableList(asList(new Route(POST, "/_tasks/_cancel"),
55+
new Route(POST, "/_tasks/{task_id}/_cancel")));
5656
}
5757

5858
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCleanupRepositoryAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class RestCleanupRepositoryAction extends BaseRestHandler {
3939

4040
@Override
4141
public List<Route> handledRoutes() {
42-
return singletonList(new Route("/_snapshot/{repository}/_cleanup", POST));
42+
return singletonList(new Route(POST, "/_snapshot/{repository}/_cleanup"));
4343
}
4444

4545
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClearVotingConfigExclusionsAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class RestClearVotingConfigExclusionsAction extends BaseRestHandler {
3636

3737
@Override
3838
public List<Route> handledRoutes() {
39-
return singletonList(new Route("/_cluster/voting_config_exclusions", DELETE));
39+
return singletonList(new Route(DELETE, "/_cluster/voting_config_exclusions"));
4040
}
4141

4242
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public class RestClusterAllocationExplainAction extends BaseRestHandler {
4848
@Override
4949
public List<Route> handledRoutes() {
5050
return unmodifiableList(asList(
51-
new Route("/_cluster/allocation/explain", GET),
52-
new Route("/_cluster/allocation/explain", POST)));
51+
new Route(GET, "/_cluster/allocation/explain"),
52+
new Route(POST, "/_cluster/allocation/explain")));
5353
}
5454

5555
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public RestClusterGetSettingsAction(Settings settings, ClusterSettings clusterSe
5858

5959
@Override
6060
public List<Route> handledRoutes() {
61-
return singletonList(new Route("/_cluster/settings", GET));
61+
return singletonList(new Route(GET, "/_cluster/settings"));
6262
}
6363
@Override
6464
public String getName() {

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public class RestClusterHealthAction extends BaseRestHandler {
4545

4646
@Override
4747
public List<Route> handledRoutes() {
48-
return unmodifiableList(asList(new Route("/_cluster/health", GET),
49-
new Route("/_cluster/health/{index}", GET)));
48+
return unmodifiableList(asList(new Route(GET, "/_cluster/health"),
49+
new Route(GET, "/_cluster/health/{index}")));
5050
}
5151

5252
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public RestClusterRerouteAction(SettingsFilter settingsFilter) {
6363

6464
@Override
6565
public List<Route> handledRoutes() {
66-
return singletonList(new Route("/_cluster/reroute", POST));
66+
return singletonList(new Route(POST, "/_cluster/reroute"));
6767
}
6868

6969
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public class RestClusterSearchShardsAction extends BaseRestHandler {
4141
@Override
4242
public List<Route> handledRoutes() {
4343
return unmodifiableList(asList(
44-
new Route("/_search_shards", GET),
45-
new Route("/_search_shards", POST),
46-
new Route("/{index}/_search_shards", GET),
47-
new Route("/{index}/_search_shards", POST)));
44+
new Route(GET, "/_search_shards"),
45+
new Route(POST, "/_search_shards"),
46+
new Route(GET, "/{index}/_search_shards"),
47+
new Route(POST, "/{index}/_search_shards")));
4848
}
4949

5050
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ public String getName() {
6363
@Override
6464
public List<Route> handledRoutes() {
6565
return unmodifiableList(asList(
66-
new Route("/_cluster/state", GET),
67-
new Route("/_cluster/state/{metric}", GET),
68-
new Route("/_cluster/state/{metric}/{indices}", GET)));
66+
new Route(GET, "/_cluster/state"),
67+
new Route(GET, "/_cluster/state/{metric}"),
68+
new Route(GET, "/_cluster/state/{metric}/{indices}")));
6969
}
7070

7171
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public class RestClusterStatsAction extends BaseRestHandler {
3737
@Override
3838
public List<Route> handledRoutes() {
3939
return unmodifiableList(asList(
40-
new Route("/_cluster/stats", GET),
41-
new Route("/_cluster/stats/nodes/{nodeId}", GET)));
40+
new Route(GET, "/_cluster/stats"),
41+
new Route(GET, "/_cluster/stats/nodes/{nodeId}")));
4242
}
4343

4444
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class RestClusterUpdateSettingsAction extends BaseRestHandler {
4343

4444
@Override
4545
public List<Route> handledRoutes() {
46-
return singletonList(new Route("/_cluster/settings", PUT));
46+
return singletonList(new Route(PUT, "/_cluster/settings"));
4747
}
4848

4949
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCreateSnapshotAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public class RestCreateSnapshotAction extends BaseRestHandler {
4242
@Override
4343
public List<Route> handledRoutes() {
4444
return unmodifiableList(asList(
45-
new Route("/_snapshot/{repository}/{snapshot}", PUT),
46-
new Route("/_snapshot/{repository}/{snapshot}", POST)));
45+
new Route(PUT, "/_snapshot/{repository}/{snapshot}"),
46+
new Route(POST, "/_snapshot/{repository}/{snapshot}")));
4747
}
4848

4949
@Override

‎server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class RestDeleteRepositoryAction extends BaseRestHandler {
3939

4040
@Override
4141
public List<Route> handledRoutes() {
42-
return singletonList(new Route("/_snapshot/{repository}", DELETE));
42+
return singletonList(new Route(DELETE, "/_snapshot/{repository}"));
4343
}
4444

4545
@Override

0 commit comments

Comments
 (0)