SLING-4153 - removed serializable, made request constructors consistent, adjusted jsr305 annotations
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1638060 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java b/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java
index 1dbe7d4..16b5da2 100644
--- a/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java
+++ b/src/main/java/org/apache/sling/distribution/agent/DistributionAgent.java
@@ -44,6 +44,7 @@
* retrieves the names of the queues for this agent.
* @return the list of queue names
*/
+ @Nonnull
Iterable<String> getQueueNames();
/**
@@ -54,7 +55,7 @@
* @throws DistributionAgentException if an error occurs in retrieving the queue
*/
@CheckForNull
- DistributionQueue getQueue(@Nullable String name) throws DistributionAgentException;
+ DistributionQueue getQueue(@Nonnull String name) throws DistributionAgentException;
/**
* executes a {@link org.apache.sling.distribution.communication.DistributionRequest}
diff --git a/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java b/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java
index f3d099d..fbb5df2 100644
--- a/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java
+++ b/src/main/java/org/apache/sling/distribution/communication/DistributionRequest.java
@@ -32,7 +32,7 @@
private final String[] paths;
- public DistributionRequest(@Nonnull DistributionActionType action, @Nonnull String[] paths) {
+ public DistributionRequest(@Nonnull DistributionActionType action, @Nonnull String... paths) {
this(System.currentTimeMillis(), action, paths);
}
@@ -45,7 +45,7 @@
/**
* get the time this distribution request was created
*
- * @return a <code>long</code> representing the distribution request creation time e.g. as returned by {@code System#currentTimeMillis}
+ * @return the distribution request creation time as returned by {@code System#currentTimeMillis}
*/
public long getTime() {
return time;
@@ -54,16 +54,16 @@
/**
* get the {@link DistributionActionType} associated with this request
*
- * @return the action as a <code>distributionActionType</code>
+ * @return the action as a {@link org.apache.sling.distribution.communication.DistributionActionType}
*/
- public DistributionActionType getAction() {
+ public DistributionActionType getActionType() {
return action;
}
/**
* get the paths for this distribution request
*
- * @return an array of <code>String</code>s representing the paths
+ * @return an array of paths
*/
public String[] getPaths() {
return paths;
diff --git a/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java b/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java
index 03259e2..442bb6e 100644
--- a/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java
+++ b/src/main/java/org/apache/sling/distribution/event/DistributionEventType.java
@@ -34,7 +34,7 @@
PACKAGE_QUEUED,
/**
- * event for package replicated
+ * event for package distributed
*/
PACKAGE_DISTRIBUTED,
diff --git a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackage.java b/src/main/java/org/apache/sling/distribution/packaging/DistributionPackage.java
index ae32dc6..c04085b 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/DistributionPackage.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/DistributionPackage.java
@@ -21,7 +21,6 @@
import javax.annotation.Nonnull;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Serializable;
import aQute.bnd.annotation.ConsumerType;
@@ -29,7 +28,7 @@
* A distribution package
*/
@ConsumerType
-public interface DistributionPackage extends Serializable {
+public interface DistributionPackage {
/**
* get package id. the id is a unique string that can be used to retrieve
