From 8f04cc6e65aaafede160b7cd17016d64a040b9b3 Mon Sep 17 00:00:00 2001
From: ajs6f <ajs6f@apache.org>
Date: Thu, 25 Jan 2018 14:27:16 -0500
Subject: [PATCH 1/2] A little sprinkling of cinnamon-sugar type-safety

---
 .../src/main/java/org/trellisldp/api/ResourceService.java   | 1 -
 .../test/java/org/trellisldp/api/ConstraintServiceTest.java | 2 --
 .../test/java/org/trellisldp/event/EventSerializerTest.java | 6 +++---
 .../main/java/org/trellisldp/http/impl/BaseLdpHandler.java  | 2 --
 .../main/java/org/trellisldp/http/impl/MementoResource.java | 1 -
 .../src/test/java/org/trellisldp/io/IOServiceTest.java      | 4 ++--
 .../src/test/java/org/trellisldp/vocabulary/ACLTest.java    | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/ASTest.java     | 4 +++-
 .../org/trellisldp/vocabulary/AbstractVocabularyTest.java   | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/DCTest.java     | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/FOAFTest.java   | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/JSONLDTest.java | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/LDPTest.java    | 2 +-
 .../test/java/org/trellisldp/vocabulary/MementoTest.java    | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/OATest.java     | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/PROVTest.java   | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/RDFSTest.java   | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/RDFTest.java    | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/SKOSTest.java   | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/TimeTest.java   | 2 +-
 .../test/java/org/trellisldp/vocabulary/TrellisTest.java    | 2 +-
 .../src/test/java/org/trellisldp/vocabulary/VCARDTest.java  | 2 +-
 .../src/main/java/org/trellisldp/webac/WebACService.java    | 1 -
 .../test/java/org/trellisldp/webac/WebACServiceTest.java    | 4 ++--
 24 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/trellis-api/src/main/java/org/trellisldp/api/ResourceService.java b/trellis-api/src/main/java/org/trellisldp/api/ResourceService.java
index dcc5dafa6..5cc612239 100644
--- a/trellis-api/src/main/java/org/trellisldp/api/ResourceService.java
+++ b/trellis-api/src/main/java/org/trellisldp/api/ResourceService.java
@@ -13,7 +13,6 @@
  */
 package org.trellisldp.api;
 
-import static java.util.Optional.empty;
 import static java.util.Optional.of;
 import static org.trellisldp.api.RDFUtils.TRELLIS_BNODE_PREFIX;
 import static org.trellisldp.api.RDFUtils.TRELLIS_DATA_PREFIX;
diff --git a/trellis-api/src/test/java/org/trellisldp/api/ConstraintServiceTest.java b/trellis-api/src/test/java/org/trellisldp/api/ConstraintServiceTest.java
index 078b62a50..a78713ba1 100644
--- a/trellis-api/src/test/java/org/trellisldp/api/ConstraintServiceTest.java
+++ b/trellis-api/src/test/java/org/trellisldp/api/ConstraintServiceTest.java
@@ -19,8 +19,6 @@
 import static java.util.stream.Stream.of;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.trellisldp.vocabulary.RDF.type;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
diff --git a/trellis-event-serialization/src/test/java/org/trellisldp/event/EventSerializerTest.java b/trellis-event-serialization/src/test/java/org/trellisldp/event/EventSerializerTest.java
index 1340433da..c052b8ad6 100644
--- a/trellis-event-serialization/src/test/java/org/trellisldp/event/EventSerializerTest.java
+++ b/trellis-event-serialization/src/test/java/org/trellisldp/event/EventSerializerTest.java
@@ -97,13 +97,13 @@ public void testSerializationStructure() throws Exception {
         assertTrue(map.containsKey("object"));
         assertTrue(map.containsKey("published"));
 
-        final List types = (List) map.get("type");
+        final List<?> types = (List<?>) map.get("type");
         assertTrue(types.contains("Create"));
         assertTrue(types.contains(Activity.getIRIString()));
 
         assertTrue(AS.URI.contains((String) map.get("@context")));
 
-        final List actor = (List) map.get("actor");
+        final List<?> actor = (List<?>) map.get("actor");
         assertTrue(actor.contains("info:user/test"));
 
         assertTrue(map.get("id").equals("info:event/12345"));
@@ -131,7 +131,7 @@ public void testSerializationStructureNoEmptyElements() throws Exception {
         assertTrue(map.containsKey("object"));
         assertTrue(map.containsKey("published"));
 
-        final List types = (List) map.get("type");
+        final List<?> types = (List<?>) map.get("type");
         assertTrue(types.contains("Create"));
 
         @SuppressWarnings("unchecked")
diff --git a/trellis-http/src/main/java/org/trellisldp/http/impl/BaseLdpHandler.java b/trellis-http/src/main/java/org/trellisldp/http/impl/BaseLdpHandler.java
index c0be02775..9158e7b93 100644
--- a/trellis-http/src/main/java/org/trellisldp/http/impl/BaseLdpHandler.java
+++ b/trellis-http/src/main/java/org/trellisldp/http/impl/BaseLdpHandler.java
@@ -24,8 +24,6 @@
 import static org.apache.commons.rdf.api.RDFSyntax.NTRIPLES;
 import static org.apache.commons.rdf.api.RDFSyntax.TURTLE;
 import static org.trellisldp.api.RDFUtils.getInstance;
-import static org.trellisldp.vocabulary.LDP.Resource;
-
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/trellis-http/src/main/java/org/trellisldp/http/impl/MementoResource.java b/trellis-http/src/main/java/org/trellisldp/http/impl/MementoResource.java
index 5c68e2c90..ac7946d34 100644
--- a/trellis-http/src/main/java/org/trellisldp/http/impl/MementoResource.java
+++ b/trellis-http/src/main/java/org/trellisldp/http/impl/MementoResource.java
@@ -19,7 +19,6 @@
 import static java.time.ZonedDateTime.parse;
 import static java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME;
 import static java.util.Objects.nonNull;
-import static java.util.Optional.empty;
 import static java.util.Optional.of;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.joining;
diff --git a/trellis-io-jena/src/test/java/org/trellisldp/io/IOServiceTest.java b/trellis-io-jena/src/test/java/org/trellisldp/io/IOServiceTest.java
index 1d611d25c..e80ecc08b 100644
--- a/trellis-io-jena/src/test/java/org/trellisldp/io/IOServiceTest.java
+++ b/trellis-io-jena/src/test/java/org/trellisldp/io/IOServiceTest.java
@@ -132,8 +132,8 @@ public void setUp() {
         when(mockNamespaceService.getPrefix(eq("http://purl.org/dc/dcmitype/")))
             .thenReturn(Optional.of("dcmitype"));
         when(mockCache.get(anyString(), any(Function.class))).thenAnswer(inv -> {
-            final String key = (String) inv.getArgument(0);
-            final Function mapper = (Function<String, String>) inv.getArgument(1);
+            final String key = inv.getArgument(0);
+            final Function<String, String> mapper = inv.getArgument(1);
             return mapper.apply(key);
         });
     }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/ACLTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/ACLTest.java
index 4441d547b..0f0dc62e4 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/ACLTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/ACLTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<ACL> vocabulary() {
         return ACL.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/ASTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/ASTest.java
index f8421faf0..991e43c34 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/ASTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/ASTest.java
@@ -25,11 +25,13 @@
  */
 public class ASTest extends AbstractVocabularyTest {
 
+    @Override
     public String namespace() {
         return "https://www.w3.org/ns/activitystreams#";
     }
 
-    public Class vocabulary() {
+    @Override
+    public Class<AS> vocabulary() {
         return AS.class;
     }
 
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/AbstractVocabularyTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/AbstractVocabularyTest.java
index a3704fd83..d60c44fce 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/AbstractVocabularyTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/AbstractVocabularyTest.java
@@ -48,7 +48,7 @@ public abstract class AbstractVocabularyTest {
 
     public abstract String namespace();
 
-    public abstract Class vocabulary();
+    public abstract Class<?> vocabulary();
 
     public Boolean isStrict() {
         return true;
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/DCTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/DCTest.java
index abd1f56d4..d4565e050 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/DCTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/DCTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<DC> vocabulary() {
         return DC.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/FOAFTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/FOAFTest.java
index 0ee2c6ddc..81d5c9966 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/FOAFTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/FOAFTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<FOAF> vocabulary() {
         return FOAF.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/JSONLDTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/JSONLDTest.java
index 3733c1797..32d6b000b 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/JSONLDTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/JSONLDTest.java
@@ -30,7 +30,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<JSONLD> vocabulary() {
         return JSONLD.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/LDPTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/LDPTest.java
index 3e9e479af..a30cb3124 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/LDPTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/LDPTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<LDP> vocabulary() {
         return LDP.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/MementoTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/MementoTest.java
index 0d4150f11..ce52443de 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/MementoTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/MementoTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<Memento> vocabulary() {
         return Memento.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/OATest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/OATest.java
index 47db2cf6f..2b36c3698 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/OATest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/OATest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<OA> vocabulary() {
         return OA.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/PROVTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/PROVTest.java
index 8662443bd..dfea4ca80 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/PROVTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/PROVTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<PROV> vocabulary() {
         return PROV.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/RDFSTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/RDFSTest.java
index e5ad4b04c..b126ffb29 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/RDFSTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/RDFSTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<RDFS> vocabulary() {
         return RDFS.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/RDFTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/RDFTest.java
index 7d0f60eca..716161c0d 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/RDFTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/RDFTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<RDF> vocabulary() {
         return RDF.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/SKOSTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/SKOSTest.java
index 937423fbf..e0718edef 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/SKOSTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/SKOSTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<SKOS> vocabulary() {
         return SKOS.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/TimeTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/TimeTest.java
index 23d617d81..cba430c94 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/TimeTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/TimeTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<Time> vocabulary() {
         return Time.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/TrellisTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/TrellisTest.java
index 0f52a7e9d..d7aef1cb4 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/TrellisTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/TrellisTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<Trellis> vocabulary() {
         return Trellis.class;
     }
 }
diff --git a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/VCARDTest.java b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/VCARDTest.java
index 3dc76c8f9..d702ec9ab 100644
--- a/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/VCARDTest.java
+++ b/trellis-vocabulary/src/test/java/org/trellisldp/vocabulary/VCARDTest.java
@@ -25,7 +25,7 @@ public String namespace() {
     }
 
     @Override
-    public Class vocabulary() {
+    public Class<VCARD> vocabulary() {
         return VCARD.class;
     }
 }
diff --git a/trellis-webac/src/main/java/org/trellisldp/webac/WebACService.java b/trellis-webac/src/main/java/org/trellisldp/webac/WebACService.java
index e6ad8669d..7b8a02b3e 100644
--- a/trellis-webac/src/main/java/org/trellisldp/webac/WebACService.java
+++ b/trellis-webac/src/main/java/org/trellisldp/webac/WebACService.java
@@ -19,7 +19,6 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
-import static java.util.stream.Stream.empty;
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.trellisldp.api.RDFUtils.getInstance;
 import static org.trellisldp.api.RDFUtils.toGraph;
diff --git a/trellis-webac/src/test/java/org/trellisldp/webac/WebACServiceTest.java b/trellis-webac/src/test/java/org/trellisldp/webac/WebACServiceTest.java
index 3c7f5cf20..9fa009319 100644
--- a/trellis-webac/src/test/java/org/trellisldp/webac/WebACServiceTest.java
+++ b/trellis-webac/src/test/java/org/trellisldp/webac/WebACServiceTest.java
@@ -116,8 +116,8 @@ public void setUp() {
         testService = new WebACService(mockResourceService);
 
         when(mockCache.get(anyString(), any(Function.class))).thenAnswer(inv -> {
-            final String key = (String) inv.getArgument(0);
-            final Function mapper = (Function<String, String>) inv.getArgument(1);
+            final String key = inv.getArgument(0);
+            final Function<String, String> mapper = inv.getArgument(1);
             return mapper.apply(key);
         });
 

From 6471becac7c0b67ec685c5a2d8e93885a64376e2 Mon Sep 17 00:00:00 2001
From: ajs6f <ajs6f@apache.org>
Date: Thu, 25 Jan 2018 15:18:21 -0500
Subject: [PATCH 2/2] Widening the return types of both forms of
 ResourceService::get

---
 .../org/trellisldp/api/ResourceService.java   |  4 +--
 .../trellisldp/api/ResourceServiceTest.java   |  4 ++-
 .../java/org/trellisldp/http/LdpResource.java |  2 +-
 .../http/AbstractLdpResourceTest.java         | 29 ++++++++++++-------
 .../org/trellisldp/http/CORSResourceTest.java | 19 ++++++++----
 .../http/LdpForbiddenResourceTest.java        |  9 ++++--
 .../http/LdpUnauthorizedResourceTest.java     |  9 ++++--
 .../org/trellisldp/webac/WebACService.java    |  4 +--
 .../trellisldp/webac/WebACServiceTest.java    | 19 ++++++++----
 9 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/trellis-api/src/main/java/org/trellisldp/api/ResourceService.java b/trellis-api/src/main/java/org/trellisldp/api/ResourceService.java
index 5cc612239..5874b0ef0 100644
--- a/trellis-api/src/main/java/org/trellisldp/api/ResourceService.java
+++ b/trellis-api/src/main/java/org/trellisldp/api/ResourceService.java
@@ -48,7 +48,7 @@ public interface ResourceService {
      * @param identifier the resource identifier
      * @return the resource
      */
-    Optional<Resource> get(IRI identifier);
+    Optional<? extends Resource> get(IRI identifier);
 
     /**
      * Get a resource from the given location and time.
@@ -57,7 +57,7 @@ public interface ResourceService {
      * @param time the time
      * @return the resource
      */
-    Optional<Resource> get(IRI identifier, Instant time);
+    Optional<? extends Resource> get(IRI identifier, Instant time);
 
     /**
      * Put a resource into the server.
diff --git a/trellis-api/src/test/java/org/trellisldp/api/ResourceServiceTest.java b/trellis-api/src/test/java/org/trellisldp/api/ResourceServiceTest.java
index 71a1f31fa..fb72a1111 100644
--- a/trellis-api/src/test/java/org/trellisldp/api/ResourceServiceTest.java
+++ b/trellis-api/src/test/java/org/trellisldp/api/ResourceServiceTest.java
@@ -28,6 +28,7 @@
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
 
@@ -43,6 +44,7 @@
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.trellisldp.vocabulary.DC;
 import org.trellisldp.vocabulary.LDP;
 import org.trellisldp.vocabulary.Trellis;
@@ -102,7 +104,7 @@ public void testExport() {
         when(mockResource.getIdentifier()).thenReturn(existing);
         when(mockResource.stream(eq(graphs))).thenAnswer(inv ->
                 Stream.of(rdf.createTriple(existing, DC.title, rdf.createLiteral("A title"))));
-        when(mockResourceService.get(eq(existing))).thenReturn(of(mockResource));
+        Mockito.<Optional<? extends Resource>>when(mockResourceService.get(eq(existing))).thenReturn(of(mockResource));
 
         final List<Quad> export = mockResourceService.export(graphs).collect(toList());
         assertEquals(1L, export.size());
diff --git a/trellis-http/src/main/java/org/trellisldp/http/LdpResource.java b/trellis-http/src/main/java/org/trellisldp/http/LdpResource.java
index 0bb1ac950..1bed04808 100644
--- a/trellis-http/src/main/java/org/trellisldp/http/LdpResource.java
+++ b/trellis-http/src/main/java/org/trellisldp/http/LdpResource.java
@@ -335,7 +335,7 @@ public Response createResource(@BeanParam final LdpRequest req, final File body)
         final String separator = path.isEmpty() ? "" : "/";
 
         // First check if this is a container
-        final Optional<Resource> parent = resourceService.get(rdf.createIRI(TRELLIS_DATA_PREFIX + path));
+        final Optional<? extends Resource> parent = resourceService.get(rdf.createIRI(TRELLIS_DATA_PREFIX + path));
         if (parent.isPresent()) {
             final Optional<IRI> ixModel = parent.map(Resource::getInteractionModel);
             if (ixModel.filter(type -> ldpResourceTypes(type).anyMatch(LDP.Container::equals)).isPresent()) {
diff --git a/trellis-http/src/test/java/org/trellisldp/http/AbstractLdpResourceTest.java b/trellis-http/src/test/java/org/trellisldp/http/AbstractLdpResourceTest.java
index c54eca4ee..920c2330a 100644
--- a/trellis-http/src/test/java/org/trellisldp/http/AbstractLdpResourceTest.java
+++ b/trellis-http/src/test/java/org/trellisldp/http/AbstractLdpResourceTest.java
@@ -93,6 +93,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -119,7 +120,8 @@
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-
+import org.mockito.Mockito;
+import org.mockito.stubbing.OngoingStubbing;
 import org.trellisldp.api.AccessControlService;
 import org.trellisldp.api.AgentService;
 import org.trellisldp.api.Binary;
@@ -233,28 +235,33 @@ public void after() throws Exception {
         super.tearDown();
     }
 
+    private static OngoingStubbing<Optional<? extends Resource>> whenResource(
+                    final Optional<? extends Resource> methodCall) {
+        return Mockito.<Optional<? extends Resource>>when(methodCall);
+    }
+
     @BeforeEach
     public void setUpMocks() {
-        when(mockResourceService.get(any(IRI.class), any(Instant.class)))
+        whenResource(mockResourceService.get(any(IRI.class), any(Instant.class)))
             .thenReturn(of(mockVersionedResource));
-        when(mockResourceService.get(eq(identifier))).thenReturn(of(mockResource));
-        when(mockResourceService.get(eq(rdf.createIRI(TRELLIS_DATA_PREFIX + "repository/resource"))))
+        whenResource(mockResourceService.get(eq(identifier))).thenReturn(of(mockResource));
+        whenResource(mockResourceService.get(eq(rdf.createIRI(TRELLIS_DATA_PREFIX + "repository/resource"))))
             .thenReturn(of(mockResource));
-        when(mockResourceService.get(eq(root))).thenReturn(of(mockResource));
+        whenResource(mockResourceService.get(eq(root))).thenReturn(of(mockResource));
         when(mockResourceService.get(eq(childIdentifier))).thenReturn(empty());
         when(mockResourceService.get(eq(childIdentifier), any(Instant.class))).thenReturn(empty());
-        when(mockResourceService.get(eq(binaryIdentifier))).thenReturn(of(mockBinaryResource));
-        when(mockResourceService.get(eq(binaryIdentifier), any(Instant.class)))
+        whenResource(mockResourceService.get(eq(binaryIdentifier))).thenReturn(of(mockBinaryResource));
+        whenResource(mockResourceService.get(eq(binaryIdentifier), any(Instant.class)))
             .thenReturn(of(mockBinaryVersionedResource));
         when(mockResourceService.get(eq(nonexistentIdentifier))).thenReturn(empty());
         when(mockResourceService.get(eq(nonexistentIdentifier), any(Instant.class))).thenReturn(empty());
-        when(mockResourceService.get(eq(deletedIdentifier))).thenReturn(of(mockDeletedResource));
-        when(mockResourceService.get(eq(deletedIdentifier), any(Instant.class)))
+        whenResource(mockResourceService.get(eq(deletedIdentifier))).thenReturn(of(mockDeletedResource));
+        whenResource(mockResourceService.get(eq(deletedIdentifier), any(Instant.class)))
             .thenReturn(of(mockDeletedResource));
         when(mockResourceService.getIdentifierSupplier()).thenReturn(() -> RANDOM_VALUE);
 
-        when(mockResourceService.get(eq(userDeletedIdentifier))).thenReturn(of(mockUserDeletedResource));
-        when(mockResourceService.get(eq(userDeletedIdentifier), any(Instant.class)))
+        whenResource(mockResourceService.get(eq(userDeletedIdentifier))).thenReturn(of(mockUserDeletedResource));
+        whenResource(mockResourceService.get(eq(userDeletedIdentifier), any(Instant.class)))
             .thenReturn(of(mockUserDeletedResource));
 
         when(mockAgentService.asAgent(anyString())).thenReturn(agent);
diff --git a/trellis-http/src/test/java/org/trellisldp/http/CORSResourceTest.java b/trellis-http/src/test/java/org/trellisldp/http/CORSResourceTest.java
index 3a4077b8e..95243ec81 100644
--- a/trellis-http/src/test/java/org/trellisldp/http/CORSResourceTest.java
+++ b/trellis-http/src/test/java/org/trellisldp/http/CORSResourceTest.java
@@ -41,6 +41,7 @@
 import java.time.Instant;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
 
@@ -63,7 +64,8 @@
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-
+import org.mockito.Mockito;
+import org.mockito.stubbing.OngoingStubbing;
 import org.trellisldp.api.AccessControlService;
 import org.trellisldp.api.AgentService;
 import org.trellisldp.api.Binary;
@@ -179,16 +181,21 @@ public void after() throws Exception {
         super.tearDown();
     }
 
+    private static OngoingStubbing<Optional<? extends Resource>> whenResource(
+                    final Optional<? extends Resource> methodCall) {
+        return Mockito.<Optional<? extends Resource>>when(methodCall);
+    }
+
     @BeforeEach
     public void setUpMocks() {
-        when(mockResourceService.get(any(IRI.class), any(Instant.class)))
+        whenResource(mockResourceService.get(any(IRI.class), any(Instant.class)))
             .thenReturn(of(mockVersionedResource));
-        when(mockResourceService.get(eq(identifier))).thenReturn(of(mockResource));
-        when(mockResourceService.get(eq(root))).thenReturn(of(mockResource));
+        whenResource(mockResourceService.get(eq(identifier))).thenReturn(of(mockResource));
+        whenResource(mockResourceService.get(eq(root))).thenReturn(of(mockResource));
         when(mockResourceService.get(eq(childIdentifier))).thenReturn(empty());
         when(mockResourceService.get(eq(childIdentifier), any(Instant.class))).thenReturn(empty());
-        when(mockResourceService.get(eq(binaryIdentifier))).thenReturn(of(mockBinaryResource));
-        when(mockResourceService.get(eq(binaryIdentifier), any(Instant.class)))
+        whenResource(mockResourceService.get(eq(binaryIdentifier))).thenReturn(of(mockBinaryResource));
+        whenResource(mockResourceService.get(eq(binaryIdentifier), any(Instant.class)))
             .thenReturn(of(mockBinaryVersionedResource));
         when(mockResourceService.get(eq(nonexistentIdentifier))).thenReturn(empty());
         when(mockResourceService.get(eq(nonexistentIdentifier), any(Instant.class))).thenReturn(empty());
diff --git a/trellis-http/src/test/java/org/trellisldp/http/LdpForbiddenResourceTest.java b/trellis-http/src/test/java/org/trellisldp/http/LdpForbiddenResourceTest.java
index 73d8d72bf..39afa08e7 100644
--- a/trellis-http/src/test/java/org/trellisldp/http/LdpForbiddenResourceTest.java
+++ b/trellis-http/src/test/java/org/trellisldp/http/LdpForbiddenResourceTest.java
@@ -37,6 +37,7 @@
 import static org.trellisldp.http.domain.RdfMediaType.APPLICATION_SPARQL_UPDATE_TYPE;
 
 import java.time.Instant;
+import java.util.Optional;
 import java.util.stream.Stream;
 
 import javax.ws.rs.core.Application;
@@ -58,7 +59,7 @@
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-
+import org.mockito.Mockito;
 import org.trellisldp.api.AccessControlService;
 import org.trellisldp.api.AgentService;
 import org.trellisldp.api.BinaryService;
@@ -139,8 +140,10 @@ public void after() throws Exception {
 
     @BeforeEach
     public void setUpMocks() {
-        when(mockResourceService.get(any(IRI.class), any(Instant.class))).thenReturn(of(mockVersionedResource));
-        when(mockResourceService.get(any(IRI.class))).thenReturn(of(mockResource));
+        Mockito.<Optional<? extends Resource>>when(mockResourceService.get(any(IRI.class), any(Instant.class)))
+                        .thenReturn(of(mockVersionedResource));
+        Mockito.<Optional<? extends Resource>>when(mockResourceService.get(any(IRI.class)))
+                        .thenReturn(of(mockResource));
         when(mockResourceService.getMementos(any())).thenReturn(emptyList());
 
         when(mockAccessControlService.getAccessModes(any(IRI.class), any(Session.class))).thenReturn(emptySet());
diff --git a/trellis-http/src/test/java/org/trellisldp/http/LdpUnauthorizedResourceTest.java b/trellis-http/src/test/java/org/trellisldp/http/LdpUnauthorizedResourceTest.java
index 9aa0a5b8b..c90cfaf54 100644
--- a/trellis-http/src/test/java/org/trellisldp/http/LdpUnauthorizedResourceTest.java
+++ b/trellis-http/src/test/java/org/trellisldp/http/LdpUnauthorizedResourceTest.java
@@ -40,6 +40,7 @@
 import static org.trellisldp.http.domain.RdfMediaType.APPLICATION_SPARQL_UPDATE_TYPE;
 
 import java.time.Instant;
+import java.util.Optional;
 import java.util.stream.Stream;
 
 import javax.ws.rs.core.Application;
@@ -60,7 +61,7 @@
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-
+import org.mockito.Mockito;
 import org.trellisldp.api.AccessControlService;
 import org.trellisldp.api.BinaryService;
 import org.trellisldp.api.IOService;
@@ -139,8 +140,10 @@ public void after() throws Exception {
 
     @BeforeEach
     public void setUpMocks() {
-        when(mockResourceService.get(any(IRI.class), any(Instant.class))).thenReturn(of(mockVersionedResource));
-        when(mockResourceService.get(any(IRI.class))).thenReturn(of(mockResource));
+        Mockito.<Optional<? extends Resource>>when(mockResourceService.get(any(IRI.class), any(Instant.class)))
+                        .thenReturn(of(mockVersionedResource));
+        Mockito.<Optional<? extends Resource>>when(mockResourceService.get(any(IRI.class)))
+                        .thenReturn(of(mockResource));
         when(mockResourceService.getMementos(any())).thenReturn(emptyList());
 
         when(mockAccessControlService.getAccessModes(any(IRI.class), any(Session.class))).thenReturn(emptySet());
diff --git a/trellis-webac/src/main/java/org/trellisldp/webac/WebACService.java b/trellis-webac/src/main/java/org/trellisldp/webac/WebACService.java
index 7b8a02b3e..3ba6d0266 100644
--- a/trellis-webac/src/main/java/org/trellisldp/webac/WebACService.java
+++ b/trellis-webac/src/main/java/org/trellisldp/webac/WebACService.java
@@ -131,8 +131,8 @@ private Set<IRI> getAuthz(final IRI identifier, final IRI agent) {
             .collect(toSet());
     }
 
-    private Optional<Resource> getNearestResource(final IRI identifier) {
-        final Optional<Resource> res = resourceService.get(identifier);
+    private Optional<? extends Resource> getNearestResource(final IRI identifier) {
+        final Optional<? extends Resource> res = resourceService.get(identifier);
         // TODO -- JDK9 refactor with Optional::or
         if (res.isPresent()) {
             return res;
diff --git a/trellis-webac/src/test/java/org/trellisldp/webac/WebACServiceTest.java b/trellis-webac/src/test/java/org/trellisldp/webac/WebACServiceTest.java
index 9fa009319..252a52a40 100644
--- a/trellis-webac/src/test/java/org/trellisldp/webac/WebACServiceTest.java
+++ b/trellis-webac/src/test/java/org/trellisldp/webac/WebACServiceTest.java
@@ -24,6 +24,7 @@
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.trellisldp.vocabulary.RDF.type;
 
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -36,6 +37,8 @@
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.stubbing.OngoingStubbing;
 import org.trellisldp.api.AccessControlService;
 import org.trellisldp.api.CacheService;
 import org.trellisldp.api.Resource;
@@ -108,6 +111,12 @@ public class WebACServiceTest {
 
     private static final IRI groupIRI2 = rdf.createIRI("trellis:repository/group/test/");
 
+
+    private static OngoingStubbing<Optional<? extends Resource>> whenResource(
+                    final Optional<? extends Resource> methodCall) {
+        return Mockito.<Optional<? extends Resource>>when(methodCall);
+    }
+
     @BeforeEach
     @SuppressWarnings("unchecked")
     public void setUp() {
@@ -165,11 +174,11 @@ public void setUp() {
                 rdf.createTriple(authIRI8, ACL.mode, ACL.Write)));
 
         when(mockResourceService.get(eq(nonexistentIRI))).thenReturn(empty());
-        when(mockResourceService.get(eq(resourceIRI))).thenReturn(of(mockResource));
-        when(mockResourceService.get(eq(childIRI))).thenReturn(of(mockChildResource));
-        when(mockResourceService.get(eq(parentIRI))).thenReturn(of(mockParentResource));
-        when(mockResourceService.get(eq(rootIRI))).thenReturn(of(mockRootResource));
-        when(mockResourceService.get(eq(groupIRI))).thenReturn(of(mockGroupResource));
+        whenResource(mockResourceService.get(eq(resourceIRI))).thenReturn(of(mockResource));
+        whenResource(mockResourceService.get(eq(childIRI))).thenReturn(of(mockChildResource));
+        whenResource(mockResourceService.get(eq(parentIRI))).thenReturn(of(mockParentResource));
+        whenResource(mockResourceService.get(eq(rootIRI))).thenReturn(of(mockRootResource));
+        whenResource(mockResourceService.get(eq(groupIRI))).thenReturn(of(mockGroupResource));
         when(mockResourceService.getContainer(nonexistentIRI)).thenReturn(of(resourceIRI));
         when(mockResourceService.getContainer(resourceIRI)).thenReturn(of(childIRI));
         when(mockResourceService.getContainer(childIRI)).thenReturn(of(parentIRI));