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

Add TRACE, CONNECT, and PATCH http methods #31035

Merged
merged 3 commits into from
Jun 1, 2018
Merged

Add TRACE, CONNECT, and PATCH http methods #31035

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71d387d
Add TRACE, CONNECT, and PATCH http methods
Tim-Brooks Jun 1, 2018
417e062
Put override back
Tim-Brooks Jun 1, 2018
3cdcc89
Merge remote-tracking branch 'upstream/master' into fix_http_method
Tim-Brooks Jun 1, 2018
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
14 changes: 13 additions & 1 deletion modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,19 @@ public Method method() {
return Method.OPTIONS;
}

return Method.GET;
if (httpMethod == HttpMethod.PATCH) {
return Method.PATCH;
}

if (httpMethod == HttpMethod.TRACE) {
return Method.TRACE;
}

if (httpMethod == HttpMethod.CONNECT) {
return Method.CONNECT;
}

throw new IllegalArgumentException("Unexpected http method: " + httpMethod);
}

@Override
Expand Down
15 changes: 13 additions & 2 deletions plugins/transport-nio/src/main/java/org/elasticsearch/http/nio/NioHttpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ public class NioHttpRequest extends RestRequest {
}
}

@Override
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this still @Override?

public Method method() {
HttpMethod httpMethod = request.method();
if (httpMethod == HttpMethod.GET)
Expand All @@ -84,7 +83,19 @@ public Method method() {
return Method.OPTIONS;
}

return Method.GET;
if (httpMethod == HttpMethod.PATCH) {
return Method.PATCH;
}

if (httpMethod == HttpMethod.TRACE) {
return Method.TRACE;
}

if (httpMethod == HttpMethod.CONNECT) {
return Method.CONNECT;
}

throw new IllegalArgumentException("Unexpected http method: " + httpMethod);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/rest/RestRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public RestRequest(
}

public enum Method {
GET, POST, PUT, DELETE, OPTIONS, HEAD
GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH, TRACE, CONNECT
}

public abstract Method method();
Expand Down