You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/09/15 08:50:28 UTC
[1/2] qpid-broker-j git commit: Revert "QPID-7773: [Java Broker,
REST API] Fix REST API calls in QpidRestAPIQueueCreator"
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 99365c079 -> 3da255dee
Revert "QPID-7773: [Java Broker, REST API] Fix REST API calls in QpidRestAPIQueueCreator"
This reverts commit 99365c079bb9571cd2fd9fe02a8dd134949ebca8.
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/6845fa67
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/6845fa67
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/6845fa67
Branch: refs/heads/master
Commit: 6845fa67cccc595ebdffa6793501e52f79d8e93d
Parents: 99365c0
Author: Keith Wall <kw...@apache.org>
Authored: Fri Sep 15 09:30:16 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Fri Sep 15 09:30:16 2017 +0100
----------------------------------------------------------------------
.../apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/6845fa67/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 4652114..480dffe 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,6 +24,7 @@ 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;
@@ -66,7 +67,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<HashMap<String, Object>> MAP_TYPE_REFERENCE = new TypeReference<HashMap<String,Object>>(){};
+ private static final TypeReference<List<HashMap<String, Object>>> MAP_TYPE_REFERENCE = new TypeReference<List<HashMap<String,Object>>>(){};
private final HttpHost _management;
private final String _virtualhostnode;
@@ -243,7 +244,8 @@ public class QpidRestAPIQueueCreator implements QueueCreator
private Map<String, Object> managementQueryBroker(final HttpClientContext context)
{
HttpGet get = new HttpGet(_brokerApiUrl);
- return executeManagement(get, context);
+ final List<Map<String, Object>> maps = executeManagement(get, context);
+ return maps.isEmpty() ? Collections.emptyMap() : maps.get(0);
}
private void managementCreateQueue(final String name, final HttpClientContext context)
@@ -263,7 +265,7 @@ public class QpidRestAPIQueueCreator implements QueueCreator
executeManagement(delete, context);
}
- private Map<String, Object> executeManagement(final HttpRequest httpRequest, final HttpClientContext context)
+ private List<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
[2/2] qpid-broker-j git commit: QPID-7773: [Java Broker] [Perf Tests]
Use singletonModelObjectResponseAsList option in QpidRestAPIQueueCreator when
querying broker to avoid compatibility problems with older version.
Posted by kw...@apache.org.
QPID-7773: [Java Broker] [Perf Tests] Use singletonModelObjectResponseAsList option in QpidRestAPIQueueCreator when querying broker to avoid compatibility problems with older version.
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/3da255de
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/3da255de
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/3da255de
Branch: refs/heads/master
Commit: 3da255dee11c24afae9d3b6d7db3fbb39330539f
Parents: 6845fa6
Author: Keith Wall <kw...@apache.org>
Authored: Fri Sep 15 09:47:22 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Fri Sep 15 09:48:29 2017 +0100
----------------------------------------------------------------------
.../org/apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/3da255de/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..475bef5 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
@@ -87,7 +87,8 @@ public class QpidRestAPIQueueCreator implements QueueCreator
_management = HttpHost.create(System.getProperty("perftests.manangement-url", "http://localhost:8080"));
_queueApiUrl = System.getProperty("perftests.manangement-api-queue", "/api/latest/queue/%s/%s/%s");
- _brokerApiUrl = System.getProperty("perftests.manangement-api-broker", "/api/latest/broker");
+ // QPID-7773: singletonModelObjectResponseAsList caused Java Broker v7.0 to return lists, like older versions did.
+ _brokerApiUrl = System.getProperty("perftests.manangement-api-broker", "/api/latest/broker?singletonModelObjectResponseAsList=true");
_credentialsProvider = getCredentialsProvider(managementUser, managementPassword);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org