You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/09/14 19:10:07 UTC

qpid-broker-j git commit: QPID-7773: [Java Broker, REST API] Fix REST API calls in QpidRestAPIQueueCreator

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master d128dea9e -> 99365c079


QPID-7773: [Java Broker, REST API] Fix REST API calls in QpidRestAPIQueueCreator


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/99365c07
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/99365c07
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/99365c07

Branch: refs/heads/master
Commit: 99365c079bb9571cd2fd9fe02a8dd134949ebca8
Parents: d128dea
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Sep 14 20:09:32 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Thu Sep 14 20:09:32 2017 +0100

----------------------------------------------------------------------
 .../apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/99365c07/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java
----------------------------------------------------------------------
diff --git a/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java b/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java
index 480dffe..4652114 100644
--- a/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java
+++ b/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -67,7 +66,7 @@ public class QpidRestAPIQueueCreator implements QueueCreator
 {
     private static final Logger LOGGER = LoggerFactory.getLogger(QpidRestAPIQueueCreator.class);
     private static int _drainPollTimeout = Integer.getInteger(QUEUE_CREATOR_DRAIN_POLL_TIMEOUT, 500);
-    private static final TypeReference<List<HashMap<String, Object>>> MAP_TYPE_REFERENCE = new TypeReference<List<HashMap<String,Object>>>(){};
+    private static final TypeReference<HashMap<String, Object>> MAP_TYPE_REFERENCE = new TypeReference<HashMap<String,Object>>(){};
 
     private final HttpHost _management;
     private final String _virtualhostnode;
@@ -244,8 +243,7 @@ public class QpidRestAPIQueueCreator implements QueueCreator
     private Map<String, Object> managementQueryBroker(final HttpClientContext context)
     {
         HttpGet get = new HttpGet(_brokerApiUrl);
-        final List<Map<String, Object>> maps = executeManagement(get, context);
-        return maps.isEmpty() ? Collections.emptyMap() : maps.get(0);
+        return executeManagement(get, context);
     }
 
     private void managementCreateQueue(final String name, final HttpClientContext context)
@@ -265,7 +263,7 @@ public class QpidRestAPIQueueCreator implements QueueCreator
         executeManagement(delete, context);
     }
 
-    private List<Map<String, Object>> executeManagement(final HttpRequest httpRequest, final HttpClientContext context)
+    private Map<String, Object> executeManagement(final HttpRequest httpRequest, final HttpClientContext context)
     {
         try(CloseableHttpClient httpClient = HttpClients.custom()
                                                         .setDefaultCredentialsProvider(_credentialsProvider)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org