cleanup

Author: acoburn

access-grant/src/main/java/com/inrupt/client/accessgrant/AccessRequest.java

@@ -37,6 +37,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -153,10 +154,10 @@ static AccessRequest parse(final String serialization) throws IOException {
      */
     public static String template(final String dataPath) {
         Objects.requireNonNull(dataPath, "dataPath may not be null!");
-        if (!dataPath.startsWith("/")) {
-            return "https://{domain}/{+path}/" + dataPath;
+        if (!dataPath.startsWith("/") || dataPath.isBlank()) {
+            return template("/" + dataPath);
         }
-        return template("/" + dataPath);
+        return "https://{domain}/{+path}" + dataPath;
     }
 
     /**

access-grant/src/test/java/com/inrupt/client/accessgrant/AccessRequestTest.java

@@ -278,6 +278,7 @@ void testTemplate() {
         assertEquals("https://{domain}/{+path}/custom-path", AccessRequest.template("custom-path"));
         assertEquals("https://{domain}/{+path}/custom-path", AccessRequest.template("/custom-path"));
         assertEquals("https://{domain}/{+path}/./custom-path", AccessRequest.template("./custom-path"));
+        assertEquals("https://{domain}/{+path}/", AccessRequest.template(""));
     }
 
     @Test