You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by tm...@apache.org on 2018/11/12 15:36:49 UTC
[sling-org-apache-sling-distribution-core] branch master updated:
SLING-8098 - Update DistributionQueue method/variable to deal with entries
This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git
The following commit(s) were added to refs/heads/master by this push:
new c3aa04c SLING-8098 - Update DistributionQueue method/variable to deal with entries
c3aa04c is described below
commit c3aa04c6e03af966388a6bffd96b92a32df05216
Author: tmaret <tm...@adobe.com>
AuthorDate: Mon Nov 12 16:36:36 2018 +0100
SLING-8098 - Update DistributionQueue method/variable to deal with entries
---
.../exporter/AgentDistributionPackageExporter.java | 2 +-
.../distribution/queue/DistributionQueueEntry.java | 8 ++---
.../distribution/queue/DistributionQueueItem.java | 4 +--
.../queue/impl/CachingDistributionQueue.java | 1 +
.../queue/impl/DistributionQueueWrapper.java | 10 +++---
.../queue/impl/SimpleAgentDistributionQueue.java | 1 +
.../jobhandling/JobHandlingDistributionQueue.java | 7 ++--
.../queue/impl/resource/ResourceQueue.java | 12 +++----
.../queue/impl/simple/SimpleDistributionQueue.java | 9 ++---
.../simple/SimpleDistributionQueueCheckpoint.java | 2 +-
.../distribution/queue/spi/DistributionQueue.java | 41 +++++++++-------------
...xtendedDistributionServiceResourceProvider.java | 4 +--
.../servlet/DistributionAgentQueueServlet.java | 2 +-
.../monitor/DistributionQueueHealthCheckTest.java | 4 +--
.../JobHandlingDistributionQueueTest.java | 2 +-
.../queue/impl/resource/ResourceQueueIT.java | 2 +-
.../SimpleDistributionQueueCheckpointTest.java | 4 +--
.../impl/simple/SimpleDistributionQueueTest.java | 5 ++-
18 files changed, 56 insertions(+), 64 deletions(-)
diff --git a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
index 17bb7ed..d2b1510 100644
--- a/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
+++ b/src/main/java/org/apache/sling/distribution/packaging/impl/exporter/AgentDistributionPackageExporter.java
@@ -123,7 +123,7 @@ public class AgentDistributionPackageExporter implements DistributionPackageExpo
log.debug("getting package from queue {}", queueName);
DistributionQueue queue = getQueueOrThrow(queueName);
- DistributionQueueEntry entry = queue.getItem(distributionPackageId);
+ DistributionQueueEntry entry = queue.getEntry(distributionPackageId);
DistributionPackage distributionPackage;
if (entry != null) {
diff --git a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java
index 11e8bf2..889c54a 100644
--- a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java
+++ b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueEntry.java
@@ -26,12 +26,12 @@ import org.jetbrains.annotations.NotNull;
*/
public final class DistributionQueueEntry {
- private final String id;
+ private final String entryId;
private final DistributionQueueItem item;
private final DistributionQueueItemStatus status;
- public DistributionQueueEntry(String id, @NotNull DistributionQueueItem item, @NotNull DistributionQueueItemStatus status) {
- this.id = id;
+ public DistributionQueueEntry(String entryId, @NotNull DistributionQueueItem item, @NotNull DistributionQueueItemStatus status) {
+ this.entryId = entryId;
this.item = item;
this.status = status;
}
@@ -57,6 +57,6 @@ public final class DistributionQueueEntry {
}
public String getId() {
- return id;
+ return entryId;
}
}
diff --git a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java
index 2a29557..69fea98 100644
--- a/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java
+++ b/src/main/java/org/apache/sling/distribution/queue/DistributionQueueItem.java
@@ -40,9 +40,9 @@ public final class DistributionQueueItem extends ValueMapDecorator implements Va
this(packageId, -1, base);
}
- public DistributionQueueItem(String id, long size, Map<String, Object> base) {
+ public DistributionQueueItem(String packageId, long size, Map<String, Object> base) {
super(base);
- this.packageId = id;
+ this.packageId = packageId;
this.size = size;
}
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java b/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java
index 47ae169..1b10f50 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/CachingDistributionQueue.java
@@ -70,6 +70,7 @@ public class CachingDistributionQueue extends DistributionQueueWrapper {
return queueStatus;
}
+ @NotNull
@Override
public DistributionQueueType getType() {
return wrappedQueue.getType();
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java b/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
index d7aa307..0b658c2 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/DistributionQueueWrapper.java
@@ -18,11 +18,9 @@
*/
package org.apache.sling.distribution.queue.impl;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
import org.apache.sling.distribution.queue.spi.DistributionQueue;
@@ -66,13 +64,13 @@ public abstract class DistributionQueueWrapper implements DistributionQueue {
@NotNull
@Override
- public Iterable<DistributionQueueEntry> getItems(int skip, int limit) {
- return wrappedQueue.getItems(skip, limit);
+ public Iterable<DistributionQueueEntry> getEntries(int skip, int limit) {
+ return wrappedQueue.getEntries(skip, limit);
}
@Override
- public DistributionQueueEntry getItem(@NotNull String itemId) {
- return wrappedQueue.getItem(itemId);
+ public DistributionQueueEntry getEntry(@NotNull String itemId) {
+ return wrappedQueue.getEntry(itemId);
}
@Override
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java b/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java
index 564ea5c..336a930 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/SimpleAgentDistributionQueue.java
@@ -42,6 +42,7 @@ public class SimpleAgentDistributionQueue extends DistributionQueueWrapper {
return calculateStatus();
}
+ @NotNull
@Override
public DistributionQueueType getType() {
return wrappedQueue.getType();
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java b/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
index e8b9081..dfe197f 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueue.java
@@ -153,7 +153,7 @@ public class JobHandlingDistributionQueue implements DistributionQueue {
@NotNull
- public List<DistributionQueueEntry> getItems(int skip, int limit) {
+ public List<DistributionQueueEntry> getEntries(int skip, int limit) {
List<DistributionQueueEntry> items = new ArrayList<DistributionQueueEntry>();
Collection<Job> jobs = getJobs(skip, limit);
@@ -164,7 +164,7 @@ public class JobHandlingDistributionQueue implements DistributionQueue {
return items;
}
- public DistributionQueueEntry getItem(@NotNull String id) {
+ public DistributionQueueEntry getEntry(@NotNull String id) {
Job job = getJob(id);
if (job != null) {
@@ -222,6 +222,7 @@ public class JobHandlingDistributionQueue implements DistributionQueue {
return new DistributionQueueStatus(itemsCount, state);
}
+ @NotNull
@Override
public DistributionQueueType getType() {
return type;
@@ -231,7 +232,7 @@ public class JobHandlingDistributionQueue implements DistributionQueue {
@Override
public Iterable<DistributionQueueEntry> clear(int limit) {
final List<DistributionQueueEntry> removedEntries = new ArrayList<DistributionQueueEntry>();
- for (DistributionQueueEntry entry : getItems(0, limit)) {
+ for (DistributionQueueEntry entry : getEntries(0, limit)) {
DistributionQueueEntry removed = remove(entry.getId());
if (removed != null) {
removedEntries.add(removed);
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueue.java b/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueue.java
index 612211d..9a04b4c 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueue.java
@@ -127,7 +127,7 @@ public class ResourceQueue implements DistributionQueue {
@NotNull
@Override
- public Iterable<DistributionQueueEntry> getItems(int skip, int limit) {
+ public Iterable<DistributionQueueEntry> getEntries(int skip, int limit) {
ResourceResolver resourceResolver = null;
try {
resourceResolver = DistributionUtils.loginService(resolverFactory, serviceName);
@@ -135,7 +135,7 @@ public class ResourceQueue implements DistributionQueue {
List<DistributionQueueEntry> entries = ResourceQueueUtils.getEntries(queueRoot, skip, limit);
- log.debug("queue[{}] getItems entries={}", new Object[] { queueName, entries.size() });
+ log.debug("queue[{}] getEntries entries={}", new Object[] { queueName, entries.size() });
return entries;
} catch (LoginException e) {
@@ -150,7 +150,7 @@ public class ResourceQueue implements DistributionQueue {
@Nullable
@Override
- public DistributionQueueEntry getItem(@NotNull String itemId) {
+ public DistributionQueueEntry getEntry(@NotNull String itemId) {
ResourceResolver resourceResolver = null;
try {
resourceResolver = DistributionUtils.loginService(resolverFactory, serviceName);
@@ -160,7 +160,7 @@ public class ResourceQueue implements DistributionQueue {
DistributionQueueEntry entry = ResourceQueueUtils.readEntry(queueRoot, itemResource);
- logEntry(entry, "getItem");
+ logEntry(entry, "getEntry");
return entry;
@@ -213,7 +213,7 @@ public class ResourceQueue implements DistributionQueue {
}
}
- @Nullable
+ @NotNull
@Override
public DistributionQueueStatus getStatus() {
ResourceResolver resourceResolver = null;
@@ -259,7 +259,7 @@ public class ResourceQueue implements DistributionQueue {
@Override
public Iterable<DistributionQueueEntry> clear(int limit) {
final List<DistributionQueueEntry> removedEntries = new ArrayList<DistributionQueueEntry>();
- for (DistributionQueueEntry entry : getItems(0, limit)) {
+ for (DistributionQueueEntry entry : getEntries(0, limit)) {
DistributionQueueEntry removed = remove(entry.getId());
if (removed != null) {
removedEntries.add(removed);
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java
index 24b376b..62e9e49 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueue.java
@@ -129,6 +129,7 @@ public class SimpleDistributionQueue implements DistributionQueue {
return new DistributionQueueStatus(queue.size(), getState());
}
+ @NotNull
@Override
public DistributionQueueType getType() {
return DistributionQueueType.ORDERED;
@@ -141,7 +142,7 @@ public class SimpleDistributionQueue implements DistributionQueue {
@NotNull
- public Iterable<DistributionQueueEntry> getItems(int skip, int limit) {
+ public Iterable<DistributionQueueEntry> getEntries(int skip, int limit) {
List<DistributionQueueEntry> result = new ArrayList<DistributionQueueEntry>();
for (DistributionQueueItem item : queue) {
@@ -151,7 +152,7 @@ public class SimpleDistributionQueue implements DistributionQueue {
}
@Nullable
- public DistributionQueueEntry getItem(@NotNull String id) {
+ public DistributionQueueEntry getEntry(@NotNull String id) {
for (DistributionQueueItem item : queue) {
if (id.equals(item.getPackageId())) {
return new DistributionQueueEntry(id, item, statusMap.get(item));
@@ -176,7 +177,7 @@ public class SimpleDistributionQueue implements DistributionQueue {
@Nullable
public DistributionQueueEntry remove(@NotNull String id) {
- DistributionQueueEntry toRemove = getItem(id);
+ DistributionQueueEntry toRemove = getEntry(id);
boolean removed = false;
if (toRemove != null) {
@@ -201,7 +202,7 @@ public class SimpleDistributionQueue implements DistributionQueue {
@Override
public Iterable<DistributionQueueEntry> clear(int limit) {
final List<DistributionQueueEntry> removedEntries = new ArrayList<DistributionQueueEntry>();
- for (DistributionQueueEntry entry : getItems(0, limit)) {
+ for (DistributionQueueEntry entry : getEntries(0, limit)) {
DistributionQueueEntry removed = remove(entry.getId());
if (removed != null) {
removedEntries.add(removed);
diff --git a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpoint.java b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpoint.java
index 21c5282..8dad30e 100644
--- a/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpoint.java
+++ b/src/main/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpoint.java
@@ -60,7 +60,7 @@ class SimpleDistributionQueueCheckpoint implements Runnable {
assert checkpointFile.createNewFile();
Collection<String> lines = new LinkedList<String>();
FileOutputStream fileOutputStream = new FileOutputStream(checkpointFile);
- for (DistributionQueueEntry queueEntry : queue.getItems(0, -1)) {
+ for (DistributionQueueEntry queueEntry : queue.getEntries(0, -1)) {
DistributionQueueItem item = queueEntry.getItem();
String line = mapper.writeQueueItem(item);
lines.add(line);
diff --git a/src/main/java/org/apache/sling/distribution/queue/spi/DistributionQueue.java b/src/main/java/org/apache/sling/distribution/queue/spi/DistributionQueue.java
index cd052e1..c14d069 100644
--- a/src/main/java/org/apache/sling/distribution/queue/spi/DistributionQueue.java
+++ b/src/main/java/org/apache/sling/distribution/queue/spi/DistributionQueue.java
@@ -21,25 +21,16 @@ package org.apache.sling.distribution.queue.spi;
import java.util.Set;
import aQute.bnd.annotation.ConsumerType;
-import org.apache.sling.distribution.agent.spi.DistributionAgent;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueStatus;
import org.apache.sling.distribution.queue.DistributionQueueType;
-import org.apache.sling.distribution.queue.impl.DistributionQueueProcessor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
- * A queue is responsible for collecting the {@link DistributionPackage}s
- * exported by a {@link DistributionAgent} in
- * order to be able to process them also when there are multiple (concurrent)
- * {@link org.apache.sling.distribution.DistributionRequest}s executed
- * on that same agent.
- * <p/>
- * The items (packages) in the queue can then get processed according to a FIFO
- * strategy or in parallel, or some other way, via {@link DistributionQueueProcessor}s.
+ * Holds the {@link DistributionQueueItem} queue items in a sequential queue.
*/
@ConsumerType
public interface DistributionQueue {
@@ -63,42 +54,42 @@ public interface DistributionQueue {
DistributionQueueEntry add(@NotNull DistributionQueueItem item);
/**
- * get the first item (in a FIFO strategy, the next to be processed) from the queue
+ * get the first entry (in a FIFO strategy, the next to be processed) from the queue
*
- * @return the first item into the queue or {@code null} if the queue is empty
+ * @return the first entry into the queue or {@code null} if the queue is empty
*/
@Nullable
DistributionQueueEntry getHead();
/**
- * get all the items in the queue
+ * get all the entries in the queue
*
- * @param skip the number of items to skip
- * @param limit the maximum number of items to return. use -1 to return all items.
- * @return a {@link java.lang.Iterable} of {@link DistributionQueueItem}s
+ * @param skip the number of entries to skip
+ * @param limit the maximum number of entries to return. use -1 to return all entries.
+ * @return a {@link java.lang.Iterable} of {@link DistributionQueueEntry} entries
*/
@NotNull
- Iterable<DistributionQueueEntry> getItems(int skip, int limit);
+ Iterable<DistributionQueueEntry> getEntries(int skip, int limit);
/**
- * gets an item from the queue by specifying its id
+ * gets an entry from the queue by specifying its id
*
- * @param itemId the id of the item as returned by {@link DistributionQueueItem#getPackageId()}
- * @return the item, or {@code null} if the item with the given id
+ * @param entryId the entry identifier
+ * @return the entry, or {@code null} if the entry with the given id
* doesn't exist
*/
@Nullable
- DistributionQueueEntry getItem(@NotNull String itemId);
+ DistributionQueueEntry getEntry(@NotNull String entryId);
/**
- * remove an item from the queue by specifying its id
+ * remove an entry from the queue by specifying its id
*
- * @param itemId the id the item as returned by {@link DistributionQueueItem#getPackageId()}
- * @return the removed item, or {@code null} if the item with the given id
+ * @param entryId the entry identifier
+ * @return the removed entry, or {@code null} if the entry with the given id
* doesn't exist
*/
@Nullable
- DistributionQueueEntry remove(@NotNull String itemId);
+ DistributionQueueEntry remove(@NotNull String entryId);
/**
* Remove a set entries from the queue by specifying their identifiers.
diff --git a/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java b/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
index 57f75d1..f6081ab 100644
--- a/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
+++ b/src/main/java/org/apache/sling/distribution/resources/impl/ExtendedDistributionServiceResourceProvider.java
@@ -172,7 +172,7 @@ public class ExtendedDistributionServiceResourceProvider extends DistributionSer
if (queue != null) {
String itemId = queueInfo.getChildResourceName();
- DistributionQueueEntry entry = queue.getItem(itemId);
+ DistributionQueueEntry entry = queue.getEntry(itemId);
result = getItemProperties(entry);
}
@@ -232,7 +232,7 @@ public class ExtendedDistributionServiceResourceProvider extends DistributionSer
boolean shouldFetch = items == null || !items.hasNext();
if (shouldFetch) {
- items = queue.getItems(fetched, MAX_QUEUE_CHUNK).iterator();
+ items = queue.getEntries(fetched, MAX_QUEUE_CHUNK).iterator();
}
return items.hasNext();
diff --git a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
index 767868b..104fe19 100644
--- a/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
+++ b/src/main/java/org/apache/sling/distribution/servlet/DistributionAgentQueueServlet.java
@@ -118,7 +118,7 @@ public class DistributionAgentQueueServlet extends SlingAllMethodsServlet {
private void addItems(ResourceResolver resourceResolver, DistributionQueue targetQueue, DistributionQueue sourceQueue, String[] ids) {
for (String id: ids) {
- DistributionQueueEntry entry = sourceQueue.getItem(id);
+ DistributionQueueEntry entry = sourceQueue.getEntry(id);
if (entry != null) {
targetQueue.add(entry.getItem());
DistributionPackage distributionPackage = getPackage(resourceResolver, entry.getItem());
diff --git a/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java b/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
index 3c33bab..d0bcd1d 100644
--- a/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
+++ b/src/test/java/org/apache/sling/distribution/monitor/DistributionQueueHealthCheckTest.java
@@ -83,7 +83,7 @@ public class DistributionQueueHealthCheckTest {
DistributionQueue queue = mock(DistributionQueue.class);
DistributionQueueItem item = new DistributionQueueItem("packageId", new HashMap<String, Object>());
DistributionQueueItemStatus status = new DistributionQueueItemStatus(Calendar.getInstance(), DistributionQueueItemState.QUEUED, 1, "queueName");
- when(queue.getItem(any(String.class))).thenReturn(new DistributionQueueEntry(null, item, status));
+ when(queue.getEntry(any(String.class))).thenReturn(new DistributionQueueEntry(null, item, status));
when(queue.getHead()).thenReturn(new DistributionQueueEntry(null, item, status));
DistributionAgent distributionAgent = mock(DistributionAgent.class);
@@ -107,7 +107,7 @@ public class DistributionQueueHealthCheckTest {
DistributionQueue queue = mock(DistributionQueue.class);
DistributionQueueItem item = new DistributionQueueItem("packageId", new HashMap<String, Object>());
DistributionQueueItemStatus status = new DistributionQueueItemStatus(Calendar.getInstance(), DistributionQueueItemState.QUEUED, 10, "queueName");
- when(queue.getItem(any(String.class))).thenReturn(new DistributionQueueEntry(null, item, status));
+ when(queue.getEntry(any(String.class))).thenReturn(new DistributionQueueEntry(null, item, status));
when(queue.getHead()).thenReturn(new DistributionQueueEntry(null, item, status));
DistributionAgent distributionAgent = mock(DistributionAgent.class);
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java
index 25c0f84..947d786 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java
@@ -87,7 +87,7 @@ public class JobHandlingDistributionQueueTest {
packageInfo.put(DistributionPackageInfo.PROPERTY_REQUEST_TYPE, DistributionRequestType.ADD);
DistributionQueueItem distributionQueueItem = new DistributionQueueItem("an-id", packageInfo);
assertNotNull(queue.add(distributionQueueItem));
- DistributionQueueItemStatus status = queue.getItem(job.getId()).getStatus();
+ DistributionQueueItemStatus status = queue.getEntry(job.getId()).getStatus();
assertNotNull(status);
assertEquals(DistributionQueueItemState.QUEUED, status.getItemState());
}
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueIT.java b/src/test/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueIT.java
index b599aa5..dad0fe9 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueIT.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/resource/ResourceQueueIT.java
@@ -149,7 +149,7 @@ public class ResourceQueueIT extends DistributionBaseIT {
}
void clear(DistributionQueue queue) {
- for (DistributionQueueEntry entry : queue.getItems(0, -1)) {
+ for (DistributionQueueEntry entry : queue.getEntries(0, -1)) {
queue.remove(entry.getId());
}
}
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpointTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpointTest.java
index 860fd54..19d9612 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpointTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueCheckpointTest.java
@@ -44,7 +44,7 @@ public class SimpleDistributionQueueCheckpointTest {
public void testRunWithNothingInQueue() throws Exception {
DistributionQueue queue = mock(DistributionQueue.class);
Iterable<DistributionQueueEntry> items = new LinkedList<DistributionQueueEntry>();
- when(queue.getItems(0, -1)).thenReturn(items);
+ when(queue.getEntries(0, -1)).thenReturn(items);
File checkpointDirectory = FileUtils.getTempDirectory();
SimpleDistributionQueueCheckpoint simpleDistributionQueueCheckpoint = new SimpleDistributionQueueCheckpoint(queue,
checkpointDirectory);
@@ -63,7 +63,7 @@ public class SimpleDistributionQueueCheckpointTest {
base.put("multi", new String[]{"1", "2"});
entries.add(new DistributionQueueEntry("123", new DistributionQueueItem("pid123", base),
new DistributionQueueItemStatus(DistributionQueueItemState.QUEUED, queueName)));
- when(queue.getItems(0, -1)).thenReturn(entries);
+ when(queue.getEntries(0, -1)).thenReturn(entries);
File checkpointDirectory = FileUtils.getTempDirectory();
SimpleDistributionQueueCheckpoint simpleDistributionQueueCheckpoint = new SimpleDistributionQueueCheckpoint(queue,
checkpointDirectory);
diff --git a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java
index 7689f6e..521c78d 100644
--- a/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java
+++ b/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java
@@ -32,7 +32,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
/**
* Testcase for {@link SimpleDistributionQueue}
@@ -55,7 +54,7 @@ public class SimpleDistributionQueueTest {
assertFalse(queue.getStatus().isEmpty());
assertNotNull(queue.remove(pkg.getPackageId()));
assertTrue(queue.getStatus().isEmpty());
- DistributionQueueEntry entry = queue.getItem(pkg.getPackageId());
+ DistributionQueueEntry entry = queue.getEntry(pkg.getPackageId());
assertNull(entry);
}
@@ -67,7 +66,7 @@ public class SimpleDistributionQueueTest {
assertFalse(queue.getStatus().isEmpty());
assertEquals(pkg, queue.getHead().getItem());
assertFalse(queue.getStatus().isEmpty());
- DistributionQueueItemStatus status = queue.getItem(pkg.getPackageId()).getStatus();
+ DistributionQueueItemStatus status = queue.getEntry(pkg.getPackageId()).getStatus();
assertNotNull(queue.remove(pkg.getPackageId()));
assertTrue(queue.getStatus().isEmpty());
assertNotNull(status);