Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove type end-points from search and related APIs #2263

Merged
merged 1 commit into from
Mar 2, 2022
Merged

Remove type end-points from search and related APIs #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .../lang-mustache/src/main/java/org/opensearch/script/mustache/RestSearchTemplateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,7 @@ public List<Route> routes() {
new Route(GET, "/_search/template"),
new Route(POST, "/_search/template"),
new Route(GET, "/{index}/_search/template"),
new Route(POST, "/{index}/_search/template"),
// Deprecated typed endpoints.
new Route(GET, "/{index}/{type}/_search/template"),
new Route(POST, "/{index}/{type}/_search/template")
new Route(POST, "/{index}/_search/template")
)
);
}
Expand Down
2 changes: 1 addition & 1 deletion modules/reindex/src/main/java/org/opensearch/index/reindex/RestDeleteByQueryAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public RestDeleteByQueryAction() {

@Override
public List<Route> routes() {
return unmodifiableList(asList(new Route(POST, "/{index}/_delete_by_query"), new Route(POST, "/{index}/{type}/_delete_by_query")));
return unmodifiableList(asList(new Route(POST, "/{index}/_delete_by_query")));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public RestUpdateByQueryAction() {

@Override
public List<Route> routes() {
return unmodifiableList(asList(new Route(POST, "/{index}/_update_by_query"), new Route(POST, "/{index}/{type}/_update_by_query")));
return unmodifiableList(asList(new Route(POST, "/{index}/_update_by_query")));
}

@Override
Expand Down
59 changes: 0 additions & 59 deletions modules/reindex/src/test/java/org/opensearch/index/reindex/RestDeleteByQueryActionTests.java
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions modules/reindex/src/test/java/org/opensearch/index/reindex/RestUpdateByQueryActionTests.java
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,6 @@
"description":"A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices"
}
}
},
{
"path" : "/{index}/{type}/_delete_by_query",
"methods": ["POST"],
"parts": {
"index": {
"required": true,
"type": "list",
"description": "A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices"
},
"type": {
"type": "list",
"description": "A comma-separated list of document types to search; leave empty to perform the operation on all types"
}
},
"deprecated": {
"version" : "7.0.0",
"description" : "Specifying types in urls has been deprecated"
}
}
]
},
Expand Down
26 changes: 4 additions & 22 deletions rest-api-spec/src/main/resources/rest-api-spec/api/msearch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,16 @@
]
},
{
"path":"/{index}/_msearch",
"methods":[
"path": "/{index}/_msearch",
"methods": [
"GET",
"POST"
],
"parts":{
"index":{
"type":"list",
"description":"A comma-separated list of index names to use as default"
}
}
},
{
"path" : "/{index}/{type}/_msearch",
"methods": ["GET", "POST"],
"parts": {
"index": {
"type" : "list",
"description" : "A comma-separated list of index names to use as default"
},
"type": {
"type" : "list",
"description" : "A comma-separated list of document types to use as default"
"type": "list",
"description": "A comma-separated list of index names to use as default"
}
},
"deprecated": {
"version" : "7.0.0",
"description" : "Specifying types in urls has been deprecated"
}
}
]
Expand Down
18 changes: 0 additions & 18 deletions rest-api-spec/src/main/resources/rest-api-spec/api/msearch_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,6 @@
"description":"A comma-separated list of index names to use as default"
}
}
},
{
"path" : "/{index}/{type}/_msearch/template",
"methods": ["GET", "POST"],
"parts": {
"index": {
"type" : "list",
"description" : "A comma-separated list of index names to use as default"
},
"type": {
"type" : "list",
"description" : "A comma-separated list of document types to use as default"
}
},
"deprecated": {
"version" : "7.0.0",
"description" : "Specifying types in urls has been deprecated"
}
}
]
},
Expand Down
19 changes: 0 additions & 19 deletions rest-api-spec/src/main/resources/rest-api-spec/api/mtermvectors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,6 @@
"description":"The index in which the document resides."
}
}
},
{
"path" : "/{index}/{type}/_mtermvectors",
"methods" : ["GET", "POST"],
"parts" : {
"index" : {
"type" : "string",
"description" : "The index in which the document resides."
},
"type" : {
"type" : "string",
"description" : "The type of the document."
}
},
"deprecated":{
"version" : "7.0.0",

"description" : "Specifying types in urls has been deprecated"
}
}
]
},
Expand Down
18 changes: 0 additions & 18 deletions rest-api-spec/src/main/resources/rest-api-spec/api/search.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,6 @@
"description":"A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices"
}
}
},
{
"path" : "/{index}/{type}/_search",
"methods": ["GET", "POST"],
"parts": {
"index": {
"type" : "list",
"description" : "A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices"
},
"type": {
"type": "list",
"description": "A comma-separated list of document types to search; leave empty to perform the operation on all types"
}
},
"deprecated" : {
"version" : "7.0.0",
"description" : "Specifying types in urls has been deprecated"
}
}
]
},
Expand Down
18 changes: 0 additions & 18 deletions rest-api-spec/src/main/resources/rest-api-spec/api/search_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,6 @@
"description":"A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices"
}
}
},
{
"path" : "/{index}/{type}/_search/template",
"methods": ["GET", "POST"],
"parts": {
"index": {
"type" : "list",
"description" : "A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices"
},
"type": {
"type" : "list",
"description" : "A comma-separated list of document types to search; leave empty to perform the operation on all types"
}
},
"deprecated" : {
"version" : "7.0.0",
"description" : "Specifying types in urls has been deprecated"
}
}
]
},
Expand Down
44 changes: 0 additions & 44 deletions rest-api-spec/src/main/resources/rest-api-spec/api/termvectors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,50 +36,6 @@
"description":"The index in which the document resides."
}
}
},
{
"path" : "/{index}/{type}/{id}/_termvectors",
"methods" : ["GET", "POST"],
"parts" : {
"index" : {
"type" : "string",
"description" : "The index in which the document resides.",
"required" : true
},
"type" : {
"type" : "string",
"description" : "The type of the document.",
"required" : false
},
"id" : {
"type" : "string",
"description" : "The id of the document, when not specified a doc param should be supplied."
}
},
"deprecated": {
"version" : "7.0.0",
"description" : "Specifying types in urls has been deprecated"
}
},
{
"path" : "/{index}/{type}/_termvectors",
"methods" : ["GET", "POST"],
"parts" : {
"index" : {
"type" : "string",
"description" : "The index in which the document resides.",
"required" : true
},
"type" : {
"type" : "string",
"description" : "The type of the document.",
"required" : false
}
},
"deprecated": {
"version" : "7.0.0",
"description" : "Specifying types in urls has been deprecated"
}
}
]
},
Expand Down
19 changes: 0 additions & 19 deletions rest-api-spec/src/main/resources/rest-api-spec/api/update_by_query.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,6 @@
"description":"A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices"
}
}
},
{
"path" : "/{index}/{type}/_update_by_query",
"methods": ["POST"],
"parts": {
"index": {
"required": true,
"type": "list",
"description": "A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices"
},
"type": {
"type": "list",
"description": "A comma-separated list of document types to search; leave empty to perform the operation on all types"
}
},
"deprecated" : {
"version" : "7.0.0",
"description" : "Specifying types in urls has been deprecated"
}
}
]
},
Expand Down
Loading