Skip to content

Commit 42f39d8

Browse files
Brian CribbsBrian Cribbs
Brian Cribbs
authored and
Brian Cribbs
committed
updated request classes to set key based on configuration rather than forcing the user to set it
1 parent 50547d9 commit 42f39d8

File tree

6 files changed

+147
-109
lines changed

6 files changed

+147
-109
lines changed

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

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,41 @@
1414

1515
/**
1616
* This class holds various functions for the Mandrill Messages API
17+
*
1718
* @author Brian Cribbs
18-
*
19+
*
1920
*/
2021
public class MandrillMessagesRequest {
21-
22-
MandrillRESTRequest request;
23-
TypeReference<List<MessageResponse>> messageResponseListReference = new TypeReference<List<MessageResponse>>(){};
24-
25-
/**
26-
* Send a new transactional message through Mandrill
27-
* @param messageRequest a populated @see com.cribstechnologies.clients.mandrill.model.MandrillMessageRequest
28-
* @throws RequestFailedException
29-
*/
30-
public SendMessageResponse sendMessage(MandrillMessageRequest messageRequest) throws RequestFailedException {
31-
SendMessageResponse response = new SendMessageResponse();
32-
response.setList(((BaseMandrillAnonymousListResponse<MessageResponse>) request.postRequest(messageRequest, ServiceMethods.Messages.SEND, SendMessageResponse.class, messageResponseListReference)).getList());
33-
return response;
34-
}
35-
36-
public SendMessageResponse sendTemplatedMessage(MandrillTemplatedMessageRequest templateMessage) throws RequestFailedException {
37-
SendMessageResponse response = new SendMessageResponse();
38-
response.setList(((BaseMandrillAnonymousListResponse<MessageResponse>) request.postRequest(templateMessage, ServiceMethods.Messages.SEND_TEMPLATE, SendMessageResponse.class, messageResponseListReference)).getList());
39-
return response;
40-
}
41-
42-
public void setRequest(MandrillRESTRequest request) {
43-
this.request = request;
44-
}
45-
22+
23+
MandrillRESTRequest request;
24+
TypeReference<List<MessageResponse>> messageResponseListReference = new TypeReference<List<MessageResponse>>() {
25+
};
26+
27+
/**
28+
* Send a new transactional message through Mandrill
29+
*
30+
* @param messageRequest
31+
* a populated @see com.cribstechnologies.clients.mandrill.model.MandrillMessageRequest
32+
* @throws RequestFailedException
33+
*/
34+
public SendMessageResponse sendMessage(MandrillMessageRequest messageRequest) throws RequestFailedException {
35+
messageRequest.setKey(request.getConfig().getApiKey());
36+
SendMessageResponse response = new SendMessageResponse();
37+
response.setList(((BaseMandrillAnonymousListResponse<MessageResponse>) request.postRequest(messageRequest, ServiceMethods.Messages.SEND, SendMessageResponse.class,
38+
messageResponseListReference)).getList());
39+
return response;
40+
}
41+
42+
public SendMessageResponse sendTemplatedMessage(MandrillTemplatedMessageRequest templateMessage) throws RequestFailedException {
43+
templateMessage.setKey(request.getConfig().getApiKey());
44+
SendMessageResponse response = new SendMessageResponse();
45+
response.setList(((BaseMandrillAnonymousListResponse<MessageResponse>) request.postRequest(templateMessage, ServiceMethods.Messages.SEND_TEMPLATE,
46+
SendMessageResponse.class, messageResponseListReference)).getList());
47+
return response;
48+
}
49+
50+
public void setRequest(MandrillRESTRequest request) {
51+
this.request = request;
52+
}
53+
4654
}

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

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

130+
public MandrillConfiguration getConfig() {
131+
return config;
132+
}
133+
130134
}

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

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,39 @@
1515
import com.cribbstechnologies.clients.mandrill.model.response.tags.TagWithTime;
1616

1717
public class MandrillTagsRequest {
18-
19-
MandrillRESTRequest request;
20-
21-
TypeReference<List<TagWithTime>> timeTagReference = new TypeReference<List<TagWithTime>>(){};
22-
TypeReference<List<BaseTag>> nameTagReference = new TypeReference<List<BaseTag>>(){};
23-
24-
public TagListResponse getList(BaseMandrillRequest tagsRequest) throws RequestFailedException {
25-
TagListResponse response = new TagListResponse();
26-
response.setList(((BaseMandrillAnonymousListResponse<BaseTag>) request.postRequest(tagsRequest, ServiceMethods.Tags.LIST, TagListResponse.class, nameTagReference)).getList());
27-
return response;
28-
}
29-
30-
public TagSeriesResponse getTimeSeries(MandrillRequestWithTag tagsRequest) throws RequestFailedException {
31-
TagSeriesResponse response = new TagSeriesResponse();
32-
response.setList(((BaseMandrillAnonymousListResponse<TagWithTime>)request.postRequest(tagsRequest, ServiceMethods.Tags.TIME_SERIES, TagSeriesResponse.class, timeTagReference)).getList());
33-
return response;
34-
}
35-
36-
public TagSeriesResponse getAllTimeSeries(BaseMandrillRequest tagsRequest) throws RequestFailedException {
37-
TagSeriesResponse response = new TagSeriesResponse();
38-
response.setList(((BaseMandrillAnonymousListResponse<TagWithTime>)request.postRequest(tagsRequest, ServiceMethods.Tags.ALL_TIME_SERIES, TagSeriesResponse.class, timeTagReference)).getList());
39-
return response;
40-
}
41-
42-
public void setRequest(MandrillRESTRequest request) {
43-
this.request = request;
44-
}
18+
19+
MandrillRESTRequest request;
20+
21+
TypeReference<List<TagWithTime>> timeTagReference = new TypeReference<List<TagWithTime>>() {
22+
};
23+
TypeReference<List<BaseTag>> nameTagReference = new TypeReference<List<BaseTag>>() {
24+
};
25+
26+
public TagListResponse getList(BaseMandrillRequest tagsRequest) throws RequestFailedException {
27+
tagsRequest.setKey(request.getConfig().getApiKey());
28+
TagListResponse response = new TagListResponse();
29+
response.setList(((BaseMandrillAnonymousListResponse<BaseTag>) request.postRequest(tagsRequest, ServiceMethods.Tags.LIST, TagListResponse.class, nameTagReference))
30+
.getList());
31+
return response;
32+
}
33+
34+
public TagSeriesResponse getTimeSeries(MandrillRequestWithTag tagsRequest) throws RequestFailedException {
35+
tagsRequest.setKey(request.getConfig().getApiKey());
36+
TagSeriesResponse response = new TagSeriesResponse();
37+
response.setList(((BaseMandrillAnonymousListResponse<TagWithTime>) request.postRequest(tagsRequest, ServiceMethods.Tags.TIME_SERIES, TagSeriesResponse.class,
38+
timeTagReference)).getList());
39+
return response;
40+
}
41+
42+
public TagSeriesResponse getAllTimeSeries(BaseMandrillRequest tagsRequest) throws RequestFailedException {
43+
tagsRequest.setKey(request.getConfig().getApiKey());
44+
TagSeriesResponse response = new TagSeriesResponse();
45+
response.setList(((BaseMandrillAnonymousListResponse<TagWithTime>) request.postRequest(tagsRequest, ServiceMethods.Tags.ALL_TIME_SERIES, TagSeriesResponse.class,
46+
timeTagReference)).getList());
47+
return response;
48+
}
49+
50+
public void setRequest(MandrillRESTRequest request) {
51+
this.request = request;
52+
}
4553
}

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

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,42 @@
1414
import com.cribbstechnologies.clients.mandrill.model.response.templates.TemplateResponse;
1515

1616
public class MandrillTemplatesRequest {
17-
18-
MandrillRESTRequest request;
19-
20-
TypeReference<List<TemplateResponse>> templatesListReference = new TypeReference<List<TemplateResponse>>(){};
21-
22-
public TemplateResponse addTemplate(MandrillRequestWithCode addRequest) throws RequestFailedException {
23-
return (TemplateResponse) request.postRequest(addRequest, ServiceMethods.Templates.ADD, TemplateResponse.class);
24-
}
25-
26-
public TemplateResponse getTemplateInfo(MandrillRequestWithName infoRequest) throws RequestFailedException {
27-
return (TemplateResponse) request.postRequest(infoRequest, ServiceMethods.Templates.INFO, TemplateResponse.class);
28-
}
29-
30-
public TemplateResponse updateTemplate(MandrillRequestWithCode updateRequest) throws RequestFailedException {
31-
return (TemplateResponse) request.postRequest(updateRequest, ServiceMethods.Templates.UPDATE, TemplateResponse.class);
32-
}
33-
34-
public TemplateResponse deleteTemplate(MandrillRequestWithName deleteRequest) throws RequestFailedException {
35-
return (TemplateResponse) request.postRequest(deleteRequest, ServiceMethods.Templates.DELETE, TemplateResponse.class);
36-
}
37-
38-
public TemplateListResponse getTemplates(BaseMandrillRequest listRequest) throws RequestFailedException {
39-
TemplateListResponse response = new TemplateListResponse();
40-
response.setList(((BaseMandrillAnonymousListResponse<TemplateResponse>)request.postRequest(listRequest, ServiceMethods.Templates.LIST, TemplateResponse.class, templatesListReference)).getList());
41-
return response;
42-
}
43-
44-
public void setRequest(MandrillRESTRequest request) {
45-
this.request = request;
46-
}
17+
18+
MandrillRESTRequest request;
19+
20+
TypeReference<List<TemplateResponse>> templatesListReference = new TypeReference<List<TemplateResponse>>() {
21+
};
22+
23+
public TemplateResponse addTemplate(MandrillRequestWithCode addRequest) throws RequestFailedException {
24+
addRequest.setKey(request.getConfig().getApiKey());
25+
return (TemplateResponse) request.postRequest(addRequest, ServiceMethods.Templates.ADD, TemplateResponse.class);
26+
}
27+
28+
public TemplateResponse getTemplateInfo(MandrillRequestWithName infoRequest) throws RequestFailedException {
29+
infoRequest.setKey(request.getConfig().getApiKey());
30+
return (TemplateResponse) request.postRequest(infoRequest, ServiceMethods.Templates.INFO, TemplateResponse.class);
31+
}
32+
33+
public TemplateResponse updateTemplate(MandrillRequestWithCode updateRequest) throws RequestFailedException {
34+
updateRequest.setKey(request.getConfig().getApiKey());
35+
return (TemplateResponse) request.postRequest(updateRequest, ServiceMethods.Templates.UPDATE, TemplateResponse.class);
36+
}
37+
38+
public TemplateResponse deleteTemplate(MandrillRequestWithName deleteRequest) throws RequestFailedException {
39+
deleteRequest.setKey(request.getConfig().getApiKey());
40+
return (TemplateResponse) request.postRequest(deleteRequest, ServiceMethods.Templates.DELETE, TemplateResponse.class);
41+
}
42+
43+
public TemplateListResponse getTemplates(BaseMandrillRequest listRequest) throws RequestFailedException {
44+
listRequest.setKey(request.getConfig().getApiKey());
45+
TemplateListResponse response = new TemplateListResponse();
46+
response.setList(((BaseMandrillAnonymousListResponse<TemplateResponse>) request.postRequest(listRequest, ServiceMethods.Templates.LIST, TemplateResponse.class,
47+
templatesListReference)).getList());
48+
return response;
49+
}
50+
51+
public void setRequest(MandrillRESTRequest request) {
52+
this.request = request;
53+
}
4754

4855
}

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

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,37 @@
1515

1616
public class MandrillUrlsRequest {
1717

18-
MandrillRESTRequest request;
19-
20-
TypeReference<List<UrlResponse>> urlsListReference = new TypeReference<List<UrlResponse>>(){};
21-
22-
public UrlListResponse getList(BaseMandrillRequest listRequest) throws RequestFailedException {
23-
UrlListResponse response = new UrlListResponse();
24-
response.setList(((BaseMandrillAnonymousListResponse<UrlResponse>)request.postRequest(listRequest, ServiceMethods.Urls.LIST, UrlListResponse.class, urlsListReference)).getList());
25-
return response;
26-
}
27-
28-
public UrlListResponse doSearch(MandrillRequestWithQuery searchRequest) throws RequestFailedException {
29-
UrlListResponse response = new UrlListResponse();
30-
response.setList(((BaseMandrillAnonymousListResponse<UrlResponse>)request.postRequest(searchRequest, ServiceMethods.Urls.SEARCH, UrlListResponse.class, urlsListReference)).getList());
31-
return response;
32-
}
33-
34-
public UrlListResponse getTimeSeries(MandrillRequestWithUrl seriesRequest) throws RequestFailedException {
35-
UrlListResponse response = new UrlListResponse();
36-
response.setList(((BaseMandrillAnonymousListResponse<UrlResponse>)request.postRequest(seriesRequest, ServiceMethods.Urls.TIME_SERIES, UrlListResponse.class, urlsListReference)).getList());
37-
return response;
38-
}
39-
40-
public void setRequest(MandrillRESTRequest request) {
41-
this.request = request;
42-
}
43-
18+
MandrillRESTRequest request;
19+
20+
TypeReference<List<UrlResponse>> urlsListReference = new TypeReference<List<UrlResponse>>() {
21+
};
22+
23+
public UrlListResponse getList(BaseMandrillRequest listRequest) throws RequestFailedException {
24+
UrlListResponse response = new UrlListResponse();
25+
listRequest.setKey(request.getConfig().getApiKey());
26+
response.setList(((BaseMandrillAnonymousListResponse<UrlResponse>) request.postRequest(listRequest, ServiceMethods.Urls.LIST, UrlListResponse.class, urlsListReference))
27+
.getList());
28+
return response;
29+
}
30+
31+
public UrlListResponse doSearch(MandrillRequestWithQuery searchRequest) throws RequestFailedException {
32+
UrlListResponse response = new UrlListResponse();
33+
searchRequest.setKey(request.getConfig().getApiKey());
34+
response.setList(((BaseMandrillAnonymousListResponse<UrlResponse>) request.postRequest(searchRequest, ServiceMethods.Urls.SEARCH, UrlListResponse.class, urlsListReference))
35+
.getList());
36+
return response;
37+
}
38+
39+
public UrlListResponse getTimeSeries(MandrillRequestWithUrl seriesRequest) throws RequestFailedException {
40+
seriesRequest.setKey(request.getConfig().getApiKey());
41+
UrlListResponse response = new UrlListResponse();
42+
response.setList(((BaseMandrillAnonymousListResponse<UrlResponse>) request.postRequest(seriesRequest, ServiceMethods.Urls.TIME_SERIES, UrlListResponse.class,
43+
urlsListReference)).getList());
44+
return response;
45+
}
46+
47+
public void setRequest(MandrillRESTRequest request) {
48+
this.request = request;
49+
}
50+
4451
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public class MandrillUsersRequest {
4141
* @throws RequestFailedException
4242
*/
4343
public UsersInfoResponse getInfo(BaseMandrillRequest infoRequest) throws RequestFailedException {
44+
infoRequest.setKey(request.getConfig().getApiKey());
4445
BaseMandrillResponse response = request.postRequest(infoRequest, ServiceMethods.Users.INFO, UsersInfoResponse.class);
4546
return (UsersInfoResponse) response;
4647
}
@@ -53,6 +54,7 @@ public UsersInfoResponse getInfo(BaseMandrillRequest infoRequest) throws Request
5354
* @throws RequestFailedException
5455
*/
5556
public BaseMandrillStringResponse performPing(BaseMandrillRequest pingRequest) throws RequestFailedException {
57+
pingRequest.setKey(request.getConfig().getApiKey());
5658
BaseMandrillStringResponse response = (BaseMandrillStringResponse) request.postRequest(pingRequest, ServiceMethods.Users.PING, null);
5759
return response;
5860
}
@@ -65,6 +67,7 @@ public BaseMandrillStringResponse performPing(BaseMandrillRequest pingRequest) t
6567
* @throws RequestFailedException
6668
*/
6769
public PingResponse performPing2(BaseMandrillRequest pingRequest) throws RequestFailedException {
70+
pingRequest.setKey(request.getConfig().getApiKey());
6871
PingResponse response = (PingResponse) request.postRequest(pingRequest, ServiceMethods.Users.PING2, PingResponse.class);
6972
return response;
7073
}
@@ -77,6 +80,7 @@ public PingResponse performPing2(BaseMandrillRequest pingRequest) throws Request
7780
* @throws RequestFailedException
7881
*/
7982
public UsersSendersResponse getSenders(BaseMandrillRequest sendersRequest) throws RequestFailedException {
83+
sendersRequest.setKey(request.getConfig().getApiKey());
8084
UsersSendersResponse response = new UsersSendersResponse();
8185
response.setList(((BaseMandrillAnonymousListResponse<MandrillSender>) request.postRequest(sendersRequest, ServiceMethods.Users.SENDERS, UsersSendersResponse.class,
8286
usersListReference)).getList());

0 commit comments

Comments
 (0)