Skip to content

Add optional reportUrl parameter #16

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

Merged
merged 2 commits into from
Jun 28, 2016
Merged

Add optional reportUrl parameter #16

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
cd7b52a
Add optional reportUrl parameter
Jun 9, 2016
e2d7fc3
#17 Fix constructor with serviceUrl and remove obsolete imports
Jun 10, 2016
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
5 changes: 2 additions & 3 deletions api/src/main/java/com/messagebird/MessageBirdService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.messagebird;

import java.util.Map;

import com.messagebird.exceptions.GeneralException;
import com.messagebird.exceptions.NotFoundException;
import com.messagebird.exceptions.UnauthorizedException;

import java.io.UnsupportedEncodingException;
import java.util.Map;

/**
* Created by rvt on 1/7/15.
*/
Expand Down
33 changes: 22 additions & 11 deletions api/src/main/java/com/messagebird/MessageBirdServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
package com.messagebird;

import com.messagebird.exceptions.GeneralException;
import com.messagebird.exceptions.NotFoundException;
import com.messagebird.exceptions.UnauthorizedException;
import com.messagebird.objects.ErrorReport;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.Proxy;
import java.net.URL;
import java.net.URLEncoder;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.DeserializationConfig;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.annotate.JsonSerialize;

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.*;
import java.util.*;
import com.messagebird.exceptions.GeneralException;
import com.messagebird.exceptions.NotFoundException;
import com.messagebird.exceptions.UnauthorizedException;
import com.messagebird.objects.ErrorReport;

/**
* Implementation of MessageBirdService
Expand All @@ -31,7 +37,7 @@ public class MessageBirdServiceImpl implements MessageBirdService {
private static final String REQUEST_TYPE_MUST_BE_SET_TO_GET_OR_POST = "Request type must be set to GET, POST or DELETE";
private static final List<String> REQUESTMETHODS = Arrays.asList(new String[]{"GET", "POST", "DELETE"});
private final String accessKey;
private final String serviceUrl = "https://rest.messagebird.com";
private final String serviceUrl;
private final String clientVersion = "1.2.1";
private final String userAgentString = "MessageBird/Java ApiClient/" + clientVersion;
private Proxy proxy = null;
Expand All @@ -44,8 +50,13 @@ public MessageBirdServiceImpl(final String accessKey, final String serviceUrl) {
throw new IllegalArgumentException(SERVICE_URL_MUST_BE_SPECIFIED);
}
this.accessKey = accessKey;
this.serviceUrl = serviceUrl;
}

/**
* Initiate service with default serviceUrl.
* @param accessKey
*/
public MessageBirdServiceImpl(final String accessKey) {
this(accessKey, "https://rest.messagebird.com");
}
Expand Down
14 changes: 14 additions & 0 deletions api/src/main/java/com/messagebird/objects/Message.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.Serializable;
import java.math.BigInteger;
import java.net.URL;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
Expand Down Expand Up @@ -30,6 +31,11 @@ public class Message implements MessageBase, Serializable {
private DataCodingType datacoding = DataCodingType.plain;
private MClassType mclass;
private Date scheduledDatetime;

/**
* Optional URL for the status report. If not set uses URL from account settings.
*/
private URL reportUrl;

public Message(String originator, String body, String recipients) {
if (recipients == null || recipients.trim().length() == 0) {
Expand Down Expand Up @@ -115,6 +121,7 @@ public String toString() {
", reference='" + reference + '\'' +
", validity=" + validity +
", gateway=" + gateway +
", reportUrl=" + reportUrl +
", typeDetails='" + typeDetails + '\'' +
", datacoding=" + datacoding +
", mclass=" + mclass +
Expand Down Expand Up @@ -298,5 +305,12 @@ public void setPremiumSMS(Object shortcode, Object keyword, Object tariff, Objec
this.type = MsgType.premium;
}

public URL getReportUrl() {
return reportUrl;
}

public void setReportUrl(URL reportUrl) {
this.reportUrl = reportUrl;
}

}