Skip to content

Commit 00cede7

Browse files
Brian CribbsBrian Cribbs
authored andcommitted
just kidding, someone did this more intelligently already
1 parent 42f39d8 commit 00cede7

File tree

6 files changed

+1
-22
lines changed

6 files changed

+1
-22
lines changed

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillMessagesRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@ public class MandrillMessagesRequest {
3232
* @throws RequestFailedException
3333
*/
3434
public SendMessageResponse sendMessage(MandrillMessageRequest messageRequest) throws RequestFailedException {
35-
messageRequest.setKey(request.getConfig().getApiKey());
3635
SendMessageResponse response = new SendMessageResponse();
3736
response.setList(((BaseMandrillAnonymousListResponse<MessageResponse>) request.postRequest(messageRequest, ServiceMethods.Messages.SEND, SendMessageResponse.class,
3837
messageResponseListReference)).getList());
3938
return response;
4039
}
4140

4241
public SendMessageResponse sendTemplatedMessage(MandrillTemplatedMessageRequest templateMessage) throws RequestFailedException {
43-
templateMessage.setKey(request.getConfig().getApiKey());
4442
SendMessageResponse response = new SendMessageResponse();
4543
response.setList(((BaseMandrillAnonymousListResponse<MessageResponse>) request.postRequest(templateMessage, ServiceMethods.Messages.SEND_TEMPLATE,
4644
SendMessageResponse.class, messageResponseListReference)).getList());

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillRESTRequest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,4 @@ public void setObjectMapper(ObjectMapper objectMapper) {
127127
this.objectMapper = objectMapper;
128128
}
129129

130-
public MandrillConfiguration getConfig() {
131-
return config;
132-
}
133-
134130
}

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillTagsRequest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,20 @@ public class MandrillTagsRequest {
2424
};
2525

2626
public TagListResponse getList(BaseMandrillRequest tagsRequest) throws RequestFailedException {
27-
tagsRequest.setKey(request.getConfig().getApiKey());
2827
TagListResponse response = new TagListResponse();
2928
response.setList(((BaseMandrillAnonymousListResponse<BaseTag>) request.postRequest(tagsRequest, ServiceMethods.Tags.LIST, TagListResponse.class, nameTagReference))
3029
.getList());
3130
return response;
3231
}
3332

3433
public TagSeriesResponse getTimeSeries(MandrillRequestWithTag tagsRequest) throws RequestFailedException {
35-
tagsRequest.setKey(request.getConfig().getApiKey());
3634
TagSeriesResponse response = new TagSeriesResponse();
3735
response.setList(((BaseMandrillAnonymousListResponse<TagWithTime>) request.postRequest(tagsRequest, ServiceMethods.Tags.TIME_SERIES, TagSeriesResponse.class,
3836
timeTagReference)).getList());
3937
return response;
4038
}
4139

4240
public TagSeriesResponse getAllTimeSeries(BaseMandrillRequest tagsRequest) throws RequestFailedException {
43-
tagsRequest.setKey(request.getConfig().getApiKey());
4441
TagSeriesResponse response = new TagSeriesResponse();
4542
response.setList(((BaseMandrillAnonymousListResponse<TagWithTime>) request.postRequest(tagsRequest, ServiceMethods.Tags.ALL_TIME_SERIES, TagSeriesResponse.class,
4643
timeTagReference)).getList());

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillTemplatesRequest.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,22 @@ public class MandrillTemplatesRequest {
2121
};
2222

2323
public TemplateResponse addTemplate(MandrillRequestWithCode addRequest) throws RequestFailedException {
24-
addRequest.setKey(request.getConfig().getApiKey());
2524
return (TemplateResponse) request.postRequest(addRequest, ServiceMethods.Templates.ADD, TemplateResponse.class);
2625
}
2726

2827
public TemplateResponse getTemplateInfo(MandrillRequestWithName infoRequest) throws RequestFailedException {
29-
infoRequest.setKey(request.getConfig().getApiKey());
3028
return (TemplateResponse) request.postRequest(infoRequest, ServiceMethods.Templates.INFO, TemplateResponse.class);
3129
}
3230

3331
public TemplateResponse updateTemplate(MandrillRequestWithCode updateRequest) throws RequestFailedException {
34-
updateRequest.setKey(request.getConfig().getApiKey());
3532
return (TemplateResponse) request.postRequest(updateRequest, ServiceMethods.Templates.UPDATE, TemplateResponse.class);
3633
}
3734

3835
public TemplateResponse deleteTemplate(MandrillRequestWithName deleteRequest) throws RequestFailedException {
39-
deleteRequest.setKey(request.getConfig().getApiKey());
4036
return (TemplateResponse) request.postRequest(deleteRequest, ServiceMethods.Templates.DELETE, TemplateResponse.class);
4137
}
4238

4339
public TemplateListResponse getTemplates(BaseMandrillRequest listRequest) throws RequestFailedException {
44-
listRequest.setKey(request.getConfig().getApiKey());
4540
TemplateListResponse response = new TemplateListResponse();
4641
response.setList(((BaseMandrillAnonymousListResponse<TemplateResponse>) request.postRequest(listRequest, ServiceMethods.Templates.LIST, TemplateResponse.class,
4742
templatesListReference)).getList());

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillUrlsRequest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,19 @@ public class MandrillUrlsRequest {
2222

2323
public UrlListResponse getList(BaseMandrillRequest listRequest) throws RequestFailedException {
2424
UrlListResponse response = new UrlListResponse();
25-
listRequest.setKey(request.getConfig().getApiKey());
2625
response.setList(((BaseMandrillAnonymousListResponse<UrlResponse>) request.postRequest(listRequest, ServiceMethods.Urls.LIST, UrlListResponse.class, urlsListReference))
2726
.getList());
2827
return response;
2928
}
3029

3130
public UrlListResponse doSearch(MandrillRequestWithQuery searchRequest) throws RequestFailedException {
3231
UrlListResponse response = new UrlListResponse();
33-
searchRequest.setKey(request.getConfig().getApiKey());
3432
response.setList(((BaseMandrillAnonymousListResponse<UrlResponse>) request.postRequest(searchRequest, ServiceMethods.Urls.SEARCH, UrlListResponse.class, urlsListReference))
3533
.getList());
3634
return response;
3735
}
3836

3937
public UrlListResponse getTimeSeries(MandrillRequestWithUrl seriesRequest) throws RequestFailedException {
40-
seriesRequest.setKey(request.getConfig().getApiKey());
4138
UrlListResponse response = new UrlListResponse();
4239
response.setList(((BaseMandrillAnonymousListResponse<UrlResponse>) request.postRequest(seriesRequest, ServiceMethods.Urls.TIME_SERIES, UrlListResponse.class,
4340
urlsListReference)).getList());

src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillUsersRequest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public class MandrillUsersRequest {
4141
* @throws RequestFailedException
4242
*/
4343
public UsersInfoResponse getInfo(BaseMandrillRequest infoRequest) throws RequestFailedException {
44-
infoRequest.setKey(request.getConfig().getApiKey());
4544
BaseMandrillResponse response = request.postRequest(infoRequest, ServiceMethods.Users.INFO, UsersInfoResponse.class);
4645
return (UsersInfoResponse) response;
4746
}
@@ -54,7 +53,6 @@ public UsersInfoResponse getInfo(BaseMandrillRequest infoRequest) throws Request
5453
* @throws RequestFailedException
5554
*/
5655
public BaseMandrillStringResponse performPing(BaseMandrillRequest pingRequest) throws RequestFailedException {
57-
pingRequest.setKey(request.getConfig().getApiKey());
5856
BaseMandrillStringResponse response = (BaseMandrillStringResponse) request.postRequest(pingRequest, ServiceMethods.Users.PING, null);
5957
return response;
6058
}
@@ -67,8 +65,7 @@ public BaseMandrillStringResponse performPing(BaseMandrillRequest pingRequest) t
6765
* @throws RequestFailedException
6866
*/
6967
public PingResponse performPing2(BaseMandrillRequest pingRequest) throws RequestFailedException {
70-
pingRequest.setKey(request.getConfig().getApiKey());
71-
PingResponse response = (PingResponse) request.postRequest(pingRequest, ServiceMethods.Users.PING2, PingResponse.class);
68+
PingResponse response = (PingResponse) request.postRequest(pingRequest, ServiceMethods.Users.PING2, null);
7269
return response;
7370
}
7471

@@ -80,7 +77,6 @@ public PingResponse performPing2(BaseMandrillRequest pingRequest) throws Request
8077
* @throws RequestFailedException
8178
*/
8279
public UsersSendersResponse getSenders(BaseMandrillRequest sendersRequest) throws RequestFailedException {
83-
sendersRequest.setKey(request.getConfig().getApiKey());
8480
UsersSendersResponse response = new UsersSendersResponse();
8581
response.setList(((BaseMandrillAnonymousListResponse<MandrillSender>) request.postRequest(sendersRequest, ServiceMethods.Users.SENDERS, UsersSendersResponse.class,
8682
usersListReference)).getList());

0 commit comments

Comments
 (0)