svn commit: r1725533 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue: DistributionQueueEntry.java impl/jobhandling/DistributionAgentJobConsumer.java impl/jobhandling/JobHandlingUtils.java

[tommaso]

Author: tommaso
Date: Tue Jan 19 14:41:44 2016
New Revision: 1725533

URL: http://svn.apache.org/viewvc?rev=1725533&view=rev
Log:
SLING-5440 - only get DistributionQueueEntry from Job

Modified:
    
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java
    
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
    
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java?rev=1725533&r1=1725532&r2=1725533&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java
 Tue Jan 19 14:41:44 2016
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.distribution.queue;
 
+import javax.annotation.Nonnull;
+
 /**
  * an entry in a {@link DistributionQueue}
  */
@@ -26,7 +28,7 @@ public final class DistributionQueueEntr
     private final DistributionQueueItem item;
     private final DistributionQueueItemStatus status;
 
-    public DistributionQueueEntry(DistributionQueueItem item, 
DistributionQueueItemStatus status) {
+    public DistributionQueueEntry(@Nonnull DistributionQueueItem item, 
@Nonnull DistributionQueueItemStatus status) {
         this.item = item;
         this.status = status;
     }
@@ -36,6 +38,7 @@ public final class DistributionQueueEntr
      *
      * @return a {@link DistributionQueueStatus}
      */
+    @Nonnull
     public DistributionQueueItemStatus getStatus() {
         return status;
     }
@@ -45,6 +48,7 @@ public final class DistributionQueueEntr
      *
      * @return a {@link DistributionQueueItem}
      */
+    @Nonnull
     public DistributionQueueItem getItem() {
         return item;
     }

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java?rev=1725533&r1=1725532&r2=1725533&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumer.java
 Tue Jan 19 14:41:44 2016
@@ -41,10 +41,10 @@ class DistributionAgentJobConsumer imple
 
     public JobResult process(Job job) {
         log.debug("processing job {}", job.getId());
-        String queueName = JobHandlingUtils.getQueueName(job);
         DistributionQueueEntry entry = JobHandlingUtils.getEntry(job);
         boolean processingResult = false;
         if (entry != null) {
+            String queueName = entry.getStatus().getQueueName();
             DistributionQueueItem item = entry.getItem();
             log.debug("processing item {} in queue {}", item.getId(), 
queueName);
             processingResult = queueProcessor.process(queueName, entry);

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java?rev=1725533&r1=1725532&r2=1725533&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtils.java
 Tue Jan 19 14:41:44 2016
@@ -81,7 +81,7 @@ class JobHandlingUtils {
         return properties;
     }
 
-    @Nonnull
+    @CheckForNull
     public static String getQueueName(Job job) {
 
         String topic = job.getTopic();