This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
The following commit(s) were added to refs/heads/master by this push:
new 5b16bd2 Sling 12274 3 (#144)
5b16bd2 is described below
commit 5b16bd25882a2b805713dd7eb7a537e856d66bf0
Author: Danilo Banjac <[email protected]>
AuthorDate: Thu May 2 08:50:43 2024 +0200
Sling 12274 3 (#144)
* SLING-12274: Catch runtime exception also when executing invalidate
request.
* SLING-12274: Add paths when building test package message.
---------
Co-authored-by: Danilo Banjac <[email protected]>
---
.../distribution/journal/impl/publisher/PackageMessageFactory.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/src/main/java/org/apache/sling/distribution/journal/impl/publisher/PackageMessageFactory.java
b/src/main/java/org/apache/sling/distribution/journal/impl/publisher/PackageMessageFactory.java
index ed95991..f787f38 100644
---
a/src/main/java/org/apache/sling/distribution/journal/impl/publisher/PackageMessageFactory.java
+++
b/src/main/java/org/apache/sling/distribution/journal/impl/publisher/PackageMessageFactory.java
@@ -92,7 +92,7 @@ public class PackageMessageFactory {
case ADD: return createAdd(packageBuilder, resourceResolver,
pubAgentName, request);
case DELETE: return createDelete(packageBuilder, resourceResolver,
request, pubAgentName);
case INVALIDATE: return createInvalidate(packageBuilder,
resourceResolver, request, pubAgentName);
- case TEST: return createTest(packageBuilder, resourceResolver,
pubAgentName);
+ case TEST: return createTest(packageBuilder, resourceResolver,
request, pubAgentName);
default: throw new IllegalArgumentException(format("Unsupported
request with requestType=%s", request.getRequestType()));
}
}
@@ -164,12 +164,13 @@ public class PackageMessageFactory {
}
@Nonnull
- public PackageMessage createTest(DistributionPackageBuilder
packageBuilder, ResourceResolver resourceResolver, String pubAgentName) {
+ public PackageMessage createTest(DistributionPackageBuilder
packageBuilder, ResourceResolver resourceResolver, DistributionRequest request,
String pubAgentName) {
String pkgId = UUID.randomUUID().toString();
return PackageMessage.builder()
.pubSlingId(pubSlingId)
- .pubAgentName(pubAgentName)
.pkgId(pkgId)
+ .pubAgentName(pubAgentName)
+ .paths(Arrays.asList(request.getPaths()))
.reqType(ReqType.TEST)
.pkgType(packageBuilder.getType())
.userId(resourceResolver.getUserID())
