JCL-373: Address minor compiler warnings (#503)

Author: acoburn

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

@@ -576,8 +576,7 @@ public <T extends AccessCredential> CompletionStage<T> fetch(final URI identifie
             });
     }
 
-
-
+    @SuppressWarnings("unchecked")
     <T extends AccessCredential> T processVerifiableCredential(final InputStream input, final Set<String> validTypes,
             final Class<T> clazz) throws IOException {
         final Map<String, Object> data = jsonService.fromJson(input,
@@ -601,6 +600,7 @@ <T extends AccessCredential> T processVerifiableCredential(final InputStream inp
         throw new AccessGrantException("Invalid Access Grant: missing supported type");
     }
 
+    @SuppressWarnings("unchecked")
     <T extends AccessCredential> List<T> processQueryResponse(final InputStream input, final Set<String> validTypes,
             final Class<T> clazz) throws IOException {
         final Map<String, Object> data = jsonService.fromJson(input,
@@ -676,7 +676,9 @@ byte[] serialize(final Map<String, Object> data) {
     static Collection<Object> getCredentials(final Map<String, Object> data) {
         final Object credential = data.get(VERIFIABLE_CREDENTIAL);
         if (credential instanceof Collection) {
-            return (Collection) credential;
+            @SuppressWarnings("unchecked")
+            final Collection<Object> coll = (Collection<Object>) credential;
+            return coll;
         }
         return Collections.emptyList();
     }

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

@@ -90,7 +90,7 @@ void testAccessGrantSession() throws IOException {
         final String token = AccessGrantTestUtils.generateIdToken(claims);
 
         try (final InputStream resource = AccessGrantTest.class.getResourceAsStream("/access_grant1.json")) {
-            final AccessGrant grant = AccessGrant.ofAccessGrant(resource);
+            final AccessGrant grant = AccessGrant.of(resource);
             final Session session = AccessGrantSession.ofAccessGrant(OpenIdSession.ofIdToken(token), grant);
             assertEquals(Optional.of(URI.create(WEBID)), session.getPrincipal());
             assertFalse(grant.getResources().isEmpty());
@@ -120,7 +120,7 @@ void testProtectedResource() throws IOException {
         final String token = AccessGrantTestUtils.generateIdToken(claims);
 
         try (final InputStream resource = AccessGrantTest.class.getResourceAsStream("/access_grant3.json")) {
-            final AccessGrant grant = AccessGrant.ofAccessGrant(resource);
+            final AccessGrant grant = AccessGrant.of(resource);
             final Session session = AccessGrantSession.ofAccessGrant(OpenIdSession.ofIdToken(token), grant);
             final Request req = Request.newBuilder(URI.create("https://storage.example/protected-resource")).build();
             final Authenticator auth = new OpenIdAuthenticationProvider().getAuthenticator(Challenge.of("Bearer"));

examples/cli/src/main/java/com/inrupt/client/examples/cli/SolidApp.java

@@ -82,7 +82,7 @@ public int run(final String... args) {
                 printWriter.format("WebID: %s", webid);
                 printWriter.println();
                 try (final var profile = client.read(webid, WebIdProfile.class)) {
-                    profile.getStorage().stream().findFirst().ifPresent(storage -> {
+                    profile.getStorages().stream().findFirst().ifPresent(storage -> {
                         printWriter.format("Storage %s ", storage);
                         printWriter.println();
                         try (final var container = client.read(storage, SolidContainer.class)) {

examples/springboot/src/main/java/com/inrupt/client/examples/springboot/SecurityConfiguration.java

@@ -23,6 +23,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.oauth2.client.oidc.authentication.OidcIdTokenDecoderFactory;
@@ -55,7 +56,7 @@ public SecurityFilterChain securityFilterChain(final HttpSecurity http) throws E
                 .deleteCookies("JSESSIONID")
                 .logoutSuccessHandler(oidcLogoutSuccessHandler())
             )
-            .oauth2Login();
+            .oauth2Login(Customizer.withDefaults());
         return http.build();
     }
 

examples/webapp/src/main/java/com/inrupt/client/examples/webapp/SolidStorage.java

@@ -75,7 +75,7 @@ public CompletionStage<TemplateInstance> solid() {
         return jwt.claim("webid").map(String.class::cast).map(URI::create).map(webid -> {
             final var session = client.session(OpenIdSession.ofIdToken(jwt.getRawToken()));
             return session.read(webid, WebIdProfile.class)
-                .thenCompose(profile -> profile.getStorage().stream().findFirst().map(storage ->
+                .thenCompose(profile -> profile.getStorages().stream().findFirst().map(storage ->
                             session.read(storage, SolidContainer.class).thenApply(container -> {
                                 try (container) {
                                     final var resources = container.getResources().stream()

integration/base/src/main/java/com/inrupt/client/integration/base/AccessGrantScenarios.java

@@ -145,8 +145,8 @@ static void setup() throws IOException {
         State.WEBID = URI.create(webidUrl);
         final SolidSyncClient client = SolidSyncClient.getClientBuilder().build();
         try (final WebIdProfile profile = client.read(URI.create(webidUrl), WebIdProfile.class)) {
-            issuer = profile.getOidcIssuer().iterator().next().toString();
-            podUrl = profile.getStorage().iterator().next().toString();
+            issuer = profile.getOidcIssuers().iterator().next().toString();
+            podUrl = profile.getStorages().iterator().next().toString();
         }
         if (!podUrl.endsWith(Utils.FOLDER_SEPARATOR)) {
             podUrl += Utils.FOLDER_SEPARATOR;

integration/base/src/main/java/com/inrupt/client/integration/base/AuthenticationScenarios.java

@@ -117,8 +117,8 @@ static void setup() {
         State.WEBID = URI.create(webidUrl);
         final SolidSyncClient client = SolidSyncClient.getClient();
         try (final WebIdProfile profile = client.read(URI.create(webidUrl), WebIdProfile.class)) {
-            issuer = profile.getOidcIssuer().iterator().next().toString();
-            podUrl = profile.getStorage().iterator().next().toString();
+            issuer = profile.getOidcIssuers().iterator().next().toString();
+            podUrl = profile.getStorages().iterator().next().toString();
         }
         if (!podUrl.endsWith(Utils.FOLDER_SEPARATOR)) {
             podUrl += Utils.FOLDER_SEPARATOR;

integration/base/src/main/java/com/inrupt/client/integration/base/DomainModulesResource.java

@@ -109,7 +109,7 @@ static void setup() {
         State.WEBID = URI.create(webidUrl);
         //find storage from WebID using domain-specific webID solid concept
         try (final WebIdProfile sameProfile = client.read(URI.create(webidUrl), WebIdProfile.class)) {
-            final var storages = sameProfile.getStorage();
+            final var storages = sameProfile.getStorages();
             if (!storages.isEmpty()) {
                 podUrl = storages.iterator().next().toString();
             }
@@ -253,7 +253,7 @@ void findStorageTest() {
         LOGGER.info("Integration Test - find pod storage from webID");
 
         try (final WebIdProfile sameProfile = client.read(URI.create(webidUrl), WebIdProfile.class)) {
-            assertFalse(sameProfile.getStorage().isEmpty());
+            assertFalse(sameProfile.getStorages().isEmpty());
         }
 
         final var missingWebId = URIBuilder.newBuilder(URI.create(webidUrl)).path(UUID.randomUUID().toString()).build();

integration/base/src/test/java/com/inrupt/client/integration/base/ServerTest.java

@@ -90,8 +90,8 @@ static void setup() {
         State.WEBID = URI.create(webidUrl);
         final SolidSyncClient client = SolidSyncClient.getClient();
         try (final WebIdProfile profile = client.read(URI.create(webidUrl), WebIdProfile.class)) {
-            issuer = profile.getOidcIssuer().iterator().next().toString();
-            podUrl = profile.getStorage().iterator().next().toString();
+            issuer = profile.getOidcIssuers().iterator().next().toString();
+            podUrl = profile.getStorages().iterator().next().toString();
         }
     }
 

openid/src/main/java/com/inrupt/client/openid/OpenIdAuthenticationProvider.java

@@ -58,6 +58,7 @@ public OpenIdAuthenticationProvider(final int priority) {
         this.priorityLevel = priority;
     }
 
+    /* deprecated */
     @Override
     public String getScheme() {
         return BEARER;