diff --git a/access-grant/pom.xml b/access-grant/pom.xml index b55865f6a99..e22050af49a 100644 --- a/access-grant/pom.xml +++ b/access-grant/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-accessgrant diff --git a/access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrantUtils.java b/access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrantUtils.java index c6c968e6737..7fe672adde2 100644 --- a/access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrantUtils.java +++ b/access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrantUtils.java @@ -37,7 +37,10 @@ /** * Utility methods for use with the Access Grant module. + * + * @deprecated This class will be removed from the SDK in version 3.0 and moved into the examples. **/ +@Deprecated(since = "2.1.0", forRemoval = true) public final class AccessGrantUtils { private static final RDF rdf = RDFFactory.getInstance(); diff --git a/acp/pom.xml b/acp/pom.xml index 4233ea9e10b..5fb35d21069 100644 --- a/acp/pom.xml +++ b/acp/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-acp diff --git a/acp/src/main/java/com/inrupt/client/acp/AccessControl.java b/acp/src/main/java/com/inrupt/client/acp/AccessControl.java index 0e351769acd..28f10fda2af 100644 --- a/acp/src/main/java/com/inrupt/client/acp/AccessControl.java +++ b/acp/src/main/java/com/inrupt/client/acp/AccessControl.java @@ -38,7 +38,10 @@ * *

An access control applies {@link Policy} objects directly to a resource * via {@code acp:accessControl} or to container members via {@code acp:memberAccessControl} + * + * @deprecated This module will be removed from the SDK in version 3.0 and moved into the examples. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class AccessControl extends WrapperIRI { /** diff --git a/acp/src/main/java/com/inrupt/client/acp/AccessControlResource.java b/acp/src/main/java/com/inrupt/client/acp/AccessControlResource.java index eacf803375e..2bc11abb533 100644 --- a/acp/src/main/java/com/inrupt/client/acp/AccessControlResource.java +++ b/acp/src/main/java/com/inrupt/client/acp/AccessControlResource.java @@ -50,7 +50,10 @@ * An Access Control Resource type. * *

This is the root type for a resource that expresses access control policies. + * + * @deprecated This module will be removed from the SDK in version 3.0 and moved into the examples. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class AccessControlResource extends RDFSource { private static final Logger LOGGER = LoggerFactory.getLogger(AccessControlResource.class); diff --git a/acp/src/main/java/com/inrupt/client/acp/Matcher.java b/acp/src/main/java/com/inrupt/client/acp/Matcher.java index 58de0310f67..5b363319daf 100644 --- a/acp/src/main/java/com/inrupt/client/acp/Matcher.java +++ b/acp/src/main/java/com/inrupt/client/acp/Matcher.java @@ -40,7 +40,10 @@ * *

A matcher is associated with {@link Policy} objects, defining * agents, clients, issuers or verifiable credential (vc) types. + * + * @deprecated This module will be removed from the SDK in version 3.0 and moved into the examples. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class Matcher extends WrapperIRI { /** diff --git a/acp/src/main/java/com/inrupt/client/acp/Policy.java b/acp/src/main/java/com/inrupt/client/acp/Policy.java index 3f57945e29a..e0381893228 100644 --- a/acp/src/main/java/com/inrupt/client/acp/Policy.java +++ b/acp/src/main/java/com/inrupt/client/acp/Policy.java @@ -40,7 +40,10 @@ * *

A policy will reference various {@link Matcher} objects * and apply access rules such as {@code Read} or {@code Write}. + * + * @deprecated This module will be removed from the SDK in version 3.0 and moved into the examples. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class Policy extends WrapperIRI { /** diff --git a/acp/src/main/java/com/inrupt/client/acp/package-info.java b/acp/src/main/java/com/inrupt/client/acp/package-info.java index 5b96b0cf47d..ca9cba61657 100644 --- a/acp/src/main/java/com/inrupt/client/acp/package-info.java +++ b/acp/src/main/java/com/inrupt/client/acp/package-info.java @@ -47,5 +47,7 @@ * client.update(acr); * }} * + * + *

Deprecated: This module will be removed from the SDK in version 3.0 and moved into the examples. */ package com.inrupt.client.acp; diff --git a/api/pom.xml b/api/pom.xml index 6a0eab5de73..9eadf6be2cc 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-api diff --git a/api/src/main/java/com/inrupt/client/NonRDFSource.java b/api/src/main/java/com/inrupt/client/NonRDFSource.java index 5b2973c5c17..1522299d7f5 100644 --- a/api/src/main/java/com/inrupt/client/NonRDFSource.java +++ b/api/src/main/java/com/inrupt/client/NonRDFSource.java @@ -30,7 +30,10 @@ * A base class for non-RDF-bearing resources. * *

This class can be used as a basis for object mapping with the high-level client operations. + * + * @deprecated This class will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class NonRDFSource implements Resource { private final URI identifier; diff --git a/api/src/main/java/com/inrupt/client/RDFSource.java b/api/src/main/java/com/inrupt/client/RDFSource.java index 0ba3e906483..cebc867ca81 100644 --- a/api/src/main/java/com/inrupt/client/RDFSource.java +++ b/api/src/main/java/com/inrupt/client/RDFSource.java @@ -40,7 +40,10 @@ * A base class for RDF-based resource mapping. * *

This class can be used as a basis for object mapping with higher-level client applications. + * + * @deprecated This class will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class RDFSource extends WrapperDataset implements Resource { /** diff --git a/archetypes/java/pom.xml b/archetypes/java/pom.xml index 587e3d34db7..893ace5fc13 100644 --- a/archetypes/java/pom.xml +++ b/archetypes/java/pom.xml @@ -3,7 +3,7 @@ com.inrupt.client inrupt-client-archetype-parent - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-archetype-java diff --git a/archetypes/pom.xml b/archetypes/pom.xml index f007a615a3f..c87c698f823 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-archetype-parent diff --git a/bom/pom.xml b/bom/pom.xml index 93caa85987e..ef06ceffa5a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -5,7 +5,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT .. diff --git a/caffeine/pom.xml b/caffeine/pom.xml index c92c7560d27..444c3d69bff 100644 --- a/caffeine/pom.xml +++ b/caffeine/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-caffeine diff --git a/caffeine/src/main/java/com/inrupt/client/caffeine/CaffeineCache.java b/caffeine/src/main/java/com/inrupt/client/caffeine/CaffeineCache.java index fd384525b7c..29991a82c06 100644 --- a/caffeine/src/main/java/com/inrupt/client/caffeine/CaffeineCache.java +++ b/caffeine/src/main/java/com/inrupt/client/caffeine/CaffeineCache.java @@ -30,7 +30,11 @@ * * @param the key type * @param the value type + * + * @deprecated Use the Guava-based {@code inrupt-client-guava} module instead. This module will be removed in version + * 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class CaffeineCache implements ClientCache { private static final String CACHE_NOT_NULL = "cache may not be null!"; diff --git a/caffeine/src/main/java/com/inrupt/client/caffeine/CaffeineCacheBuilder.java b/caffeine/src/main/java/com/inrupt/client/caffeine/CaffeineCacheBuilder.java index 92ef1b1e809..aafc5a56ba8 100644 --- a/caffeine/src/main/java/com/inrupt/client/caffeine/CaffeineCacheBuilder.java +++ b/caffeine/src/main/java/com/inrupt/client/caffeine/CaffeineCacheBuilder.java @@ -29,7 +29,11 @@ /** * A {@link CacheBuilderService} using a Caffeine-based cache. + * + * @deprecated Use the Guava-based {@code inrupt-client-guava} module instead. This module will be removed in version + * 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class CaffeineCacheBuilder implements CacheBuilderService { @Override diff --git a/core/pom.xml b/core/pom.xml index cb53a29d8f8..b11d967f8ca 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-core diff --git a/examples/cli/pom.xml b/examples/cli/pom.xml index c69f90dc509..7a8d81fe54d 100644 --- a/examples/cli/pom.xml +++ b/examples/cli/pom.xml @@ -5,11 +5,11 @@ com.inrupt.client inrupt-client-examples-parent - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-examples-cli - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT Inrupt Java Client Libraries - CLI Example Sample CLI application. diff --git a/examples/pom.xml b/examples/pom.xml index dd2afae85cc..6c4fbb14ddd 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-examples-parent diff --git a/examples/spring-web/pom.xml b/examples/spring-web/pom.xml index dd63e144a21..b48294e055f 100644 --- a/examples/spring-web/pom.xml +++ b/examples/spring-web/pom.xml @@ -5,11 +5,11 @@ com.inrupt.client inrupt-client-examples-parent - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-examples-spring-web - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT Inrupt Java Client Libraries - SpringBoot WebApp Example Sample SpringBoot Web Application. diff --git a/examples/springboot/pom.xml b/examples/springboot/pom.xml index 7fdb9c9e285..7cf6face7d6 100644 --- a/examples/springboot/pom.xml +++ b/examples/springboot/pom.xml @@ -5,11 +5,11 @@ com.inrupt.client inrupt-client-examples-parent - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-examples-springboot - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT Inrupt Java Client Libraries - Spring Boot Example Sample Spring Boot application. diff --git a/examples/webapp/pom.xml b/examples/webapp/pom.xml index 85a84d7d090..a0e6b629445 100644 --- a/examples/webapp/pom.xml +++ b/examples/webapp/pom.xml @@ -5,11 +5,11 @@ com.inrupt.client inrupt-client-examples-parent - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-examples-webapp - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT Inrupt Java Client Libraries - Quarkus Example Sample web application. diff --git a/guava/pom.xml b/guava/pom.xml index ba774df3d15..0d2935830a7 100644 --- a/guava/pom.xml +++ b/guava/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-guava diff --git a/httpclient/pom.xml b/httpclient/pom.xml index f9c901f0af9..68a334c44ed 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-httpclient diff --git a/integration/base/pom.xml b/integration/base/pom.xml index abac47e5bab..81ee6be1b55 100644 --- a/integration/base/pom.xml +++ b/integration/base/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-integration-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-integration-base-tests Inrupt Java Client Libraries - Integration Base Tests diff --git a/integration/openid/pom.xml b/integration/openid/pom.xml index 617b180997d..9aa2451e77e 100644 --- a/integration/openid/pom.xml +++ b/integration/openid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-integration-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-integration-openid-tests diff --git a/integration/pom.xml b/integration/pom.xml index fc4d1deb64f..665b5e6c50a 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-integration-tests diff --git a/integration/uma/pom.xml b/integration/uma/pom.xml index 5b50b639836..478026f3739 100644 --- a/integration/uma/pom.xml +++ b/integration/uma/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-integration-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-integration-uma-tests diff --git a/jackson/pom.xml b/jackson/pom.xml index ae0908c5f5c..291eb9c17c2 100644 --- a/jackson/pom.xml +++ b/jackson/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-jackson diff --git a/jena/pom.xml b/jena/pom.xml index 09e30407246..e6a9035f279 100644 --- a/jena/pom.xml +++ b/jena/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-jena diff --git a/jena/src/main/java/com/inrupt/client/jena/JenaBodyHandlers.java b/jena/src/main/java/com/inrupt/client/jena/JenaBodyHandlers.java index d734b7906fe..dc6a6c4a904 100644 --- a/jena/src/main/java/com/inrupt/client/jena/JenaBodyHandlers.java +++ b/jena/src/main/java/com/inrupt/client/jena/JenaBodyHandlers.java @@ -39,7 +39,10 @@ /** * {@link Response.BodyHandler} implementations for use with Jena types. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public final class JenaBodyHandlers { private static final String CONTENT_TYPE = "Content-Type"; diff --git a/jena/src/main/java/com/inrupt/client/jena/JenaBodyPublishers.java b/jena/src/main/java/com/inrupt/client/jena/JenaBodyPublishers.java index c2030f5d15d..9111a8020a3 100644 --- a/jena/src/main/java/com/inrupt/client/jena/JenaBodyPublishers.java +++ b/jena/src/main/java/com/inrupt/client/jena/JenaBodyPublishers.java @@ -32,7 +32,10 @@ /** * {@link Request.BodyPublisher} implementations for use with Jena types. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public final class JenaBodyPublishers { /** diff --git a/jena/src/main/java/com/inrupt/client/jena/JenaService.java b/jena/src/main/java/com/inrupt/client/jena/JenaService.java index ecadc33db67..4986cc29ad6 100644 --- a/jena/src/main/java/com/inrupt/client/jena/JenaService.java +++ b/jena/src/main/java/com/inrupt/client/jena/JenaService.java @@ -38,7 +38,10 @@ /** * An {@link RdfService} that uses the Jena library. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class JenaService implements RdfService { private static final String UNSUPPORTED_SYNTAX = "Unsupported syntax: "; diff --git a/jena/src/main/java/com/inrupt/client/jena/package-info.java b/jena/src/main/java/com/inrupt/client/jena/package-info.java index 6b700863caf..ecf4341f972 100644 --- a/jena/src/main/java/com/inrupt/client/jena/package-info.java +++ b/jena/src/main/java/com/inrupt/client/jena/package-info.java @@ -82,5 +82,7 @@ System.out.println("HTTP status code: " + response.statusCode()); * } + * + *

Deprecated: This module will be removed in version 3.0. */ package com.inrupt.client.jena; diff --git a/jsonb/pom.xml b/jsonb/pom.xml index 7c8cce83fe5..1d0b047627f 100644 --- a/jsonb/pom.xml +++ b/jsonb/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-jsonb diff --git a/jsonb/src/main/java/com/inrupt/client/jsonb/JsonbService.java b/jsonb/src/main/java/com/inrupt/client/jsonb/JsonbService.java index 6f41a58e8fe..4083745634a 100644 --- a/jsonb/src/main/java/com/inrupt/client/jsonb/JsonbService.java +++ b/jsonb/src/main/java/com/inrupt/client/jsonb/JsonbService.java @@ -36,7 +36,11 @@ /** * A {@link JsonService} using the JakartaEE JSON Bind API. + * + * @deprecated Use the Jackson-based {@code inrupt-client-jackson} module instead. This module will be removed in + * version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class JsonbService implements JsonService { private final Jsonb jsonb; diff --git a/jsonb/src/main/java/com/inrupt/client/jsonb/package-info.java b/jsonb/src/main/java/com/inrupt/client/jsonb/package-info.java index 27593a01ab3..a703174f65d 100644 --- a/jsonb/src/main/java/com/inrupt/client/jsonb/package-info.java +++ b/jsonb/src/main/java/com/inrupt/client/jsonb/package-info.java @@ -47,5 +47,8 @@ System.out.println("Custom Type Id is: " + obj.id); } * } + * + *

Deprecated: Use the Jackson-based {@code inrupt-client-jackson} module instead. This module will + * be removed in version 3.0. */ package com.inrupt.client.jsonb; diff --git a/okhttp/pom.xml b/okhttp/pom.xml index 803586da618..bc8a05335e0 100644 --- a/okhttp/pom.xml +++ b/okhttp/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-okhttp diff --git a/okhttp/src/main/java/com/inrupt/client/okhttp/OkHttpService.java b/okhttp/src/main/java/com/inrupt/client/okhttp/OkHttpService.java index 3346de7973f..b04533a7004 100644 --- a/okhttp/src/main/java/com/inrupt/client/okhttp/OkHttpService.java +++ b/okhttp/src/main/java/com/inrupt/client/okhttp/OkHttpService.java @@ -46,7 +46,11 @@ /** * A {@link HttpService} using the {@code okhttp3.OkHttpClient}. + * + * @deprecated Use the {@code java.net.http}-based {@code inrupt-client-httpclient} module instead. This module will be + * removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class OkHttpService implements HttpService { static final Logger LOGGER = LoggerFactory.getLogger(OkHttpService.class); diff --git a/okhttp/src/main/java/com/inrupt/client/okhttp/package-info.java b/okhttp/src/main/java/com/inrupt/client/okhttp/package-info.java index 989b76abeb7..ab086612490 100644 --- a/okhttp/src/main/java/com/inrupt/client/okhttp/package-info.java +++ b/okhttp/src/main/java/com/inrupt/client/okhttp/package-info.java @@ -46,5 +46,8 @@ System.out.println("Response uri: " + response.uri()); System.out.println("Content type: " + response.headers().asMap().get(CONTENT_TYPE)); * } + * + *

Deprecated: Use the {@code java.net.http}-based {@code inrupt-client-httpclient} module instead. + * This module will be removed in version 3.0. */ package com.inrupt.client.okhttp; diff --git a/openid/pom.xml b/openid/pom.xml index 5d7769124ff..42b1bf5c4cc 100644 --- a/openid/pom.xml +++ b/openid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-openid diff --git a/parser/pom.xml b/parser/pom.xml index 827a0516331..b689293601f 100644 --- a/parser/pom.xml +++ b/parser/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-parser diff --git a/performance/base/pom.xml b/performance/base/pom.xml index c4e320ac938..374fefa8eac 100644 --- a/performance/base/pom.xml +++ b/performance/base/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-performance-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-performance-base-tests Inrupt Java Client Libraries - Performance Base Tests diff --git a/performance/pom.xml b/performance/pom.xml index 39406ba0a71..b737c44fb4c 100644 --- a/performance/pom.xml +++ b/performance/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-performance-tests diff --git a/performance/uma/pom.xml b/performance/uma/pom.xml index 9190fd0e8a8..491a250515a 100644 --- a/performance/uma/pom.xml +++ b/performance/uma/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client-performance-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-performance-uma-tests diff --git a/pom.xml b/pom.xml index 663acf9f688..20ed99259cb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT Inrupt Java Client Libraries https://docs.inrupt.com/developer-tools/java/client-libraries/ diff --git a/quarkus/pom.xml b/quarkus/pom.xml index 60e4f1f1af8..927346ab61f 100644 --- a/quarkus/pom.xml +++ b/quarkus/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-quarkus diff --git a/quarkus/src/main/java/com/inrupt/client/quarkus/SessionUtils.java b/quarkus/src/main/java/com/inrupt/client/quarkus/SessionUtils.java index 0f49984f25b..a141f3d7181 100644 --- a/quarkus/src/main/java/com/inrupt/client/quarkus/SessionUtils.java +++ b/quarkus/src/main/java/com/inrupt/client/quarkus/SessionUtils.java @@ -31,7 +31,10 @@ /** * A utility class for converting a Quarkus (Microprofile) {@link JsonWebToken} to session objects * for use with the Java Client libraries. + * + * @deprecated This module will be removed from the SDK in version 3.0 and moved into the examples. */ +@Deprecated(since = "2.1.0", forRemoval = true) public final class SessionUtils { /** diff --git a/quarkus/src/main/java/com/inrupt/client/quarkus/package-info.java b/quarkus/src/main/java/com/inrupt/client/quarkus/package-info.java index 825ce37efb8..aa72ec78cdf 100644 --- a/quarkus/src/main/java/com/inrupt/client/quarkus/package-info.java +++ b/quarkus/src/main/java/com/inrupt/client/quarkus/package-info.java @@ -27,5 +27,7 @@ Optional session = SessionUtils.asSession(jwt); } * + * + *

Deprecated: This module will be removed from the SDK in version 3.0 and moved into the examples. */ package com.inrupt.client.quarkus; diff --git a/rdf4j/pom.xml b/rdf4j/pom.xml index e8e7ffc5371..9e56b8e9c35 100644 --- a/rdf4j/pom.xml +++ b/rdf4j/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-rdf4j diff --git a/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JBodyHandlers.java b/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JBodyHandlers.java index 3273b22e477..1ba9c2d844c 100644 --- a/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JBodyHandlers.java +++ b/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JBodyHandlers.java @@ -38,7 +38,10 @@ /** * {@link Response.BodyHandler} implementations for use with RDF4J types. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public final class RDF4JBodyHandlers { /** diff --git a/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JBodyPublishers.java b/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JBodyPublishers.java index 5a495404601..d381501514e 100644 --- a/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JBodyPublishers.java +++ b/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JBodyPublishers.java @@ -33,7 +33,10 @@ /** * {@link Request.BodyPublisher} implementations for use with RDF4J types. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public final class RDF4JBodyPublishers { /** * Serialize a RDF4J Model as an HTTP request body. diff --git a/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JService.java b/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JService.java index 30d9cb15632..7da674d7a26 100644 --- a/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JService.java +++ b/rdf4j/src/main/java/com/inrupt/client/rdf4j/RDF4JService.java @@ -48,7 +48,10 @@ /** * An {@link RdfService} that uses the RDF4J library. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class RDF4JService implements RdfService { private static final Map SYNTAX_TO_FORMAT = buildSyntaxMapping(); diff --git a/rdf4j/src/main/java/com/inrupt/client/rdf4j/package-info.java b/rdf4j/src/main/java/com/inrupt/client/rdf4j/package-info.java index 464b60bafa2..d540fd809eb 100644 --- a/rdf4j/src/main/java/com/inrupt/client/rdf4j/package-info.java +++ b/rdf4j/src/main/java/com/inrupt/client/rdf4j/package-info.java @@ -81,5 +81,7 @@ System.out.println("HTTP status code: " + response.statusCode()); * } + * + *

Deprecated: This module will be removed in version 3.0. */ package com.inrupt.client.rdf4j; diff --git a/reports/pom.xml b/reports/pom.xml index f5066b84d69..54fe621c888 100644 --- a/reports/pom.xml +++ b/reports/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-report diff --git a/runtime/pom.xml b/runtime/pom.xml index 35dab867842..a8a8425a5b5 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -5,7 +5,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT .. diff --git a/solid/pom.xml b/solid/pom.xml index 3012d58c4d4..3cacb242321 100644 --- a/solid/pom.xml +++ b/solid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-solid diff --git a/solid/src/main/java/com/inrupt/client/solid/BadRequestException.java b/solid/src/main/java/com/inrupt/client/solid/BadRequestException.java index 3fc0ad547f1..dcc341a4608 100644 --- a/solid/src/main/java/com/inrupt/client/solid/BadRequestException.java +++ b/solid/src/main/java/com/inrupt/client/solid/BadRequestException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP bad request (400) response. * * @see RFC 9110 (15.5.1.) 400 Bad Request + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class BadRequestException extends SolidClientException { private static final long serialVersionUID = -3379457428921025570L; diff --git a/solid/src/main/java/com/inrupt/client/solid/ConflictException.java b/solid/src/main/java/com/inrupt/client/solid/ConflictException.java index d88386eb724..85c83965a90 100644 --- a/solid/src/main/java/com/inrupt/client/solid/ConflictException.java +++ b/solid/src/main/java/com/inrupt/client/solid/ConflictException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP conflict (409) response.. * * @see RFC 9110 (15.5.10.) 409 Conflict + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class ConflictException extends SolidClientException { private static final long serialVersionUID = -203198307847520748L; diff --git a/solid/src/main/java/com/inrupt/client/solid/DataMappingException.java b/solid/src/main/java/com/inrupt/client/solid/DataMappingException.java index cb2be1b9fbc..723e1a92990 100644 --- a/solid/src/main/java/com/inrupt/client/solid/DataMappingException.java +++ b/solid/src/main/java/com/inrupt/client/solid/DataMappingException.java @@ -22,6 +22,12 @@ import java.util.Collection; +/** + * A data mapping exception for Solid resources. + * + * @deprecated This module will be removed in version 3.0. + */ +@Deprecated(since = "2.1.0", forRemoval = true) public class DataMappingException extends SolidResourceException{ private static final long serialVersionUID = 3752688648792259425L; diff --git a/solid/src/main/java/com/inrupt/client/solid/ForbiddenException.java b/solid/src/main/java/com/inrupt/client/solid/ForbiddenException.java index 7aeb3219bec..f832f5762c5 100644 --- a/solid/src/main/java/com/inrupt/client/solid/ForbiddenException.java +++ b/solid/src/main/java/com/inrupt/client/solid/ForbiddenException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP forbidden (403) response. * * @see RFC 9110 (15.5.4.) 403 Forbidden + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class ForbiddenException extends SolidClientException { private static final long serialVersionUID = 3299286274724874244L; diff --git a/solid/src/main/java/com/inrupt/client/solid/GoneException.java b/solid/src/main/java/com/inrupt/client/solid/GoneException.java index 0882302e27b..b4516610b4b 100644 --- a/solid/src/main/java/com/inrupt/client/solid/GoneException.java +++ b/solid/src/main/java/com/inrupt/client/solid/GoneException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP gone (410) response. * * @see RFC 9110 (15.5.11.) 410 Gone + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class GoneException extends SolidClientException { private static final long serialVersionUID = -6892345582498100242L; diff --git a/solid/src/main/java/com/inrupt/client/solid/InternalServerErrorException.java b/solid/src/main/java/com/inrupt/client/solid/InternalServerErrorException.java index ea9acb1c56e..a84e97f47e5 100644 --- a/solid/src/main/java/com/inrupt/client/solid/InternalServerErrorException.java +++ b/solid/src/main/java/com/inrupt/client/solid/InternalServerErrorException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP internal server error (500) response. * * @see RFC 9110 (15.6.1.) 500 Internal Server Error + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class InternalServerErrorException extends SolidClientException { private static final long serialVersionUID = -6672490715281719330L; diff --git a/solid/src/main/java/com/inrupt/client/solid/Metadata.java b/solid/src/main/java/com/inrupt/client/solid/Metadata.java index 9da65e820b7..b225f88eac4 100644 --- a/solid/src/main/java/com/inrupt/client/solid/Metadata.java +++ b/solid/src/main/java/com/inrupt/client/solid/Metadata.java @@ -33,7 +33,10 @@ /** * Solid Resource Metadata. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class Metadata { private static final String CONTENT_TYPE = "Content-Type"; diff --git a/solid/src/main/java/com/inrupt/client/solid/MethodNotAllowedException.java b/solid/src/main/java/com/inrupt/client/solid/MethodNotAllowedException.java index d472b5fcbd3..f721414ddd0 100644 --- a/solid/src/main/java/com/inrupt/client/solid/MethodNotAllowedException.java +++ b/solid/src/main/java/com/inrupt/client/solid/MethodNotAllowedException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP method not allowed (405) response. * * @see RFC 9110 (15.5.6.) 405 Method Not Allowed + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class MethodNotAllowedException extends SolidClientException { private static final long serialVersionUID = -9125437562813923030L; diff --git a/solid/src/main/java/com/inrupt/client/solid/NotAcceptableException.java b/solid/src/main/java/com/inrupt/client/solid/NotAcceptableException.java index 53744c0b2e8..16ebda04460 100644 --- a/solid/src/main/java/com/inrupt/client/solid/NotAcceptableException.java +++ b/solid/src/main/java/com/inrupt/client/solid/NotAcceptableException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP not acceptable (406) response. * * @see RFC 9110 (15.5.7.) 406 Not Acceptable + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class NotAcceptableException extends SolidClientException { private static final long serialVersionUID = 6594993822477388733L; diff --git a/solid/src/main/java/com/inrupt/client/solid/NotFoundException.java b/solid/src/main/java/com/inrupt/client/solid/NotFoundException.java index 466bed74894..cc223ea24ec 100644 --- a/solid/src/main/java/com/inrupt/client/solid/NotFoundException.java +++ b/solid/src/main/java/com/inrupt/client/solid/NotFoundException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP not found (404) response. * * @see RFC 9110 (15.5.5.) 404 Not Found + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class NotFoundException extends SolidClientException { private static final long serialVersionUID = -2256628528500739683L; diff --git a/solid/src/main/java/com/inrupt/client/solid/PreconditionFailedException.java b/solid/src/main/java/com/inrupt/client/solid/PreconditionFailedException.java index 461c937a0eb..48fc5bf8a0f 100644 --- a/solid/src/main/java/com/inrupt/client/solid/PreconditionFailedException.java +++ b/solid/src/main/java/com/inrupt/client/solid/PreconditionFailedException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP precondition failed (412) response. * * @see RFC 9110 (15.5.13.) 412 Precondition Failed + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class PreconditionFailedException extends SolidClientException { private static final long serialVersionUID = 4205761003697773528L; diff --git a/solid/src/main/java/com/inrupt/client/solid/SolidClient.java b/solid/src/main/java/com/inrupt/client/solid/SolidClient.java index 736f1f39a11..1dba0a49874 100644 --- a/solid/src/main/java/com/inrupt/client/solid/SolidClient.java +++ b/solid/src/main/java/com/inrupt/client/solid/SolidClient.java @@ -40,7 +40,10 @@ /** * A high-level client for interacting with Solid resources. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class SolidClient { static final Headers EMPTY_HEADERS = Headers.of(Collections.emptyMap()); diff --git a/solid/src/main/java/com/inrupt/client/solid/SolidClientException.java b/solid/src/main/java/com/inrupt/client/solid/SolidClientException.java index 731280df350..addbad3a395 100644 --- a/solid/src/main/java/com/inrupt/client/solid/SolidClientException.java +++ b/solid/src/main/java/com/inrupt/client/solid/SolidClientException.java @@ -28,7 +28,10 @@ /** * A runtime exception for use with SolidClient HTTP operations. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class SolidClientException extends InruptClientException { private static final long serialVersionUID = 2868432164225689934L; diff --git a/solid/src/main/java/com/inrupt/client/solid/SolidContainer.java b/solid/src/main/java/com/inrupt/client/solid/SolidContainer.java index 58343e6c18d..4d02adaa7aa 100644 --- a/solid/src/main/java/com/inrupt/client/solid/SolidContainer.java +++ b/solid/src/main/java/com/inrupt/client/solid/SolidContainer.java @@ -44,7 +44,10 @@ /** * A Solid Container Object. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class SolidContainer extends SolidRDFSource { /** diff --git a/solid/src/main/java/com/inrupt/client/solid/SolidNonRDFSource.java b/solid/src/main/java/com/inrupt/client/solid/SolidNonRDFSource.java index 58e4759786c..ff3236c6c63 100644 --- a/solid/src/main/java/com/inrupt/client/solid/SolidNonRDFSource.java +++ b/solid/src/main/java/com/inrupt/client/solid/SolidNonRDFSource.java @@ -28,7 +28,10 @@ /** * A non-RDF-bearing Solid Resource. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class SolidNonRDFSource extends NonRDFSource implements SolidResource { private final Metadata metadata; diff --git a/solid/src/main/java/com/inrupt/client/solid/SolidProblemDetails.java b/solid/src/main/java/com/inrupt/client/solid/SolidProblemDetails.java index 9a393d403bd..b46c4e9724a 100644 --- a/solid/src/main/java/com/inrupt/client/solid/SolidProblemDetails.java +++ b/solid/src/main/java/com/inrupt/client/solid/SolidProblemDetails.java @@ -34,6 +34,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * A problem details object for Solid error responses. + * + * @deprecated This module will be removed in version 3.0. + */ +@Deprecated(since = "2.1.0", forRemoval = true) public class SolidProblemDetails implements ProblemDetails { private static final Logger LOGGER = LoggerFactory.getLogger(SolidProblemDetails.class); diff --git a/solid/src/main/java/com/inrupt/client/solid/SolidRDFSource.java b/solid/src/main/java/com/inrupt/client/solid/SolidRDFSource.java index b10b9cd3795..44893a777d2 100644 --- a/solid/src/main/java/com/inrupt/client/solid/SolidRDFSource.java +++ b/solid/src/main/java/com/inrupt/client/solid/SolidRDFSource.java @@ -29,7 +29,10 @@ /** * A Solid Resource Object. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class SolidRDFSource extends RDFSource implements SolidResource { private final Metadata metadata; diff --git a/solid/src/main/java/com/inrupt/client/solid/SolidResource.java b/solid/src/main/java/com/inrupt/client/solid/SolidResource.java index 7eb7b1480af..274e62c7863 100644 --- a/solid/src/main/java/com/inrupt/client/solid/SolidResource.java +++ b/solid/src/main/java/com/inrupt/client/solid/SolidResource.java @@ -22,6 +22,12 @@ import com.inrupt.client.Resource; +/** + * A Solid resource type. + * + * @deprecated This module will be removed in version 3.0. + */ +@Deprecated(since = "2.1.0", forRemoval = true) public interface SolidResource extends Resource { /** diff --git a/solid/src/main/java/com/inrupt/client/solid/SolidResourceException.java b/solid/src/main/java/com/inrupt/client/solid/SolidResourceException.java index bf7bd2d0a6e..920ad7c2384 100644 --- a/solid/src/main/java/com/inrupt/client/solid/SolidResourceException.java +++ b/solid/src/main/java/com/inrupt/client/solid/SolidResourceException.java @@ -24,7 +24,10 @@ /** * A runtime exception for use with Solid resource related errors. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class SolidResourceException extends InruptClientException { private static final long serialVersionUID = 2812695548792441025L; diff --git a/solid/src/main/java/com/inrupt/client/solid/SolidResourceHandlers.java b/solid/src/main/java/com/inrupt/client/solid/SolidResourceHandlers.java index 3efa0fdd010..ad8fde880b9 100644 --- a/solid/src/main/java/com/inrupt/client/solid/SolidResourceHandlers.java +++ b/solid/src/main/java/com/inrupt/client/solid/SolidResourceHandlers.java @@ -35,7 +35,10 @@ /** * Body handlers for Solid Resources. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public final class SolidResourceHandlers { private static final RdfService service = ServiceProvider.getRdfService(); diff --git a/solid/src/main/java/com/inrupt/client/solid/SolidResourceReference.java b/solid/src/main/java/com/inrupt/client/solid/SolidResourceReference.java index 674552d0f9a..f7f1a42515f 100644 --- a/solid/src/main/java/com/inrupt/client/solid/SolidResourceReference.java +++ b/solid/src/main/java/com/inrupt/client/solid/SolidResourceReference.java @@ -30,7 +30,10 @@ /** * A reference to a Solid Resource without any corresponding data. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class SolidResourceReference implements SolidResource { private final InputStream entity; diff --git a/solid/src/main/java/com/inrupt/client/solid/SolidSyncClient.java b/solid/src/main/java/com/inrupt/client/solid/SolidSyncClient.java index 795d24570f6..434dd94238c 100644 --- a/solid/src/main/java/com/inrupt/client/solid/SolidSyncClient.java +++ b/solid/src/main/java/com/inrupt/client/solid/SolidSyncClient.java @@ -36,7 +36,10 @@ /** * A high-level synchronous client for interacting with Solid resources. + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class SolidSyncClient { private final SolidClient client; diff --git a/solid/src/main/java/com/inrupt/client/solid/TooManyRequestsException.java b/solid/src/main/java/com/inrupt/client/solid/TooManyRequestsException.java index 4f299fc9492..ab3d4c69698 100644 --- a/solid/src/main/java/com/inrupt/client/solid/TooManyRequestsException.java +++ b/solid/src/main/java/com/inrupt/client/solid/TooManyRequestsException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP too many requests (429) response. * * @see RFC 6585 (4.) 429 Too Many Requests + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class TooManyRequestsException extends SolidClientException { private static final long serialVersionUID = -1798491190232642824L; diff --git a/solid/src/main/java/com/inrupt/client/solid/UnauthorizedException.java b/solid/src/main/java/com/inrupt/client/solid/UnauthorizedException.java index db8615df958..c896356653c 100644 --- a/solid/src/main/java/com/inrupt/client/solid/UnauthorizedException.java +++ b/solid/src/main/java/com/inrupt/client/solid/UnauthorizedException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP unauthorized (401) response. * * @see RFC 9110 (15.5.2.) 401 Unauthorized + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class UnauthorizedException extends SolidClientException { private static final long serialVersionUID = -3219668517323678497L; diff --git a/solid/src/main/java/com/inrupt/client/solid/UnsupportedMediaTypeException.java b/solid/src/main/java/com/inrupt/client/solid/UnsupportedMediaTypeException.java index 27e9c96953d..8b5434dde7f 100644 --- a/solid/src/main/java/com/inrupt/client/solid/UnsupportedMediaTypeException.java +++ b/solid/src/main/java/com/inrupt/client/solid/UnsupportedMediaTypeException.java @@ -28,7 +28,10 @@ * A runtime exception that represents an HTTP unsupported media type (415) response. * * @see RFC 9110 (15.5.16.) 415 Unsupported Media Type + * + * @deprecated This module will be removed in version 3.0. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class UnsupportedMediaTypeException extends SolidClientException { private static final long serialVersionUID = 1312856145838280673L; diff --git a/solid/src/main/java/com/inrupt/client/solid/package-info.java b/solid/src/main/java/com/inrupt/client/solid/package-info.java index 1e05f4c5374..90942e2921f 100644 --- a/solid/src/main/java/com/inrupt/client/solid/package-info.java +++ b/solid/src/main/java/com/inrupt/client/solid/package-info.java @@ -104,5 +104,7 @@ System.out.println("HTTP status: " + response.statusCode()); System.out.println("Resource URI: " + response.body().getId());} * + * + *

Deprecated: This module will be removed in version 3.0. */ package com.inrupt.client.solid; diff --git a/spring/pom.xml b/spring/pom.xml index 2d8f9e44a7b..2de52c4d5d8 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-spring diff --git a/spring/src/main/java/com/inrupt/client/spring/SessionUtils.java b/spring/src/main/java/com/inrupt/client/spring/SessionUtils.java index b709801086f..f07d1c9ead5 100644 --- a/spring/src/main/java/com/inrupt/client/spring/SessionUtils.java +++ b/spring/src/main/java/com/inrupt/client/spring/SessionUtils.java @@ -32,7 +32,10 @@ /** * A utility class for converting Spring constructs into session objects for use with the Java Client libraries. + * + * @deprecated This module will be removed from the SDK in version 3.0 and moved into the examples. */ +@Deprecated(since = "2.1.0", forRemoval = true) public final class SessionUtils { /** diff --git a/spring/src/main/java/com/inrupt/client/spring/package-info.java b/spring/src/main/java/com/inrupt/client/spring/package-info.java index 85ac3220525..26c114fba8e 100644 --- a/spring/src/main/java/com/inrupt/client/spring/package-info.java +++ b/spring/src/main/java/com/inrupt/client/spring/package-info.java @@ -27,5 +27,7 @@ Optional session = SessionUtils.asSession(user); } * + * + *

Deprecated: This module will be removed from the SDK in version 3.0 and moved into the examples. */ package com.inrupt.client.spring; diff --git a/test/pom.xml b/test/pom.xml index 1573799a695..f7a1c4b0cb8 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-test diff --git a/uma/pom.xml b/uma/pom.xml index 9325e84139f..3d48a59ddf9 100644 --- a/uma/pom.xml +++ b/uma/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-uma diff --git a/uma/src/main/java/com/inrupt/client/uma/ClaimGatheringHandler.java b/uma/src/main/java/com/inrupt/client/uma/ClaimGatheringHandler.java index 5b4f4308341..9a16c4b2412 100644 --- a/uma/src/main/java/com/inrupt/client/uma/ClaimGatheringHandler.java +++ b/uma/src/main/java/com/inrupt/client/uma/ClaimGatheringHandler.java @@ -24,7 +24,10 @@ /** * A handler capable of gathering claims for a given type, from a given issuer. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public interface ClaimGatheringHandler { /** diff --git a/uma/src/main/java/com/inrupt/client/uma/ClaimToken.java b/uma/src/main/java/com/inrupt/client/uma/ClaimToken.java index 809f9433e14..ad87e9d1453 100644 --- a/uma/src/main/java/com/inrupt/client/uma/ClaimToken.java +++ b/uma/src/main/java/com/inrupt/client/uma/ClaimToken.java @@ -28,7 +28,10 @@ * * @see * User-Managed Access 2.0: Client Request to Authorization Server for RPT + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public final class ClaimToken { private final String token; diff --git a/uma/src/main/java/com/inrupt/client/uma/ErrorResponse.java b/uma/src/main/java/com/inrupt/client/uma/ErrorResponse.java index 05fd0e4ce20..f34df15e33f 100644 --- a/uma/src/main/java/com/inrupt/client/uma/ErrorResponse.java +++ b/uma/src/main/java/com/inrupt/client/uma/ErrorResponse.java @@ -26,7 +26,10 @@ /** * A concrete error response class from the UMA server. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class ErrorResponse { public String error; diff --git a/uma/src/main/java/com/inrupt/client/uma/InvalidGrantException.java b/uma/src/main/java/com/inrupt/client/uma/InvalidGrantException.java index 95a5ea4e092..8fbe8437a45 100644 --- a/uma/src/main/java/com/inrupt/client/uma/InvalidGrantException.java +++ b/uma/src/main/java/com/inrupt/client/uma/InvalidGrantException.java @@ -22,7 +22,10 @@ /** * An invalid grant error from the UMA server. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class InvalidGrantException extends UmaException { private static final long serialVersionUID = 2634097455648315683L; diff --git a/uma/src/main/java/com/inrupt/client/uma/InvalidScopeException.java b/uma/src/main/java/com/inrupt/client/uma/InvalidScopeException.java index 4d5472a938f..8c3975972eb 100644 --- a/uma/src/main/java/com/inrupt/client/uma/InvalidScopeException.java +++ b/uma/src/main/java/com/inrupt/client/uma/InvalidScopeException.java @@ -22,7 +22,10 @@ /** * An invalid scope error from the UMA server. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class InvalidScopeException extends UmaException { private static final long serialVersionUID = 2634097455648315683L; diff --git a/uma/src/main/java/com/inrupt/client/uma/Metadata.java b/uma/src/main/java/com/inrupt/client/uma/Metadata.java index ef28c64e873..def783c00a7 100644 --- a/uma/src/main/java/com/inrupt/client/uma/Metadata.java +++ b/uma/src/main/java/com/inrupt/client/uma/Metadata.java @@ -25,7 +25,10 @@ /** * A class representing an UMA discovery document. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class Metadata { public Set dpopSigningAlgValuesSupported; diff --git a/uma/src/main/java/com/inrupt/client/uma/NeedInfo.java b/uma/src/main/java/com/inrupt/client/uma/NeedInfo.java index 208f741337d..d0ad9e81736 100644 --- a/uma/src/main/java/com/inrupt/client/uma/NeedInfo.java +++ b/uma/src/main/java/com/inrupt/client/uma/NeedInfo.java @@ -29,7 +29,10 @@ /** * A class representing a {@code need_info} error response from an UMA server. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public final class NeedInfo { private static final String NEED_INFO = "need_info"; diff --git a/uma/src/main/java/com/inrupt/client/uma/RequestDeniedException.java b/uma/src/main/java/com/inrupt/client/uma/RequestDeniedException.java index 74e95f59b29..64ffeff15b8 100644 --- a/uma/src/main/java/com/inrupt/client/uma/RequestDeniedException.java +++ b/uma/src/main/java/com/inrupt/client/uma/RequestDeniedException.java @@ -22,7 +22,10 @@ /** * A request denied error from the UMA server. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class RequestDeniedException extends UmaException { private static final long serialVersionUID = 2634097455648315683L; diff --git a/uma/src/main/java/com/inrupt/client/uma/RequiredClaims.java b/uma/src/main/java/com/inrupt/client/uma/RequiredClaims.java index 47b4796347e..ebaa4ba53d1 100644 --- a/uma/src/main/java/com/inrupt/client/uma/RequiredClaims.java +++ b/uma/src/main/java/com/inrupt/client/uma/RequiredClaims.java @@ -28,7 +28,10 @@ /** * A class representing the required claims that are part of an UMA interactive exchange. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class RequiredClaims { private final Map data; diff --git a/uma/src/main/java/com/inrupt/client/uma/TokenRequest.java b/uma/src/main/java/com/inrupt/client/uma/TokenRequest.java index 6187fb57640..2f5f40d84da 100644 --- a/uma/src/main/java/com/inrupt/client/uma/TokenRequest.java +++ b/uma/src/main/java/com/inrupt/client/uma/TokenRequest.java @@ -27,7 +27,10 @@ /** * An UMA token request class. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class TokenRequest { private final String ticket; diff --git a/uma/src/main/java/com/inrupt/client/uma/TokenResponse.java b/uma/src/main/java/com/inrupt/client/uma/TokenResponse.java index 10ad59963d6..e007ad33e04 100644 --- a/uma/src/main/java/com/inrupt/client/uma/TokenResponse.java +++ b/uma/src/main/java/com/inrupt/client/uma/TokenResponse.java @@ -22,7 +22,10 @@ /** * An UMA token response class. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class TokenResponse { public String accessToken; public String tokenType; diff --git a/uma/src/main/java/com/inrupt/client/uma/UmaAuthenticationProvider.java b/uma/src/main/java/com/inrupt/client/uma/UmaAuthenticationProvider.java index 73a7bd3e534..24116ea6391 100644 --- a/uma/src/main/java/com/inrupt/client/uma/UmaAuthenticationProvider.java +++ b/uma/src/main/java/com/inrupt/client/uma/UmaAuthenticationProvider.java @@ -51,7 +51,10 @@ * * @see User * Managed Access (UMA) 2.0 Grant for OAuth 2.0 Authorization + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class UmaAuthenticationProvider implements AuthenticationProvider { public static final URI ID_TOKEN = URI.create("http://openid.net/specs/openid-connect-core-1_0.html#IDToken"); diff --git a/uma/src/main/java/com/inrupt/client/uma/UmaClient.java b/uma/src/main/java/com/inrupt/client/uma/UmaClient.java index dc6a71d5d25..0a01cbb71d3 100644 --- a/uma/src/main/java/com/inrupt/client/uma/UmaClient.java +++ b/uma/src/main/java/com/inrupt/client/uma/UmaClient.java @@ -45,7 +45,10 @@ /** * An UMA client implmentation. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class UmaClient { /* HTTP */ diff --git a/uma/src/main/java/com/inrupt/client/uma/UmaException.java b/uma/src/main/java/com/inrupt/client/uma/UmaException.java index d26f2591f3d..4f9f382e23f 100644 --- a/uma/src/main/java/com/inrupt/client/uma/UmaException.java +++ b/uma/src/main/java/com/inrupt/client/uma/UmaException.java @@ -24,7 +24,10 @@ /** * A runtime exception for use with UMA-related errors. + * + * @deprecated UMA support will be removed in version 3.0 with no replacement. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class UmaException extends InruptClientException { private static final long serialVersionUID = 3422598347430002847L; diff --git a/uma/src/main/java/com/inrupt/client/uma/package-info.java b/uma/src/main/java/com/inrupt/client/uma/package-info.java index 999c0ef6ab6..6c95403af6e 100644 --- a/uma/src/main/java/com/inrupt/client/uma/package-info.java +++ b/uma/src/main/java/com/inrupt/client/uma/package-info.java @@ -85,5 +85,7 @@ System.out.println("An invalid scope was provided"); } * } + * + *

Deprecated: UMA support will be removed in version 3.0 with no replacement. */ package com.inrupt.client.uma; diff --git a/vocabulary/pom.xml b/vocabulary/pom.xml index 7e2cd5d4b5b..1eab7186710 100644 --- a/vocabulary/pom.xml +++ b/vocabulary/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-vocabulary diff --git a/webid/pom.xml b/webid/pom.xml index 1c79738504a..da857afd93c 100644 --- a/webid/pom.xml +++ b/webid/pom.xml @@ -4,7 +4,7 @@ com.inrupt.client inrupt-client - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT inrupt-client-webid diff --git a/webid/src/main/java/com/inrupt/client/webid/WebIdException.java b/webid/src/main/java/com/inrupt/client/webid/WebIdException.java index 05c65f529ac..c37336eff3e 100644 --- a/webid/src/main/java/com/inrupt/client/webid/WebIdException.java +++ b/webid/src/main/java/com/inrupt/client/webid/WebIdException.java @@ -24,7 +24,10 @@ /** * A runtime exception for use with WebId-related errors. + * + * @deprecated This module will be removed from the SDK in version 3.0 and moved into the examples. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class WebIdException extends InruptClientException { private static final long serialVersionUID = 3854695545552441025L; diff --git a/webid/src/main/java/com/inrupt/client/webid/WebIdProfile.java b/webid/src/main/java/com/inrupt/client/webid/WebIdProfile.java index e9daa6189ca..9c383c3a021 100644 --- a/webid/src/main/java/com/inrupt/client/webid/WebIdProfile.java +++ b/webid/src/main/java/com/inrupt/client/webid/WebIdProfile.java @@ -39,7 +39,10 @@ /** * A WebID Profile for use with Solid. + * + * @deprecated This module will be removed from the SDK in version 3.0 and moved into the examples. */ +@Deprecated(since = "2.1.0", forRemoval = true) public class WebIdProfile extends RDFSource { private final IRI rdfType; diff --git a/webid/src/main/java/com/inrupt/client/webid/package-info.java b/webid/src/main/java/com/inrupt/client/webid/package-info.java index 1451f9ceb00..adbd0fc8424 100644 --- a/webid/src/main/java/com/inrupt/client/webid/package-info.java +++ b/webid/src/main/java/com/inrupt/client/webid/package-info.java @@ -35,5 +35,7 @@ } }} * + * + *

Deprecated: This module will be removed from the SDK in version 3.0 and moved into the examples. */ package com.inrupt.client.webid;