diff options
| author | Alex Rudyy <orudyy@apache.org> | 2014-05-02 15:29:25 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2014-05-02 15:29:25 +0000 |
| commit | 75e7d8b9d87c03876d14cd689dc2f1ba1bfcd250 (patch) | |
| tree | d722fbba47103a0436972deeb889974ca1816361 /qpid/java | |
| parent | 3a12f8a561e9a7d8e27d004f6e0b39366c39abbf (diff) | |
| download | qpid-python-75e7d8b9d87c03876d14cd689dc2f1ba1bfcd250.tar.gz | |
QPID-5744: Move management REST API under /api/latest and auxiliary REST services under /service
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1591948 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
38 files changed, 444 insertions, 457 deletions
diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java index b44cef8851..b15a4ab37d 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java +++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java @@ -60,7 +60,7 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase super.setUp(); _hostName = getTestName(); - _baseNodeRestUrl = "/rest/virtualhostnode/"; + _baseNodeRestUrl = "virtualhostnode/"; _storeBaseDir = new File(TMP_FOLDER, "store-" + _hostName + "-" + System.currentTimeMillis()); @@ -136,7 +136,7 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase if (isMaster) { assertEquals("Unexpected role", "MASTER", nodeData.get(BDBHAVirtualHostNode.ROLE)); - Map<String, Object> hostData = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/" + masterNode + "/" + _hostName + "?depth=0"); + Map<String, Object> hostData = getRestTestHelper().getJsonAsSingletonList("virtualhost/" + masterNode + "/" + _hostName + "?depth=0"); assertEquals("Unexpected host name", _hostName, hostData.get(VirtualHost.NAME)); } else @@ -156,7 +156,7 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase remotes.remove(clusterNodeName); for (String remote : remotes) { - String remoteUrl = "/rest/replicationnode/" + clusterNodeName + "/" + remote; + String remoteUrl = "replicationnode/" + clusterNodeName + "/" + remote; waitForAttributeChanged(remoteUrl, BDBHARemoteReplicationNode.ROLE, remote.equals(masterNode) ? "MASTER" : "REPLICA"); } } diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 13ff57eae6..54c66647c0 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java @@ -232,8 +232,9 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem root.getServletContext().setAttribute(HttpManagementUtil.ATTR_MANAGEMENT_CONFIGURATION, this); FilterHolder restAuthorizationFilter = new FilterHolder(new ForbiddingAuthorisationFilter()); - restAuthorizationFilter.setInitParameter(ForbiddingAuthorisationFilter.INIT_PARAM_ALLOWED, "/rest/sasl"); - root.addFilter(restAuthorizationFilter, "/rest/*", EnumSet.of(DispatcherType.REQUEST)); + restAuthorizationFilter.setInitParameter(ForbiddingAuthorisationFilter.INIT_PARAM_ALLOWED, "/service/sasl"); + root.addFilter(restAuthorizationFilter, "/api/*", EnumSet.of(DispatcherType.REQUEST)); + root.addFilter(restAuthorizationFilter, "/service/*", EnumSet.of(DispatcherType.REQUEST)); root.addFilter(new FilterHolder(new RedirectingAuthorisationFilter()), HttpManagementUtil.ENTRY_POINT_PATH, EnumSet.of(DispatcherType.REQUEST)); root.addFilter(new FilterHolder(new RedirectingAuthorisationFilter()), "/index.html", EnumSet.of(DispatcherType.REQUEST)); root.addFilter(new FilterHolder(new RedirectingAuthorisationFilter()), "/", EnumSet.of(DispatcherType.REQUEST)); @@ -261,15 +262,15 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem addRestServlet(root, "binding", VirtualHostNode.class, VirtualHost.class, Exchange.class, Queue.class, Binding.class); addRestServlet(root, "session", VirtualHostNode.class, VirtualHost.class, Connection.class, Session.class); - root.addServlet(new ServletHolder(new UserPreferencesServlet()), "/rest/userpreferences/*"); - root.addServlet(new ServletHolder(new LoggedOnUserPreferencesServlet()), "/rest/preferences"); - root.addServlet(new ServletHolder(new StructureServlet()), "/rest/structure"); - root.addServlet(new ServletHolder(new MessageServlet()), "/rest/message/*"); - root.addServlet(new ServletHolder(new MessageContentServlet()), "/rest/message-content/*"); + root.addServlet(new ServletHolder(new UserPreferencesServlet()), "/service/userpreferences/*"); + root.addServlet(new ServletHolder(new LoggedOnUserPreferencesServlet()), "/service/preferences"); + root.addServlet(new ServletHolder(new StructureServlet()), "/service/structure"); + root.addServlet(new ServletHolder(new MessageServlet()), "/service/message/*"); + root.addServlet(new ServletHolder(new MessageContentServlet()), "/service/message-content/*"); - root.addServlet(new ServletHolder(new LogRecordsServlet()), "/rest/logrecords"); + root.addServlet(new ServletHolder(new LogRecordsServlet()), "/service/logrecords"); - root.addServlet(new ServletHolder(new SaslServlet()), "/rest/sasl"); + root.addServlet(new ServletHolder(new SaslServlet()), "/service/sasl"); root.addServlet(new ServletHolder(new DefinedFileServlet("index.html")), HttpManagementUtil.ENTRY_POINT_PATH); root.addServlet(new ServletHolder(new DefinedFileServlet("index.html")), "/"); @@ -289,9 +290,9 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem root.addServlet(new ServletHolder(new FileServlet()), "*.json"); root.addServlet(new ServletHolder(new FileServlet()), "*.txt"); root.addServlet(new ServletHolder(new FileServlet()), "*.xsl"); - root.addServlet(new ServletHolder(new HelperServlet()), "/rest/helper"); - root.addServlet(new ServletHolder(new LogFileListingServlet()), "/rest/logfilenames"); - root.addServlet(new ServletHolder(new LogFileServlet()), "/rest/logfile"); + root.addServlet(new ServletHolder(new HelperServlet()), "/service/helper"); + root.addServlet(new ServletHolder(new LogFileListingServlet()), "/service/logfilenames"); + root.addServlet(new ServletHolder(new LogFileServlet()), "/service/logfile"); final SessionManager sessionManager = root.getSessionHandler().getSessionManager(); sessionManager.getSessionCookieConfig().setName(JSESSIONID_COOKIE_PREFIX + lastPort); @@ -384,7 +385,7 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem private void addRestServlet(ServletContextHandler root, String name, Class<? extends ConfiguredObject>... hierarchy) { - root.addServlet(new ServletHolder(name, new RestServlet(hierarchy)), "/rest/" + name + "/*"); + root.addServlet(new ServletHolder(name, new RestServlet(hierarchy)), "/api/latest/" + name + "/*"); } private void logOperationalListenMessages(Server server) diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java index 1faacbb079..336dedb422 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java @@ -52,7 +52,6 @@ public class AlertingTest extends AbstractTestLogging public void setUp() throws Exception { _numMessages = 50; - TestBrokerConfiguration brokerConfiguration = getBrokerConfiguration(); setTestSystemProperty("virtualhost.housekeepingCheckPeriod", String.valueOf(ALERT_LOG_WAIT_PERIOD)); setTestSystemProperty("queue.alertThresholdQueueDepthMessages", String.valueOf(_numMessages)); @@ -186,7 +185,7 @@ public class AlertingTest extends AbstractTestLogging setTestSystemProperty("queue.alertThresholdQueueDepthMessages","5"); brokerConfiguration.setSaved(false); - restTestHelper.submitRequest("/rest/queue/test/test/" + getTestQueueName(), "PUT", Collections.<String, Object>singletonMap(org.apache.qpid.server.model.Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 5)); + restTestHelper.submitRequest("queue/test/test/" + getTestQueueName(), "PUT", Collections.<String, Object>singletonMap(org.apache.qpid.server.model.Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 5)); // Trigger the new value sendMessage(_session, _destination, 3); _session.commit(); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java index 983b21da51..4140c9c12c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java @@ -113,7 +113,7 @@ public class AccessControlProviderRestTest extends QpidRestTestCase //remove the access control provider using the 'allowed' user getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); - responseCode = getRestTestHelper().submitRequest("/rest/accesscontrolprovider/" + accessControlProviderName, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("accesscontrolprovider/" + accessControlProviderName, "DELETE"); assertEquals("Access control provider deletion should be allowed", 200, responseCode); assertAccessControlProviderExistence(accessControlProviderName, false); @@ -164,7 +164,7 @@ public class AccessControlProviderRestTest extends QpidRestTestCase //remove the original access control provider using the 'allowed' user getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); - responseCode = getRestTestHelper().submitRequest("/rest/accesscontrolprovider/" + accessControlProviderName1, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("accesscontrolprovider/" + accessControlProviderName1, "DELETE"); assertEquals("Access control provider deletion should be allowed", 200, responseCode); assertAccessControlProviderExistence(accessControlProviderName1, false); @@ -218,7 +218,7 @@ public class AccessControlProviderRestTest extends QpidRestTestCase //remove the second access control provider using the 'allowed' user getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); - responseCode = getRestTestHelper().submitRequest("/rest/accesscontrolprovider/" + accessControlProviderName2, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("accesscontrolprovider/" + accessControlProviderName2, "DELETE"); assertEquals("Access control provider deletion should be allowed", 200, responseCode); assertAccessControlProviderExistence(accessControlProviderName2, false); @@ -249,28 +249,28 @@ public class AccessControlProviderRestTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD); - Map<String, Object> acl = getRestTestHelper().getJsonAsSingletonList("/rest/accesscontrolprovider/" + TestBrokerConfiguration.ENTRY_NAME_ACL_FILE); + Map<String, Object> acl = getRestTestHelper().getJsonAsSingletonList("accesscontrolprovider/" + TestBrokerConfiguration.ENTRY_NAME_ACL_FILE); assertEquals("Unexpected id", id.toString(), acl.get(AccessControlProvider.ID)); assertEquals("Unexpected path", file.getAbsolutePath() , acl.get(FileAccessControlProviderConstants.PATH)); assertEquals("Unexpected state", State.ERRORED.name() , acl.get(AccessControlProvider.STATE)); - int status = getRestTestHelper().submitRequest("/rest/accesscontrolprovider/" + TestBrokerConfiguration.ENTRY_NAME_ACL_FILE, "DELETE", null); + int status = getRestTestHelper().submitRequest("accesscontrolprovider/" + TestBrokerConfiguration.ENTRY_NAME_ACL_FILE, "DELETE"); assertEquals("ACL was not deleted", 200, status); - List<Map<String, Object>> acls = getRestTestHelper().getJsonAsList("/rest/accesscontrolprovider/" + TestBrokerConfiguration.ENTRY_NAME_ACL_FILE); + List<Map<String, Object>> acls = getRestTestHelper().getJsonAsList("accesscontrolprovider/" + TestBrokerConfiguration.ENTRY_NAME_ACL_FILE); assertEquals("ACL exists", 0, acls.size()); } private void assertCanAccessManagementInterface(String accessControlProviderName, boolean canAccess) throws Exception { int expected = canAccess ? 200 : 403; - int responseCode = getRestTestHelper().submitRequest("/rest/accesscontrolprovider/" + accessControlProviderName, "GET", null); + int responseCode = getRestTestHelper().submitRequest("accesscontrolprovider/" + accessControlProviderName, "GET"); assertEquals("Unexpected response code", expected, responseCode); } private void assertAccessControlProviderExistence(String accessControlProviderName, boolean exists) throws Exception { - String path = "/rest/accesscontrolprovider/" + accessControlProviderName; + String path = "accesscontrolprovider/" + accessControlProviderName; List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList(path); assertEquals("Unexpected result", exists, !providers.isEmpty()); } @@ -283,6 +283,6 @@ public class AccessControlProviderRestTest extends QpidRestTestCase attributes.put(AccessControlProvider.TYPE, FileAccessControlProviderConstants.ACL_FILE_PROVIDER_TYPE); attributes.put(FileAccessControlProviderConstants.PATH, file.getAbsoluteFile()); - return getRestTestHelper().submitRequest("/rest/accesscontrolprovider/" + accessControlProviderName, "PUT", attributes); + return getRestTestHelper().submitRequest("accesscontrolprovider/" + accessControlProviderName, "PUT", attributes); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java index adbd8d6821..3f944da8c7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java @@ -69,7 +69,7 @@ public class AnonymousAccessRestTest extends QpidRestTestCase { startBrokerNow(); - Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("broker"); assertNotNull("Unexpected broker attributes", brokerDetails); assertNotNull("Unexpected value of attribute " + Broker.ID, brokerDetails.get(Broker.ID)); } @@ -81,10 +81,10 @@ public class AnonymousAccessRestTest extends QpidRestTestCase Map<String, Object> brokerAttributes = new HashMap<String, Object>(); brokerAttributes.put(Broker.DEFAULT_VIRTUAL_HOST, TEST3_VIRTUALHOST); - int response = getRestTestHelper().submitRequest("/rest/broker", "PUT", brokerAttributes); + int response = getRestTestHelper().submitRequest("broker", "PUT", brokerAttributes); assertEquals("Unexpected update response", 200, response); - Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("broker"); assertNotNull("Unexpected broker attributes", brokerDetails); assertNotNull("Unexpected value of attribute " + Broker.ID, brokerDetails.get(Broker.ID)); assertEquals("Unexpected default virtual host", TEST3_VIRTUALHOST, brokerDetails.get(Broker.DEFAULT_VIRTUAL_HOST)); @@ -96,7 +96,7 @@ public class AnonymousAccessRestTest extends QpidRestTestCase TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); startBrokerNow(); - int response = getRestTestHelper().submitRequest("/rest/broker", "GET", null); + int response = getRestTestHelper().submitRequest("broker", "GET"); assertEquals("Anonymous access should be denied", 401, response); } @@ -109,7 +109,7 @@ public class AnonymousAccessRestTest extends QpidRestTestCase Map<String, Object> brokerAttributes = new HashMap<String, Object>(); brokerAttributes.put(Broker.DEFAULT_VIRTUAL_HOST, TEST3_VIRTUALHOST); - int response = getRestTestHelper().submitRequest("/rest/broker", "PUT", brokerAttributes); + int response = getRestTestHelper().submitRequest("broker", "PUT", brokerAttributes); assertEquals("Anonymous access should be denied", 401, response); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java index 6f4b553530..cb57d6e5dc 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java @@ -44,7 +44,7 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase public void testGet() throws Exception { - List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("/rest/authenticationprovider"); + List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("authenticationprovider"); assertNotNull("Providers details cannot be null", providerDetails); assertEquals("Unexpected number of providers", 2, providerDetails.size()); for (Map<String, Object> provider : providerDetails) @@ -57,7 +57,7 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase managesPrincipals = false; } assertProvider(managesPrincipals, type , provider); - Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("/rest/authenticationprovider/" + Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" + provider.get(AuthenticationProvider.NAME)); assertNotNull("Cannot load data for " + provider.get(AuthenticationProvider.NAME), data); assertProvider(managesPrincipals, type, data); @@ -74,7 +74,7 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase attributes.put(AuthenticationProvider.TYPE, PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE); attributes.put(ExternalFileBasedAuthenticationManager.PATH, principalDatabase.getAbsolutePath()); - int responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes); assertEquals("failed to create authentication provider", 201, responseCode); } @@ -85,10 +85,10 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase attributes.put(AuthenticationProvider.NAME, providerName); attributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManager.PROVIDER_TYPE); - int responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes); assertEquals("Unexpected response code", 201, responseCode); - List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("/rest/authenticationprovider/" + providerName); + List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("authenticationprovider/" + providerName); assertNotNull("Providers details cannot be null", providerDetails); assertEquals("Unexpected number of providers", 1, providerDetails.size()); Map<String, Object> provider = providerDetails.get(0); @@ -102,12 +102,12 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase attributes.put(AuthenticationProvider.NAME, providerName); attributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManager.PROVIDER_TYPE); - int responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes); assertEquals("Unexpected response code", 201, responseCode); attributes.put(AuthenticationProvider.ID, UUID.randomUUID()); - responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes); assertEquals("Update with new ID should fail", 409, responseCode); } @@ -119,7 +119,7 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase attributes.put(AuthenticationProvider.NAME, providerName); attributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManager.PROVIDER_TYPE); - int responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes); assertEquals("Unexpected response code for provider creation", 201, responseCode); // create port @@ -129,13 +129,13 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase portAttributes.put(Port.AUTHENTICATION_PROVIDER, providerName); portAttributes.put(Port.PORT, findFreePort()); - responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", portAttributes); + responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", portAttributes); assertEquals("Unexpected response code for port creation", 201, responseCode); - responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName , "DELETE", null); + responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName , "DELETE"); assertEquals("Unexpected response code for provider deletion", 409, responseCode); - List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("/rest/authenticationprovider/" + providerName); + List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("authenticationprovider/" + providerName); assertNotNull("Providers details cannot be null", providerDetails); assertEquals("Unexpected number of providers", 1, providerDetails.size()); assertProvider(false, AnonymousAuthenticationManager.PROVIDER_TYPE, providerDetails.get(0)); @@ -149,13 +149,13 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase attributes.put(AuthenticationProvider.NAME, providerName); attributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManager.PROVIDER_TYPE); - int responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes); assertEquals("Unexpected response code for provider creation", 201, responseCode); - responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName , "DELETE", null); + responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName , "DELETE"); assertEquals("Unexpected response code for provider deletion", 200, responseCode); - List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("/rest/authenticationprovider/" + providerName); + List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("authenticationprovider/" + providerName); assertNotNull("Providers details cannot be null", providerDetails); assertEquals("Unexpected number of providers", 0, providerDetails.size()); } @@ -185,16 +185,16 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD); - Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList("/rest/authenticationprovider/" + providerName); + Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" + providerName); assertEquals("Unexpected id", id.toString(), provider.get(AuthenticationProvider.ID)); assertEquals("Unexpected name", providerName, provider.get(AuthenticationProvider.NAME)); assertEquals("Unexpected path", file.getAbsolutePath() , provider.get(ExternalFileBasedAuthenticationManager.PATH)); assertEquals("Unexpected state", State.ERRORED.name() , provider.get(AuthenticationProvider.STATE)); - int status = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "DELETE", null); + int status = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "DELETE"); assertEquals("ACL was not deleted", 200, status); - List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList("/rest/authenticationprovider/" + providerName); + List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList("authenticationprovider/" + providerName); assertEquals("Provider exists", 0, providers.size()); } @@ -223,7 +223,7 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD); - Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList("/rest/authenticationprovider/" + providerName); + Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" + providerName); assertEquals("Unexpected id", id.toString(), provider.get(AuthenticationProvider.ID)); assertEquals("Unexpected name", providerName, provider.get(AuthenticationProvider.NAME)); assertEquals("Unexpected path", file.getAbsolutePath() , provider.get(ExternalFileBasedAuthenticationManager.PATH)); @@ -239,10 +239,10 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase attributes.put(AuthenticationProvider.TYPE, PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE); attributes.put(ExternalFileBasedAuthenticationManager.PATH, principalDatabase.getAbsolutePath()); - int status = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "PUT", attributes); + int status = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes); assertEquals("ACL was not deleted", 200, status); - provider = getRestTestHelper().getJsonAsSingletonList("/rest/authenticationprovider/" + providerName); + provider = getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" + providerName); assertEquals("Unexpected id", id.toString(), provider.get(AuthenticationProvider.ID)); assertEquals("Unexpected name", providerName, provider.get(AuthenticationProvider.NAME)); assertEquals("Unexpected path", principalDatabase.getAbsolutePath() , provider.get( @@ -282,11 +282,11 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase attributes.put(AuthenticationProvider.TYPE, PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE); attributes.put(ExternalFileBasedAuthenticationManager.PATH, file.getAbsolutePath()); - int responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes); assertEquals("Password provider was not created", 201, responseCode); - Map<String, Object> providerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/authenticationprovider/" + providerName); + Map<String, Object> providerDetails = getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" + providerName); assertNotNull("Providers details cannot be null", providerDetails); assertEquals("Unexpected name", providerName, providerDetails.get(AuthenticationProvider.NAME)); assertEquals("Unexpected type", PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE, providerDetails.get(AuthenticationProvider.TYPE)); @@ -295,10 +295,10 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase assertTrue("User file should be created", file.exists()); - responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName , "DELETE", null); + responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName , "DELETE"); assertEquals("Unexpected response code for provider deletion", 200, responseCode); - List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList("/rest/authenticationprovider/" + providerName); + List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList("authenticationprovider/" + providerName); assertNotNull("Providers details cannot be null", providers); assertEquals("Unexpected number of providers", 0, providers.size()); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java index c9d5131b76..c51457cdab 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java @@ -24,7 +24,6 @@ import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE; import static org.apache.qpid.test.utils.TestSSLConstants.TRUSTSTORE_PASSWORD; import java.io.IOException; -import java.net.HttpURLConnection; import java.util.Collections; import javax.servlet.http.HttpServletResponse; @@ -66,8 +65,7 @@ public class BasicAuthRestTest extends QpidRestTestCase private void verifyGetBrokerAttempt(int responseCode) throws IOException { - HttpURLConnection conn = getRestTestHelper().openManagementConnection("/rest/broker", "GET"); - assertEquals(responseCode, conn.getResponseCode()); + assertEquals(responseCode, getRestTestHelper().submitRequest("broker", "GET")); } public void testBasicAuthWhenEnabledWithHttps() throws Exception diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java index ee7abd2424..368bc90d3d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java @@ -20,7 +20,6 @@ */ package org.apache.qpid.systest.rest; -import java.net.HttpURLConnection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -39,7 +38,7 @@ public class BindingRestTest extends QpidRestTestCase public void testGetAllBindings() throws Exception { - List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test"); + List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("binding/test"); assertNotNull("Bindings cannot be null", bindings); assertEquals("Unexpected number of bindings", RestTestHelper.EXPECTED_QUEUES.length, bindings.size()); for (Map<String, Object> binding : bindings) @@ -50,7 +49,7 @@ public class BindingRestTest extends QpidRestTestCase public void testGetVirtualHostExchangeBindings() throws Exception { - List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/test/amq.direct"); + List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("binding/test/test/amq.direct"); assertNotNull("Bindings cannot be null", bindings); assertEquals("Unexpected number of bindings", RestTestHelper.EXPECTED_QUEUES.length, bindings.size()); for (String queueName : RestTestHelper.EXPECTED_QUEUES) @@ -62,7 +61,7 @@ public class BindingRestTest extends QpidRestTestCase public void testGetVirtualHostExchangeQueueBindings() throws Exception { - List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/test/amq.direct/queue"); + List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("binding/test/test/amq.direct/queue"); assertNotNull("Bindings cannot be null", bindings); assertEquals("Unexpected number of bindings", 1, bindings.size()); Asserts.assertBinding("queue", "amq.direct", bindings.get(0)); @@ -71,12 +70,12 @@ public class BindingRestTest extends QpidRestTestCase public void testDeleteBinding() throws Exception { - String bindingUrl = "/rest/binding/test/test/amq.direct/queue/queue"; + String bindingUrl = "binding/test/test/amq.direct/queue/queue"; List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList(bindingUrl); assertEquals("Unexpected number of bindings", 1, bindings.size()); Asserts.assertBinding("queue", "amq.direct", bindings.get(0)); - int responseCode = getRestTestHelper().submitRequest(bindingUrl, "DELETE", null); + int responseCode = getRestTestHelper().submitRequest(bindingUrl, "DELETE"); assertEquals("Unexpected response code", 200, responseCode); bindings = getRestTestHelper().getJsonAsList(bindingUrl); @@ -85,10 +84,10 @@ public class BindingRestTest extends QpidRestTestCase public void testDeleteBindingById() throws Exception { - Map<String, Object> binding = getRestTestHelper().getJsonAsSingletonList("/rest/binding/test/test/amq.direct/queue"); - int responseCode = getRestTestHelper().submitRequest("/rest/binding/test/test/amq.direct?id=" + binding.get(Binding.ID), "DELETE", null); + Map<String, Object> binding = getRestTestHelper().getJsonAsSingletonList("binding/test/test/amq.direct/queue"); + int responseCode = getRestTestHelper().submitRequest("binding/test/test/amq.direct?id=" + binding.get(Binding.ID), "DELETE"); assertEquals("Unexpected response code", 200, responseCode); - List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/test/amq.direct/queue"); + List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("binding/test/test/amq.direct/queue"); assertEquals("Binding should be deleted", 0, bindings.size()); } @@ -100,7 +99,7 @@ public class BindingRestTest extends QpidRestTestCase bindingData.put(Binding.QUEUE, "queue"); bindingData.put(Binding.EXCHANGE, "amq.direct"); - String bindingUrl = "/rest/binding/test/test/amq.direct/queue/" + bindingName; + String bindingUrl = "binding/test/test/amq.direct/queue/" + bindingName; int responseCode = getRestTestHelper().submitRequest(bindingUrl, "PUT", bindingData); assertEquals("Unexpected response code", 201, responseCode); @@ -117,7 +116,7 @@ public class BindingRestTest extends QpidRestTestCase attributes.put(Binding.QUEUE, "queue"); attributes.put(Binding.EXCHANGE, "amq.direct"); - String bindingUrl = "/rest/binding/test/test/amq.direct/queue/" + bindingName; + String bindingUrl = "binding/test/test/amq.direct/queue/" + bindingName; int responseCode = getRestTestHelper().submitRequest(bindingUrl, "PUT", attributes); assertEquals("Unexpected response code", 201, responseCode); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java index e3e74c8670..5b8d919d3e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java @@ -79,7 +79,7 @@ public class BrokerRestHttpsClientCertAuthTest extends QpidRestTestCase public void testGetWithHttps() throws Exception { - Map<String, Object> saslData = getRestTestHelper().getJsonAsMap("/rest/sasl"); + Map<String, Object> saslData = getRestTestHelper().getJsonAsMap("/service/sasl"); Asserts.assertAttributesPresent(saslData, "user"); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java index 6baf9d1109..a4d0f40590 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java @@ -61,7 +61,7 @@ public class BrokerRestHttpsTest extends QpidRestTestCase public void testGetWithHttps() throws Exception { - Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("broker"); Asserts.assertAttributesPresent(brokerDetails, ConfiguredObjectTypeRegistry.getAttributeNames(Broker.class), Broker.PROCESS_PID, Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java index afd647a969..e9745f68e5 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java @@ -54,7 +54,7 @@ public class BrokerRestTest extends QpidRestTestCase public void testGet() throws Exception { - Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("broker"); assertBrokerAttributes(brokerDetails); @@ -102,11 +102,11 @@ public class BrokerRestTest extends QpidRestTestCase { Map<String, Object> brokerAttributes = getValidBrokerAttributes(); - int response = getRestTestHelper().submitRequest("/rest/broker", "PUT", brokerAttributes); + int response = getRestTestHelper().submitRequest("broker", "PUT", brokerAttributes); assertEquals("Unexpected update response", 200, response); restartBroker(); - Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("broker"); assertBrokerAttributes(brokerAttributes, brokerDetails); } @@ -125,10 +125,10 @@ public class BrokerRestTest extends QpidRestTestCase attributes.put(entry.getKey(), value); } - int response = getRestTestHelper().submitRequest("/rest/broker", "PUT", attributes); + int response = getRestTestHelper().submitRequest("broker", "PUT", attributes); assertEquals("Unexpected update response", 200, response); - Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("broker"); assertBrokerAttributes(validAttributes, brokerDetails); } @@ -144,7 +144,7 @@ public class BrokerRestTest extends QpidRestTestCase { Map<String, Object> brokerAttributes = getValidBrokerAttributes(); brokerAttributes.put(entry.getKey(), entry.getValue()); - int response = getRestTestHelper().submitRequest("/rest/broker", "PUT", brokerAttributes); + int response = getRestTestHelper().submitRequest("broker", "PUT", brokerAttributes); assertEquals("Unexpected update response for invalid attribute " + entry.getKey() + "=" + entry.getValue(), 409, response); } @@ -152,16 +152,16 @@ public class BrokerRestTest extends QpidRestTestCase public void testSetCloseOnNoRoute() throws Exception { - Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("broker"); assertTrue("closeOnNoRoute should be true", (Boolean)brokerDetails.get(Broker.CONNECTION_CLOSE_WHEN_NO_ROUTE)); Map<String, Object> brokerAttributes = new HashMap<String, Object>(); brokerAttributes.put(Broker.CONNECTION_CLOSE_WHEN_NO_ROUTE, false); - int response = getRestTestHelper().submitRequest("/rest/broker", "PUT", brokerAttributes); + int response = getRestTestHelper().submitRequest("broker", "PUT", brokerAttributes); assertEquals("Unexpected update response", 200, response); - brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + brokerDetails = getRestTestHelper().getJsonAsSingletonList("broker"); assertFalse("closeOnNoRoute should be false", (Boolean)brokerDetails.get(Broker.CONNECTION_CLOSE_WHEN_NO_ROUTE)); Connection connection = getConnection(); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java index 9013db7469..e07fd5ccaf 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java @@ -91,14 +91,14 @@ public class ConnectionRestTest extends QpidRestTestCase public void testGetAllConnections() throws Exception { - List<Map<String, Object>> connections = getRestTestHelper().getJsonAsList("/rest/connection"); + List<Map<String, Object>> connections = getRestTestHelper().getJsonAsList("connection"); assertEquals("Unexpected number of connections", 1, connections.size()); Asserts.assertConnection(connections.get(0), (AMQConnection) _connection); } public void testGetVirtualHostConnections() throws Exception { - List<Map<String, Object>> connections = getRestTestHelper().getJsonAsList("/rest/connection/test/test"); + List<Map<String, Object>> connections = getRestTestHelper().getJsonAsList("connection/test/test"); assertEquals("Unexpected number of connections", 1, connections.size()); Asserts.assertConnection(connections.get(0), (AMQConnection) _connection); } @@ -108,21 +108,21 @@ public class ConnectionRestTest extends QpidRestTestCase // get connection name String connectionName = getConnectionName(); - Map<String, Object> connectionDetails = getRestTestHelper().getJsonAsSingletonList("/rest/connection/test/test/" + Map<String, Object> connectionDetails = getRestTestHelper().getJsonAsSingletonList("connection/test/test/" + URLDecoder.decode(connectionName, "UTF-8")); assertConnection(connectionDetails); } public void testGetAllSessions() throws Exception { - List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("/rest/session"); + List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("session"); assertEquals("Unexpected number of sessions", 1, sessions.size()); assertSession(sessions.get(0), (AMQSession<?, ?>) _session); } public void testGetVirtualHostSessions() throws Exception { - List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("/rest/session/test/test"); + List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("session/test/test"); assertEquals("Unexpected number of sessions", 1, sessions.size()); assertSession(sessions.get(0), (AMQSession<?, ?>) _session); } @@ -132,7 +132,7 @@ public class ConnectionRestTest extends QpidRestTestCase // get connection name String connectionName = getConnectionName(); - List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("/rest/session/test/test/" + List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("session/test/test/" + URLDecoder.decode(connectionName, "UTF-8")); assertEquals("Unexpected number of sessions", 1, sessions.size()); assertSession(sessions.get(0), (AMQSession<?, ?>) _session); @@ -143,7 +143,7 @@ public class ConnectionRestTest extends QpidRestTestCase // get connection name String connectionName = getConnectionName(); - List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("/rest/session/test/test/" + List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("session/test/test/" + URLDecoder.decode(connectionName, "UTF-8") + "/" + ((AMQSession<?, ?>) _session).getChannelId()); assertEquals("Unexpected number of sessions", 1, sessions.size()); assertSession(sessions.get(0), (AMQSession<?, ?>) _session); @@ -210,7 +210,7 @@ public class ConnectionRestTest extends QpidRestTestCase private String getConnectionName() throws IOException { - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test/test"); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test/test"); @SuppressWarnings("unchecked") List<Map<String, Object>> connections = (List<Map<String, Object>>) hostDetails .get(VirtualHostRestTest.VIRTUALHOST_CONNECTIONS_ATTRIBUTE); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java index ef674fc95b..9b3bffd97a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java @@ -39,7 +39,7 @@ public class ExchangeRestTest extends QpidRestTestCase public void testGet() throws Exception { - List<Map<String, Object>> exchanges = getRestTestHelper().getJsonAsList("/rest/exchange"); + List<Map<String, Object>> exchanges = getRestTestHelper().getJsonAsList("exchange"); assertNotNull("Exchanges cannot be null", exchanges); assertTrue("Unexpected number of exchanges", exchanges.size() >= EXPECTED_VIRTUALHOSTS.length * EXPECTED_EXCHANGES.length); for (Map<String, Object> exchange : exchanges) @@ -50,7 +50,7 @@ public class ExchangeRestTest extends QpidRestTestCase public void testGetHostExchanges() throws Exception { - List<Map<String, Object>> exchanges = getRestTestHelper().getJsonAsList("/rest/exchange/test"); + List<Map<String, Object>> exchanges = getRestTestHelper().getJsonAsList("exchange/test"); assertNotNull("Users cannot be null", exchanges); assertEquals("Unexpected number of exchanges", exchanges.size(), EXPECTED_EXCHANGES.length); for (String exchangeName : EXPECTED_EXCHANGES) @@ -64,7 +64,7 @@ public class ExchangeRestTest extends QpidRestTestCase { for (String exchangeName : EXPECTED_EXCHANGES) { - Map<String, Object> exchange = getRestTestHelper().getJsonAsSingletonList("/rest/exchange/test/test/" + Map<String, Object> exchange = getRestTestHelper().getJsonAsSingletonList("exchange/test/test/" + URLDecoder.decode(exchangeName, "UTF-8")); assertExchange(exchangeName, exchange); } @@ -73,7 +73,7 @@ public class ExchangeRestTest extends QpidRestTestCase public void testSetExchangeAttributesUnsupported() throws Exception { String exchangeName = getTestName(); - String exchangeUrl = "/rest/exchange/test/test/" + exchangeName; + String exchangeUrl = "exchange/test/test/" + exchangeName; Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(Exchange.NAME, exchangeName); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java index 884d3d321a..47424919c0 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java @@ -71,13 +71,13 @@ public class GroupProviderRestTest extends QpidRestTestCase public void testGet() throws Exception { - List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("/rest/groupprovider"); + List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("groupprovider"); assertNotNull("Providers details cannot be null", providerDetails); assertEquals("Unexpected number of providers", 1, providerDetails.size()); for (Map<String, Object> provider : providerDetails) { assertProvider(FILE_GROUP_MANAGER, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE, provider); - Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + provider.get(GroupProvider.NAME)); assertNotNull("Cannot load data for " + provider.get(GroupProvider.NAME), data); assertProvider(FILE_GROUP_MANAGER, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE, data); @@ -88,14 +88,14 @@ public class GroupProviderRestTest extends QpidRestTestCase { String groupName = "newGroup"; - Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + FILE_GROUP_MANAGER); + Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER); assertNotNull("Cannot load data for provider", data); getRestTestHelper().assertNumberOfGroups(data, 1); getRestTestHelper().createGroup(groupName, FILE_GROUP_MANAGER); - data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + FILE_GROUP_MANAGER); + data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER); assertNotNull("Cannot load data for provider", data); getRestTestHelper().assertNumberOfGroups(data, 2); @@ -105,14 +105,14 @@ public class GroupProviderRestTest extends QpidRestTestCase { String groupName = "myGroup"; - Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + FILE_GROUP_MANAGER); + Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER); assertNotNull("Cannot load data for provider", data); getRestTestHelper().assertNumberOfGroups(data, 1); getRestTestHelper().removeGroup(groupName, FILE_GROUP_MANAGER); - data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + FILE_GROUP_MANAGER); + data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER); assertNotNull("Cannot load data for provider", data); getRestTestHelper().assertNumberOfGroups(data, 0); @@ -130,10 +130,10 @@ public class GroupProviderRestTest extends QpidRestTestCase attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE); attributes.put(FileBasedGroupProvider.PATH, groupFile.getAbsolutePath()); - int responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("groupprovider/" + providerName, "PUT", attributes); assertEquals("Group provider was not created", 201, responseCode); - Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + providerName + "?depth=2"); + Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + providerName + "?depth=2"); assertProvider(providerName, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE, data); assertEquals("Unexpected name", providerName, data.get(GroupProvider.NAME)); assertEquals("Unexpected path", groupFile.getAbsolutePath(), data.get(FileBasedGroupProvider.PATH)); @@ -176,7 +176,7 @@ public class GroupProviderRestTest extends QpidRestTestCase attributes.put(GroupProvider.NAME, providerName); attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE); - int responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("groupprovider/" + providerName, "PUT", attributes); assertEquals("Group provider was created", 409, responseCode); } @@ -192,10 +192,10 @@ public class GroupProviderRestTest extends QpidRestTestCase attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE); attributes.put(FileBasedGroupProvider.PATH, groupFile.getAbsolutePath()); - int responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("groupprovider/" + providerName, "PUT", attributes); assertEquals("Group provider was not created", 201, responseCode); - Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + providerName); + Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + providerName); assertEquals("Unexpected name", providerName, data.get(GroupProvider.NAME)); assertEquals("Unexpected path", groupFile.getAbsolutePath(), data.get(FileBasedGroupProvider.PATH)); @@ -223,11 +223,11 @@ public class GroupProviderRestTest extends QpidRestTestCase attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE); attributes.put(FileBasedGroupProvider.PATH, groupFile.getAbsolutePath()); - int responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("groupprovider/" + providerName, "PUT", attributes); assertEquals("Group provider was not created", 201, responseCode); attributes.put(GroupProvider.NAME, providerName + 2); - responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + providerName + 2, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("groupprovider/" + providerName + 2, "PUT", attributes); assertEquals("Group provider for the same group file was created", 409, responseCode); } finally @@ -247,13 +247,13 @@ public class GroupProviderRestTest extends QpidRestTestCase attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE); attributes.put(FileBasedGroupProvider.PATH, groupFile.getAbsolutePath()); - int responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("groupprovider/" + providerName, "PUT", attributes); assertEquals("Expected to fail because we can have only one password provider", 201, responseCode); - responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + providerName , "DELETE", null); + responseCode = getRestTestHelper().submitRequest("groupprovider/" + providerName , "DELETE"); assertEquals("Group provider was not deleted", 200, responseCode); - List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("/rest/groupprovider/" + providerName); + List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("groupprovider/" + providerName); assertEquals("Provider was not deleted", 0, providerDetails.size()); assertFalse("Groups file should be deleted", groupFile.exists()); } @@ -274,13 +274,13 @@ public class GroupProviderRestTest extends QpidRestTestCase attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE); attributes.put(FileBasedGroupProvider.PATH, groupFile.getAbsolutePath()); - int responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("groupprovider/" + providerName, "PUT", attributes); assertEquals("Expected to fail because we can have only one password provider", 201, responseCode); File newGroupFile = new File(TMP_FOLDER + File.separator + getTestName() + File.separator + "groups"); attributes.put(FileBasedGroupProvider.PATH, newGroupFile.getAbsolutePath()); - responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + providerName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("groupprovider/" + providerName, "PUT", attributes); assertEquals("Expected to fail because we can have only one password provider", 409, responseCode); } finally @@ -308,15 +308,15 @@ public class GroupProviderRestTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD); - Map<String, Object> groupProvider = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + TestBrokerConfiguration.ENTRY_NAME_GROUP_FILE); + Map<String, Object> groupProvider = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + TestBrokerConfiguration.ENTRY_NAME_GROUP_FILE); assertEquals("Unexpected id", id.toString(), groupProvider.get(GroupProvider.ID)); assertEquals("Unexpected path", file.getAbsolutePath() , groupProvider.get(FileBasedGroupProvider.PATH)); assertEquals("Unexpected state", State.ERRORED.name() , groupProvider.get(GroupProvider.STATE)); - int status = getRestTestHelper().submitRequest("/rest/groupprovider/" + TestBrokerConfiguration.ENTRY_NAME_GROUP_FILE, "DELETE", null); + int status = getRestTestHelper().submitRequest("groupprovider/" + TestBrokerConfiguration.ENTRY_NAME_GROUP_FILE, "DELETE"); assertEquals("ACL was not deleted", 200, status); - List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList("/rest/groupprovider/" + TestBrokerConfiguration.ENTRY_NAME_GROUP_FILE); + List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList("groupprovider/" + TestBrokerConfiguration.ENTRY_NAME_GROUP_FILE); assertEquals("Provider exists", 0, providers.size()); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java index 67e50b1bd1..eeb9511289 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java @@ -64,7 +64,7 @@ public class GroupRestTest extends QpidRestTestCase public void testGet() throws Exception { - Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("/rest/group/" + FILE_GROUP_MANAGER + "/myGroup"); + Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup"); List<Map<String, Object>> groupmembers = (List<Map<String, Object>>) group.get("groupmembers"); assertEquals(1, groupmembers.size()); @@ -74,23 +74,23 @@ public class GroupRestTest extends QpidRestTestCase public void testCreateNewMemberOfGroup() throws Exception { - Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("/rest/group/" + FILE_GROUP_MANAGER + "/myGroup"); + Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup"); getRestTestHelper().assertNumberOfGroupMembers(group, 1); getRestTestHelper().createNewGroupMember(FILE_GROUP_MANAGER, GROUP_NAME, NEW_MEMBER); - group = getRestTestHelper().getJsonAsSingletonList("/rest/group/" + FILE_GROUP_MANAGER + "/myGroup"); + group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup"); getRestTestHelper().assertNumberOfGroupMembers(group, 2); } public void testRemoveMemberFromGroup() throws Exception { - Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("/rest/group/" + FILE_GROUP_MANAGER + "/myGroup"); + Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup"); getRestTestHelper().assertNumberOfGroupMembers(group, 1); getRestTestHelper().removeMemberFromGroup(FILE_GROUP_MANAGER, GROUP_NAME, EXISTING_MEMBER); - group = getRestTestHelper().getJsonAsSingletonList("/rest/group/" + FILE_GROUP_MANAGER + "/myGroup"); + group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/myGroup"); getRestTestHelper().assertNumberOfGroupMembers(group, 0); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java index fcf969e979..abafb7fcaf 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java @@ -32,7 +32,7 @@ public class HttpManagementRestTest extends QpidRestTestCase public void testGetHttpManagement() throws Exception { Map<String, Object> details = getRestTestHelper().getJsonAsSingletonList( - "/rest/plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT); + "plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT); assertEquals("Unexpected session timeout", HttpManagement.DEFAULT_TIMEOUT_IN_SECONDS, details.get(HttpManagement.TIME_OUT)); @@ -55,10 +55,10 @@ public class HttpManagementRestTest extends QpidRestTestCase attributes.put(HttpManagement.HTTP_SASL_AUTHENTICATION_ENABLED, false); attributes.put(HttpManagement.TIME_OUT, 10000); - getRestTestHelper().submitRequest("/rest/plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes); + getRestTestHelper().submitRequest("plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes); Map<String, Object> details = getRestTestHelper().getJsonAsSingletonList( - "/rest/plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT); + "plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT); assertEquals("Unexpected session timeout", 10000, details.get(HttpManagement.TIME_OUT)); assertEquals("Unexpected http basic auth enabled", true, details.get(HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED)); @@ -79,13 +79,13 @@ public class HttpManagementRestTest extends QpidRestTestCase { Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(invalidAttribute.getKey(), invalidAttribute.getValue()); - int response = getRestTestHelper().submitRequest("/rest/plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes); + int response = getRestTestHelper().submitRequest("plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes); assertEquals("Update should fail for attribute " + invalidAttribute.getKey() + " with value " + invalidAttribute.getValue() , 409, response); } Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(HttpManagement.TIME_OUT, -1l); - int response = getRestTestHelper().submitRequest("/rest/plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes); + int response = getRestTestHelper().submitRequest("plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes); assertEquals("Update should fail for invalid session timeout", 409, response); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java index 834beb542c..4b881d1e9f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java @@ -70,7 +70,7 @@ public class KeyStoreRestTest extends QpidRestTestCase createKeyStore(name, certAlias); assertNumberOfKeyStores(2); - List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("/rest/keystore/" + name); + List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("keystore/" + name); assertNotNull("details cannot be null", keyStores); assertKeyStoreAttributes(keyStores.get(0), name, TestSSLConstants.KEYSTORE, certAlias); @@ -87,10 +87,10 @@ public class KeyStoreRestTest extends QpidRestTestCase createKeyStore(name, certAlias); assertNumberOfKeyStores(2); - int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "DELETE", null); + int responseCode = getRestTestHelper().submitRequest("keystore/" + name , "DELETE"); assertEquals("Unexpected response code for provider deletion", 200, responseCode); - List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("/rest/keystore/" + name); + List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("keystore/" + name); assertNotNull("details should not be null", keyStore); assertTrue("details should be empty as the keystore no longer exists", keyStore.isEmpty()); @@ -126,17 +126,17 @@ public class KeyStoreRestTest extends QpidRestTestCase //verify the keystore is there assertNumberOfKeyStores(2); - List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("/rest/keystore/" + name); + List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("keystore/" + name); assertNotNull("details should not be null", keyStore); assertKeyStoreAttributes(keyStore.get(0), name, TestSSLConstants.BROKER_KEYSTORE, null); //try to delete it, which should fail as it is in use - int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "DELETE", null); + int responseCode = getRestTestHelper().submitRequest("keystore/" + name , "DELETE"); assertEquals("Unexpected response code for provider deletion", 409, responseCode); //check its still there assertNumberOfKeyStores(2); - keyStore = getRestTestHelper().getJsonAsList("/rest/keystore/" + name); + keyStore = getRestTestHelper().getJsonAsList("keystore/" + name); assertNotNull("details should not be null", keyStore); assertKeyStoreAttributes(keyStore.get(0), name, TestSSLConstants.BROKER_KEYSTORE, null); } @@ -155,10 +155,10 @@ public class KeyStoreRestTest extends QpidRestTestCase attributes.put(KeyStore.NAME, name); attributes.put(FileKeyStore.PATH, TestSSLConstants.UNTRUSTED_KEYSTORE); - int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("keystore/" + name , "PUT", attributes); assertEquals("Unexpected response code for keystore update", 200, responseCode); - List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("/rest/keystore/" + name); + List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("keystore/" + name); assertNotNull("details should not be null", keyStore); assertKeyStoreAttributes(keyStore.get(0), name, TestSSLConstants.UNTRUSTED_KEYSTORE, null); @@ -178,10 +178,10 @@ public class KeyStoreRestTest extends QpidRestTestCase attributes.put(KeyStore.NAME, name); attributes.put(FileKeyStore.PATH, "does.not.exist"); - int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("keystore/" + name , "PUT", attributes); assertEquals("Unexpected response code for keystore update", 409, responseCode); - List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("/rest/keystore/" + name); + List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("keystore/" + name); assertNotNull("details should not be null", keyStore); //verify the details remain unchanged @@ -198,7 +198,7 @@ public class KeyStoreRestTest extends QpidRestTestCase createKeyStore(name, "app1"); assertNumberOfKeyStores(2); - List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("/rest/keystore/" + name); + List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("keystore/" + name); assertNotNull("details should not be null", keyStore); assertKeyStoreAttributes(keyStore.get(0), name, TestSSLConstants.KEYSTORE, "app1"); @@ -207,10 +207,10 @@ public class KeyStoreRestTest extends QpidRestTestCase attributes.put(KeyStore.NAME, name); attributes.put(FileKeyStore.CERTIFICATE_ALIAS, "app2"); - int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("keystore/" + name , "PUT", attributes); assertEquals("Unexpected response code for keystore update", 200, responseCode); - keyStore = getRestTestHelper().getJsonAsList("/rest/keystore/" + name); + keyStore = getRestTestHelper().getJsonAsList("keystore/" + name); assertNotNull("details should not be null", keyStore); assertKeyStoreAttributes(keyStore.get(0), name, TestSSLConstants.KEYSTORE, "app2"); @@ -220,10 +220,10 @@ public class KeyStoreRestTest extends QpidRestTestCase attributes.put(KeyStore.NAME, name); attributes.put(FileKeyStore.CERTIFICATE_ALIAS, null); - responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name , "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("keystore/" + name , "PUT", attributes); assertEquals("Unexpected response code for keystore update", 200, responseCode); - keyStore = getRestTestHelper().getJsonAsList("/rest/keystore/" + name); + keyStore = getRestTestHelper().getJsonAsList("keystore/" + name); assertNotNull("details should not be null", keyStore); assertKeyStoreAttributes(keyStore.get(0), name, TestSSLConstants.KEYSTORE, null); @@ -232,7 +232,7 @@ public class KeyStoreRestTest extends QpidRestTestCase private List<Map<String, Object>> assertNumberOfKeyStores(int numberOfKeystores) throws IOException, JsonParseException, JsonMappingException { - List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("/rest/keystore"); + List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("keystore"); assertNotNull("keystores should not be null", keyStores); assertEquals("Unexpected number of keystores", numberOfKeystores, keyStores.size()); @@ -247,7 +247,7 @@ public class KeyStoreRestTest extends QpidRestTestCase keyStoreAttributes.put(FileKeyStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD); keyStoreAttributes.put(FileKeyStore.CERTIFICATE_ALIAS, certAlias); - int responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + name, "PUT", keyStoreAttributes); + int responseCode = getRestTestHelper().submitRequest("keystore/" + name, "PUT", keyStoreAttributes); assertEquals("Unexpected response code", 201, responseCode); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java index 8f2c138869..4d06c7b624 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java @@ -27,7 +27,7 @@ public class LogRecordsRestTest extends QpidRestTestCase { public void testGet() throws Exception { - List<Map<String, Object>> logs = getRestTestHelper().getJsonAsList("/rest/logrecords"); + List<Map<String, Object>> logs = getRestTestHelper().getJsonAsList("/service/logrecords"); assertNotNull("Logs data cannot be null", logs); assertTrue("Logs are not found", logs.size() > 0); Map<String, Object> record = getRestTestHelper().find("message", "[Broker] BRK-1004 : Qpid Broker Ready", logs); @@ -42,7 +42,7 @@ public class LogRecordsRestTest extends QpidRestTestCase public void testGetLogsFromGivenId() throws Exception { - List<Map<String, Object>> logs = getRestTestHelper().getJsonAsList("/rest/logrecords"); + List<Map<String, Object>> logs = getRestTestHelper().getJsonAsList("/service/logrecords"); assertNotNull("Logs data cannot be null", logs); assertTrue("Logs are not found", logs.size() > 0); @@ -52,7 +52,7 @@ public class LogRecordsRestTest extends QpidRestTestCase //make sure that new logs are created getConnection(); - List<Map<String, Object>> newLogs = getRestTestHelper().getJsonAsList("/rest/logrecords?lastLogId=" + lastId); + List<Map<String, Object>> newLogs = getRestTestHelper().getJsonAsList("/service/logrecords?lastLogId=" + lastId); assertNotNull("Logs data cannot be null", newLogs); assertTrue("Logs are not found", newLogs.size() > 0); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java index e00a9889e6..f2fb2581f7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java @@ -49,7 +49,7 @@ public class LogViewerTest extends QpidRestTestCase public void testGetLogFiles() throws Exception { - List<Map<String, Object>> logFiles = getRestTestHelper().getJsonAsList("/rest/logfilenames"); + List<Map<String, Object>> logFiles = getRestTestHelper().getJsonAsList("/service/logfilenames"); assertNotNull("Log files data cannot be null", logFiles); // 1 file appender is configured in QPID default log4j xml: @@ -65,7 +65,7 @@ public class LogViewerTest extends QpidRestTestCase public void testDownloadExistingLogFiles() throws Exception { - byte[] bytes = getRestTestHelper().getBytes("/rest/logfile?l=" + DEFAULT_FILE_APPENDER_NAME + "%2F" + _expectedLogFileName); + byte[] bytes = getRestTestHelper().getBytes("/service/logfile?l=" + DEFAULT_FILE_APPENDER_NAME + "%2F" + _expectedLogFileName); ZipInputStream zis = new ZipInputStream(new ByteArrayInputStream(bytes)); try @@ -91,15 +91,15 @@ public class LogViewerTest extends QpidRestTestCase public void testDownloadNonExistingLogFiles() throws Exception { - int responseCode = getRestTestHelper().submitRequest("/rest/logfile?l=" + DEFAULT_FILE_APPENDER_NAME + "%2F" - + _expectedLogFileName + "_" + System.currentTimeMillis(), "GET", null); + int responseCode = getRestTestHelper().submitRequest("/service/logfile?l=" + DEFAULT_FILE_APPENDER_NAME + "%2F" + + _expectedLogFileName + "_" + System.currentTimeMillis(), "GET"); assertEquals("Unexpected response code", 404, responseCode); } public void testDownloadNonLogFiles() throws Exception { - int responseCode = getRestTestHelper().submitRequest("/rest/logfile?l=config.json", "GET", null); + int responseCode = getRestTestHelper().submitRequest("/service/logfile?l=config.json", "GET"); assertEquals("Unexpected response code", 400, responseCode); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java index d8dc7f35c0..630f0e0c1f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java @@ -21,7 +21,6 @@ package org.apache.qpid.systest.rest; import java.io.IOException; -import java.net.HttpURLConnection; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -85,7 +84,7 @@ public class MessagesRestTest extends QpidRestTestCase public void testGet() throws Exception { String queueName = getTestQueueName(); - List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("/rest/message/test/" + queueName); + List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("/service/message/test/" + queueName); assertNotNull("Messages are not found", messages); assertEquals("Unexpected number of messages", MESSAGE_NUMBER, messages.size()); int position = 0; @@ -111,7 +110,7 @@ public class MessagesRestTest extends QpidRestTestCase // get message IDs List<Long> ids = getMesssageIds(queueName); - Map<String, Object> message = getRestTestHelper().getJsonAsMap("/rest/message/test/" + queueName + "/" + ids.get(0)); + Map<String, Object> message = getRestTestHelper().getJsonAsMap("/service/message/test/" + queueName + "/" + ids.get(0)); assertMessageAttributes(message); assertMessageAttributeValues(message, true); @@ -121,7 +120,7 @@ public class MessagesRestTest extends QpidRestTestCase assertEquals("Unexpected message header", 0, headers.get("index")); Long lastMessageId = ids.get(ids.size() - 1); - message = getRestTestHelper().getJsonAsMap("/rest/message/test/" + queueName + "/" + lastMessageId); + message = getRestTestHelper().getJsonAsMap("/service/message/test/" + queueName + "/" + lastMessageId); assertMessageAttributes(message); assertEquals("Unexpected message attribute mimeType", "application/octet-stream", message.get("mimeType")); assertEquals("Unexpected message attribute size", 4, message.get("size")); @@ -132,10 +131,7 @@ public class MessagesRestTest extends QpidRestTestCase assertEquals("Unexpected message header", "value", bytesMessageHeader.get("test")); // get content - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/message-content/test/" + queueName + "/" - + lastMessageId, "GET"); - connection.connect(); - byte[] data = getRestTestHelper().readConnectionInputStream(connection); + byte[] data = getRestTestHelper().getBytes("/service/message-content/test/" + queueName + "/" + lastMessageId); assertTrue("Unexpected message", Arrays.equals(messageBytes, data)); } @@ -159,18 +155,17 @@ public class MessagesRestTest extends QpidRestTestCase } // move messages - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/message/test/" + queueName, "POST"); Map<String, Object> messagesData = new HashMap<String, Object>(); messagesData.put("messages", movedMessageIds); messagesData.put("destinationQueue", queueName2); messagesData.put("move", Boolean.TRUE); - getRestTestHelper().writeJsonRequest(connection, messagesData); - assertEquals("Unexpected response code", 200, connection.getResponseCode()); + int status = getRestTestHelper().submitRequest("/service/message/test/" + queueName, "POST", messagesData); + assertEquals("Unexpected response code", 200, status); // check messages on target queue - List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("/rest/message/test/" + queueName2); + List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("/service/message/test/" + queueName2); assertNotNull("Messages are not found", messages); assertEquals("Unexpected number of messages", movedMessageIds.size(), messages.size()); for (Long id : movedMessageIds) @@ -180,7 +175,7 @@ public class MessagesRestTest extends QpidRestTestCase } // check messages on original queue - messages = getRestTestHelper().getJsonAsList("/rest/message/test/" + queueName); + messages = getRestTestHelper().getJsonAsList("/service/message/test/" + queueName); assertNotNull("Messages are not found", messages); assertEquals("Unexpected number of messages", ids.size(), messages.size()); for (Long id : ids) @@ -214,17 +209,15 @@ public class MessagesRestTest extends QpidRestTestCase } // copy messages - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/message/test/" + queueName, "POST"); - Map<String, Object> messagesData = new HashMap<String, Object>(); messagesData.put("messages", copyMessageIds); messagesData.put("destinationQueue", queueName2); - getRestTestHelper().writeJsonRequest(connection, messagesData); - assertEquals("Unexpected response code", 200, connection.getResponseCode()); + int responseCode = getRestTestHelper().submitRequest("/service/message/test/" + queueName, "POST", messagesData); + assertEquals("Unexpected response code", 200, responseCode); // check messages on target queue - List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("/rest/message/test/" + queueName2); + List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("/service/message/test/" + queueName2); assertNotNull("Messages are not found", messages); assertEquals("Unexpected number of messages", copyMessageIds.size(), messages.size()); for (Long id : copyMessageIds) @@ -234,7 +227,7 @@ public class MessagesRestTest extends QpidRestTestCase } // check messages on original queue - messages = getRestTestHelper().getJsonAsList("/rest/message/test/" + queueName); + messages = getRestTestHelper().getJsonAsList("/service/message/test/" + queueName); assertNotNull("Messages are not found", messages); assertEquals("Unexpected number of messages", MESSAGE_NUMBER, messages.size()); for (Long id : ids) @@ -272,13 +265,11 @@ public class MessagesRestTest extends QpidRestTestCase } // delete messages - HttpURLConnection connection = getRestTestHelper().openManagementConnection( - "/rest/message/test/" + queueName + "?" + queryString.toString(), "DELETE"); - connection.connect(); - assertEquals("Unexpected response code", 200, connection.getResponseCode()); + int responseCode = getRestTestHelper().submitRequest("/service/message/test/" + queueName + "?" + queryString.toString(), "DELETE"); + assertEquals("Unexpected response code", 200, responseCode); // check messages on queue - List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("/rest/message/test/" + queueName); + List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("/service/message/test/" + queueName); assertNotNull("Messages are not found", messages); assertEquals("Unexpected number of messages", ids.size(), messages.size()); for (Long id : ids) @@ -295,7 +286,7 @@ public class MessagesRestTest extends QpidRestTestCase private List<Long> getMesssageIds(String queueName) throws IOException, JsonParseException, JsonMappingException { - List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("/rest/message/test/" + queueName); + List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("/service/message/test/" + queueName); List<Long> ids = new ArrayList<Long>(); for (Map<String, Object> message : messages) { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java index 40ffc680a7..826922575d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java @@ -42,7 +42,7 @@ public class PortRestTest extends QpidRestTestCase { public void testGet() throws Exception { - List<Map<String, Object>> ports = getRestTestHelper().getJsonAsList("/rest/port/"); + List<Map<String, Object>> ports = getRestTestHelper().getJsonAsList("port/"); assertNotNull("Port data cannot be null", ports); assertEquals("Unexpected number of ports", 2, ports.size()); @@ -59,14 +59,14 @@ public class PortRestTest extends QpidRestTestCase public void testGetPort() throws Exception { - List<Map<String, Object>> ports = getRestTestHelper().getJsonAsList("/rest/port/"); + List<Map<String, Object>> ports = getRestTestHelper().getJsonAsList("port/"); assertNotNull("Ports data cannot be null", ports); assertEquals("Unexpected number of ports", 2, ports.size()); for (Map<String, Object> portMap : ports) { String portName = (String) portMap.get(Port.NAME); assertNotNull("Port name attribute is not found", portName); - Map<String, Object> portData = getRestTestHelper().getJsonAsSingletonList("/rest/port/" + URLDecoder.decode(portName, "UTF-8")); + Map<String, Object> portData = getRestTestHelper().getJsonAsSingletonList("port/" + URLDecoder.decode(portName, "UTF-8")); assertNotNull("Port " + portName + " is not found", portData); Asserts.assertPortAttributes(portData); } @@ -80,10 +80,10 @@ public class PortRestTest extends QpidRestTestCase attributes.put(Port.PORT, findFreePort()); attributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); - int responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Unexpected response code", 201, responseCode); - List<Map<String, Object>> portDetails = getRestTestHelper().getJsonAsList("/rest/port/" + portName); + List<Map<String, Object>> portDetails = getRestTestHelper().getJsonAsList("port/" + portName); assertNotNull("Port details cannot be null", portDetails); assertEquals("Unexpected number of ports with name " + portName, 1, portDetails.size()); Map<String, Object> port = portDetails.get(0); @@ -92,7 +92,7 @@ public class PortRestTest extends QpidRestTestCase // make sure that port is there after broker restart restartBroker(); - portDetails = getRestTestHelper().getJsonAsList("/rest/port/" + portName); + portDetails = getRestTestHelper().getJsonAsList("port/" + portName); assertNotNull("Port details cannot be null", portDetails); assertEquals("Unexpected number of ports with name " + portName, 1, portDetails.size()); } @@ -105,10 +105,10 @@ public class PortRestTest extends QpidRestTestCase attributes.put(Port.PORT, findFreePort()); attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.RMI)); - int responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Unexpected response code", 201, responseCode); - List<Map<String, Object>> portDetails = getRestTestHelper().getJsonAsList("/rest/port/" + portName); + List<Map<String, Object>> portDetails = getRestTestHelper().getJsonAsList("port/" + portName); assertNotNull("Port details cannot be null", portDetails); assertEquals("Unexpected number of ports with name " + portName, 1, portDetails.size()); Map<String, Object> port = portDetails.get(0); @@ -117,7 +117,7 @@ public class PortRestTest extends QpidRestTestCase // make sure that port is there after broker restart restartBroker(); - portDetails = getRestTestHelper().getJsonAsList("/rest/port/" + portName); + portDetails = getRestTestHelper().getJsonAsList("port/" + portName); assertNotNull("Port details cannot be null", portDetails); assertEquals("Unexpected number of ports with name " + portName, 1, portDetails.size()); port = portDetails.get(0); @@ -130,7 +130,7 @@ public class PortRestTest extends QpidRestTestCase attributes.put(Port.PORT, findFreePort()); attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.RMI)); - responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Adding of a second RMI port should fail", 409, responseCode); } @@ -142,10 +142,10 @@ public class PortRestTest extends QpidRestTestCase attributes.put(Port.PORT, findFreePort()); attributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); - int responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Unexpected response code for port creation", 201, responseCode); - List<Map<String, Object>> portDetails = getRestTestHelper().getJsonAsList("/rest/port/" + portName); + List<Map<String, Object>> portDetails = getRestTestHelper().getJsonAsList("port/" + portName); assertNotNull("Port details cannot be null", portDetails); assertEquals("Unexpected number of ports with name " + portName, 1, portDetails.size()); Map<String, Object> port = portDetails.get(0); @@ -155,14 +155,14 @@ public class PortRestTest extends QpidRestTestCase authProviderAttributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManager.PROVIDER_TYPE); authProviderAttributes.put(AuthenticationProvider.NAME, TestBrokerConfiguration.ENTRY_NAME_ANONYMOUS_PROVIDER); - responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + TestBrokerConfiguration.ENTRY_NAME_ANONYMOUS_PROVIDER, "PUT", authProviderAttributes); + responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + TestBrokerConfiguration.ENTRY_NAME_ANONYMOUS_PROVIDER, "PUT", authProviderAttributes); assertEquals("Unexpected response code for authentication provider creation", 201, responseCode); attributes = new HashMap<String, Object>(port); attributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_ANONYMOUS_PROVIDER); attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.AMQP_0_9_1)); - responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Unexpected response code for port update", 200, responseCode); } @@ -174,10 +174,10 @@ public class PortRestTest extends QpidRestTestCase attributes.put(Port.TRANSPORTS, Collections.singleton(Transport.SSL)); attributes.put(Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE); - int responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Transport has not been changed to SSL " , 200, responseCode); - Map<String, Object> port = getRestTestHelper().getJsonAsSingletonList("/rest/port/" + portName); + Map<String, Object> port = getRestTestHelper().getJsonAsSingletonList("port/" + portName); @SuppressWarnings("unchecked") Collection<String> transports = (Collection<String>) port.get(Port.TRANSPORTS); @@ -195,7 +195,7 @@ public class PortRestTest extends QpidRestTestCase attributes.put(Port.NAME, portName); attributes.put(Port.TRANSPORTS, Collections.singleton(Transport.SSL)); - int responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Creation of SSL port without keystore should fail", 409, responseCode); } @@ -210,16 +210,16 @@ public class PortRestTest extends QpidRestTestCase attributes.put(Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE); attributes.put(Port.TRUST_STORES, Collections.singleton(TestBrokerConfiguration.ENTRY_NAME_SSL_TRUSTSTORE)); - int responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("SSL port was not added", 201, responseCode); attributes.put(Port.NEED_CLIENT_AUTH, true); attributes.put(Port.WANT_CLIENT_AUTH, true); - responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Attributes for need/want client auth are not set", 200, responseCode); - Map<String, Object> port = getRestTestHelper().getJsonAsSingletonList("/rest/port/" + portName); + Map<String, Object> port = getRestTestHelper().getJsonAsSingletonList("port/" + portName); assertEquals("Unexpected " + Port.NEED_CLIENT_AUTH, true, port.get(Port.NEED_CLIENT_AUTH)); assertEquals("Unexpected " + Port.WANT_CLIENT_AUTH, true, port.get(Port.WANT_CLIENT_AUTH)); assertEquals("Unexpected " + Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE, port.get(Port.KEY_STORE)); @@ -232,7 +232,7 @@ public class PortRestTest extends QpidRestTestCase attributes.put(Port.NAME, portName); attributes.put(Port.TRANSPORTS, Collections.singleton(Transport.TCP)); - responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Should not be able to change transport to TCP without reseting of attributes for need/want client auth", 409, responseCode); attributes = new HashMap<String, Object>(); @@ -241,10 +241,10 @@ public class PortRestTest extends QpidRestTestCase attributes.put(Port.NEED_CLIENT_AUTH, false); attributes.put(Port.WANT_CLIENT_AUTH, false); - responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Should be able to change transport to TCP ", 200, responseCode); - port = getRestTestHelper().getJsonAsSingletonList("/rest/port/" + portName); + port = getRestTestHelper().getJsonAsSingletonList("port/" + portName); assertEquals("Unexpected " + Port.NEED_CLIENT_AUTH, false, port.get(Port.NEED_CLIENT_AUTH)); assertEquals("Unexpected " + Port.WANT_CLIENT_AUTH, false, port.get(Port.WANT_CLIENT_AUTH)); @@ -260,13 +260,13 @@ public class PortRestTest extends QpidRestTestCase Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(Port.NAME, portName); attributes.put(Port.NEED_CLIENT_AUTH, true); - int responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Unexpected response when trying to set 'needClientAuth' on non-SSL port", 409, responseCode); attributes = new HashMap<String, Object>(); attributes.put(Port.NAME, portName); attributes.put(Port.WANT_CLIENT_AUTH, true); - responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Unexpected response when trying to set 'wantClientAuth' on non-SSL port", 409, responseCode); } @@ -276,16 +276,16 @@ public class PortRestTest extends QpidRestTestCase Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(Port.NAME, portName); attributes.put(Port.AUTHENTICATION_PROVIDER, "non-existing"); - int responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Unexpected response when trying to change auth provider to non-existing one", 409, responseCode); attributes = new HashMap<String, Object>(); attributes.put(Port.NAME, portName); attributes.put(Port.AUTHENTICATION_PROVIDER, ANONYMOUS_AUTHENTICATION_PROVIDER); - responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Unexpected response when trying to change auth provider to existing one", 200, responseCode); - Map<String, Object> port = getRestTestHelper().getJsonAsSingletonList("/rest/port/" + portName); + Map<String, Object> port = getRestTestHelper().getJsonAsSingletonList("port/" + portName); assertEquals("Unexpected auth provider", ANONYMOUS_AUTHENTICATION_PROVIDER, port.get(Port.AUTHENTICATION_PROVIDER)); } @@ -297,17 +297,17 @@ public class PortRestTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD); String ampqPortName = TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT; - Map<String, Object> portData = getRestTestHelper().getJsonAsSingletonList("/rest/port/" + URLDecoder.decode(ampqPortName, "UTF-8")); + Map<String, Object> portData = getRestTestHelper().getJsonAsSingletonList("port/" + URLDecoder.decode(ampqPortName, "UTF-8")); Asserts.assertPortAttributes(portData, State.QUIESCED); } public void testNewPortQuiescedIfPortNumberWasUsed() throws Exception { String ampqPortName = TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT; - Map<String, Object> portData = getRestTestHelper().getJsonAsSingletonList("/rest/port/" + URLDecoder.decode(ampqPortName, "UTF-8")); + Map<String, Object> portData = getRestTestHelper().getJsonAsSingletonList("port/" + URLDecoder.decode(ampqPortName, "UTF-8")); int amqpPort = (Integer)portData.get(Port.PORT); - int deleteResponseCode = getRestTestHelper().submitRequest("/rest/port/" + ampqPortName, "DELETE", null); + int deleteResponseCode = getRestTestHelper().submitRequest("port/" + ampqPortName, "DELETE"); assertEquals("Port deletion should be allowed", 200, deleteResponseCode); String newPortName = "reused-port"; @@ -316,10 +316,10 @@ public class PortRestTest extends QpidRestTestCase attributes.put(Port.PORT, amqpPort); // reuses port that was previously in use attributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); - int responseCode = getRestTestHelper().submitRequest("/rest/port/" + newPortName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("port/" + newPortName, "PUT", attributes); assertEquals("Unexpected response code for port creation", 201, responseCode); - portData = getRestTestHelper().getJsonAsSingletonList("/rest/port/" + URLDecoder.decode(newPortName, "UTF-8")); + portData = getRestTestHelper().getJsonAsSingletonList("port/" + URLDecoder.decode(newPortName, "UTF-8")); Asserts.assertPortAttributes(portData, State.QUIESCED); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java index a5b96fa6cd..b7a85a1ffe 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java @@ -83,13 +83,13 @@ public class PreferencesProviderRestTest extends QpidRestTestCase public void testCreateAndGetProvider() throws Exception { - List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("/rest/preferencesprovider"); + List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList("preferencesprovider"); assertEquals("Unexpected number of providers", 0, providerDetails.size()); createPreferencesProvider(TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER, "test1"); createPreferencesProvider(TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "-2", "test2"); - providerDetails = getRestTestHelper().getJsonAsList("/rest/preferencesprovider"); + providerDetails = getRestTestHelper().getJsonAsList("preferencesprovider"); assertEquals("Unexpected number of providers", 2, providerDetails.size()); for (Map<String, Object> provider : providerDetails) @@ -98,12 +98,12 @@ public class PreferencesProviderRestTest extends QpidRestTestCase } Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList( - "/rest/preferencesprovider/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/test1"); + "preferencesprovider/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/test1"); assertProvider(provider); assertEquals("Unexpected provider name ", "test1", provider.get(PreferencesProvider.NAME)); Map<String, Object> provider2 = getRestTestHelper().getJsonAsSingletonList( - "/rest/preferencesprovider/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "-2/test2"); + "preferencesprovider/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "-2/test2"); assertProvider(provider); assertEquals("Unexpected provider name ", "test2", provider2.get(PreferencesProvider.NAME)); } @@ -111,12 +111,12 @@ public class PreferencesProviderRestTest extends QpidRestTestCase public void testDeleteProvider() throws Exception { createPreferencesProvider(TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER, "test1"); - String providerUrl = "/rest/preferencesprovider/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/test1"; + String providerUrl = "preferencesprovider/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/test1"; Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList(providerUrl); assertProvider(provider); assertEquals("Unexpected provider name ", "test1", provider.get(PreferencesProvider.NAME)); - int responseCode = getRestTestHelper().submitRequest(providerUrl, "DELETE", null); + int responseCode = getRestTestHelper().submitRequest(providerUrl, "DELETE"); assertEquals("Failed to delete preferences provider", 200, responseCode); List<Map<String, Object>> providerDetails = getRestTestHelper().getJsonAsList(providerUrl); @@ -126,7 +126,7 @@ public class PreferencesProviderRestTest extends QpidRestTestCase public void testUpdateProvider() throws Exception { createPreferencesProvider(TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER, "test1"); - String providerUrl = "/rest/preferencesprovider/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/test1"; + String providerUrl = "preferencesprovider/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/test1"; Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList(providerUrl); assertProvider(provider); assertEquals("Unexpected provider name ", "test1", provider.get(PreferencesProvider.NAME)); @@ -190,7 +190,7 @@ public class PreferencesProviderRestTest extends QpidRestTestCase attributes.put(FileSystemPreferencesProvider.PATH, file.getAbsolutePath()); int responseCode = getRestTestHelper().submitRequest( - "/rest/preferencesprovider/" + authenticationProvider + "/" + providerName, "PUT", attributes); + "preferencesprovider/" + authenticationProvider + "/" + providerName, "PUT", attributes); assertEquals("Unexpected response code", 201, responseCode); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java index c4b182da1a..bd72391522 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java @@ -73,7 +73,7 @@ public class PreferencesRestTest extends QpidRestTestCase public void testGetPreferences() throws Exception { - Map<String, Object> preferences = getRestTestHelper().getJsonAsMap("/rest/preferences"); + Map<String, Object> preferences = getRestTestHelper().getJsonAsMap("/service/preferences"); assertEquals("Unexpected number of preferences", 2, preferences.size()); assertEquals("Unexpected language preference", "en", preferences.get("language")); assertEquals("Unexpected saveTabs preference", true, preferences.get("saveTabs")); @@ -85,10 +85,10 @@ public class PreferencesRestTest extends QpidRestTestCase additionalPreferences.put("timezone", "Europe/London"); additionalPreferences.put("test", 1); - int status = getRestTestHelper().submitRequest("/rest/preferences", "POST", additionalPreferences); + int status = getRestTestHelper().submitRequest("/service/preferences", "POST", additionalPreferences); assertEquals("Unexpected response code", 200, status); - Map<String, Object> preferences = getRestTestHelper().getJsonAsMap("/rest/preferences"); + Map<String, Object> preferences = getRestTestHelper().getJsonAsMap("/service/preferences"); assertEquals("Unexpected number of preferences", 4, preferences.size()); assertEquals("Unexpected language preference", "en", preferences.get("language")); assertEquals("Unexpected saveTabs preference", true, preferences.get("saveTabs")); @@ -102,10 +102,10 @@ public class PreferencesRestTest extends QpidRestTestCase additionalPreferences.put("timezone", "Europe/London"); additionalPreferences.put("test", 1); - int status = getRestTestHelper().submitRequest("/rest/preferences", "PUT", additionalPreferences); + int status = getRestTestHelper().submitRequest("/service/preferences", "PUT", additionalPreferences); assertEquals("Unexpected response code", 200, status); - Map<String, Object> preferences = getRestTestHelper().getJsonAsMap("/rest/preferences"); + Map<String, Object> preferences = getRestTestHelper().getJsonAsMap("/service/preferences"); assertEquals("Unexpected number of preferences", 2, preferences.size()); assertEquals("Unexpected timezone preference", "Europe/London", preferences.get("timezone")); assertEquals("Unexpected test preference", 1, preferences.get("test")); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java index 7780022251..b091fd876b 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java @@ -21,7 +21,6 @@ package org.apache.qpid.systest.rest; import java.io.IOException; -import java.net.HttpURLConnection; import java.net.URLDecoder; import java.util.HashMap; import java.util.List; @@ -82,7 +81,7 @@ public class QueueRestTest extends QpidRestTestCase public void testGetVirtualHostQueues() throws Exception { String queueName = getTestQueueName(); - List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/queue/test"); + List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("queue/test"); assertEquals("Unexpected number of queues", 1, queues.size()); String[] expectedQueues = new String[]{queueName}; @@ -104,7 +103,7 @@ public class QueueRestTest extends QpidRestTestCase public void testGetByName() throws Exception { String queueName = getTestQueueName(); - Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/test/" + queueName); + Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("queue/test/test/" + queueName); Asserts.assertQueue(queueName, "standard", queueDetails); assertStatistics(queueDetails); @@ -130,7 +129,7 @@ public class QueueRestTest extends QpidRestTestCase Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(Queue.NAME, queueName); - String queueUrl = "/rest/queue/test/test/" + queueName; + String queueUrl = "queue/test/test/" + queueName; int responseCode = getRestTestHelper().submitRequest(queueUrl, "PUT", attributes); assertEquals("Queue was not created", 201, responseCode); @@ -172,7 +171,7 @@ public class QueueRestTest extends QpidRestTestCase createBinding(bindingName, exchanges[i], queueName); } - Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/test/" + queueName); + Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("queue/test/test/" + queueName); Asserts.assertQueue(queueName, "standard", queueDetails); @SuppressWarnings("unchecked") @@ -193,19 +192,14 @@ public class QueueRestTest extends QpidRestTestCase private void createBinding(String bindingName, String exchangeName, String queueName) throws IOException { - HttpURLConnection connection = getRestTestHelper().openManagementConnection( - "/rest/binding/test/test/" + URLDecoder.decode(exchangeName, "UTF-8") + "/" + queueName + "/" + bindingName, - "PUT"); - Map<String, Object> bindingData = new HashMap<String, Object>(); bindingData.put(Binding.NAME, bindingName); bindingData.put(Binding.EXCHANGE, exchangeName); bindingData.put(Binding.QUEUE, queueName); - getRestTestHelper().writeJsonRequest(connection, bindingData); - assertEquals("Unexpected response code", 201, connection.getResponseCode()); - - connection.disconnect(); + String url = "binding/test/test/" + URLDecoder.decode(exchangeName, "UTF-8") + "/" + queueName + "/" + bindingName; + int responseCode = getRestTestHelper().submitRequest(url, "PUT", bindingData); + assertEquals("Unexpected response code", 201, responseCode); } private void assertConsumer(Map<String, Object> consumer) diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java index ca024c2ac6..bbb0ab4dc7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java @@ -30,6 +30,7 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; @@ -57,7 +58,6 @@ import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.TypeReference; - import org.apache.qpid.server.BrokerOptions; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Binding; @@ -68,6 +68,12 @@ import org.apache.qpid.test.utils.TestBrokerConfiguration; public class RestTestHelper { + + private static final TypeReference<List<LinkedHashMap<String, Object>>> TYPE_LIST_OF_LINKED_HASH_MAPS = new TypeReference<List<LinkedHashMap<String, Object>>>() + { + }; + public static final String API_BASE = "/api/latest/"; + private static final Logger LOGGER = Logger.getLogger(RestTestHelper.class); private static final String CERT_ALIAS_APP1 = "app1"; @@ -116,6 +122,10 @@ public class RestTestHelper public HttpURLConnection openManagementConnection(String path, String method) throws IOException { + if (!path.startsWith("/")) + { + path = API_BASE + path; + } URL url = getManagementURL(path); HttpURLConnection httpCon = (HttpURLConnection) url.openConnection(); @@ -179,13 +189,8 @@ public class RestTestHelper JsonParseException, JsonMappingException { byte[] data = readConnectionInputStream(connection); -String dataAsString = new String(data); ObjectMapper mapper = new ObjectMapper(); - - TypeReference<List<LinkedHashMap<String, Object>>> typeReference = new TypeReference<List<LinkedHashMap<String, Object>>>() - { - }; - List<Map<String, Object>> providedObject = mapper.readValue(new ByteArrayInputStream(data), typeReference); + List<Map<String, Object>> providedObject = mapper.readValue(new ByteArrayInputStream(data), TYPE_LIST_OF_LINKED_HASH_MAPS); return providedObject; } @@ -203,7 +208,7 @@ String dataAsString = new String(data); return providedObject; } - public byte[] readConnectionInputStream(HttpURLConnection connection) throws IOException + private byte[] readConnectionInputStream(HttpURLConnection connection) throws IOException { InputStream is = connection.getInputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -220,7 +225,7 @@ String dataAsString = new String(data); return baos.toByteArray(); } - public void writeJsonRequest(HttpURLConnection connection, Map<String, Object> data) throws JsonGenerationException, + private void writeJsonRequest(HttpURLConnection connection, Map<String, Object> data) throws JsonGenerationException, JsonMappingException, IOException { ObjectMapper mapper = new ObjectMapper(); @@ -296,7 +301,7 @@ String dataAsString = new String(data); public void createNewGroupMember(String groupProviderName, String groupName, String memberName, int responseCode) throws IOException { HttpURLConnection connection = openManagementConnection( - "/rest/groupmember/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8") + "/" + URLDecoder.decode(memberName, "UTF-8"), + "groupmember/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8") + "/" + URLDecoder.decode(memberName, "UTF-8"), "PUT"); Map<String, Object> groupMemberData = new HashMap<String, Object>(); @@ -316,7 +321,7 @@ String dataAsString = new String(data); public void removeMemberFromGroup(String groupProviderName, String groupName, String memberName, int responseCode) throws IOException { HttpURLConnection connection = openManagementConnection( - "/rest/groupmember/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8") + "/" + URLDecoder.decode(memberName, "UTF-8"), + "groupmember/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8") + "/" + URLDecoder.decode(memberName, "UTF-8"), "DELETE"); Assert.assertEquals("Unexpected response code", responseCode, connection.getResponseCode()); @@ -349,7 +354,7 @@ String dataAsString = new String(data); public void createGroup(String groupName, String groupProviderName, int responseCode) throws IOException { HttpURLConnection connection = openManagementConnection( - "/rest/group/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8"), + "group/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8"), "PUT"); Map<String, Object> groupData = new HashMap<String, Object>(); @@ -367,7 +372,7 @@ String dataAsString = new String(data); public void createOrUpdateUser(String username, String password, int responseCode) throws IOException { - HttpURLConnection connection = openManagementConnection("/rest/user/" + HttpURLConnection connection = openManagementConnection("user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + username, "PUT"); Map<String, Object> data = new HashMap<String, Object>(); @@ -382,7 +387,7 @@ String dataAsString = new String(data); public void removeGroup(String groupName, String groupProviderName, int responseCode) throws IOException { HttpURLConnection connection = openManagementConnection( - "/rest/group/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8"), + "group/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8"), "DELETE"); Assert.assertEquals("Unexpected response code", responseCode, connection.getResponseCode()); @@ -396,7 +401,7 @@ String dataAsString = new String(data); public void removeUserById(String id) throws IOException { - HttpURLConnection connection = openManagementConnection("/rest/user/" + HttpURLConnection connection = openManagementConnection("user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "?id=" + id, "DELETE"); Assert.assertEquals("Unexpected response code", HttpServletResponse.SC_OK, connection.getResponseCode()); connection.disconnect(); @@ -404,7 +409,7 @@ String dataAsString = new String(data); public void removeUser(String username, int responseCode) throws IOException { - HttpURLConnection connection = openManagementConnection("/rest/user/" + HttpURLConnection connection = openManagementConnection("user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + username, "DELETE"); Assert.assertEquals("Unexpected response code", responseCode, connection.getResponseCode()); connection.disconnect(); @@ -505,6 +510,25 @@ String dataAsString = new String(data); return responseCode; } + public int submitRequest(String url, String method) throws IOException + { + return submitRequest(url, method, (byte[])null); + } + + public int submitRequest(String url, String method, byte[] parameters) throws IOException + { + HttpURLConnection connection = openManagementConnection(url, method); + if (parameters != null) + { + OutputStream os = connection.getOutputStream(); + os.write(parameters); + os.flush(); + } + int responseCode = connection.getResponseCode(); + connection.disconnect(); + return responseCode; + } + public byte[] getBytes(String path) throws IOException { HttpURLConnection connection = openManagementConnection(path, "GET"); @@ -526,15 +550,16 @@ String dataAsString = new String(data); Map<String, Object> queueData = new HashMap<String, Object>(); queueData.put(Queue.NAME, queueName); queueData.put(Queue.DURABLE, Boolean.FALSE); - int responseCode = submitRequest("/rest/queue/test/test/" + queueName, "PUT", queueData); + int responseCode = submitRequest("queue/test/test/" + queueName, "PUT", queueData); Assert.assertEquals("Unexpected response code creating queue" + queueName, 201, responseCode); Map<String, Object> bindingData = new HashMap<String, Object>(); bindingData.put(Binding.NAME, queueName); bindingData.put(Binding.QUEUE, queueName); bindingData.put(Binding.EXCHANGE, "amq.direct"); - responseCode = submitRequest("/rest/binding/test/test/amq.direct/" + queueName + "/" + queueName, "PUT", queueData); + responseCode = submitRequest("binding/test/test/amq.direct/" + queueName + "/" + queueName, "PUT", queueData); Assert.assertEquals("Unexpected response code binding queue " + queueName, 201, responseCode); } } + } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java index d1f9053221..163aa8dad9 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java @@ -62,7 +62,7 @@ public class SaslRestTest extends QpidRestTestCase { startBrokerNow(); - Map<String, Object> saslData = getRestTestHelper().getJsonAsMap("/rest/sasl"); + Map<String, Object> saslData = getRestTestHelper().getJsonAsMap("/service/sasl"); assertNotNull("mechanisms attribute is not found", saslData.get("mechanisms")); @SuppressWarnings("unchecked") @@ -80,7 +80,7 @@ public class SaslRestTest extends QpidRestTestCase configureBase64MD5FilePrincipalDatabase(); startBrokerNow(); - Map<String, Object> saslData = getRestTestHelper().getJsonAsMap("/rest/sasl"); + Map<String, Object> saslData = getRestTestHelper().getJsonAsMap("/service/sasl"); assertNotNull("mechanisms attribute is not found", saslData.get("mechanisms")); @SuppressWarnings("unchecked") @@ -102,18 +102,18 @@ public class SaslRestTest extends QpidRestTestCase String responseData = Base64.encodeBase64String(responseBytes); String parameters= "mechanism=PLAIN&response=" + responseData; - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/sasl", "POST"); + HttpURLConnection connection = getRestTestHelper().openManagementConnection("/service/sasl", "POST"); OutputStream os = connection.getOutputStream(); os.write(parameters.getBytes()); os.flush(); - int code = connection.getResponseCode(); + int code = getRestTestHelper().submitRequest("/service/sasl", "POST", parameters.getBytes()); assertEquals("Unexpected response code", 200, code); List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); // request authenticated user details - connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + connection = getRestTestHelper().openManagementConnection("/service/sasl", "GET"); applyCookiesToConnection(cookies, connection); Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); assertEquals("Unexpected user", "admin", response2.get("user")); @@ -127,7 +127,7 @@ public class SaslRestTest extends QpidRestTestCase String responseData = Base64.encodeBase64String(responseBytes); String parameters= "mechanism=PLAIN&response=" + responseData; - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/sasl", "POST"); + HttpURLConnection connection = getRestTestHelper().openManagementConnection("/service/sasl", "POST"); OutputStream os = connection.getOutputStream(); os.write(parameters.getBytes()); os.flush(); @@ -138,7 +138,7 @@ public class SaslRestTest extends QpidRestTestCase List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); // request authenticated user details - connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + connection = getRestTestHelper().openManagementConnection("/service/sasl", "GET"); applyCookiesToConnection(cookies, connection); Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); assertNull("Unexpected user", response2.get("user")); @@ -152,7 +152,7 @@ public class SaslRestTest extends QpidRestTestCase String responseData = Base64.encodeBase64String(responseBytes); String parameters= "mechanism=PLAIN&response=" + responseData; - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/sasl", "POST"); + HttpURLConnection connection = getRestTestHelper().openManagementConnection("/service/sasl", "POST"); OutputStream os = connection.getOutputStream(); os.write(parameters.getBytes()); os.flush(); @@ -163,7 +163,7 @@ public class SaslRestTest extends QpidRestTestCase List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); // request authenticated user details - connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + connection = getRestTestHelper().openManagementConnection("/service/sasl", "GET"); applyCookiesToConnection(cookies, connection); Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); assertNull("Unexpected user", response2.get("user")); @@ -182,7 +182,7 @@ public class SaslRestTest extends QpidRestTestCase assertEquals("Unexpected response code", 200, code); // request authenticated user details - connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + connection = getRestTestHelper().openManagementConnection("/service/sasl", "GET"); applyCookiesToConnection(cookies, connection); Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); assertEquals("Unexpected user", "admin", response2.get("user")); @@ -201,7 +201,7 @@ public class SaslRestTest extends QpidRestTestCase assertEquals("Unexpected response code", 401, code); // request authenticated user details - connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + connection = getRestTestHelper().openManagementConnection("/service/sasl", "GET"); applyCookiesToConnection(cookies, connection); Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); assertNull("Unexpected user", response2.get("user")); @@ -220,7 +220,7 @@ public class SaslRestTest extends QpidRestTestCase assertEquals("Unexpected response code", 401, code); // request authenticated user details - connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + connection = getRestTestHelper().openManagementConnection("/service/sasl", "GET"); applyCookiesToConnection(cookies, connection); Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); assertNull("Unexpected user", response2.get("user")); @@ -240,7 +240,7 @@ public class SaslRestTest extends QpidRestTestCase assertEquals("Unexpected response code", 200, code); // request authenticated user details - connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + connection = getRestTestHelper().openManagementConnection("/service/sasl", "GET"); applyCookiesToConnection(cookies, connection); Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); assertEquals("Unexpected user", "admin", response2.get("user")); @@ -259,7 +259,7 @@ public class SaslRestTest extends QpidRestTestCase assertEquals("Unexpected response code", 401, code); // request authenticated user details - connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + connection = getRestTestHelper().openManagementConnection("/service/sasl", "GET"); applyCookiesToConnection(cookies, connection); Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); assertNull("Unexpected user", response2.get("user")); @@ -278,7 +278,7 @@ public class SaslRestTest extends QpidRestTestCase assertEquals("Unexpected response code", 401, code); // request authenticated user details - connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + connection = getRestTestHelper().openManagementConnection("/service/sasl", "GET"); applyCookiesToConnection(cookies, connection); Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); assertNull("Unexpected user", response2.get("user")); @@ -286,14 +286,14 @@ public class SaslRestTest extends QpidRestTestCase private HttpURLConnection requestSasServerChallenge(String mechanism) throws IOException { - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/sasl", "POST"); + HttpURLConnection connection = getRestTestHelper().openManagementConnection("/service/sasl", "POST"); OutputStream os = connection.getOutputStream(); os.write(("mechanism=" + mechanism).getBytes()); os.flush(); return connection; } - private int authenticateUser(HttpURLConnection requestChallengeConnection, String userName, String userPassword, String mechanism) + public int authenticateUser(HttpURLConnection requestChallengeConnection, String userName, String userPassword, String mechanism) throws IOException, JsonParseException, JsonMappingException, Exception { // get the response @@ -311,7 +311,7 @@ public class SaslRestTest extends QpidRestTestCase String requestParameters = ("id=" + response.get("id") + "&response=" + responseData); // re-open connection - HttpURLConnection authenticateConnection = getRestTestHelper().openManagementConnection("/rest/sasl", "POST"); + HttpURLConnection authenticateConnection = getRestTestHelper().openManagementConnection("/service/sasl", "POST"); // set cookies to use the same server session applyCookiesToConnection(cookies, authenticateConnection); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java index adc9790f36..daefc05e2a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java @@ -39,7 +39,7 @@ public class StructureRestTest extends QpidRestTestCase public void testGet() throws Exception { - Map<String, Object> structure = getRestTestHelper().getJsonAsMap("/rest/structure"); + Map<String, Object> structure = getRestTestHelper().getJsonAsMap("/service/structure"); assertNotNull("Structure data cannot be null", structure); assertNode(structure, "Broker"); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java index d50da1c1f9..5d2e9de3fa 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java @@ -69,7 +69,7 @@ public class TrustStoreRestTest extends QpidRestTestCase createTrustStore(name, true); assertNumberOfTrustStores(2); - List<Map<String, Object>> trustStores = getRestTestHelper().getJsonAsList("/rest/truststore/" + name); + List<Map<String, Object>> trustStores = getRestTestHelper().getJsonAsList("truststore/" + name); assertNotNull("details cannot be null", trustStores); assertTrustStoreAttributes(trustStores.get(0), name, TestSSLConstants.TRUSTSTORE, true); @@ -85,10 +85,10 @@ public class TrustStoreRestTest extends QpidRestTestCase createTrustStore(name, false); assertNumberOfTrustStores(2); - int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "DELETE", null); + int responseCode = getRestTestHelper().submitRequest("truststore/" + name , "DELETE"); assertEquals("Unexpected response code for provider deletion", 200, responseCode); - List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("/rest/truststore/" + name); + List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("truststore/" + name); assertNotNull("details should not be null", trustStore); assertTrue("details should be empty as the truststore no longer exists", trustStore.isEmpty()); @@ -125,17 +125,17 @@ public class TrustStoreRestTest extends QpidRestTestCase //verify the truststore is there assertNumberOfTrustStores(2); - List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("/rest/truststore/" + name); + List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("truststore/" + name); assertNotNull("details should not be null", trustStore); assertTrustStoreAttributes(trustStore.get(0), name, TestSSLConstants.TRUSTSTORE, false); //try to delete it, which should fail as it is in use - int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "DELETE", null); + int responseCode = getRestTestHelper().submitRequest("truststore/" + name , "DELETE"); assertEquals("Unexpected response code for provider deletion", 409, responseCode); //check its still there assertNumberOfTrustStores(2); - trustStore = getRestTestHelper().getJsonAsList("/rest/truststore/" + name); + trustStore = getRestTestHelper().getJsonAsList("truststore/" + name); assertNotNull("details should not be null", trustStore); assertTrustStoreAttributes(trustStore.get(0), name, TestSSLConstants.TRUSTSTORE, false); } @@ -154,10 +154,10 @@ public class TrustStoreRestTest extends QpidRestTestCase attributes.put(TrustStore.NAME, name); attributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE); - int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("truststore/" + name , "PUT", attributes); assertEquals("Unexpected response code for truststore update", 200, responseCode); - List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("/rest/truststore/" + name); + List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("truststore/" + name); assertNotNull("details should not be null", trustStore); assertTrustStoreAttributes(trustStore.get(0), name, TestSSLConstants.TRUSTSTORE, false); @@ -177,10 +177,10 @@ public class TrustStoreRestTest extends QpidRestTestCase attributes.put(TrustStore.NAME, name); attributes.put(FileTrustStore.PATH, "does.not.exist"); - int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("truststore/" + name , "PUT", attributes); assertEquals("Unexpected response code for trust store update", 409, responseCode); - List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("/rest/truststore/" + name); + List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("truststore/" + name); assertNotNull("details should not be null", trustStore); //verify the details remain unchanged @@ -202,10 +202,10 @@ public class TrustStoreRestTest extends QpidRestTestCase attributes.put(TrustStore.NAME, name); attributes.put(FileTrustStore.PEERS_ONLY, true); - int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("truststore/" + name , "PUT", attributes); assertEquals("Unexpected response code for trust store update", 200, responseCode); - List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("/rest/truststore/" + name); + List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("truststore/" + name); assertNotNull("details should not be null", trustStore); assertTrustStoreAttributes(trustStore.get(0), name, TestSSLConstants.TRUSTSTORE, true); @@ -215,10 +215,10 @@ public class TrustStoreRestTest extends QpidRestTestCase attributes.put(TrustStore.NAME, name); attributes.put(FileTrustStore.PEERS_ONLY, null); - responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name , "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("truststore/" + name , "PUT", attributes); assertEquals("Unexpected response code for trust store update", 200, responseCode); - trustStore = getRestTestHelper().getJsonAsList("/rest/truststore/" + name); + trustStore = getRestTestHelper().getJsonAsList("truststore/" + name); assertNotNull("details should not be null", trustStore); assertTrustStoreAttributes(trustStore.get(0), name, TestSSLConstants.TRUSTSTORE, false); @@ -227,7 +227,7 @@ public class TrustStoreRestTest extends QpidRestTestCase private List<Map<String, Object>> assertNumberOfTrustStores(int numberOfTrustStores) throws IOException, JsonParseException, JsonMappingException { - List<Map<String, Object>> trustStores = getRestTestHelper().getJsonAsList("/rest/truststore"); + List<Map<String, Object>> trustStores = getRestTestHelper().getJsonAsList("truststore"); assertNotNull("trust stores should not be null", trustStores); assertEquals("Unexpected number of trust stores", numberOfTrustStores, trustStores.size()); @@ -243,7 +243,7 @@ public class TrustStoreRestTest extends QpidRestTestCase trustStoreAttributes.put(FileTrustStore.PASSWORD, TestSSLConstants.TRUSTSTORE_PASSWORD); trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, peersOnly); - int responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + name, "PUT", trustStoreAttributes); + int responseCode = getRestTestHelper().submitRequest("truststore/" + name, "PUT", trustStoreAttributes); assertEquals("Unexpected response code", 201, responseCode); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java index 296ccf9221..a0902912ce 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java @@ -79,7 +79,7 @@ public class UserPreferencesRestTest extends QpidRestTestCase public void testGetUserPreferences() throws Exception { Map<String, Object> preferences = getRestTestHelper().getJsonAsMap( - "/rest/userpreferences/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/webadmin"); + "/service/userpreferences/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/webadmin"); assertEquals("Unexpected number of preferences", 2, preferences.size()); assertEquals("Unexpected language preference", "en", preferences.get("language")); assertEquals("Unexpected saveTabs preference", true, preferences.get("saveTabs")); @@ -88,7 +88,7 @@ public class UserPreferencesRestTest extends QpidRestTestCase public void testGetUserListForAuthenticationProvider() throws Exception { List<Map<String, Object>> users = getRestTestHelper().getJsonAsList( - "/rest/userpreferences/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); + "/service/userpreferences/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); assertEquals("Unexpected number of users", 2, users.size()); String[] expectedUsers = { "webadmin", "admin" }; for (int i = 0; i < expectedUsers.length; i++) @@ -100,7 +100,7 @@ public class UserPreferencesRestTest extends QpidRestTestCase public void testGetUserList() throws Exception { - List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("/rest/userpreferences"); + List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("/service/userpreferences"); assertEquals("Unexpected number of users", 2, users.size()); String[] expectedUsers = { "webadmin", "admin" }; for (int i = 0; i < expectedUsers.length; i++) @@ -113,11 +113,11 @@ public class UserPreferencesRestTest extends QpidRestTestCase public void testDeleteUser() throws Exception { int status = getRestTestHelper().submitRequest( - "/rest/userpreferences?user=" + "/service/userpreferences?user=" + URLEncoder.encode(TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/webadmin", - "UTF-8"), "DELETE", null); + "UTF-8"), "DELETE"); assertEquals("Unexpected status ", 200, status); - List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("/rest/userpreferences"); + List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("/service/userpreferences"); assertEquals("Unexpected number of users", 1, users.size()); Map<String, Object> user = findUser("admin", users); assertNotNull("User admin is not found", user); @@ -126,12 +126,12 @@ public class UserPreferencesRestTest extends QpidRestTestCase public void testDeleteMultipleUser() throws Exception { - int status = getRestTestHelper().submitRequest("/rest/userpreferences?user=" + int status = getRestTestHelper().submitRequest("/service/userpreferences?user=" + URLEncoder.encode(TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/webadmin", "UTF-8") + "&user=" + URLEncoder.encode(TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/admin", "UTF-8"), - "DELETE", null); + "DELETE"); assertEquals("Unexpected status ", 200, status); - List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("/rest/userpreferences"); + List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("/service/userpreferences"); assertEquals("Unexpected number of users", 0, users.size()); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java index e2a6762731..5df8a4ed9a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java @@ -39,7 +39,7 @@ public class UserRestTest extends QpidRestTestCase public void testGet() throws Exception { - List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("/rest/user"); + List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("user"); assertNotNull("Users cannot be null", users); assertTrue("Unexpected number of users", users.size() > 1); for (Map<String, Object> user : users) @@ -50,7 +50,7 @@ public class UserRestTest extends QpidRestTestCase public void testGetUserByName() throws Exception { - List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("/rest/user"); + List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("user"); assertNotNull("Users cannot be null", users); assertTrue("Unexpected number of users", users.size() > 1); for (Map<String, Object> user : users) @@ -58,7 +58,7 @@ public class UserRestTest extends QpidRestTestCase assertNotNull("Attribute " + User.ID, user.get(User.ID)); String userName = (String) user.get(User.NAME); assertNotNull("Attribute " + User.NAME, userName); - Map<String, Object> userDetails = getRestTestHelper().getJsonAsSingletonList("/rest/user/" + Map<String, Object> userDetails = getRestTestHelper().getJsonAsSingletonList("user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + userName); assertUser(userDetails); assertEquals("Unexpected user name", userName, userDetails.get(User.NAME)); @@ -70,7 +70,7 @@ public class UserRestTest extends QpidRestTestCase String userName = getTestName(); getRestTestHelper().createOrUpdateUser(userName, "newPassword"); - Map<String, Object> userDetails = getRestTestHelper().getJsonAsSingletonList("/rest/user/" + Map<String, Object> userDetails = getRestTestHelper().getJsonAsSingletonList("user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + userName); assertUser(userDetails); assertEquals("Unexpected user name", userName, userDetails.get(User.NAME)); @@ -81,13 +81,13 @@ public class UserRestTest extends QpidRestTestCase String userName = getTestName(); getRestTestHelper().createOrUpdateUser(userName, "newPassword"); - Map<String, Object> userDetails = getRestTestHelper().getJsonAsSingletonList("/rest/user/" + Map<String, Object> userDetails = getRestTestHelper().getJsonAsSingletonList("user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + userName); String id = (String) userDetails.get(User.ID); getRestTestHelper().removeUserById(id); - List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("/rest/user/" + List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + userName); assertEquals("User should be deleted", 0, users.size()); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java index 4bd1a19fe2..d3dad3ddf5 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java @@ -22,7 +22,6 @@ package org.apache.qpid.systest.rest; import java.io.File; import java.io.IOException; -import java.net.HttpURLConnection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -55,7 +54,7 @@ public class VirtualHostRestTest extends QpidRestTestCase public void testGet() throws Exception { - List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("/rest/virtualhost"); + List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("virtualhost"); assertNotNull("Hosts data cannot be null", hosts); assertEquals("Unexpected number of hosts", EXPECTED_VIRTUALHOSTS.length, hosts.size()); for (String hostName : EXPECTED_VIRTUALHOSTS) @@ -72,7 +71,7 @@ public class VirtualHostRestTest extends QpidRestTestCase Session session = _connection.createSession(true, Session.SESSION_TRANSACTED); session.createConsumer(getTestQueue()); - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test"); Asserts.assertVirtualHost("test", hostDetails); @SuppressWarnings("unchecked") @@ -114,7 +113,7 @@ public class VirtualHostRestTest extends QpidRestTestCase { // make sure that the host is saved in the broker store restartBroker(); - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/" + hostName); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/" + hostName); Asserts.assertVirtualHost(hostName, hostDetails); assertNewVirtualHost(hostDetails); @@ -130,31 +129,28 @@ public class VirtualHostRestTest extends QpidRestTestCase public void testDeleteHost() throws Exception { - String hostToDelete = TEST3_VIRTUALHOST; - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/virtualhost/" + hostToDelete + "/" + hostToDelete, "DELETE"); - connection.connect(); - assertEquals("Unexpected response code", 200, connection.getResponseCode()); + int responseCode = getRestTestHelper().submitRequest("virtualhost/" + TEST3_VIRTUALHOST + "/" + TEST3_VIRTUALHOST, "DELETE"); + assertEquals("Unexpected response code", 200, responseCode); - List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("/rest/virtualhost/" + hostToDelete); + List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("virtualhost/" + TEST3_VIRTUALHOST); assertEquals("Host should be deleted", 0, hosts.size()); } public void testDeleteDefaultHostFails() throws Exception { - String hostToDelete = TEST1_VIRTUALHOST; - int response = getRestTestHelper().submitRequest("/rest/virtualhost/" + hostToDelete, "DELETE", null); - assertEquals("Unexpected response code", 409, response); + int responseCode = getRestTestHelper().submitRequest("virtualhost/" + TEST1_VIRTUALHOST, "DELETE"); + assertEquals("Unexpected response code", 409, responseCode); restartBroker(); - List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("/rest/virtualhost/" + hostToDelete); + List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("virtualhost/" + TEST1_VIRTUALHOST); assertEquals("Host should be deleted", 1, hosts.size()); } public void testUpdateActiveHostFails() throws Exception { String hostToUpdate = TEST3_VIRTUALHOST; - String restHostUrl = "/rest/virtualhost/" + hostToUpdate + "/" + hostToUpdate; + String restHostUrl = "virtualhost/" + hostToUpdate + "/" + hostToUpdate; Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList(restHostUrl); Asserts.assertVirtualHost(hostToUpdate, hostDetails); @@ -190,7 +186,7 @@ public class VirtualHostRestTest extends QpidRestTestCase lvqQueueAttributes.put(LastValueQueue.LVQ_KEY, "LVQ"); createQueue(queueName + "-lvq", "lvq", lvqQueueAttributes); - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test"); @SuppressWarnings("unchecked") List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE); @@ -223,7 +219,7 @@ public class VirtualHostRestTest extends QpidRestTestCase createExchange(exchangeName + "-headers", "headers"); createExchange(exchangeName + "-fanout", "fanout"); - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test"); @SuppressWarnings("unchecked") List<Map<String, Object>> exchanges = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_EXCHANGES_ATTRIBUTE); @@ -249,7 +245,7 @@ public class VirtualHostRestTest extends QpidRestTestCase String queueName = getTestQueueName()+ "-lvq"; createQueue(queueName, "lvq", null); - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test"); @SuppressWarnings("unchecked") List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE); @@ -266,7 +262,7 @@ public class VirtualHostRestTest extends QpidRestTestCase int responseCode = tryCreateQueue(queueName, "sorted", null); assertEquals("Unexpected response code", HttpServletResponse.SC_CONFLICT, responseCode); - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test"); @SuppressWarnings("unchecked") List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE); @@ -280,7 +276,7 @@ public class VirtualHostRestTest extends QpidRestTestCase String queueName = getTestQueueName()+ "-priority"; createQueue(queueName, "priority", null); - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test"); @SuppressWarnings("unchecked") List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE); @@ -296,7 +292,7 @@ public class VirtualHostRestTest extends QpidRestTestCase String queueName = getTestQueueName(); createQueue(queueName, null, null); - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test"); @SuppressWarnings("unchecked") List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE); @@ -311,7 +307,7 @@ public class VirtualHostRestTest extends QpidRestTestCase int responseCode = tryCreateQueue(queueName, "unsupported", null); assertEquals("Unexpected response code", HttpServletResponse.SC_CONFLICT, responseCode); - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test"); @SuppressWarnings("unchecked") List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE); @@ -325,13 +321,12 @@ public class VirtualHostRestTest extends QpidRestTestCase String queueName = getTestQueueName(); createQueue(queueName, null, null); - String queueUrl = "/rest/queue/test/test/" + queueName; + String queueUrl = "queue/test/test/" + queueName; List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList(queueUrl); assertEquals("Queue should exist", 1, queues.size()); - HttpURLConnection connection = getRestTestHelper().openManagementConnection(queueUrl, "DELETE"); - connection.connect(); - assertEquals("Unexpected response code", 200, connection.getResponseCode()); + int statusCode = getRestTestHelper().submitRequest(queueUrl, "DELETE"); + assertEquals("Unexpected response code", 200, statusCode); queues = getRestTestHelper().getJsonAsList(queueUrl); assertEquals("Queue should be deleted", 0, queues.size()); } @@ -340,12 +335,10 @@ public class VirtualHostRestTest extends QpidRestTestCase { String queueName = getTestQueueName(); createQueue(queueName, null, null); - Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/test/" + queueName); - - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/queue/test/test?id=" + queueDetails.get(Queue.ID), "DELETE"); - connection.connect(); - assertEquals("Unexpected response code", 200, connection.getResponseCode()); - List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/queue/test/test/" + queueName); + Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("queue/test/test/" + queueName); + int statusCode = getRestTestHelper().submitRequest("queue/test/test?id=" + queueDetails.get(Queue.ID), "DELETE"); + assertEquals("Unexpected response code", 200, statusCode); + List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName); assertEquals("Queue should be deleted", 0, queues.size()); } @@ -354,10 +347,10 @@ public class VirtualHostRestTest extends QpidRestTestCase String exchangeName = getTestName(); createExchange(exchangeName, "direct"); - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/exchange/test/test/" + exchangeName, "DELETE"); - connection.connect(); - assertEquals("Unexpected response code", 200, connection.getResponseCode()); - List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/exchange/test/test/" + exchangeName); + int statusCode = getRestTestHelper().submitRequest("exchange/test/test/" + exchangeName, "DELETE"); + + assertEquals("Unexpected response code", 200, statusCode); + List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("exchange/test/test/" + exchangeName); assertEquals("Exchange should be deleted", 0, queues.size()); } @@ -365,12 +358,12 @@ public class VirtualHostRestTest extends QpidRestTestCase { String exchangeName = getTestName(); createExchange(exchangeName, "direct"); - Map<String, Object> echangeDetails = getRestTestHelper().getJsonAsSingletonList("/rest/exchange/test/test/" + exchangeName); + Map<String, Object> echangeDetails = getRestTestHelper().getJsonAsSingletonList("exchange/test/test/" + exchangeName); + + int statusCode = getRestTestHelper().submitRequest("exchange/test/test?id=" + echangeDetails.get(Exchange.ID), "DELETE"); - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/exchange/test/test?id=" + echangeDetails.get(Exchange.ID), "DELETE"); - connection.connect(); - assertEquals("Unexpected response code", 200, connection.getResponseCode()); - List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/exchange/test/test/" + exchangeName); + assertEquals("Unexpected response code", 200, statusCode); + List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("exchange/test/test/" + exchangeName); assertEquals("Exchange should be deleted", 0, queues.size()); } @@ -404,7 +397,7 @@ public class VirtualHostRestTest extends QpidRestTestCase lvqQueueAttributes.put(LastValueQueue.LVQ_KEY, "LVQ"); createQueue(queueName + "-lvq", "lvq", lvqQueueAttributes); - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test"); @SuppressWarnings("unchecked") List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE); @@ -433,7 +426,7 @@ public class VirtualHostRestTest extends QpidRestTestCase attributes.put(AbstractVirtualHost.CREATE_DLQ_ON_CREATION, true); //verify the starting state - Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); + Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test"); List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE); List<Map<String, Object>> exchanges = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_EXCHANGES_ATTRIBUTE); @@ -445,7 +438,7 @@ public class VirtualHostRestTest extends QpidRestTestCase createQueue(queueName, "standard", attributes); //verify the new queue, as well as the DLQueue and DLExchange have been created - hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); + hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test"); queues = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_QUEUES_ATTRIBUTE); exchanges = (List<Map<String, Object>>) hostDetails.get(VirtualHostRestTest.VIRTUALHOST_EXCHANGES_ATTRIBUTE); @@ -466,17 +459,13 @@ public class VirtualHostRestTest extends QpidRestTestCase private void createExchange(String exchangeName, String exchangeType) throws IOException { - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/exchange/test/test/" + exchangeName, "PUT"); - Map<String, Object> queueData = new HashMap<String, Object>(); queueData.put(Exchange.NAME, exchangeName); queueData.put(Exchange.DURABLE, Boolean.TRUE); queueData.put(Exchange.TYPE, exchangeType); - getRestTestHelper().writeJsonRequest(connection, queueData); - assertEquals("Unexpected response code", 201, connection.getResponseCode()); - - connection.disconnect(); + int statusCode = getRestTestHelper().submitRequest("exchange/test/test/" + exchangeName, "PUT", queueData); + assertEquals("Unexpected response code", 201, statusCode); } private void createQueue(String queueName, String queueType, Map<String, Object> attributes) throws IOException, @@ -489,8 +478,6 @@ public class VirtualHostRestTest extends QpidRestTestCase private int tryCreateQueue(String queueName, String queueType, Map<String, Object> attributes) throws IOException, JsonGenerationException, JsonMappingException { - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/queue/test/test/" + queueName, "PUT"); - Map<String, Object> queueData = new HashMap<String, Object>(); queueData.put(Queue.NAME, queueName); queueData.put(Queue.DURABLE, Boolean.TRUE); @@ -503,10 +490,7 @@ public class VirtualHostRestTest extends QpidRestTestCase queueData.putAll(attributes); } - getRestTestHelper().writeJsonRequest(connection, queueData); - int responseCode = connection.getResponseCode(); - connection.disconnect(); - return responseCode; + return getRestTestHelper().submitRequest("queue/test/test/" + queueName, "PUT", queueData); } private String createHost(String hostName, String storeType, String configPath) throws IOException, JsonGenerationException, @@ -533,7 +517,7 @@ public class VirtualHostRestTest extends QpidRestTestCase hostData.put(VirtualHostNode.IS_MESSAGE_STORE_PROVIDER, true); hostData.put(DurableConfigurationStore.STORE_PATH, storePath); - return getRestTestHelper().submitRequest("/rest/virtualhostnode/" + hostName, "PUT", hostData); + return getRestTestHelper().submitRequest("virtualhostnode/" + hostName, "PUT", hostData); } private void assertNewVirtualHost(Map<String, Object> hostDetails) diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java index 9168d5c81a..0f9df8795e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java @@ -119,7 +119,7 @@ public class BrokerACLTest extends QpidRestTestCase assertAuthenticationProviderExists(providerName); - responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "DELETE"); assertEquals("Provider deletion should be allowed", 200, responseCode); assertAuthenticationProviderDoesNotExist(TEST2_VIRTUALHOST); @@ -137,7 +137,7 @@ public class BrokerACLTest extends QpidRestTestCase assertAuthenticationProviderExists(providerName); getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "DELETE"); assertEquals("Provider deletion should be denied", 403, responseCode); assertAuthenticationProviderExists(providerName); @@ -159,7 +159,7 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(AuthenticationProvider.TYPE, PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE); attributes.put(ExternalFileBasedAuthenticationManager.PATH, file.getAbsolutePath()); - int responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes); assertEquals("Setting of provider attribites should be allowed", 200, responseCode); } @@ -169,8 +169,7 @@ public class BrokerACLTest extends QpidRestTestCase String providerName = TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER; - Map<String, Object> providerData = getRestTestHelper().getJsonAsSingletonList( - "/rest/authenticationprovider/" + providerName); + Map<String, Object> providerData = getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" + providerName); File file = TestFileUtils.createTempFile(this, ".users", "guest:guest\n" + ALLOWED_USER + ":" + ALLOWED_USER + "\n" + DENIED_USER + ":" + DENIED_USER); @@ -182,10 +181,10 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManager.PROVIDER_TYPE); attributes.put(ExternalFileBasedAuthenticationManager.PATH, file.getAbsolutePath()); - int responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("authenticationprovider/" + providerName, "PUT", attributes); assertEquals("Setting of provider attribites should be allowed", 403, responseCode); - Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList("/rest/authenticationprovider/" + providerName); + Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" + providerName); assertEquals("Unexpected PATH attribute value", providerData.get(ExternalFileBasedAuthenticationManager.PATH), provider.get(ExternalFileBasedAuthenticationManager.PATH)); @@ -223,7 +222,7 @@ public class BrokerACLTest extends QpidRestTestCase assertVirtualHostNodeExists(TEST2_VIRTUALHOST); - int responseCode = getRestTestHelper().submitRequest("/rest/virtualhostnode/" + TEST2_VIRTUALHOST, "DELETE", null); + int responseCode = getRestTestHelper().submitRequest("virtualhostnode/" + TEST2_VIRTUALHOST, "DELETE"); assertEquals("Virtual host node deletion should be allowed", 200, responseCode); assertVirtualHostNodeDoesNotExist(TEST2_VIRTUALHOST); @@ -237,7 +236,7 @@ public class BrokerACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - int responseCode = getRestTestHelper().submitRequest("/rest/virtualhostnode/" + TEST2_VIRTUALHOST, "DELETE", null); + int responseCode = getRestTestHelper().submitRequest("virtualhostnode/" + TEST2_VIRTUALHOST, "DELETE"); assertEquals("Virtual host node deletion should be denied", 403, responseCode); assertVirtualHostNodeExists(TEST2_VIRTUALHOST); @@ -278,7 +277,7 @@ public class BrokerACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - int responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "DELETE", null); + int responseCode = getRestTestHelper().submitRequest("port/" + portName, "DELETE"); assertEquals("Port deletion should be denied", 403, responseCode); assertPortExists(portName); @@ -293,7 +292,7 @@ public class BrokerACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); - int responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "DELETE", null); + int responseCode = getRestTestHelper().submitRequest("port/" + portName, "DELETE"); assertEquals("Port deletion should be allowed", 200, responseCode); assertPortDoesNotExist(portName); @@ -315,10 +314,10 @@ public class BrokerACLTest extends QpidRestTestCase Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(Port.NAME, portName); attributes.put(Port.AUTHENTICATION_PROVIDER, ANONYMOUS_AUTHENTICATION_PROVIDER); - responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Setting of port attribites should be allowed", 200, responseCode); - Map<String, Object> port = getRestTestHelper().getJsonAsSingletonList("/rest/port/" + portName); + Map<String, Object> port = getRestTestHelper().getJsonAsSingletonList("port/" + portName); assertEquals("Unexpected authentication provider attribute value", ANONYMOUS_AUTHENTICATION_PROVIDER, port.get(Port.AUTHENTICATION_PROVIDER)); } @@ -340,10 +339,10 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(Port.NAME, portName); attributes.put(Port.PROTOCOLS, Arrays.asList(Protocol.AMQP_0_9)); attributes.put(Port.AUTHENTICATION_PROVIDER, ANONYMOUS_AUTHENTICATION_PROVIDER); - responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); assertEquals("Setting of port attribites should be denied", 403, responseCode); - Map<String, Object> port = getRestTestHelper().getJsonAsSingletonList("/rest/port/" + portName); + Map<String, Object> port = getRestTestHelper().getJsonAsSingletonList("port/" + portName); assertEquals("Unexpected authentication provider attribute value", TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER, port.get(Port.AUTHENTICATION_PROVIDER)); } @@ -393,7 +392,7 @@ public class BrokerACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + keyStoreName, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("keystore/" + keyStoreName, "DELETE"); assertEquals("keystore deletion should be denied", 403, responseCode); assertKeyStoreExistence(keyStoreName, true); @@ -414,7 +413,7 @@ public class BrokerACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); - responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + keyStoreName, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("keystore/" + keyStoreName, "DELETE"); assertEquals("keystore deletion should be allowed", 200, responseCode); assertKeyStoreExistence(keyStoreName, false); @@ -434,16 +433,16 @@ public class BrokerACLTest extends QpidRestTestCase assertEquals("keyStore creation should be allowed", 201, responseCode); assertKeyStoreExistence(keyStoreName, true); - Map<String, Object> keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName); + Map<String, Object> keyStore = getRestTestHelper().getJsonAsSingletonList("keystore/" + keyStoreName); assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS)); Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(KeyStore.NAME, keyStoreName); attributes.put(FileKeyStore.CERTIFICATE_ALIAS, updatedCertAlias); - responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + keyStoreName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("keystore/" + keyStoreName, "PUT", attributes); assertEquals("Setting of keystore attributes should be allowed", 200, responseCode); - keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName); + keyStore = getRestTestHelper().getJsonAsSingletonList("keystore/" + keyStoreName); assertEquals("Unexpected certificateAlias attribute value", updatedCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS)); } @@ -461,7 +460,7 @@ public class BrokerACLTest extends QpidRestTestCase assertEquals("keyStore creation should be allowed", 201, responseCode); assertKeyStoreExistence(keyStoreName, true); - Map<String, Object> keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName); + Map<String, Object> keyStore = getRestTestHelper().getJsonAsSingletonList("keystore/" + keyStoreName); assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS)); getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); @@ -469,10 +468,10 @@ public class BrokerACLTest extends QpidRestTestCase Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(KeyStore.NAME, keyStoreName); attributes.put(FileKeyStore.CERTIFICATE_ALIAS, updatedCertAlias); - responseCode = getRestTestHelper().submitRequest("/rest/keystore/" + keyStoreName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("keystore/" + keyStoreName, "PUT", attributes); assertEquals("Setting of keystore attributes should be denied", 403, responseCode); - keyStore = getRestTestHelper().getJsonAsSingletonList("/rest/keystore/" + keyStoreName); + keyStore = getRestTestHelper().getJsonAsSingletonList("keystore/" + keyStoreName); assertEquals("Unexpected certificateAlias attribute value", initialCertAlias, keyStore.get(FileKeyStore.CERTIFICATE_ALIAS)); } @@ -521,7 +520,7 @@ public class BrokerACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + trustStoreName, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("truststore/" + trustStoreName, "DELETE"); assertEquals("truststore deletion should be denied", 403, responseCode); assertTrustStoreExistence(trustStoreName, true); @@ -542,7 +541,7 @@ public class BrokerACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); - responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + trustStoreName, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("truststore/" + trustStoreName, "DELETE"); assertEquals("truststore deletion should be allowed", 200, responseCode); assertTrustStoreExistence(trustStoreName, false); @@ -562,16 +561,16 @@ public class BrokerACLTest extends QpidRestTestCase assertEquals("trustStore creation should be allowed", 201, responseCode); assertTrustStoreExistence(trustStoreName, true); - Map<String, Object> trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName); + Map<String, Object> trustStore = getRestTestHelper().getJsonAsSingletonList("truststore/" + trustStoreName); assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY)); Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(TrustStore.NAME, trustStoreName); attributes.put(FileTrustStore.PEERS_ONLY, updatedPeersOnly); - responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + trustStoreName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("truststore/" + trustStoreName, "PUT", attributes); assertEquals("Setting of truststore attributes should be allowed", 200, responseCode); - trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName); + trustStore = getRestTestHelper().getJsonAsSingletonList("truststore/" + trustStoreName); assertEquals("Unexpected peersOnly attribute value", updatedPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY)); } @@ -589,7 +588,7 @@ public class BrokerACLTest extends QpidRestTestCase assertEquals("trustStore creation should be allowed", 201, responseCode); assertTrustStoreExistence(trustStoreName, true); - Map<String, Object> trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName); + Map<String, Object> trustStore = getRestTestHelper().getJsonAsSingletonList("truststore/" + trustStoreName); assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY)); getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); @@ -597,10 +596,10 @@ public class BrokerACLTest extends QpidRestTestCase Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(TrustStore.NAME, trustStoreName); attributes.put(FileTrustStore.PEERS_ONLY, updatedPeersOnly); - responseCode = getRestTestHelper().submitRequest("/rest/truststore/" + trustStoreName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("truststore/" + trustStoreName, "PUT", attributes); assertEquals("Setting of truststore attributes should be denied", 403, responseCode); - trustStore = getRestTestHelper().getJsonAsSingletonList("/rest/truststore/" + trustStoreName); + trustStore = getRestTestHelper().getJsonAsSingletonList("truststore/" + trustStoreName); assertEquals("Unexpected peersOnly attribute value", initialPeersOnly, trustStore.get(FileTrustStore.PEERS_ONLY)); } @@ -613,17 +612,17 @@ public class BrokerACLTest extends QpidRestTestCase int initialSessionCountLimit = 256; int updatedSessionCountLimit = 299; - Map<String, Object> brokerAttributes = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + Map<String, Object> brokerAttributes = getRestTestHelper().getJsonAsSingletonList("broker"); assertEquals("Unexpected alert repeat gap", initialSessionCountLimit, brokerAttributes.get(Broker.CONNECTION_SESSION_COUNT_LIMIT)); Map<String, Object> newAttributes = new HashMap<String, Object>(); newAttributes.put(Broker.CONNECTION_SESSION_COUNT_LIMIT, updatedSessionCountLimit); - int responseCode = getRestTestHelper().submitRequest("/rest/broker", "PUT", newAttributes); + int responseCode = getRestTestHelper().submitRequest("broker", "PUT", newAttributes); assertEquals("Setting of port attribites should be allowed", 200, responseCode); - brokerAttributes = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + brokerAttributes = getRestTestHelper().getJsonAsSingletonList("broker"); assertEquals("Unexpected default alert repeat gap", updatedSessionCountLimit, brokerAttributes.get(Broker.CONNECTION_SESSION_COUNT_LIMIT)); } @@ -635,7 +634,7 @@ public class BrokerACLTest extends QpidRestTestCase int initialSessionCountLimit = 256; int updatedSessionCountLimit = 299; - Map<String, Object> brokerAttributes = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + Map<String, Object> brokerAttributes = getRestTestHelper().getJsonAsSingletonList("broker"); assertEquals("Unexpected alert repeat gap", initialSessionCountLimit, brokerAttributes.get(Broker.CONNECTION_SESSION_COUNT_LIMIT)); @@ -643,10 +642,10 @@ public class BrokerACLTest extends QpidRestTestCase Map<String, Object> newAttributes = new HashMap<String, Object>(); newAttributes.put(Broker.CONNECTION_SESSION_COUNT_LIMIT, updatedSessionCountLimit); - int responseCode = getRestTestHelper().submitRequest("/rest/broker", "PUT", newAttributes); + int responseCode = getRestTestHelper().submitRequest("broker", "PUT", newAttributes); assertEquals("Setting of port attribites should be allowed", 403, responseCode); - brokerAttributes = getRestTestHelper().getJsonAsSingletonList("/rest/broker"); + brokerAttributes = getRestTestHelper().getJsonAsSingletonList("broker"); assertEquals("Unexpected default alert repeat gap", initialSessionCountLimit, brokerAttributes.get(Broker.CONNECTION_SESSION_COUNT_LIMIT)); } @@ -696,7 +695,7 @@ public class BrokerACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + groupProviderName, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("groupprovider/" + groupProviderName, "DELETE"); assertEquals("Group provider deletion should be denied", 403, responseCode); assertGroupProviderExistence(groupProviderName, true); @@ -717,7 +716,7 @@ public class BrokerACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); - responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + groupProviderName, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("groupprovider/" + groupProviderName, "DELETE"); assertEquals("Group provider deletion should be allowed", 200, responseCode); assertGroupProviderExistence(groupProviderName, false); @@ -740,7 +739,7 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(GroupProvider.NAME, groupProviderName); attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE); attributes.put(FileBasedGroupProvider.PATH, "/path/to/file"); - responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + groupProviderName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("groupprovider/" + groupProviderName, "PUT", attributes); assertEquals("Setting of group provider attributes should be allowed but not supported", 409, responseCode); } @@ -763,7 +762,7 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(GroupProvider.NAME, groupProviderName); attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE); attributes.put(FileBasedGroupProvider.PATH, "/path/to/file"); - responseCode = getRestTestHelper().submitRequest("/rest/groupprovider/" + groupProviderName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("groupprovider/" + groupProviderName, "PUT", attributes); assertEquals("Setting of group provider attributes should be denied", 403, responseCode); } @@ -812,7 +811,7 @@ public class BrokerACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - responseCode = getRestTestHelper().submitRequest("/rest/accesscontrolprovider/" + accessControlProviderName, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("accesscontrolprovider/" + accessControlProviderName, "DELETE"); assertEquals("Access control provider deletion should be denied", 403, responseCode); assertAccessControlProviderExistence(accessControlProviderName, true); @@ -831,7 +830,7 @@ public class BrokerACLTest extends QpidRestTestCase assertAccessControlProviderExistence(accessControlProviderName, true); - responseCode = getRestTestHelper().submitRequest("/rest/accesscontrolprovider/" + accessControlProviderName, "DELETE", null); + responseCode = getRestTestHelper().submitRequest("accesscontrolprovider/" + accessControlProviderName, "DELETE"); assertEquals("Access control provider deletion should be allowed", 200, responseCode); assertAccessControlProviderExistence(accessControlProviderName, false); @@ -854,7 +853,7 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(GroupProvider.NAME, accessControlProviderName); attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE); attributes.put(FileBasedGroupProvider.PATH, "/path/to/file"); - responseCode = getRestTestHelper().submitRequest("/rest/accesscontrolprovider/" + accessControlProviderName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("accesscontrolprovider/" + accessControlProviderName, "PUT", attributes); assertEquals("Setting of access control provider attributes should be allowed but not supported", 409, responseCode); } @@ -877,7 +876,7 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(GroupProvider.NAME, accessControlProviderName); attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE); attributes.put(FileBasedGroupProvider.PATH, "/path/to/file"); - responseCode = getRestTestHelper().submitRequest("/rest/accesscontrolprovider/" + accessControlProviderName, "PUT", attributes); + responseCode = getRestTestHelper().submitRequest("accesscontrolprovider/" + accessControlProviderName, "PUT", attributes); assertEquals("Setting of access control provider attributes should be denied", 403, responseCode); } @@ -895,11 +894,11 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(HttpManagement.TIME_OUT, 10000); int responseCode = getRestTestHelper().submitRequest( - "/rest/plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes); + "plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes); assertEquals("Setting of http management should be allowed", 200, responseCode); Map<String, Object> details = getRestTestHelper().getJsonAsSingletonList( - "/rest/plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT); + "plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT); assertEquals("Unexpected session timeout", 10000, details.get(HttpManagement.TIME_OUT)); assertEquals("Unexpected http basic auth enabled", true, details.get(HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED)); @@ -920,11 +919,11 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(HttpManagement.TIME_OUT, 10000); int responseCode = getRestTestHelper().submitRequest( - "/rest/plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes); + "plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, "PUT", attributes); assertEquals("Setting of http management should be denied", 403, responseCode); Map<String, Object> details = getRestTestHelper().getJsonAsSingletonList( - "/rest/plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT); + "plugin/" + TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT); assertEquals("Unexpected session timeout", HttpManagement.DEFAULT_TIMEOUT_IN_SECONDS, details.get(HttpManagement.TIME_OUT)); @@ -947,7 +946,7 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(Port.PORT, findFreePort()); attributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); - return getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + return getRestTestHelper().submitRequest("port/" + portName, "PUT", attributes); } private void assertPortExists(String portName) throws Exception @@ -962,19 +961,19 @@ public class BrokerACLTest extends QpidRestTestCase private void assertPortExistence(String portName, boolean exists) throws Exception { - List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("/rest/port/" + portName); + List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("port/" + portName); assertEquals("Unexpected result", exists, !hosts.isEmpty()); } private void assertKeyStoreExistence(String keyStoreName, boolean exists) throws Exception { - List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("/rest/keystore/" + keyStoreName); + List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("keystore/" + keyStoreName); assertEquals("Unexpected result", exists, !keyStores.isEmpty()); } private void assertTrustStoreExistence(String trustStoreName, boolean exists) throws Exception { - List<Map<String, Object>> trustStores = getRestTestHelper().getJsonAsList("/rest/truststore/" + trustStoreName); + List<Map<String, Object>> trustStores = getRestTestHelper().getJsonAsList("truststore/" + trustStoreName); assertEquals("Unexpected result", exists, !trustStores.isEmpty()); } @@ -985,7 +984,7 @@ public class BrokerACLTest extends QpidRestTestCase data.put(VirtualHostNode.TYPE, getTestProfileVirtualHostNodeType()); data.put(DurableConfigurationStore.STORE_PATH, getStoreLocation(virtualHostNodeName)); - return getRestTestHelper().submitRequest("/rest/virtualhostnode/" + virtualHostNodeName, "PUT", data); + return getRestTestHelper().submitRequest("virtualhostnode/" + virtualHostNodeName, "PUT", data); } private void assertVirtualHostNodeDoesNotExist(String name) throws Exception @@ -1000,7 +999,7 @@ public class BrokerACLTest extends QpidRestTestCase private void assertVirtualHostNodeExistence(String name, boolean exists) throws Exception { - List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("/rest/virtualhostnode/" + name); + List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("virtualhostnode/" + name); assertEquals("Node " + name + (exists ? " does not exist" : " exists" ), exists, !hosts.isEmpty()); } @@ -1015,7 +1014,7 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(AuthenticationProvider.NAME, authenticationProviderName); attributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManager.PROVIDER_TYPE); - return getRestTestHelper().submitRequest("/rest/authenticationprovider/" + authenticationProviderName, "PUT", attributes); + return getRestTestHelper().submitRequest("authenticationprovider/" + authenticationProviderName, "PUT", attributes); } private void assertAuthenticationProviderDoesNotExist(String authenticationProviderName) throws Exception @@ -1030,7 +1029,7 @@ public class BrokerACLTest extends QpidRestTestCase private void assertAuthenticationProviderExistence(String authenticationProviderName, boolean exists) throws Exception { - String path = "/rest/authenticationprovider/" + authenticationProviderName; + String path = "authenticationprovider/" + authenticationProviderName; List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList(path); assertEquals("Unexpected result", exists, !providers.isEmpty()); } @@ -1043,7 +1042,7 @@ public class BrokerACLTest extends QpidRestTestCase keyStoreAttributes.put(FileKeyStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD); keyStoreAttributes.put(FileKeyStore.CERTIFICATE_ALIAS, certAlias); - return getRestTestHelper().submitRequest("/rest/keystore/" + name, "PUT", keyStoreAttributes); + return getRestTestHelper().submitRequest("keystore/" + name, "PUT", keyStoreAttributes); } private int createTrustStore(String name, boolean peersOnly) throws IOException, JsonGenerationException, JsonMappingException @@ -1054,12 +1053,12 @@ public class BrokerACLTest extends QpidRestTestCase trustStoreAttributes.put(FileTrustStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD); trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, peersOnly); - return getRestTestHelper().submitRequest("/rest/truststore/" + name, "PUT", trustStoreAttributes); + return getRestTestHelper().submitRequest("truststore/" + name, "PUT", trustStoreAttributes); } private void assertGroupProviderExistence(String groupProviderName, boolean exists) throws Exception { - String path = "/rest/groupprovider/" + groupProviderName; + String path = "groupprovider/" + groupProviderName; List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList(path); assertEquals("Unexpected result", exists, !providers.isEmpty()); } @@ -1072,12 +1071,12 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(GroupProvider.TYPE, FileBasedGroupProviderImpl.GROUP_FILE_PROVIDER_TYPE); attributes.put(FileBasedGroupProvider.PATH, file.getAbsoluteFile()); - return getRestTestHelper().submitRequest("/rest/groupprovider/" + groupProviderName, "PUT", attributes); + return getRestTestHelper().submitRequest("groupprovider/" + groupProviderName, "PUT", attributes); } private void assertAccessControlProviderExistence(String accessControlProviderName, boolean exists) throws Exception { - String path = "/rest/accesscontrolprovider/" + accessControlProviderName; + String path = "accesscontrolprovider/" + accessControlProviderName; List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList(path); assertEquals("Unexpected result", exists, !providers.isEmpty()); } @@ -1090,6 +1089,6 @@ public class BrokerACLTest extends QpidRestTestCase attributes.put(AccessControlProvider.TYPE, FileAccessControlProviderConstants.ACL_FILE_PROVIDER_TYPE); attributes.put(FileAccessControlProviderConstants.PATH, file.getAbsoluteFile()); - return getRestTestHelper().submitRequest("/rest/accesscontrolprovider/" + accessControlProviderName, "PUT", attributes); + return getRestTestHelper().submitRequest("accesscontrolprovider/" + accessControlProviderName, "PUT", attributes); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java index 0854befc0a..b0c66cb3af 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java @@ -77,11 +77,11 @@ public class ExchangeRestACLTest extends QpidRestTestCase Map<String, Object> queueData = new HashMap<String, Object>(); queueData.put(Queue.NAME, _queueName); queueData.put(Queue.DURABLE, Boolean.TRUE); - int status = getRestTestHelper().submitRequest("/rest/queue/test/test/" + _queueName, "PUT", queueData); + int status = getRestTestHelper().submitRequest("queue/test/test/" + _queueName, "PUT", queueData); assertEquals("Unexpected status", 201, status); _exchangeName = getTestName(); - _exchangeUrl = "/rest/exchange/test/test/" + _exchangeName; + _exchangeUrl = "exchange/test/test/" + _exchangeName; } public void testCreateExchangeAllowed() throws Exception @@ -114,7 +114,7 @@ public class ExchangeRestACLTest extends QpidRestTestCase assertExchangeExists(); - responseCode = getRestTestHelper().submitRequest(_exchangeUrl, "DELETE", null); + responseCode = getRestTestHelper().submitRequest(_exchangeUrl, "DELETE"); assertEquals("Exchange deletion should be allowed", 200, responseCode); assertExchangeDoesNotExist(); @@ -130,7 +130,7 @@ public class ExchangeRestACLTest extends QpidRestTestCase assertExchangeExists(); getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - responseCode = getRestTestHelper().submitRequest(_exchangeUrl, "DELETE", null); + responseCode = getRestTestHelper().submitRequest(_exchangeUrl, "DELETE"); assertEquals("Exchange deletion should be denied", 403, responseCode); assertExchangeExists(); @@ -222,7 +222,7 @@ public class ExchangeRestACLTest extends QpidRestTestCase attributes.put(Binding.QUEUE, _queueName); attributes.put(Binding.EXCHANGE, "amq.direct"); - int responseCode = getRestTestHelper().submitRequest("/rest/binding/test/test/amq.direct/" + _queueName + "/" + bindingName, "PUT", attributes); + int responseCode = getRestTestHelper().submitRequest("binding/test/test/amq.direct/" + _queueName + "/" + bindingName, "PUT", attributes); return responseCode; } @@ -238,7 +238,7 @@ public class ExchangeRestACLTest extends QpidRestTestCase private void assertBindingExistence(String bindingName, boolean exists) throws Exception { - List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/test/amq.direct/" + _queueName + "/" + bindingName); + List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("binding/test/test/amq.direct/" + _queueName + "/" + bindingName); assertEquals("Unexpected result", exists, !bindings.isEmpty()); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java index d2eba6a924..3ebfafb8da 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java @@ -103,19 +103,19 @@ public class GroupRestACLTest extends QpidRestTestCase super.setUp(); getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); - Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + FILE_GROUP_MANAGER); + Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER); getRestTestHelper().assertNumberOfGroups(data, 3); getRestTestHelper().createGroup("newGroup", FILE_GROUP_MANAGER); - data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + FILE_GROUP_MANAGER); + data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER); getRestTestHelper().assertNumberOfGroups(data, 4); getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); getRestTestHelper().createGroup("anotherNewGroup", FILE_GROUP_MANAGER, HttpServletResponse.SC_FORBIDDEN); - data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + FILE_GROUP_MANAGER); + data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER); getRestTestHelper().assertNumberOfGroups(data, 4); } @@ -129,19 +129,19 @@ public class GroupRestACLTest extends QpidRestTestCase super.setUp(); getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + FILE_GROUP_MANAGER); + Map<String, Object> data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER); getRestTestHelper().assertNumberOfGroups(data, 3); getRestTestHelper().removeGroup(OTHER_GROUP, FILE_GROUP_MANAGER, HttpServletResponse.SC_FORBIDDEN); - data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + FILE_GROUP_MANAGER); + data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER); getRestTestHelper().assertNumberOfGroups(data, 3); getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); getRestTestHelper().removeGroup(OTHER_GROUP, FILE_GROUP_MANAGER); - data = getRestTestHelper().getJsonAsSingletonList("/rest/groupprovider/" + FILE_GROUP_MANAGER); + data = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + FILE_GROUP_MANAGER); getRestTestHelper().assertNumberOfGroups(data, 2); } @@ -187,7 +187,7 @@ public class GroupRestACLTest extends QpidRestTestCase private void assertNumberOfGroupMembers(String groupName, int expectedNumberOfMembers) throws IOException { - Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("/rest/group/" + FILE_GROUP_MANAGER + "/" + groupName); + Map<String, Object> group = getRestTestHelper().getJsonAsSingletonList("group/" + FILE_GROUP_MANAGER + "/" + groupName); getRestTestHelper().assertNumberOfGroupMembers(group, expectedNumberOfMembers); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java index 86dc1ea17a..1b14e3b10e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java @@ -52,7 +52,7 @@ public class LogViewerACLTest extends QpidRestTestCase { getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); - int responseCode = getRestTestHelper().submitRequest("/rest/logrecords", "GET", null); + int responseCode = getRestTestHelper().submitRequest("/service/logrecords", "GET"); assertEquals("Access to log records should be allowed", 200, responseCode); } @@ -60,7 +60,7 @@ public class LogViewerACLTest extends QpidRestTestCase { getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - int responseCode = getRestTestHelper().submitRequest("/rest/logrecords", "GET", null); + int responseCode = getRestTestHelper().submitRequest("/service/logrecords", "GET"); assertEquals("Access to log records should be denied", 403, responseCode); } @@ -68,7 +68,7 @@ public class LogViewerACLTest extends QpidRestTestCase { getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); - int responseCode = getRestTestHelper().submitRequest("/rest/logfilenames", "GET", null); + int responseCode = getRestTestHelper().submitRequest("/service/logfilenames", "GET"); assertEquals("Access to log files should be allowed", 200, responseCode); } @@ -76,7 +76,7 @@ public class LogViewerACLTest extends QpidRestTestCase { getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - int responseCode = getRestTestHelper().submitRequest("/rest/logfilenames", "GET", null); + int responseCode = getRestTestHelper().submitRequest("/service/logfilenames", "GET"); assertEquals("Access to log files should be denied", 403, responseCode); } @@ -84,7 +84,7 @@ public class LogViewerACLTest extends QpidRestTestCase { getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); - int responseCode = getRestTestHelper().submitRequest("/rest/logfile?l=appender%2fqpid.log", "GET", null); + int responseCode = getRestTestHelper().submitRequest("/service/logfile?l=appender%2fqpid.log", "GET"); assertEquals("Access to log files should be allowed", 404, responseCode); } @@ -92,7 +92,7 @@ public class LogViewerACLTest extends QpidRestTestCase { getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - int responseCode = getRestTestHelper().submitRequest("/rest/logfile?l=appender%2fqpid.log", "GET", null); + int responseCode = getRestTestHelper().submitRequest("/service/logfile?l=appender%2fqpid.log", "GET"); assertEquals("Access to log files should be denied", 403, responseCode); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java index 8acf4ee762..a123de2984 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java @@ -44,7 +44,7 @@ public class QueueRestACLTest extends QpidRestTestCase { super.setUp(); _queueName = getTestName(); - _queueUrl = "/rest/queue/test/test/" + _queueName; + _queueUrl = "queue/test/test/" + _queueName; } @Override @@ -95,7 +95,7 @@ public class QueueRestACLTest extends QpidRestTestCase assertQueueExists(); - responseCode = getRestTestHelper().submitRequest(_queueUrl, "DELETE", null); + responseCode = getRestTestHelper().submitRequest(_queueUrl, "DELETE"); assertEquals("Queue deletion should be allowed", 200, responseCode); assertQueueDoesNotExist(); @@ -111,7 +111,7 @@ public class QueueRestACLTest extends QpidRestTestCase assertQueueExists(); getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); - responseCode = getRestTestHelper().submitRequest(_queueUrl, "DELETE", null); + responseCode = getRestTestHelper().submitRequest(_queueUrl, "DELETE"); assertEquals("Queue deletion should be denied", 403, responseCode); assertQueueExists(); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java index 1ec40cfc14..b626b821c8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java @@ -40,7 +40,7 @@ import org.apache.qpid.test.utils.TestFileUtils; public class UserPreferencesRestACLTest extends QpidRestTestCase { - private static final String REST_USER_PREFERENCES_BASE_URL = "/rest/userpreferences"; + private static final String REST_USER_PREFERENCES_BASE_URL = "/service/userpreferences"; private static final String ALLOWED_USER = "webadmin"; private static final String DENIED_USER = "admin"; private static final String TEST_USER_PREFERENCES_GET_URL = REST_USER_PREFERENCES_BASE_URL + "/" @@ -121,9 +121,9 @@ public class UserPreferencesRestACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); int responseCode = getRestTestHelper().submitRequest( - "/rest/userpreferences?user=" + "/service/userpreferences?user=" + URLEncoder.encode(TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + ALLOWED_USER, "UTF-8"), - "DELETE", null); + "DELETE"); assertEquals("Preferences deletion should be denied", 403, responseCode); } @@ -138,9 +138,9 @@ public class UserPreferencesRestACLTest extends QpidRestTestCase assertEquals("Unexpected saveTabs preference", false, preferences.get("saveTabs")); int responseCode = getRestTestHelper().submitRequest( - "/rest/userpreferences?user=" + "/service/userpreferences?user=" + URLEncoder.encode(TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + DENIED_USER, "UTF-8"), - "DELETE", null); + "DELETE"); assertEquals("Preferences deletion should be allowed", 200, responseCode); preferences = getRestTestHelper().getJsonAsMap(userPreferencesUrl); @@ -160,9 +160,9 @@ public class UserPreferencesRestACLTest extends QpidRestTestCase getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER); int responseCode = getRestTestHelper().submitRequest( - "/rest/userpreferences?user=" + "/service/userpreferences?user=" + URLEncoder.encode(TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + ALLOWED_USER, "UTF-8"), - "DELETE", null); + "DELETE"); assertEquals("Preferences deletion should be denied", 403, responseCode); getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java index f792197369..d80c8e14b2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java @@ -21,7 +21,6 @@ package org.apache.qpid.systest.rest.acl; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.net.HttpURLConnection; import java.util.List; import java.util.Map; import java.util.Properties; @@ -168,26 +167,24 @@ public class UserRestACLTest extends QpidRestTestCase private void checkPassword(String username, String password, boolean passwordExpectedToBeCorrect) throws IOException { getRestTestHelper().setUsernameAndPassword(username, password); - HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/user/" - + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/", "GET"); - boolean passwordIsCorrect = connection.getResponseCode() == HttpServletResponse.SC_OK; - - connection.disconnect(); + int responseCode = getRestTestHelper().submitRequest("user/" + + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/", "GET", (byte[])null); + boolean passwordIsCorrect = responseCode == HttpServletResponse.SC_OK; assertEquals(passwordExpectedToBeCorrect, passwordIsCorrect); } private void assertUserDoesNotExist(String newUser) throws JsonParseException, JsonMappingException, IOException { - String path = "/rest/user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + newUser; + String path = "user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + newUser; List<Map<String, Object>> userDetailsList = getRestTestHelper().getJsonAsList(path); assertTrue(userDetailsList.isEmpty()); } private void assertUserExists(String username) throws IOException { - String path = "/rest/user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + username; + String path = "user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + username; Map<String, Object> userDetails = getRestTestHelper().getJsonAsSingletonList(path); assertEquals( |