Adjustments based on testing

Author: acoburn

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

@@ -29,7 +29,9 @@
  * An object to represent an access credential query.
  *
  * @param <T> The access credential type
+ * @deprecated As of 1.3, replaced by {@link CredentialFilter}
  */
+@Deprecated
 public class AccessCredentialQuery<T extends AccessCredential> {
 
     private final Set<URI> purposes;

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

@@ -72,14 +72,15 @@
 
    URI resource = URI.create("https://storage.example/data/resource");
    URI purpose = URI.create("https://purpose.example/1");
-   AccessCredentialQuery<AccessGrant> query = AccessCredentialQuery.newBuilder()
+   CredentialFilter<AccessGrant> filter = CredentialFilter.newBuilder()
+        .status(CredentialStatus.ACTIVE)
         .resource(resource)
-        .mode("Read")
         .purpose(purpose)
         .build(AccessGrant.class);
 
-   client.query(query)
-       .thenApply(grants -> AccessGrantSession.ofAccessGrant(openid, grants.toArray(new AccessGrant[0])))
+   client.query(filter)
+       .thenApply(results -> AccessGrantSession.ofAccessGrant(openid,
+                    results.getItems().toArray(new AccessGrant[0])))
        .thenApply(session -> SolidClient.getClient().session(session))
        .thenAccept(cl -> {
             // Do something with the Access Grant-scoped client
@@ -427,29 +428,32 @@ static String getPageQueryParam(final URI uri) {
     <T extends AccessCredential> List<T> processFilterResponseBody(final InputStream input,
             final Set<String> validTypes, final Class<T> clazz) throws IOException {
 
-        final List<T> items = new ArrayList<>();
-        final List<Object> data = jsonService.fromJson(input,
-                new ArrayList<Object>(){}.getClass().getGenericSuperclass());
-        for (final Object item : data) {
-            Utils.asMap(item).ifPresent(credential ->
-                Utils.asSet(credential.get(TYPE)).ifPresent(types -> {
-                    types.retainAll(validTypes);
-                    if (!types.isEmpty()) {
-                        final Map<String, Object> presentation = new HashMap<>();
-                        presentation.put(CONTEXT, Arrays.asList(VC_CONTEXT_URI));
-                        presentation.put(TYPE, Arrays.asList("VerifiablePresentation"));
-                        presentation.put(VERIFIABLE_CREDENTIAL, Arrays.asList(credential));
-                        if (AccessGrant.class.equals(clazz)) {
-                            items.add((T) AccessGrant.of(new String(serialize(presentation), UTF_8)));
-                        } else if (AccessRequest.class.equals(clazz)) {
-                            items.add((T) AccessRequest.of(new String(serialize(presentation), UTF_8)));
-                        } else if (AccessDenial.class.equals(clazz)) {
-                            items.add((T) AccessDenial.of(new String(serialize(presentation), UTF_8)));
+        final List<T> page = new ArrayList<>();
+        final Map<String, Object> data = jsonService.fromJson(input,
+                new HashMap<String, Object>(){}.getClass().getGenericSuperclass());
+        System.out.println("JSON: " + data);
+        Utils.asSet(data.get("items")).ifPresent(items -> {
+            for (final Object item : items) {
+                Utils.asMap(item).ifPresent(credential ->
+                    Utils.asSet(credential.get(TYPE)).ifPresent(types -> {
+                        types.retainAll(validTypes);
+                        if (!types.isEmpty()) {
+                            final Map<String, Object> presentation = new HashMap<>();
+                            presentation.put(CONTEXT, Arrays.asList(VC_CONTEXT_URI));
+                            presentation.put(TYPE, Arrays.asList("VerifiablePresentation"));
+                            presentation.put(VERIFIABLE_CREDENTIAL, Arrays.asList(credential));
+                            if (AccessGrant.class.equals(clazz)) {
+                                page.add((T) AccessGrant.of(new String(serialize(presentation), UTF_8)));
+                            } else if (AccessRequest.class.equals(clazz)) {
+                                page.add((T) AccessRequest.of(new String(serialize(presentation), UTF_8)));
+                            } else if (AccessDenial.class.equals(clazz)) {
+                                page.add((T) AccessDenial.of(new String(serialize(presentation), UTF_8)));
+                            }
                         }
-                    }
-                }));
-        }
-        return items;
+                    }));
+            }
+        });
+        return page;
     }
 
     /**
@@ -463,7 +467,9 @@ <T extends AccessCredential> List<T> processFilterResponseBody(final InputStream
      * @param mode the access mode, may be {@code null}
      * @param clazz the AccessCredential type, either {@link AccessGrant} or {@link AccessRequest}
      * @return the next stage of completion, including the matched Access Credentials
+     * @deprecated As of 1.3, replaced by {@link #query(CredentialFilter)}
      */
+    @Deprecated
     public <T extends AccessCredential> CompletionStage<List<T>> query(final URI resource, final URI creator,
             final URI recipient, final URI purpose, final String mode, final Class<T> clazz) {
 
@@ -479,7 +485,9 @@ public <T extends AccessCredential> CompletionStage<List<T>> query(final URI res
      * @param <T> the AccessCredential type
      * @param query the access credential query, never {@code null}
      * @return the next stage of completion, including the matched Access Credentials
+     * @deprecated As of 1.3, replaced by {@link #query(CredentialFilter)}
      */
+    @Deprecated
     public <T extends AccessCredential> CompletionStage<List<T>> query(final AccessCredentialQuery<T> query) {
         Objects.requireNonNull(query, "The query may not be null!");
         return query(query.getResource(), query.getCreator(), query.getRecipient(), query.getPurposes(),