You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cs...@apache.org on 2020/04/01 15:40:48 UTC
[sling-org-apache-sling-distribution-journal] 01/02: SLING-9259 -
Make event class more consistent
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch SLING-9259
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit 3fbc0622b6873a9bede7ce4163141a94a7431afb
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Mon Mar 30 12:46:58 2020 +0200
SLING-9259 - Make event class more consistent
---
.../sling/distribution/journal/impl/event/DistributionEvent.java | 9 +--------
.../distribution/journal/service/subscriber/BookKeeper.java | 2 +-
...mportedEventFactory.java => SubscriberDistributionEvent.java} | 6 +++---
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/event/DistributionEvent.java b/src/main/java/org/apache/sling/distribution/journal/impl/event/DistributionEvent.java
index 6c61274..5969be6 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/event/DistributionEvent.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/event/DistributionEvent.java
@@ -25,7 +25,6 @@ import static org.apache.sling.distribution.event.DistributionEventProperties.DI
import static org.apache.sling.distribution.event.DistributionEventTopics.AGENT_PACKAGE_CREATED;
import static org.apache.sling.distribution.event.DistributionEventTopics.AGENT_PACKAGE_DISTRIBUTED;
import static org.apache.sling.distribution.event.DistributionEventTopics.AGENT_PACKAGE_QUEUED;
-import static org.apache.sling.distribution.event.DistributionEventTopics.IMPORTER_PACKAGE_IMPORTED;
import static org.apache.sling.distribution.packaging.DistributionPackageInfo.PROPERTY_PACKAGE_TYPE;
import static org.apache.sling.distribution.packaging.DistributionPackageInfo.PROPERTY_REQUEST_PATHS;
@@ -36,25 +35,19 @@ import java.util.Map;
import javax.annotation.ParametersAreNonnullByDefault;
import org.apache.sling.distribution.journal.messages.Messages;
+import org.apache.sling.distribution.journal.messages.Messages.PackageMessage;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.osgi.service.event.Event;
-import org.apache.sling.distribution.journal.messages.Messages.PackageMessage;
-
@ParametersAreNonnullByDefault
public class DistributionEvent {
public static final String PACKAGE_ID = "distribution.package.id";
private static final String KIND_AGENT = "agent";
- private static final String KIND_IMPORTER = "importer";
private DistributionEvent() {
}
- public static Event eventImporterImported(Messages.PackageMessage pkgMsg, String agentName) {
- return buildEvent(IMPORTER_PACKAGE_IMPORTED, KIND_IMPORTER, agentName, pkgMsg);
- }
-
public static Event eventPackageCreated(Messages.PackageMessage pkgMsg, String agentName) {
return buildEvent(AGENT_PACKAGE_CREATED, KIND_AGENT, agentName, pkgMsg);
}
diff --git a/src/main/java/org/apache/sling/distribution/journal/service/subscriber/BookKeeper.java b/src/main/java/org/apache/sling/distribution/journal/service/subscriber/BookKeeper.java
index 001fafc..751de7d 100644
--- a/src/main/java/org/apache/sling/distribution/journal/service/subscriber/BookKeeper.java
+++ b/src/main/java/org/apache/sling/distribution/journal/service/subscriber/BookKeeper.java
@@ -188,7 +188,7 @@ public class BookKeeper implements Closeable {
subscriberMetrics.getImportedPackageSize().update(pkgMsg.getPkgLength());
subscriberMetrics.getPackageDistributedDuration().update((currentTimeMillis() - createdTime), TimeUnit.MILLISECONDS);
packageRetries.clear(pkgMsg.getPubAgentName());
- Event event = ImportedEventFactory.create(pkgMsg, subAgentName);
+ Event event = SubscriberDistributionEvent.eventPackageImported(pkgMsg, subAgentName);
eventAdmin.postEvent(event);
} catch (LoginException | IOException | RuntimeException e) {
failure(pkgMsg, offset, e);
diff --git a/src/main/java/org/apache/sling/distribution/journal/service/subscriber/ImportedEventFactory.java b/src/main/java/org/apache/sling/distribution/journal/service/subscriber/SubscriberDistributionEvent.java
similarity index 92%
rename from src/main/java/org/apache/sling/distribution/journal/service/subscriber/ImportedEventFactory.java
rename to src/main/java/org/apache/sling/distribution/journal/service/subscriber/SubscriberDistributionEvent.java
index 37a4734..e69903f 100644
--- a/src/main/java/org/apache/sling/distribution/journal/service/subscriber/ImportedEventFactory.java
+++ b/src/main/java/org/apache/sling/distribution/journal/service/subscriber/SubscriberDistributionEvent.java
@@ -33,15 +33,15 @@ import org.apache.sling.distribution.journal.messages.Messages;
import org.osgi.service.event.Event;
@ParametersAreNonnullByDefault
-class ImportedEventFactory {
+class SubscriberDistributionEvent {
public static final String PACKAGE_ID = "distribution.package.id";
private static final String KIND_IMPORTER = "importer";
- private ImportedEventFactory() {
+ private SubscriberDistributionEvent() {
}
- public static Event create(Messages.PackageMessage pkgMsg, String agentName) {
+ public static Event eventPackageImported(Messages.PackageMessage pkgMsg, String agentName) {
String[] pathsList = pkgMsg.getPathsList().toArray(new String[0]);
Map<String, Object> props = new HashMap<>();
props.put(DISTRIBUTION_COMPONENT_KIND, KIND_IMPORTER);