Skip to content

Commit f2c15cc

Browse files
authored
Use correct URL for extension graph update events (#1021)
1 parent 7e9b926 commit f2c15cc

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,9 @@ protected void readEntityIntoDataset(final IRI graphName, final RDFSyntax syntax
198198
*/
199199
protected CompletionStage<Void> emitEvent(final IRI identifier, final IRI activityType, final IRI resourceType) {
200200
// Always notify about updates for the resource in question
201+
final IRI eventResourceType = getExtensionGraphName() != null ? LDP.RDFSource : resourceType;
201202
getServices().getEventService().emit(new SimpleEvent(getUrl(identifier, resourceType), getSession().getAgent(),
202-
asList(PROV.Activity, activityType), ldpResourceTypes(resourceType).collect(toList())));
203+
asList(PROV.Activity, activityType), ldpResourceTypes(eventResourceType).collect(toList())));
203204

204205
// Further notifications are only relevant for non-extension resources
205206
if (getExtensionGraphName() == null) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ private CompletionStage<ResponseBuilder> assembleResponse(final Dataset mutable,
276276

277277
return createOrReplace(metadata, mutable, immutable)
278278
.thenCompose(future -> emitEvent(metadata.getIdentifier(), getResource() == null ? AS.Create : AS.Update,
279-
getExtensionGraphName() != null ? LDP.RDFSource : getLdpType()))
279+
getLdpType()))
280280
.thenApply(future -> {
281281
final RDFSyntax outputSyntax = getSyntax(getServices().getIOService(),
282282
getRequest().getAcceptableMediaTypes(), null);

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,7 @@ private ResponseBuilder decorateResponse(final ResponseBuilder builder) {
303303
}
304304

305305
private CompletionStage<Void> handleUpdateEvent(final IRI ldpType) {
306-
return emitEvent(getInternalId(), getResource() == null ? AS.Create : AS.Update,
307-
getExtensionGraphName() != null ? LDP.RDFSource : ldpType);
306+
return emitEvent(getInternalId(), getResource() == null ? AS.Create : AS.Update, ldpType);
308307
}
309308

310309
private IRI effectiveLdpType(final IRI ldpType) {

0 commit comments

Comments
 (0)