Merge branch 'master' of https://github.com/twilio/twilio-java into alpha

Author: jingming

CHANGES.md

@@ -1,6 +1,12 @@
 twilio-java changelog
 =====================
 
+[2016-11-30] Version 7.3.0-alpha-1
+--------------------------
+- Add `recordingStatusCallback` and `recordingStatusCallbackMethod` to Conference TwiML
+- Fix TaskRouter Capabaility generation
+- Address potential NPE in `ApiException`
+
 [2016-11-16] Version 7.2.0-alpha-1
 --------------------------
 - Add PublicKey Credentials.

ISSUE_TEMPLATE.md

@@ -0,0 +1,24 @@
+*Note: These issues are for bugs and feature requests for the helper libraries. If you need help or support, please email help@twilio.com and one of our experts will assist you!*
+
+
+**Version:**
+**API Subdomain (api/taskrouter/ip_messaging):**
+
+### Code Snippet
+```java
+# paste code here
+```
+
+### Exception / Log
+```
+<place exception / log here>
+```
+
+### Steps to Reproduce
+1.
+2.
+3.
+
+
+### Feature Request
+_If this is a feature request, make sure you search Issues for an existing request before creating a new one!_

src/main/java/com/twilio/exception/ApiException.java

@@ -44,15 +44,15 @@ public ApiException(final String message, final Integer code, final String moreI
         this.status = status;
     }
 
-    public int getCode() {
+    public Integer getCode() {
         return code;
     }
 
     public String getMoreInfo() {
         return moreInfo;
     }
 
-    public int getStatusCode() {
+    public Integer getStatusCode() {
         return status;
     }
 }

src/main/java/com/twilio/jwt/taskrouter/FilterRequirement.java

@@ -1,5 +1,8 @@
 package com.twilio.jwt.taskrouter;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum FilterRequirement {
     REQUIRED(true),
     OPTIONAL(false);

src/main/java/com/twilio/jwt/taskrouter/Policy.java

@@ -27,11 +27,9 @@ public class Policy {
     private final HttpMethod method;
 
     @JsonProperty("query_filter")
-    @JsonSerialize(using = FilterRequirementSerializer.class)
     private final Map<String, FilterRequirement> queryFilter;
 
     @JsonProperty("post_filter")
-    @JsonSerialize(using = FilterRequirementSerializer.class)
     private final Map<String, FilterRequirement> postFilter;
 
     @JsonProperty("allow")
@@ -149,19 +147,4 @@ public Policy build() {
             return new Policy(this);
         }
     }
-
-    private static class FilterRequirementSerializer extends JsonSerializer<Map<String, FilterRequirement>> {
-        @Override
-        public void serialize(
-            Map<String, FilterRequirement> stringFilterRequirementMap, 
-            JsonGenerator jsonGenerator, 
-            SerializerProvider serializerProvider
-        ) throws IOException, JsonProcessingException {
-            for (Map.Entry<String, FilterRequirement> entry : stringFilterRequirementMap.entrySet()) {
-                jsonGenerator.writeObjectFieldStart(entry.getKey());
-                jsonGenerator.writeBooleanField("required", entry.getValue().value());
-                jsonGenerator.writeEndObject();
-            }
-        }
-    }
 }

src/main/java/com/twilio/jwt/taskrouter/TaskRouterCapability.java

@@ -49,7 +49,7 @@ public Map<String, Object> getClaims() {
         payload.put("account_sid", this.accountSid);
         payload.put("friendly_name", this.friendlyName);
         payload.put("workspace_sid", this.workspaceSid);
-        payload.put("channel_id", this.channelId);
+        payload.put("channel", this.channelId);
 
         if (channelId.startsWith("WK")) {
             payload.put("worker_sid", this.channelId);

src/main/java/com/twilio/twiml/Conference.java

@@ -119,6 +119,12 @@ public String apply(ConferenceEvent event) {
     @XmlAttribute
     private final String statusCallback;
 
+    @XmlAttribute
+    private final String recordingStatusCallback;
+
+    @XmlAttribute
+    private final Method recordingStatusCallbackMethod;
+
     @XmlValue
     private final String name;
 
@@ -144,6 +150,8 @@ private Conference(Builder b) {
         this.statusCallbackEvents = b.statusCallbackEvents;
         this.statusCallbackMethod = b.statusCallbackMethod;
         this.statusCallback = b.statusCallback;
+        this.recordingStatusCallback = b.recordingStatusCallback;
+        this.recordingStatusCallbackMethod = b.recordingStatusCallbackMethod;
 
         if (this.statusCallbackEvents != null) {
             this.statusCallbackEvent = Joiner.on(" ").join(Lists.transform(this.statusCallbackEvents, ConferenceEvent.TO_STRING));
@@ -204,6 +212,14 @@ public List<ConferenceEvent> getStatusCallbackEvents() {
         return statusCallbackEvents;
     }
 
+    public String getRecordingStatusCallback() {
+        return recordingStatusCallback;
+    }
+
+    public Method getRecordingStatusCallbackMethod() {
+        return recordingStatusCallbackMethod;
+    }
+
     public String getName() {
         return name;
     }
@@ -222,6 +238,8 @@ public static class Builder {
         private List<ConferenceEvent> statusCallbackEvents;
         private Method statusCallbackMethod;
         private String statusCallback;
+        private String recordingStatusCallback;
+        private Method recordingStatusCallbackMethod;
         private String name;
 
         public Builder(String name) {
@@ -293,6 +311,16 @@ public Builder eventCallbackUrl(String eventCallbackUrl) {
             return this;
         }
 
+        public Builder recordingStatusCallback(String recordingStatusCallback) {
+            this.recordingStatusCallback = recordingStatusCallback;
+            return this;
+        }
+
+        public Builder recordingStatusCallbackMethod(Method recordingStatusCallbackMethod) {
+            this.recordingStatusCallbackMethod = recordingStatusCallbackMethod;
+            return this;
+        }
+
         public Conference build() {
             return new Conference(this);
         }

src/test/java/com/twilio/exception/ApiExceptionTest.java

@@ -0,0 +1,53 @@
+package com.twilio.exception;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+@SuppressWarnings("ThrowableInstanceNeverThrown")
+public class ApiExceptionTest {
+
+    private final String anyMessage = "message for test";
+    private final Throwable anyCause = new RuntimeException("some root cause");
+    private final String anyMoreInfo = "more info";
+    private final int anyErrorCode = 123;
+    private final int anyHttpStatus = 200;
+
+
+    @Test
+    public void singleArgConstructorShouldPreserveMessage() {
+        ApiException error = new ApiException(anyMessage);
+        assertEquals(anyMessage, error.getMessage());
+    }
+
+    @Test
+    public void twoArgConstructorShouldPreserveMessageAndCause() {
+        ApiException error = new ApiException(anyMessage, anyCause);
+        assertEquals("Message", anyMessage, error.getMessage());
+        assertSame("Cause", anyCause, error.getCause());
+    }
+
+    @Test
+    public void fullConstructorShouldPreserveAllValues() {
+        ApiException error = new ApiException(anyMessage, anyErrorCode, anyMoreInfo, anyHttpStatus, anyCause);
+        assertEquals("Message", anyMessage, error.getMessage());
+        assertSame("Cause", anyCause, error.getCause());
+        assertEquals("More info", anyMoreInfo, error.getMoreInfo());
+        assertEquals("Error code", anyErrorCode, error.getCode().intValue());
+        assertEquals("Status code", anyHttpStatus, error.getStatusCode().intValue());
+    }
+
+    @Test
+    public void getCodeShouldNotThrowExceptionWhenCodeIsNull() {
+        ApiException error = new ApiException(anyMessage);
+        assertEquals(null, error.getCode());
+    }
+
+    @Test
+    public void getStatusCodeShouldNotThrowExceptionWhenCodeIsNull() {
+        ApiException error = new ApiException(anyMessage);
+        assertEquals(null, error.getStatusCode());
+    }
+
+}

src/test/java/com/twilio/jwt/taskrouter/PolicyTest.java

@@ -27,9 +27,8 @@ public void testToJson() throws IOException {
             .build();
 
         Assert.assertEquals(
-            "{\"url\":\"http://localhost\",\"method\":\"GET\",\"query_filter\",\"foo\":{\"required\":true},\"post_filter\",\"allow\":true}",
-            p.toJson()
-        );
+                "{\"url\":\"http://localhost\",\"method\":\"GET\",\"query_filter\":{\"foo\":{\"required\":true}},\"post_filter\":{},\"allow\":true}",
+                p.toJson());
     }
 
 }

src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java

@@ -1,14 +1,19 @@
 package com.twilio.jwt.taskrouter;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+
 import com.google.common.collect.Lists;
+import com.twilio.http.HttpMethod;
 import com.twilio.jwt.Jwt;
+
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Date;
-import java.util.List;
 
 /**
  * Test class for {@link TaskRouterCapability}.
@@ -17,16 +22,16 @@ public class TaskRouterCapabilityTest {
 
     private static final String ACCOUNT_SID = "AC123";
     private static final String AUTH_TOKEN = "secret";
-    private static final String WORKSPACE_SID = "WK123";
-    private static final String CHANNEL_ID = "CH123";
+    private static final String WORKSPACE_SID = "WS123";
+    private static final String WORKER_SID = "WK123";
 
     @Test
     public void testToken() {
         List<Policy> policies = Lists.newArrayList(
             new Policy.Builder().url(UrlUtils.workspaces()).build()
         );
-        Jwt jwt =
-            new TaskRouterCapability.Builder(ACCOUNT_SID, AUTH_TOKEN, WORKSPACE_SID, CHANNEL_ID)
+        final Jwt jwt =
+                new TaskRouterCapability.Builder(ACCOUNT_SID, AUTH_TOKEN, WORKSPACE_SID, WORKER_SID)
                 .policies(policies)
                 .build();
         Claims claims =
@@ -36,9 +41,56 @@ public void testToken() {
                 .getBody();
 
         Assert.assertEquals(WORKSPACE_SID, claims.get("workspace_sid"));
-        Assert.assertEquals(CHANNEL_ID, claims.get("channel_id"));
+        Assert.assertEquals(WORKER_SID, claims.get("channel"));
         Assert.assertEquals(ACCOUNT_SID, claims.get("account_sid"));
         Assert.assertEquals(ACCOUNT_SID, claims.getIssuer());
         Assert.assertTrue(claims.getExpiration().getTime() > new Date().getTime());
     }
+
+    @Test
+    public void testWorkerToken() {
+        final List<Policy> policies = PolicyUtils.defaultWorkerPolicies(WORKSPACE_SID, WORKER_SID);
+
+        final Map<String, FilterRequirement> activityUpdateFilter = new HashMap<>();
+        activityUpdateFilter.put("ActivitySid", FilterRequirement.REQUIRED);
+
+        final Policy allowActivityUpdates = new Policy.Builder()
+                .url(UrlUtils.worker(WORKSPACE_SID, WORKER_SID))
+                .method(HttpMethod.POST)
+                .postFilter(activityUpdateFilter).build();
+
+        final Policy allowTasksUpdate = new Policy.Builder()
+                .url(UrlUtils.allTasks(WORKER_SID))
+                .method(HttpMethod.POST)
+                .build();
+
+        final Policy allowReservationUpdate = new Policy.Builder()
+                .url(UrlUtils.allReservations(WORKSPACE_SID, WORKER_SID))
+                .method(HttpMethod.POST)
+                .build();
+
+        policies.add(allowActivityUpdates);
+        policies.add(allowTasksUpdate);
+        policies.add(allowReservationUpdate);
+
+        final Jwt jwt =
+                new TaskRouterCapability.Builder(ACCOUNT_SID, AUTH_TOKEN, WORKSPACE_SID, WORKER_SID)
+                        .policies(policies)
+                        .build();
+        final Claims claims =
+                Jwts.parser()
+                        .setSigningKey(AUTH_TOKEN.getBytes())
+                        .parseClaimsJws(jwt.toJwt())
+                        .getBody();
+
+        Assert.assertEquals(WORKSPACE_SID, claims.get("workspace_sid"));
+        Assert.assertEquals(WORKER_SID, claims.get("channel"));
+        Assert.assertEquals(ACCOUNT_SID, claims.get("account_sid"));
+        Assert.assertEquals(ACCOUNT_SID, claims.getIssuer());
+        Assert.assertTrue(claims.getExpiration().getTime() > new Date().getTime());
+
+        final List<Policy> claimedPolicies = (List<Policy>) claims.get("policies");
+        final int connectionPolicies = 2;
+        Assert.assertEquals(policies.size() + connectionPolicies, claimedPolicies.size());
+    }
 }