Use LDP type of the deleted resource in events

Resolves #398

When a DELETE request completes, the notification will contain the
rdf:type of the deleted resource, rather than the generic ldp:Resource.

In fact, all relevant LDP types will be published in notifications

Author: acoburn

components/test/src/main/java/org/trellisldp/test/EventTests.java

@@ -215,7 +215,7 @@ default void testReceiveDeleteMessage() {
         try (final Response res = target(resource).request().header(AUTHORIZATION, buildJwt(agent2, getJwtSecret()))
                 .delete()) {
             assertEquals(SUCCESSFUL, res.getStatusInfo().getFamily(), "Verify a successful LDP-RS DELETE response");
-            assertAll("Check the LDP-BC parent", checkResourceParentLdpBC(resource, agent2, AS.Delete, LDP.Resource));
+            assertAll("Check the LDP-BC parent", checkResourceParentLdpBC(resource, agent2, AS.Delete, LDP.RDFSource));
         }
     }
 
@@ -261,7 +261,7 @@ default void testReceiveDeleteMessageDC() {
                 .delete()) {
             assertEquals(SUCCESSFUL, res.getStatusInfo().getFamily(), "Check for a successful LDP-RS DELETE");
             assertAll("Check the LDP-DC parent resource",
-                    checkResourceParentLdpDC(resource, agent2, AS.Delete, LDP.Resource, LDP.Container));
+                    checkResourceParentLdpDC(resource, agent2, AS.Delete, LDP.RDFSource, LDP.Container));
         }
     }
 
@@ -343,7 +343,7 @@ default void testReceiveDeleteMessageIC() {
                 .delete()) {
             assertEquals(SUCCESSFUL, res.getStatusInfo().getFamily(), "Check for a successful DELETE in an LDP-IC");
             assertAll("Check the LDP-IC parent resource",
-                    checkResourceParentLdpIC(resource, agent2, AS.Delete, LDP.Resource, LDP.Container));
+                    checkResourceParentLdpIC(resource, agent2, AS.Delete, LDP.RDFSource, LDP.Container));
         }
     }
 

core/http/src/main/java/org/trellisldp/http/impl/DeleteHandler.java

@@ -127,7 +127,7 @@ private CompletionStage<Void> handleDeletion(final TrellisDataset mutable,
             return handleAclDeletion(mutable, immutable);
         }
         return handleResourceDeletion(immutable).thenCompose(future ->
-                emitEvent(getInternalId(), AS.Delete, LDP.Resource));
+                emitEvent(getInternalId(), AS.Delete, getResource().getInteractionModel()));
     }
 
     private CompletionStage<Void> handleAclDeletion(final TrellisDataset mutable,

core/http/src/main/java/org/trellisldp/http/impl/MutatingLdpHandler.java

@@ -27,6 +27,7 @@
 import static javax.ws.rs.core.Response.status;
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.trellisldp.api.TrellisUtils.toQuad;
+import static org.trellisldp.http.impl.HttpUtils.ldpResourceTypes;
 import static org.trellisldp.http.impl.HttpUtils.skolemizeQuads;
 import static org.trellisldp.http.impl.HttpUtils.skolemizeTriples;
 
@@ -187,7 +188,7 @@ protected void readEntityIntoDataset(final IRI graphName, final RDFSyntax syntax
     protected CompletionStage<Void> emitEvent(final IRI identifier, final IRI activityType, final IRI resourceType) {
         // Always notify about updates for the resource in question
         getServices().getEventService().emit(new SimpleEvent(getUrl(identifier), getSession().getAgent(),
-                    asList(PROV.Activity, activityType), asList(resourceType)));
+                    asList(PROV.Activity, activityType), ldpResourceTypes(resourceType).collect(toList())));
         // If this was an update and the parent is an ldp:IndirectContainer,
         // notify about the member resource (if it exists)
         if (AS.Update.equals(activityType) && LDP.IndirectContainer.equals(getParentModel())) {
@@ -199,7 +200,8 @@ protected CompletionStage<Void> emitEvent(final IRI identifier, final IRI activi
             final IRI id = getParentIdentifier();
             if (HttpUtils.isContainer(model)) {
                 getServices().getEventService().emit(new SimpleEvent(getUrl(id),
-                                getSession().getAgent(), asList(PROV.Activity, AS.Update), asList(model)));
+                                getSession().getAgent(), asList(PROV.Activity, AS.Update),
+                                ldpResourceTypes(model).collect(toList())));
                 // If the parent's membership resource is different than the parent itself,
                 // notify about that membership resource, too (if it exists)
                 if (!Objects.equals(id, getParentMembershipResource())) {
@@ -313,7 +315,7 @@ private CompletionStage<Void> emitMembershipUpdateEvent() {
                     if (nonNull(res.getIdentifier())) {
                         getServices().getEventService().emit(new SimpleEvent(getUrl(res.getIdentifier()),
                                     getSession().getAgent(), asList(PROV.Activity, AS.Update),
-                                    asList(res.getInteractionModel())));
+                                    ldpResourceTypes(res.getInteractionModel()).collect(toList())));
                     }
                 }).toCompletableFuture());
         }