JCL-326: Remove deprecated methods and classes (#590)

Author: acoburn

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

@@ -201,22 +201,6 @@ public static class CredentialMetadata {
         private final Instant expiration;
         private final Instant issuedAt;
 
-        /**
-         * A collection of server-managed credential metadata.
-         *
-         * @param issuer the issuer
-         * @param creator the agent who created the credential
-         * @param types the credential types
-         * @param expiration the credential expiration
-         * @param status the credential status
-         * @deprecated as of Beta4, please use the 6-parameter constructor
-         */
-        @Deprecated
-        public CredentialMetadata(final URI issuer, final URI creator, final Set<String> types,
-                final Instant expiration, final Status status) {
-            this(issuer, creator, types, Instant.now(), expiration, status);
-        }
-
         /**
          * A collection of server-managed credential metadata.
          *

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

@@ -62,30 +62,6 @@ protected AccessGrant(final URI identifier, final String credential, final Crede
         super(identifier, credential, data, metadata);
     }
 
-    /**
-     * Create an AccessGrant object from a VerifiablePresentation.
-     *
-     * @param accessGrant the access grant
-     * @return a parsed access grant
-     * @deprecated As of Beta3, please use the {@link AccessGrant#of} method
-     */
-    @Deprecated
-    public static AccessGrant ofAccessGrant(final String accessGrant) {
-        return of(accessGrant);
-    }
-
-    /**
-     * Create an AccessGrant object from a VerifiablePresentation.
-     *
-     * @param accessGrant the access grant
-     * @return a parsed access grant
-     * @deprecated As of Beta3, please use the {@link AccessGrant#of} method
-     */
-    @Deprecated
-    public static AccessGrant ofAccessGrant(final InputStream accessGrant) {
-        return of(accessGrant);
-    }
-
     /**
      * Create an AccessGrant object from a serialized form.
      *
@@ -114,50 +90,6 @@ public static AccessGrant of(final InputStream serialization) {
         }
     }
 
-    /**
-     * Get the purposes of the access grant.
-     *
-     * @return the access grant purposes
-     * @deprecated as of Beta3, please use the {@link #getPurposes()} method
-     */
-    @Deprecated
-    public Set<String> getPurpose() {
-        return getPurposes().stream().map(URI::toString).collect(Collectors.toSet());
-    }
-
-    /**
-     * Get the agent to whom access is granted.
-     *
-     * @return the agent that was granted access
-     * @deprecated As of Beta3, please use {@link #getRecipient}
-     */
-    @Deprecated
-    public Optional<URI> getGrantee() {
-        return getRecipient();
-    }
-
-    /**
-     * Get the agent who granted access.
-     *
-     * @return the agent granting access
-     * @deprecated As of Beta3, please use {@link #getCreator}
-     */
-    @Deprecated
-    public URI getGrantor() {
-        return getCreator();
-    }
-
-    /**
-     * Get the raw access grant.
-     *
-     * @return the access grant
-     * @deprecated as of Beta3, please use the {@link #serialize} method
-     */
-    @Deprecated
-    public String getRawGrant() {
-        return serialize();
-    }
-
     static Set<String> getSupportedTypes() {
         final Set<String> types = new HashSet<>();
         types.add("SolidAccessGrant");

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

@@ -300,63 +300,6 @@ public CompletionStage<AccessDenial> denyAccess(final AccessRequest request) {
         });
     }
 
-    /**
-     * Issue an access grant or request.
-     *
-     * @param type the credential type
-     * @param recipient the receiving agent for this credential
-     * @param resources the resources to which this credential applies
-     * @param modes the access modes for this credential
-     * @param purposes the purposes of this credential
-     * @param expiration the expiration time of this credential
-     * @return the next stage of completion containing the resulting credential
-     * @deprecated as of Beta3, please use the {@link #requestAccess} or {@link #grantAccess} methods
-     */
-    @Deprecated
-    public CompletionStage<AccessGrant> issue(final URI type, final URI recipient, final Set<URI> resources,
-            final Set<String> modes, final Set<String> purposes, final Instant expiration) {
-        Objects.requireNonNull(type, "Access Grant type may not be null!");
-        Objects.requireNonNull(resources, "Resources may not be null!");
-        Objects.requireNonNull(modes, "Access modes may not be null!");
-        final Set<URI> uriPurposes = new HashSet<>();
-        for (final String p : purposes) {
-            try {
-                uriPurposes.add(URI.create(p));
-            } catch (final IllegalArgumentException ex) {
-                LOGGER.debug("Ignoring non-URI purpose: {}", ex.getMessage());
-            }
-        }
-        return v1Metadata().thenCompose(metadata -> {
-            final Map<String, Object> data;
-            if (FQ_ACCESS_GRANT.equals(type)) {
-                data = buildAccessGrantv1(recipient, resources, modes, uriPurposes, expiration, null);
-            } else if (FQ_ACCESS_REQUEST.equals(type)) {
-                data = buildAccessRequestv1(recipient, resources, modes, uriPurposes, expiration, null);
-            } else {
-                throw new AccessGrantException("Unsupported grant type: " + type);
-            }
-
-            final Request req = Request.newBuilder(metadata.issueEndpoint)
-                .header(CONTENT_TYPE, APPLICATION_JSON)
-                .POST(Request.BodyPublishers.ofByteArray(serialize(data))).build();
-
-            return client.send(req, Response.BodyHandlers.ofInputStream())
-                .thenApply(res -> {
-                    try (final InputStream input = res.body()) {
-                        final int status = res.statusCode();
-                        if (isSuccess(status)) {
-                            return processVerifiableCredential(input, ACCESS_GRANT_TYPES, AccessGrant.class);
-                        }
-                        throw new AccessGrantException("Unable to issue Access Grant: HTTP error " + status,
-                                status);
-                    } catch (final IOException ex) {
-                        throw new AccessGrantException(
-                                "Unexpected I/O exception while processing Access Grant", ex);
-                    }
-                });
-        });
-    }
-
     /**
      * Verify an access grant or request.
      *
@@ -481,52 +424,6 @@ private <T extends AccessCredential> CompletionStage<List<T>> query(final URI re
         });
     }
 
-    /**
-     * Perform an Access Grant query and returns 0 to N matching Access Grants.
-     *
-     * <p>The {@code type} parameter must be an absolute URI. For Access Requests,
-     * the URI is {@code http://www.w3.org/ns/solid/vc#SolidAccessRequest}. For Access Grants, the URI
-     * is {@code http://www.w3.org/ns/solid/vc#SolidAccessGrant}. Other URIs may be defined in the future.
-     *
-     * @param type the Access Grant type
-     * @param agent the agent identifier, may be {@code null}
-     * @param resource the resource identifier, may be {@code null}
-     * @param mode the access mode, may be {@code null}
-     * @return the next stage of completion, including the matched Access Grants
-     * @deprecated as of Beta3, please use the alternative {@link #query} method
-     */
-    @Deprecated
-    public CompletionStage<List<AccessGrant>> query(final URI type, final URI agent, final URI resource,
-            final String mode) {
-        Objects.requireNonNull(type, "The type parameter must not be null!");
-        return v1Metadata().thenCompose(metadata -> {
-            final List<CompletableFuture<List<AccessGrant>>> futures = buildQuery(config.getIssuer(), type,
-                    resource, null, agent, Collections.emptySet(), Collections.singleton(mode)).stream()
-                .map(data -> Request.newBuilder(metadata.queryEndpoint)
-                        .header(CONTENT_TYPE, APPLICATION_JSON)
-                        .POST(Request.BodyPublishers.ofByteArray(serialize(data))).build())
-                .map(req -> client.send(req, Response.BodyHandlers.ofInputStream())
-                        .thenApply(res -> {
-                            try (final InputStream input = res.body()) {
-                                final int status = res.statusCode();
-                                if (isSuccess(status)) {
-                                    return processQueryResponse(input, ACCESS_GRANT_TYPES, AccessGrant.class);
-                                }
-                                throw new AccessGrantException("Unable to perform Access Grant query: HTTP error " +
-                                        status, status);
-                            } catch (final IOException ex) {
-                                throw new AccessGrantException(
-                                        "Unexpected I/O exception while processing Access Grant query", ex);
-                            }
-                        }).toCompletableFuture())
-                .collect(Collectors.toList());
-
-            return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
-                .thenApply(x -> futures.stream().map(CompletableFuture::join).flatMap(List::stream)
-                        .collect(Collectors.toList()));
-        });
-    }
-
     /**
      * Revoke an access credential.
      *
@@ -562,39 +459,6 @@ public CompletionStage<Void> revoke(final AccessCredential credential) {
         });
     }
 
-    /**
-     * Delete an access credential.
-     *
-     * @param credential the access credential
-     * @return the next stage of completion
-     * @deprecated as of Beta4
-     */
-
-    @Deprecated
-    public CompletionStage<Void> delete(final AccessCredential credential) {
-        final Request req = Request.newBuilder(credential.getIdentifier()).DELETE().build();
-        return client.send(req, Response.BodyHandlers.discarding())
-            .thenAccept(res -> {
-                final int status = res.statusCode();
-                if (!isSuccess(status)) {
-                    throw new AccessGrantException("Unable to delete Access Credential: " + credential.getIdentifier(),
-                            status);
-                }
-            });
-    }
-
-    /**
-     * Fetch an access credential by identifier. Return at most one access credential or throws an exception.
-     *
-     * @param identifier the access credential identifier
-     * @return the next stage of completion, containing the access credential
-     * @deprecated as of Beta3, please use the {@link #fetch(URI, Class)} method
-     */
-    @Deprecated
-    public CompletionStage<AccessGrant> fetch(final URI identifier) {
-        return fetch(identifier, AccessGrant.class);
-    }
-
     /**
      * Fetch an access credential by identifier. Return at most one access credential or throws an exception.
      *

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

@@ -42,7 +42,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentSkipListMap;
 
@@ -158,17 +157,6 @@ public CompletionStage<Optional<Credential>> authenticate(final Authenticator au
             });
     }
 
-    /* deprecated */
-    @Override
-    public CompletionStage<Optional<Credential>> authenticate(final Request request,
-            final Set<String> algorithms) {
-        final Optional<Credential> grant = getCredential(VERIFIABLE_CREDENTIAL, request.uri());
-        if (grant.isPresent()) {
-            return CompletableFuture.completedFuture(grant);
-        }
-        return session.authenticate(request, algorithms);
-    }
-
     @Override
     public Optional<Credential> fromCache(final Request request) {
         final Credential cachedToken = tokenCache.get(cacheKey(request.uri()));