commit c6d7cdfcc1d20a60645ecdd8c44abb84341ea0a5
author Marius Petria <mpetria@apache.org> Wed Apr 13 11:42:52 2016 +0000
committer Marius Petria <mpetria@apache.org> Wed Apr 13 11:42:52 2016 +0000
tree e5f7002b79fbc1ae0522264962415441c7a61e86
parent 1a23ae6546f85044e8eb696d65f9fa485c6f812e

SLING-5576: optimizations for distribution queue items listings

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1738924 13f79535-47bb-0310-9956-ffa450edef68

src/test/java/org/apache/sling/distribution/it/DistributionUtils.java

diff --git a/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java b/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java
index 966db77..6b73338 100644
--- a/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java
+++ b/src/test/java/org/apache/sling/distribution/it/DistributionUtils.java
@@ -344,24 +344,25 @@
 
         JSONObject json = getResource(instance, queueUrl + ".infinity");
 
-        JSONArray items = json.getJSONArray("items");
 
-        for(int i=0; i < items.length(); i++) {
-            String itemId = items.getString(i);
-            JSONObject queueItem = json.getJSONObject(itemId);
+        Iterator<String> keys = json.keys();
+        while (keys.hasNext()) {
+            String key = keys.next();
+            JSONObject queueItem = json.optJSONObject(key);
+            if (queueItem != null && queueItem.optString("id") != null) {
 
+                Map<String, Object> itemProperties = new HashMap<String, Object>();
 
-            Map<String, Object> itemProperties = new HashMap<String, Object>();
+                itemProperties.put("id", queueItem.get("id"));
+                itemProperties.put("paths", queueItem.get("paths"));
+                itemProperties.put("action", queueItem.get("action"));
+                itemProperties.put("userid", queueItem.get("userid"));
+                itemProperties.put("attempts", queueItem.get("attempts"));
+                itemProperties.put("time", queueItem.get("time"));
+                itemProperties.put("state", queueItem.get("state"));
 
-            itemProperties.put("id", queueItem.get("id"));
-            itemProperties.put("paths", queueItem.get("paths"));
-            itemProperties.put("action", queueItem.get("action"));
-            itemProperties.put("userid", queueItem.get("userid"));
-            itemProperties.put("attempts", queueItem.get("attempts"));
-            itemProperties.put("time", queueItem.get("time"));
-            itemProperties.put("state", queueItem.get("state"));
-
-            result.add(itemProperties);
+                result.add(itemProperties);
+            }
         }
 
         return result;