Skip to content

Commit 8b957e9

Browse files
authored
chore: Modify request (#759)
* chore: request modified
1 parent ce4e8e8 commit 8b957e9

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ examples/Example.java
1818
sendgrid-java.jar
1919
dependency-reduced-pom.xml
2020
prism*
21+
**/.openapi-generator*
22+
**/TestSG.java

src/main/java/com/sendgrid/exception/RestException.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.Map;
1313

1414
/**
15-
* Twilio Exceptions.
15+
* Sendgrid Exceptions.
1616
*/
1717
@JsonIgnoreProperties(ignoreUnknown = true)
1818
public class RestException {
@@ -24,11 +24,11 @@ public class RestException {
2424
private final Map<String, Object> details;
2525

2626
/**
27-
* Initialize a Twilio Rest Exception.
27+
* Initialize a Sendgrid Rest Exception.
2828
*
2929
* @param status HTTP status code
3030
* @param message message of exception
31-
* @param code Twilio status code
31+
* @param code Sendgrid status code
3232
* @param moreInfo further information, if there is any
3333
*/
3434
@JsonCreator

src/main/java/com/sendgrid/http/ApiKeyRestClient.java

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import java.util.ArrayList;
1313
import java.util.List;
14+
import java.util.Map;
1415

1516
public class ApiKeyRestClient {
1617
private final String apiKey;
@@ -41,6 +42,7 @@ public Response request(final Request request) {
4142
if (userAgentExtensions != null && !userAgentExtensions.isEmpty()) {
4243
request.setUserAgentExtensions(userAgentExtensions);
4344
}
45+
request.buildUrl();
4446
logRequest(request);
4547

4648
Response response = httpClient.makeRequest(request);
@@ -87,24 +89,23 @@ public ApiKeyRestClient build() {
8789

8890

8991
public void logRequest(final Request request) {
90-
// if (logger.isDebugEnabled()) {
91-
// logger.debug("-- BEGIN Twilio API Request --");
92-
// logger.debug("request method: " + request.getMethod());
93-
// // TODO: URL Encode query params before logging.
94-
// logger.debug("request URL: " + request.getUrl().toString());
95-
//
96-
// final Map<String, String> headerParams = request.getHeaders();
97-
//
98-
// if (headerParams != null && !headerParams.isEmpty()) {
99-
// logger.debug("header parameters: ");
100-
// for (String key : headerParams.keySet()) {
101-
// if (!key.toLowerCase().contains("authorization")) {
102-
// logger.debug(key + ": " + headerParams.get(key));
103-
// }
104-
// }
105-
// }
106-
//
107-
// logger.debug("-- END Twilio API Request --");
108-
// }
92+
if (logger.isDebugEnabled()) {
93+
logger.debug("-- BEGIN Sendgrid API Request --");
94+
logger.debug("request method: " + request.getMethod());
95+
logger.debug("request URL: " + request.getUrl().toString());
96+
97+
final Map<String, String> headerParams = request.getHeaders();
98+
99+
if (headerParams != null && !headerParams.isEmpty()) {
100+
logger.debug("header parameters: ");
101+
for (String key : headerParams.keySet()) {
102+
if (!key.toLowerCase().contains("authorization")) {
103+
logger.debug(key + ": " + headerParams.get(key));
104+
}
105+
}
106+
}
107+
108+
logger.debug("-- END Sendgrid API Request --");
109+
}
109110
}
110111
}

0 commit comments

Comments
 (0)