Skip to content

Commit

Permalink
Removed builders - they were a bit redundant
Browse files Browse the repository at this point in the history
  • Loading branch information
sleroux committed Nov 24, 2012
1 parent 3e9e26c commit 18d0706
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 37 deletions.
4 changes: 2 additions & 2 deletions src/main/java/postageapp/PostageAppClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
public interface PostageAppClient {
public void sendMessage(MessageParams message);

public int getMessageReceipt(int messageUid);
public int getMessageReceipt(String messageUid);

public List<String> getMethodList();

Expand All @@ -25,7 +25,7 @@ public interface PostageAppClient {

public List<Message> getMessages();

public List<MessageTransmission> getMessageTransmissions(int messageUid);
public List<MessageTransmission> getMessageTransmissions(String messageUid);

public ProjectMetrics getMetrics();
}
8 changes: 4 additions & 4 deletions src/main/java/postageapp/PostageAppClientImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void sendMessage(MessageParams params) {
}

@Override
public int getMessageReceipt(int messageUid) {
public int getMessageReceipt(String messageUid) {
this.sendRequest(Endpoints.GET_MESSAGE_RECEIPT, this.messageUidRequestString(messageUid));
return 0;
}
Expand Down Expand Up @@ -77,7 +77,7 @@ public List<Message> getMessages() {
}

@Override
public List<MessageTransmission> getMessageTransmissions(int messageUid) {
public List<MessageTransmission> getMessageTransmissions(String messageUid) {
List<MessageTransmission> transmissions = new ArrayList<MessageTransmission>();
this.sendRequest(Endpoints.GET_MESSAGE_TRANSMISSIONS, this.messageUidRequestString(messageUid));
return transmissions;
Expand All @@ -96,10 +96,10 @@ private String apiKeyRequestString() {
return new Gson().toJson(params);
}

private String messageUidRequestString(int messageUid) {
private String messageUidRequestString(String messageUid) {
Map<String, String> params = new HashMap<String, String>();
params.put("apiKey", this.apiKey);
params.put("uid", Integer.toString(messageUid));
params.put("uid", messageUid);
return new Gson().toJson(params);
}

Expand Down
29 changes: 29 additions & 0 deletions src/main/java/postageapp/params/MessageParams.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package postageapp.params;

import java.util.HashMap;
import java.util.List;

/**
* Created with IntelliJ IDEA.
Expand All @@ -10,6 +11,34 @@
* To change this template use File | Settings | File Templates.
*/
public class MessageParams extends HashMap<String, Object> {
private String from;
private String subject;
private List<String> recipients;
private String template;

public MessageParams() {

}

public MessageParams setRecipients(List<String> recipients) {
this.recipients = recipients;
return this;
}

public MessageParams setSubject(String subject) {
this.subject = subject;
return this;
}

public MessageParams setFrom(String from) {
this.from = from;
return this;
}

public MessageParams setTemplate(String templateName) {
this.template = templateName;
return this;
}

@Override
public String toString() {
Expand Down
17 changes: 0 additions & 17 deletions src/main/java/postageapp/params/builders/MessageBuilder.java

This file was deleted.

14 changes: 0 additions & 14 deletions src/main/java/postageapp/params/builders/ParamBuilder.java

This file was deleted.

0 comments on commit 18d0706

Please sign in to comment.