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

fix: Utilize headers set on the Request object #657

Merged
merged 2 commits into from
Dec 4, 2020
Merged

fix: Utilize headers set on the Request object #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa79b2e
fix: utilize headers set on request object
prputnam Dec 3, 2020
4eaa0c4
utilize putAll for setting headers, query params
prputnam Dec 3, 2020
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
10 changes: 3 additions & 7 deletions src/main/java/com/sendgrid/BaseInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,13 +268,9 @@ public Response api(final Request request) throws IOException {
req.setEndpoint("/" + version + "/" + request.getEndpoint());
req.setBody(request.getBody());

for (final Map.Entry<String, String> header : this.requestHeaders.entrySet()) {
req.addHeader(header.getKey(), header.getValue());
}

for (final Map.Entry<String, String> queryParam : request.getQueryParams().entrySet()) {
req.addQueryParam(queryParam.getKey(), queryParam.getValue());
}
req.getHeaders().putAll(this.requestHeaders);
req.getHeaders().putAll(request.getHeaders());
req.getQueryParams().putAll(request.getQueryParams());

return makeCall(req);
}
Expand Down
52 changes: 52 additions & 0 deletions src/test/java/com/sendgrid/SendGridTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3190,4 +3190,56 @@ public void test_get_impersonate_subuser() {
sg.removeImpersonateSubuser();
Assert.assertEquals(sg.getImpersonateSubuser(), null);
}

@Test
public void test_sendgrid_object_headers_are_used_in_request() throws IOException {
Client client = mock(Client.class);
SendGrid sg = new SendGrid(SENDGRID_API_KEY, client);
sg.addRequestHeader("set-on-sendgrid", "123");

Request request = new Request();

sg.api(request);
verify(client).api(argThat((Request req) -> req.getHeaders().containsKey("set-on-sendgrid")));
}

@Test
public void test_request_headers_are_used_in_request() throws IOException {
Client client = mock(Client.class);
SendGrid sg = new SendGrid(SENDGRID_API_KEY, client);

Request request = new Request();
request.addHeader("set-on-request", "456");

sg.api(request);
verify(client).api(argThat((Request req) -> req.getHeaders().containsKey("set-on-request")));
}


@Test
public void test_sendgrid_object_and_request_headers_are_both_used_in_request() throws IOException {
Client client = mock(Client.class);
SendGrid sg = new SendGrid(SENDGRID_API_KEY, client);
sg.addRequestHeader("set-on-sendgrid", "123");

Request request = new Request();
request.addHeader("set-on-request", "456");

sg.api(request);
verify(client).api(argThat((Request req) ->
req.getHeaders().containsKey("set-on-sendgrid") && req.getHeaders().containsKey("set-on-request")));
}

@Test
public void test_request_headers_override_sendgrid_object_headers() throws IOException {
Client client = mock(Client.class);
SendGrid sg = new SendGrid(SENDGRID_API_KEY, client);
sg.addRequestHeader("set-on-both", "123");

Request request = new Request();
request.addHeader("set-on-both", "456");

sg.api(request);
verify(client).api(argThat((Request req) -> req.getHeaders().get("set-on-both").equals("456")));
}
}