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/06 06:25:24 UTC
[5/5] qpid-broker-j git commit: QPID-7220: [Java Broker,
WMC] REST requests for ConfiguredObjects should not return children
by default
QPID-7220: [Java Broker, WMC] REST requests for ConfiguredObjects should not return children by default
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/b58850ad
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/b58850ad
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/b58850ad
Branch: refs/heads/master
Commit: b58850ad20780245b6a0ac2c254032c71cfed534
Parents: 26f30a2
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Sep 5 09:15:08 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Sep 6 07:25:04 2017 +0100
----------------------------------------------------------------------
.../plugin/servlet/rest/RestServlet.java | 2 +-
.../java/resources/js/qpid/management/Port.js | 6 +--
.../resources/js/qpid/management/group/Group.js | 2 +-
.../groupprovider/GroupManagingGroupProvider.js | 16 +++++-
.../rest/AuthenticationProviderRestTest.java | 7 +--
.../qpid/systest/rest/BrokerRestTest.java | 2 +-
.../qpid/systest/rest/ConnectionRestTest.java | 8 +--
.../systest/rest/GroupProviderRestTest.java | 15 +++---
.../apache/qpid/systest/rest/GroupRestTest.java | 10 ++--
.../apache/qpid/systest/rest/QueueRestTest.java | 3 +-
.../qpid/systest/rest/VirtualHostRestTest.java | 55 ++++++++++++--------
.../qpid/systest/rest/acl/GroupRestACLTest.java | 20 ++++---
12 files changed, 92 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
index 92f58d5..6ad2158 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
@@ -97,7 +97,7 @@ public class RestServlet extends AbstractServlet
INHERITED_ACTUALS_PARAM,
CONTENT_DISPOSITION_ATTACHMENT_FILENAME_PARAM,
EXCLUDE_INHERITED_CONTEXT_PARAM));
- public static final int DEFAULT_DEPTH = 1;
+ public static final int DEFAULT_DEPTH = 0;
public static final int DEFAULT_OVERSIZE = 120;
private transient final ConfiguredObjectToMapConverter _objectConverter = new ConfiguredObjectToMapConverter();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
index bd133d0..edfeb47 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Port.js
@@ -98,12 +98,12 @@ define(["dojo/dom",
that.close();
}, util.xhrErrorHandler);
}
- }
+ };
Port.prototype.showEditDialog = function ()
{
var that = this;
- this.management.load(that.modelObj.parent, {excludeInheritedContext: true})
+ this.management.load(that.modelObj.parent, {excludeInheritedContext: true, depth: 1})
.then(function (data)
{
var brokerData = data[0];
@@ -114,7 +114,7 @@ define(["dojo/dom",
brokerData.keystores,
brokerData.truststores);
}, util.xhrErrorHandler);
- }
+ };
function PortUpdater(portTab)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
index a8a4760..f73668f 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
@@ -194,7 +194,7 @@ define(["dojo/parser",
var that = this;
- this.management.load(this.modelObj, {excludeInheritedContext: true})
+ this.management.load(this.modelObj, {excludeInheritedContext: true, depth: 1})
.then(function (data)
{
that.groupMemberData = data;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
index f0b736a..08a534c 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/GroupManagingGroupProvider.js
@@ -26,6 +26,7 @@ define(["dojo/dom",
"dojo/_base/window",
"dojo/_base/event",
"dojo/_base/json",
+ "dojo/_base/lang",
"dijit/registry",
"dojox/html/entities",
"qpid/common/util",
@@ -55,6 +56,7 @@ define(["dojo/dom",
win,
event,
json,
+ lang,
registry,
entities,
util,
@@ -156,7 +158,19 @@ define(["dojo/dom",
{
if (data)
{
- this.groupsGrid.update(data.groups);
+ this.controller.management.load({
+ type: "group",
+ parent: this.modelObj
+ },
+ {
+ actuals: false,
+ excludeInheritedContext: true,
+ depth: 0
+ })
+ .then(lang.hitch(this, function (data)
+ {
+ this.groupsGrid.update(data);
+ }), util.xhrErrorHandler);
}
};
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java b/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
index deab934..04c2202 100644
--- a/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
@@ -21,6 +21,7 @@
package org.apache.qpid.systest.rest;
import java.io.File;
+import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -288,7 +289,7 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase
}
}
- private void assertProvider(boolean managesPrincipals, String type, Map<String, Object> provider)
+ private void assertProvider(boolean managesPrincipals, String type, Map<String, Object> provider) throws IOException
{
Asserts.assertAttributesPresent(provider, BrokerModel.getInstance().getTypeRegistry().getAttributeNames(
AuthenticationProvider.class),
@@ -306,8 +307,8 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase
if (managesPrincipals)
{
- @SuppressWarnings("unchecked")
- List<Map<String, Object>> users = (List<Map<String, Object>>) provider.get("users");
+ List<Map<String, Object>> users =
+ getRestTestHelper().getJsonAsList("user/" + provider.get(AuthenticationProvider.NAME));
assertNotNull("Users are not found", users);
assertTrue("Unexpected number of users", users.size() > 1);
for (Map<String, Object> user : users)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
index afa8376..35fab48 100644
--- a/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
@@ -71,7 +71,7 @@ public class BrokerRestTest extends QpidRestTestCase
public void testGet() throws Exception
{
- Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("broker");
+ Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("broker?depth=1");
assertBrokerAttributes(brokerDetails);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java b/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
index fd675d5..06d5481 100644
--- a/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
@@ -118,7 +118,7 @@ public class ConnectionRestTest extends QpidRestTestCase
String connectionName = getConnectionName();
Map<String, Object> connectionDetailsFromPost = getRestTestHelper().postDataToPathAndGetObject("virtualhost/test/test/getConnection",
- Collections.singletonMap("name", (Object) connectionName));
+ Collections.singletonMap("name", connectionName));
assertConnection(connectionDetailsFromPost);
Map<String, Object> connectionDetailsFromGet = getRestTestHelper().getJsonAsMap("virtualhost/test/test/getConnection?name="
@@ -219,7 +219,7 @@ public class ConnectionRestTest extends QpidRestTestCase
}
- private void assertConnection(Map<String, Object> connectionDetails) throws JMSException
+ private void assertConnection(Map<String, Object> connectionDetails) throws JMSException, IOException
{
Asserts.assertConnection(connectionDetails, isBroker10() ? 2 : 1);
@@ -234,8 +234,8 @@ public class ConnectionRestTest extends QpidRestTestCase
assertEquals("Unexpected value of connection statistics attribute " + "messagesOut",
MESSAGE_NUMBER * 2 - 1, statistics.get("messagesOut"));
- @SuppressWarnings("unchecked")
- List<Map<String, Object>> sessions = (List<Map<String, Object>>) connectionDetails.get(SESSIONS_ATTRIBUTE);
+ String encodedName = getRestTestHelper().encodeAsUTF(String.valueOf(connectionDetails.get(Connection.NAME)));
+ List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("session/amqp/" + encodedName);
assertNotNull("Sessions cannot be found", sessions);
assertEquals("Unexpected number of sessions", 1, sessions.size());
assertSession(sessions.get(0), (AMQSession<?, ?>) _session);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java b/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
index 7a348de..7a909fa 100644
--- a/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
@@ -24,6 +24,7 @@ import static org.apache.qpid.server.management.plugin.servlet.rest.AbstractServ
import java.io.File;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -92,14 +93,15 @@ public class GroupProviderRestTest extends QpidRestTestCase
{
String groupName = "newGroup";
- Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER);
+ Map<String, Object> data =
+ getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER + "?depth=1");
assertNotNull("Cannot load data for provider", data);
getRestTestHelper().assertNumberOfGroups(data, 1);
getRestTestHelper().createGroup(groupName, FILE_GROUP_MANAGER);
- data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER);
+ data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER + "?depth=1");
assertNotNull("Cannot load data for provider", data);
getRestTestHelper().assertNumberOfGroups(data, 2);
@@ -109,14 +111,15 @@ public class GroupProviderRestTest extends QpidRestTestCase
{
String groupName = "myGroup";
- Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER);
+ Map<String, Object> data =
+ getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER + "?depth=1");
assertNotNull("Cannot load data for provider", data);
getRestTestHelper().assertNumberOfGroups(data, 1);
getRestTestHelper().removeGroup(groupName, FILE_GROUP_MANAGER);
- data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER);
+ data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER + "?depth=1");
assertNotNull("Cannot load data for provider", data);
getRestTestHelper().assertNumberOfGroups(data, 0);
@@ -328,7 +331,7 @@ public class GroupProviderRestTest extends QpidRestTestCase
"GET", HttpServletResponse.SC_NOT_FOUND);
}
- private void assertProvider(String name, String type, Map<String, Object> provider)
+ private void assertProvider(String name, String type, Map<String, Object> provider) throws IOException
{
Asserts.assertAttributesPresent(provider, BrokerModel.getInstance().getTypeRegistry().getAttributeNames(
GroupProvider.class),
@@ -353,7 +356,7 @@ public class GroupProviderRestTest extends QpidRestTestCase
(String) provider.get(GroupProvider.NAME));
@SuppressWarnings("unchecked")
- List<Map<String, Object>> groups = (List<Map<String, Object>>) provider.get("groups");
+ List<Map<String, Object>> groups = getRestTestHelper().getJsonAsList("group/" + name);
assertNotNull("Groups were not found", groups);
assertEquals("Unexpected number of groups", 1, groups.size());
for (Map<String, Object> group : groups)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java b/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java
index e62227b..887feb4 100644
--- a/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/rest/GroupRestTest.java
@@ -67,7 +67,7 @@ public class GroupRestTest extends QpidRestTestCase
public void testGet() throws Exception
{
- Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup");
+ Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup?depth=1");
List<Map<String, Object>> groupmembers = (List<Map<String, Object>>) group.get("groupmembers");
assertEquals(1, groupmembers.size());
@@ -77,7 +77,7 @@ public class GroupRestTest extends QpidRestTestCase
public void testCreateNewMemberByPutUsingMemberURI() throws Exception
{
- Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup");
+ Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup?depth=1");
getRestTestHelper().assertNumberOfGroupMembers(group, 1);
String url = "groupmember/" + FILE_GROUP_MANAGER + "/"+ GROUP_NAME + "/" + NEW_MEMBER;
@@ -89,7 +89,7 @@ public class GroupRestTest extends QpidRestTestCase
public void testCreateNewMemberByPostUsingParentURI() throws Exception
{
- Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup");
+ Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup?depth=1");
getRestTestHelper().assertNumberOfGroupMembers(group, 1);
String url = "groupmember/" + FILE_GROUP_MANAGER + "/"+ GROUP_NAME;
@@ -105,7 +105,7 @@ public class GroupRestTest extends QpidRestTestCase
public void testCreateNewMemberByPutUsingParentURI() throws Exception
{
- Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup");
+ Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup?depth=1");
getRestTestHelper().assertNumberOfGroupMembers(group, 1);
String url = "groupmember/" + FILE_GROUP_MANAGER + "/"+ GROUP_NAME;
@@ -121,7 +121,7 @@ public class GroupRestTest extends QpidRestTestCase
public void testRemoveMemberFromGroup() throws Exception
{
- Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup");
+ Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup?depth=1");
getRestTestHelper().assertNumberOfGroupMembers(group, 1);
getRestTestHelper().removeMemberFromGroup(FILE_GROUP_MANAGER, GROUP_NAME, EXISTING_MEMBER);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java b/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
index 928e5d2..dff4fcf 100644
--- a/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
@@ -93,7 +93,8 @@ public class QueueRestTest extends QpidRestTestCase
public void testGetByName() throws Exception
{
String queueName = getTestQueueName();
- Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("queue/test/test/" + queueName);
+ Map<String, Object> queueDetails =
+ getRestTestHelper().getJsonAsSingletonList("queue/test/test/" + queueName + "?depth=1");
Asserts.assertQueue(queueName, "standard", queueDetails);
assertStatistics(queueDetails);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java b/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
index 52fa38c..1628f8d 100644
--- a/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
@@ -94,8 +94,10 @@ public class VirtualHostRestTest extends QpidRestTestCase
assertEquals("Unexpected number of queues in statistics", 1, statistics.get("queueCount"));
assertEquals("Unexpected number of connections in statistics", 1, statistics.get("connectionCount"));
- @SuppressWarnings("unchecked")
- List<Map<String, Object>> exchanges = (List<Map<String, Object>>) hostDetails.get(VIRTUALHOST_EXCHANGES_ATTRIBUTE);
+
+ List<Map<String, Object>> exchanges = getRestTestHelper().getJsonAsList("exchange/test");
+ Asserts.assertVirtualHost("test", hostDetails);
+
assertEquals("Unexpected number of exchanges", EXPECTED_EXCHANGES.length, exchanges.size());
Asserts.assertDurableExchange("amq.fanout", "fanout", getRestTestHelper().find(Exchange.NAME, "amq.fanout", exchanges));
Asserts.assertDurableExchange("amq.topic", "topic", getRestTestHelper().find(Exchange.NAME, "amq.topic", exchanges));
@@ -103,7 +105,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
Asserts.assertDurableExchange("amq.match", "headers", getRestTestHelper().find(Exchange.NAME, "amq.match", exchanges));
@SuppressWarnings("unchecked")
- List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VIRTUALHOST_QUEUES_ATTRIBUTE);
+ List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("queue/test");
assertEquals("Unexpected number of queues", 1, queues.size());
Map<String, Object> queue = getRestTestHelper().find(Queue.NAME, getTestQueueName(), queues);
Asserts.assertQueue(getTestQueueName(), "standard", queue);
@@ -120,7 +122,11 @@ public class VirtualHostRestTest extends QpidRestTestCase
Map<String, Object> requestData = submitVirtualHost(true, "PUT", HttpServletResponse.SC_CREATED);
String hostName = (String)requestData.get(VirtualHost.NAME);
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/" + EMPTY_VIRTUALHOSTNODE_NAME + "/" + hostName);
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/"
+ + EMPTY_VIRTUALHOSTNODE_NAME
+ + "/"
+ + hostName
+ + "?depth=1");
Asserts.assertVirtualHost(hostName, hostDetails);
assertNewVirtualHost(hostDetails);
@@ -131,7 +137,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
Map<String, Object> data = submitVirtualHost(true, "PUT", HttpServletResponse.SC_CREATED);
String hostName = (String)data.get(VirtualHost.NAME);
- String url = "virtualhost/" + EMPTY_VIRTUALHOSTNODE_NAME + "/" + hostName;
+ String url = "virtualhost/" + EMPTY_VIRTUALHOSTNODE_NAME + "/" + hostName + "?depth=1";
Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList(url);
Asserts.assertVirtualHost(hostName, hostDetails);
assertNewVirtualHost(hostDetails);
@@ -142,7 +148,11 @@ public class VirtualHostRestTest extends QpidRestTestCase
Map<String, Object> data = submitVirtualHost(true, "POST", HttpServletResponse.SC_CREATED);
String hostName = (String)data.get(VirtualHost.NAME);
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/" + EMPTY_VIRTUALHOSTNODE_NAME + "/" + hostName);
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/"
+ + EMPTY_VIRTUALHOSTNODE_NAME
+ + "/"
+ + hostName
+ + "?depth=1");
Asserts.assertVirtualHost(hostName, hostDetails);
assertNewVirtualHost(hostDetails);
}
@@ -151,7 +161,11 @@ public class VirtualHostRestTest extends QpidRestTestCase
{
Map<String, Object> data = submitVirtualHost(false, "PUT", HttpServletResponse.SC_CREATED);
String hostName = (String)data.get(VirtualHost.NAME);
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/" + EMPTY_VIRTUALHOSTNODE_NAME + "/" + hostName);
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/"
+ + EMPTY_VIRTUALHOSTNODE_NAME
+ + "/"
+ + hostName
+ + "?depth=1");
Asserts.assertVirtualHost(hostName, hostDetails);
assertNewVirtualHost(hostDetails);
@@ -451,7 +465,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
lvqQueueAttributes.put(LastValueQueue.LVQ_KEY, "LVQ");
createQueue(queueName + "-lvq", "lvq", lvqQueueAttributes);
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test");
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test?depth=1");
@SuppressWarnings("unchecked")
List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE);
@@ -484,7 +498,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
createExchange(exchangeName + "-headers", "headers");
createExchange(exchangeName + "-fanout", "fanout");
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test");
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test?depth=1");
@SuppressWarnings("unchecked")
List<Map<String, Object>> exchanges = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_EXCHANGES_ATTRIBUTE);
@@ -498,11 +512,10 @@ public class VirtualHostRestTest extends QpidRestTestCase
Asserts.assertDurableExchange(exchangeName + "-headers", "headers", headersExchange);
Asserts.assertDurableExchange(exchangeName + "-fanout", "fanout", fanoutExchange);
- assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.TRUE, directExchange.get(Queue.DURABLE));
- assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.TRUE, topicExchange.get(Queue.DURABLE));
- assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.TRUE, headersExchange.get(Queue.DURABLE));
- assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.TRUE, fanoutExchange.get(Queue.DURABLE));
-
+ assertEquals("Unexpected value of queue attribute " + Exchange.DURABLE, Boolean.TRUE, directExchange.get(Exchange.DURABLE));
+ assertEquals("Unexpected value of queue attribute " + Exchange.DURABLE, Boolean.TRUE, topicExchange.get(Exchange.DURABLE));
+ assertEquals("Unexpected value of queue attribute " + Exchange.DURABLE, Boolean.TRUE, headersExchange.get(Exchange.DURABLE));
+ assertEquals("Unexpected value of queue attribute " + Exchange.DURABLE, Boolean.TRUE, fanoutExchange.get(Exchange.DURABLE));
}
public void testPutCreateLVQWithoutKey() throws Exception
@@ -510,7 +523,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
String queueName = getTestQueueName()+ "-lvq";
createQueue(queueName, "lvq", null);
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test");
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test?depth=1");
@SuppressWarnings("unchecked")
List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE);
@@ -527,7 +540,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
int responseCode = tryCreateQueue(queueName, "sorted", null);
assertEquals("Unexpected response code", SC_UNPROCESSABLE_ENTITY, responseCode);
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test");
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test?depth=1");
@SuppressWarnings("unchecked")
List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE);
@@ -541,7 +554,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
String queueName = getTestQueueName()+ "-priority";
createQueue(queueName, "priority", null);
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test");
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test?depth=1");
@SuppressWarnings("unchecked")
List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE);
@@ -557,7 +570,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
String queueName = getTestQueueName();
createQueue(queueName, null, null);
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test");
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test?depth=1");
@SuppressWarnings("unchecked")
List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE);
@@ -572,7 +585,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
int responseCode = tryCreateQueue(queueName, "unsupported", null);
assertEquals("Unexpected response code", SC_UNPROCESSABLE_ENTITY, responseCode);
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test");
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test?depth=1");
@SuppressWarnings("unchecked")
List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE);
@@ -658,7 +671,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
lvqQueueAttributes.put(LastValueQueue.LVQ_KEY, "LVQ");
createQueue(queueName + "-lvq", "lvq", lvqQueueAttributes);
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test");
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test?depth=1");
@SuppressWarnings("unchecked")
List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE);
@@ -687,7 +700,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
// Test creation
createQueue(queueNameDoubleEncoded, "standard", null);
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test");
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test?depth=1");
List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE);
Map<String, Object> queue = getRestTestHelper().find(Queue.NAME, queueName , queues);
Asserts.assertQueue(queueName, "standard", queue);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b58850ad/systests/src/test/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java b/systests/src/test/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
index ae7f96b..c410845 100644
--- a/systests/src/test/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
@@ -105,19 +105,20 @@ public class GroupRestACLTest extends QpidRestTestCase
super.startDefaultBroker();
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER);
+ Map<String, Object> data =
+ getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER + "?depth=1");
getRestTestHelper().assertNumberOfGroups(data, 3);
getRestTestHelper().createGroup("newGroup", FILE_GROUP_MANAGER);
- data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER);
+ data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER + "?depth=1");
getRestTestHelper().assertNumberOfGroups(data, 4);
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
getRestTestHelper().createGroup("anotherNewGroup", FILE_GROUP_MANAGER, HttpServletResponse.SC_FORBIDDEN);
- data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER);
+ data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER + "?depth=1");
getRestTestHelper().assertNumberOfGroups(data, 4);
}
@@ -131,19 +132,20 @@ public class GroupRestACLTest extends QpidRestTestCase
super.startDefaultBroker();
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER);
+ Map<String, Object> data =
+ getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER + "?depth=1");
getRestTestHelper().assertNumberOfGroups(data, 3);
getRestTestHelper().removeGroup(OTHER_GROUP, FILE_GROUP_MANAGER, HttpServletResponse.SC_FORBIDDEN);
- data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER);
+ data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER + "?depth=1");
getRestTestHelper().assertNumberOfGroups(data, 3);
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
getRestTestHelper().removeGroup(OTHER_GROUP, FILE_GROUP_MANAGER);
- data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER);
+ data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER + "?depth=1");
getRestTestHelper().assertNumberOfGroups(data, 2);
}
@@ -189,7 +191,11 @@ public class GroupRestACLTest extends QpidRestTestCase
private void assertNumberOfGroupMembers(String groupName, int expectedNumberOfMembers) throws IOException
{
- Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/" + groupName);
+ Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/"
+ + FILE_GROUP_MANAGER
+ + "/"
+ + groupName
+ + "?depth=1");
getRestTestHelper().assertNumberOfGroupMembers(group, expectedNumberOfMembers);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org