#159 Added support for all permission capabilities

Author: rjrudin

src/main/java/com/marklogic/client/ext/util/DefaultDocumentPermissionsParser.java

@@ -2,38 +2,32 @@
 
 import com.marklogic.client.io.DocumentMetadataHandle.Capability;
 import com.marklogic.client.io.DocumentMetadataHandle.DocumentPermissions;
-import com.marklogic.client.ext.util.DocumentPermissionsParser;
 
 public class DefaultDocumentPermissionsParser implements DocumentPermissionsParser {
 
-    @Override
-    public void parsePermissions(String str, DocumentPermissions permissions) {
-        if (str != null && str.trim().length() > 0) {
-            String[] tokens = str.split(",");
-            for (int i = 0; i < tokens.length; i += 2) {
-                String role = tokens[i];
-                if (i + 1 >= tokens.length) {
-                	throw new IllegalArgumentException("Unable to parse permissions string, which must be a comma-separated " +
-		                "list of role names and capabilities - i.e. role1,read,role2,update,role3,execute; string: " + str);
-                }
-                String capability = tokens[i + 1];
-                Capability c = null;
-                if (capability.equals("execute")) {
-                    c = Capability.EXECUTE;
-                } else if (capability.equals("insert")) {
-                    c = Capability.INSERT;
-                } else if (capability.equals("update")) {
-                    c = Capability.UPDATE;
-                } else if (capability.equals("read")) {
-                    c = Capability.READ;
-                }
-                if (permissions.containsKey(role)) {
-                	permissions.get(role).add(c);
-                } else {
-	                permissions.add(role, c);
-                }
-            }
-        }
-    }
+	@Override
+	public void parsePermissions(String str, DocumentPermissions permissions) {
+		if (str != null && str.trim().length() > 0) {
+			String[] tokens = str.split(",");
+			for (int i = 0; i < tokens.length; i += 2) {
+				String role = tokens[i];
+				if (i + 1 >= tokens.length) {
+					throw new IllegalArgumentException("Unable to parse permissions string, which must be a comma-separated " +
+						"list of role names and capabilities - i.e. role1,read,role2,update,role3,execute; string: " + str);
+				}
+				Capability c;
+				try {
+					c = Capability.getValueOf(tokens[i + 1]);
+				} catch (Exception e) {
+					throw new IllegalArgumentException("Unable to parse permissions string: " + str + "; cause: " + e.getMessage());
+				}
+				if (permissions.containsKey(role)) {
+					permissions.get(role).add(c);
+				} else {
+					permissions.add(role, c);
+				}
+			}
+		}
+	}
 
 }

src/test/java/com/marklogic/client/ext/util/ParseDocumentPermissionsTest.java

@@ -10,19 +10,22 @@ public class ParseDocumentPermissionsTest {
 	private DefaultDocumentPermissionsParser parser = new DefaultDocumentPermissionsParser();
 
 	@Test
-	public void test() {
-		String str = "rest-admin,read,rest-admin,update,rest-extension-user,execute";
+	void test() {
+		String str = "rest-admin,read,rest-admin,update,rest-extension-user,execute,app-user,node-update";
 		DocumentMetadataHandle metadata = new DocumentMetadataHandle();
 		parser.parsePermissions(str, metadata.getPermissions());
 
 		DocumentMetadataHandle.DocumentPermissions perms = metadata.getPermissions();
-		assertEquals(2, perms.size());
+		assertEquals(3, perms.size());
 		assertEquals(2, perms.get("rest-admin").size());
 		assertEquals(1, perms.get("rest-extension-user").size());
+		assertEquals(DocumentMetadataHandle.Capability.EXECUTE, perms.get("rest-extension-user").iterator().next());
+		assertEquals(1, perms.get("app-user").size());
+		assertEquals(DocumentMetadataHandle.Capability.NODE_UPDATE, perms.get("app-user").iterator().next());
 	}
 
 	@Test
-	public void badInput() {
+	void badInput() {
 		String str = "rest-admin,read,rest-admin";
 		try {
 			parser.parsePermissions(str, new DocumentMetadataHandle().getPermissions());
@@ -32,4 +35,14 @@ public void badInput() {
 			assertTrue(ex.getMessage().startsWith("Unable to parse permissions string"));
 		}
 	}
+
+	@Test
+	void invalidCapability() {
+		String str = "app-user,not-valid";
+		IllegalArgumentException ex = assertThrows(
+			IllegalArgumentException.class,
+			() -> parser.parsePermissions(str, new DocumentMetadataHandle().getPermissions()));
+		assertEquals("Unable to parse permissions string: app-user,not-valid; cause: No enum constant com.marklogic.client.io.DocumentMetadataHandle.Capability.NOT_VALID",
+			ex.getMessage());
+	}
 }