whoops, this is what filter requirements actually look like

skimbrel · skimbrel · commit b492157aa051 · 2015-02-18T10:56:37.000-08:00
diff --git a/src/main/java/com/twilio/sdk/taskrouter/FilterRequirement.java b/src/main/java/com/twilio/sdk/taskrouter/FilterRequirement.java
@@ -1,11 +1,14 @@
 package com.twilio.sdk.taskrouter;
 
-public enum FilterRequirement {
-	REQUIRED,
-	OPTIONAL;
+import java.util.HashMap;
 
-	public String toString() {
-		return this.name().toLowerCase();
+public class FilterRequirement extends HashMap<String, Boolean> {
+
+	public FilterRequirement(final boolean required) {
+		super();
+		put("required", required);
 	}
 
+	public static FilterRequirement REQUIRED = new FilterRequirement(true);
+	public static FilterRequirement OPTIONAL = new FilterRequirement(false);
 }
diff --git a/src/main/java/com/twilio/sdk/taskrouter/TaskRouterCapability.java b/src/main/java/com/twilio/sdk/taskrouter/TaskRouterCapability.java
@@ -188,10 +188,10 @@ public String toJSONString() {
 			JSONObject post = new JSONObject();
 
 			for (Map.Entry<String, FilterRequirement> e : queryFilter.entrySet()) {
-				query.put(e.getKey(), e.getValue().toString());
+				query.put(e.getKey(), e.getValue());
 			}
 			for (Map.Entry<String, FilterRequirement> e : postFilter.entrySet()) {
-				post.put(e.getKey(), e.getValue().toString());
+				post.put(e.getKey(), e.getValue());
 			}
 
 			obj.put("query_filter", query);
diff --git a/src/test/java/com/twilio/sdk/taskrouter/TaskRouterCapabilityTest.java b/src/test/java/com/twilio/sdk/taskrouter/TaskRouterCapabilityTest.java
@@ -46,6 +46,7 @@ public void testGenerateToken() throws Exception {
 		assertEquals("POST", p.get("method"));
 		JSONObject filters = (JSONObject) p.get("post_filter");
 		assertEquals(1, filters.size());
-		assertEquals("required", filters.get("ActivitySid"));
+		JSONObject required = (JSONObject) filters.get("ActivitySid");
+		assertEquals(Boolean.TRUE, required.get("required"));
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -188,10 +188,10 @@ public String toJSONString() {`
`188`	`188`	`JSONObject post = new JSONObject();`
`189`	`189`
`190`	`190`	`for (Map.Entry<String, FilterRequirement> e : queryFilter.entrySet()) {`
`191`		`- query.put(e.getKey(), e.getValue().toString());`
	`191`	`+ query.put(e.getKey(), e.getValue());`
`192`	`192`	`}`
`193`	`193`	`for (Map.Entry<String, FilterRequirement> e : postFilter.entrySet()) {`
`194`		`- post.put(e.getKey(), e.getValue().toString());`
	`194`	`+ post.put(e.getKey(), e.getValue());`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`obj.put("query_filter", query);`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public void testGenerateToken() throws Exception {`
`46`	`46`	`assertEquals("POST", p.get("method"));`
`47`	`47`	`JSONObject filters = (JSONObject) p.get("post_filter");`
`48`	`48`	`assertEquals(1, filters.size());`
`49`		`- assertEquals("required", filters.get("ActivitySid"));`
	`49`	`+ JSONObject required = (JSONObject) filters.get("ActivitySid");`
	`50`	`+ assertEquals(Boolean.TRUE, required.get("required"));`
`50`	`51`	`}`
`51`	`52`	`}`