You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2014/05/02 17:29:26 UTC
svn commit: r1591948 [1/3] - in /qpid/trunk/qpid/java:
bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/
systests/src/main/java/org/apache/qpi...
Author: orudyy
Date: Fri May 2 15:29:25 2014
New Revision: 1591948
URL: http://svn.apache.org/r1591948
Log:
QPID-5744: Move management REST API under /api/latest and auxiliary REST services under /service
Modified:
qpid/trunk/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/MessagesRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/UserRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/LogViewerACLTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java
Modified: qpid/trunk/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java (original)
+++ qpid/trunk/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java Fri May 2 15:29:25 2014
@@ -60,7 +60,7 @@ public class BDBHAVirtualHostNodeRestTes
super.setUp();
_hostName = getTestName();
- _baseNodeRestUrl = "/rest/virtualhostnode/";
+ _baseNodeRestUrl = "virtualhostnode/";
_storeBaseDir = new File(TMP_FOLDER, "store-" + _hostName + "-" + System.currentTimeMillis());
@@ -136,7 +136,7 @@ public class BDBHAVirtualHostNodeRestTes
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 BDBHAVirtualHostNodeRestTes
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");
}
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Fri May 2 15:29:25 2014
@@ -232,8 +232,9 @@ public class HttpManagement extends Abst
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 Abst
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 Abst
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 Abst
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)
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java Fri May 2 15:29:25 2014
@@ -52,7 +52,6 @@ public class AlertingTest extends Abstra
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 Abstra
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();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java Fri May 2 15:29:25 2014
@@ -113,7 +113,7 @@ public class AccessControlProviderRestTe
//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 AccessControlProviderRestTe
//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 AccessControlProviderRestTe
//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 AccessControlProviderRestTe
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 AccessControlProviderRestTe
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);
}
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AnonymousAccessRestTest.java Fri May 2 15:29:25 2014
@@ -69,7 +69,7 @@ public class AnonymousAccessRestTest ext
{
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 ext
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 ext
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 ext
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);
}
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java Fri May 2 15:29:25 2014
@@ -44,7 +44,7 @@ public class AuthenticationProviderRestT
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 AuthenticationProviderRestT
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 AuthenticationProviderRestT
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 AuthenticationProviderRestT
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 AuthenticationProviderRestT
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 AuthenticationProviderRestT
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 AuthenticationProviderRestT
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 AuthenticationProviderRestT
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 AuthenticationProviderRestT
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 AuthenticationProviderRestT
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 AuthenticationProviderRestT
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 AuthenticationProviderRestT
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 AuthenticationProviderRestT
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());
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java Fri May 2 15:29:25 2014
@@ -24,7 +24,6 @@ import static org.apache.qpid.test.utils
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 Q
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
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java Fri May 2 15:29:25 2014
@@ -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 Qpi
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 Qpi
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 Qpi
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 Qpi
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 Qpi
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 Qpi
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 Qpi
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);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsClientCertAuthTest.java Fri May 2 15:29:25 2014
@@ -79,7 +79,7 @@ public class BrokerRestHttpsClientCertAu
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");
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java Fri May 2 15:29:25 2014
@@ -61,7 +61,7 @@ public class BrokerRestHttpsTest extends
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,
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java Fri May 2 15:29:25 2014
@@ -54,7 +54,7 @@ public class BrokerRestTest extends Qpid
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 Qpid
{
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 Qpid
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 Qpid
{
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 Qpid
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();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java Fri May 2 15:29:25 2014
@@ -91,14 +91,14 @@ public class ConnectionRestTest extends
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
// 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
// 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
// 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
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);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java Fri May 2 15:29:25 2014
@@ -39,7 +39,7 @@ public class ExchangeRestTest extends Qp
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 Qp
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 Qp
{
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 Qp
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);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java Fri May 2 15:29:25 2014
@@ -71,13 +71,13 @@ public class GroupProviderRestTest exten
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 exten
{
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 exten
{
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 exten
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 exten
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 exten
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 exten
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 exten
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 exten
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 exten
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());
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupRestTest.java Fri May 2 15:29:25 2014
@@ -64,7 +64,7 @@ public class GroupRestTest extends QpidR
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 QpidR
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);
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/HttpManagementRestTest.java Fri May 2 15:29:25 2014
@@ -32,7 +32,7 @@ public class HttpManagementRestTest exte
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 exte
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 exte
{
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);
}
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java Fri May 2 15:29:25 2014
@@ -70,7 +70,7 @@ public class KeyStoreRestTest extends Qp
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 Qp
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 Qp
//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 Qp
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 Qp
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 Qp
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 Qp
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 Qp
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 Qp
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 Qp
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);
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java Fri May 2 15:29:25 2014
@@ -27,7 +27,7 @@ public class LogRecordsRestTest extends
{
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
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
//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);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java?rev=1591948&r1=1591947&r2=1591948&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/LogViewerTest.java Fri May 2 15:29:25 2014
@@ -49,7 +49,7 @@ public class LogViewerTest extends QpidR
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 QpidR
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 QpidR
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);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org