You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ev...@apache.org on 2013/11/19 22:44:33 UTC
git commit: Refactored QueueApi and pushed name param up to
MarconiApi.
Updated Branches:
refs/heads/master 318da8046 -> dc452f776
Refactored QueueApi and pushed name param up to MarconiApi.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/dc452f77
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/dc452f77
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/dc452f77
Branch: refs/heads/master
Commit: dc452f77605459921c2bc8a08c3d675a4d9d4bd4
Parents: 318da80
Author: Everett Toews <ev...@rackspace.com>
Authored: Tue Nov 19 15:28:51 2013 -0600
Committer: Everett Toews <ev...@rackspace.com>
Committed: Tue Nov 19 15:44:16 2013 -0600
----------------------------------------------------------------------
.../openstack/marconi/v1/MarconiApi.java | 7 +++-
.../openstack/marconi/v1/features/QueueApi.java | 41 +++++---------------
.../marconi/v1/features/MessageApiLiveTest.java | 8 ++--
.../marconi/v1/features/QueueApiLiveTest.java | 32 +++++++--------
.../marconi/v1/features/QueueApiMockTest.java | 32 +++++++--------
5 files changed, 50 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/dc452f77/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java
index fe4c048..3be40bf 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java
@@ -47,10 +47,13 @@ public interface MarconiApi extends Closeable {
* Provides access to Queue features.
*
* @param zone The zone where this queue will live.
+ * @param name Name of the queue. The name must not exceed 64 bytes in length, and it is limited to US-ASCII
+ * letters, digits, underscores, and hyphens.
*/
@Delegate
- QueueApi getQueueApiForZone(
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
+ @Path("/queues/{name}")
+ QueueApi getQueueApiForZoneAndQueue(
+ @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone, @PathParam("name") String name);
/**
* Provides access to Message features.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/dc452f77/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
index c80c610..9373cba 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
@@ -46,43 +46,29 @@ import java.util.Map;
@SkipEncoding({'/', '='})
@RequestFilters(AuthenticateRequest.class)
public interface QueueApi {
- // TODO: Move name parameter into MarconiApi.getQueueApiForZone(String name, String zone)
-
/**
* Create a queue.
- *
- * @param name Name of the queue. The name must not exceed 64 bytes in length, and it is limited to US-ASCII
- * letters, digits, underscores, and hyphens.
*/
@Named("queue:create")
@PUT
- @Path("queues/{name}")
@Fallback(Fallbacks.FalseOnNotFoundOr404.class)
- boolean create(@PathParam("name") String name);
+ boolean create();
/**
* Delete a queue.
- *
- * @param name Name of the queue. The name must not exceed 64 bytes in length, and it is limited to US-ASCII
- * letters, digits, underscores, and hyphens.
*/
@Named("queue:delete")
@DELETE
- @Path("queues/{name}")
@Fallback(Fallbacks.FalseOnNotFoundOr404.class)
- boolean delete(@PathParam("name") String name);
+ boolean delete();
/**
* Check for a queue's existence.
- *
- * @param name Name of the queue. The name must not exceed 64 bytes in length, and it is limited to US-ASCII
- * letters, digits, underscores, and hyphens.
*/
@Named("queue:get")
@GET
- @Path("queues/{name}")
@Fallback(Fallbacks.FalseOnNotFoundOr404.class)
- boolean exists(@PathParam("name") String name);
+ boolean exists();
// TODO stream method!
@@ -94,43 +80,34 @@ public interface QueueApi {
* This operation replaces any existing metadata document in its entirety. Ensure that you do not accidentally
* overwrite existing metadata that you want to retain.
*
- * @param name Name of the queue. The name must not exceed 64 bytes in length, and it is limited to US-ASCII
- * letters, digits, underscores, and hyphens.
* @param metadata Metadata in key/value pairs.
*/
@Named("queue:setMetadata")
@PUT
- @Path("queues/{name}/metadata")
+ @Path("/metadata")
@Produces(MediaType.APPLICATION_JSON)
@Fallback(Fallbacks.FalseOnNotFoundOr404.class)
- boolean setMetadata(@PathParam("name") String name,
- @BinderParam(BindToJsonPayload.class) Map<String, String> metadata);
+ boolean setMetadata(@BinderParam(BindToJsonPayload.class) Map<String, String> metadata);
/**
* Gets metadata for the specified queue.
- *
- * @param name Name of the queue. The name must not exceed 64 bytes in length, and it is limited to US-ASCII
- * letters, digits, underscores, and hyphens.
*/
@Named("queue:getMetadata")
@GET
- @Path("queues/{name}/metadata")
+ @Path("/metadata")
@Consumes(MediaType.APPLICATION_JSON)
@Fallback(Fallbacks.FalseOnNotFoundOr404.class)
- Map<String, String> getMetadata(@PathParam("name") String name);
+ Map<String, String> getMetadata();
/**
* Gets stats for the specified queue.
- *
- * @param name Name of the queue. The name must not exceed 64 bytes in length, and it is limited to US-ASCII
- * letters, digits, underscores, and hyphens.
*/
@Named("queue:getStats")
@GET
- @Path("queues/{name}/stats")
+ @Path("/stats")
@Consumes(MediaType.APPLICATION_JSON)
@ResponseParser(ParseQueueStats.class)
@Fallback(Fallbacks.FalseOnNotFoundOr404.class)
- QueueStats getStats(@PathParam("name") String name);
+ QueueStats getStats();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/dc452f77/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
index 3bfe3e0..68a6c4b 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
@@ -38,8 +38,8 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
public void createQueues() throws Exception {
for (String zoneId : api.getConfiguredZones()) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId);
- boolean success = queueApi.create("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue(zoneId, "jclouds-test");
+ boolean success = queueApi.create();
assertTrue(success);
}
@@ -138,8 +138,8 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "streamManyPagesOfMessages" })
public void delete() throws Exception {
for (String zoneId : api.getConfiguredZones()) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId);
- boolean success = queueApi.delete("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue(zoneId, "jclouds-test");
+ boolean success = queueApi.delete();
assertTrue(success);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/dc452f77/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
index cb3dfa3..f232de9 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
@@ -37,8 +37,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
public void create() throws Exception {
for (String zoneId : api.getConfiguredZones()) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId);
- boolean success = queueApi.create("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue(zoneId, "jclouds-test");
+ boolean success = queueApi.create();
assertTrue(success);
}
@@ -47,8 +47,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "create" })
public void exists() throws Exception {
for (String zoneId : api.getConfiguredZones()) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId);
- boolean success = queueApi.exists("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue(zoneId, "jclouds-test");
+ boolean success = queueApi.exists();
assertTrue(success);
}
@@ -57,9 +57,9 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "exists" })
public void setMetadata() throws Exception {
for (String zoneId : api.getConfiguredZones()) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId);
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue(zoneId, "jclouds-test");
Map<String, String> metadata = ImmutableMap.of("key1", "value1");
- boolean success = queueApi.setMetadata("jclouds-test", metadata);
+ boolean success = queueApi.setMetadata(metadata);
assertTrue(success);
}
@@ -68,8 +68,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "setMetadata" })
public void getMetadata() throws Exception {
for (String zoneId : api.getConfiguredZones()) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId);
- Map<String, String> metadata = queueApi.getMetadata("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue(zoneId, "jclouds-test");
+ Map<String, String> metadata = queueApi.getMetadata();
assertEquals(metadata.get("key1"), "value1");
}
@@ -78,8 +78,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "getMetadata" })
public void getStatsWithoutTotal() throws Exception {
for (String zoneId : api.getConfiguredZones()) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId);
- QueueStats stats = queueApi.getStats("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue(zoneId, "jclouds-test");
+ QueueStats stats = queueApi.getStats();
assertEquals(stats.getMessagesStats().getClaimed(), 0);
assertEquals(stats.getMessagesStats().getFree(), 0);
@@ -101,8 +101,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
messageApi.create(clientId, message);
- QueueApi queueApi = api.getQueueApiForZone(zoneId);
- QueueStats stats = queueApi.getStats("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue(zoneId, "jclouds-test");
+ QueueStats stats = queueApi.getStats();
assertEquals(stats.getMessagesStats().getClaimed(), 0);
assertEquals(stats.getMessagesStats().getFree(), 1);
@@ -117,8 +117,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "getStatsWithTotal" })
public void delete() throws Exception {
for (String zoneId : api.getConfiguredZones()) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId);
- boolean success = queueApi.delete("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue(zoneId, "jclouds-test");
+ boolean success = queueApi.delete();
assertTrue(success);
}
@@ -127,8 +127,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "delete" })
public void doesNotExist() throws Exception {
for (String zoneId : api.getConfiguredZones()) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId);
- boolean success = queueApi.exists("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue(zoneId, "jclouds-test");
+ boolean success = queueApi.exists();
assertFalse(success);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/dc452f77/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
index 375f24d..76b0fa2 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
@@ -45,8 +45,8 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW");
- boolean success = queueApi.create("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue("DFW", "jclouds-test");
+ boolean success = queueApi.create();
assertTrue(success);
@@ -66,8 +66,8 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW");
- boolean success = queueApi.delete("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue("DFW", "jclouds-test");
+ boolean success = queueApi.delete();
assertTrue(success);
@@ -87,8 +87,8 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW");
- boolean success = queueApi.exists("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue("DFW", "jclouds-test");
+ boolean success = queueApi.exists();
assertTrue(success);
@@ -108,8 +108,8 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW");
- boolean success = queueApi.exists("jclouds-blerg");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue("DFW", "jclouds-blerg");
+ boolean success = queueApi.exists();
assertFalse(success);
@@ -129,9 +129,9 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue("DFW", "jclouds-test");
Map<String, String> metadata = ImmutableMap.of("key1", "value1");
- boolean success = queueApi.setMetadata("jclouds-test", metadata);
+ boolean success = queueApi.setMetadata(metadata);
assertTrue(success);
@@ -153,8 +153,8 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW");
- Map<String, String> metadata = queueApi.getMetadata("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue("DFW", "jclouds-test");
+ Map<String, String> metadata = queueApi.getMetadata();
assertEquals(metadata.get("key1"), "value1");
@@ -175,8 +175,8 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW");
- QueueStats stats = queueApi.getStats("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue("DFW", "jclouds-test");
+ QueueStats stats = queueApi.getStats();
assertEquals(stats.getMessagesStats().getClaimed(), 0);
assertEquals(stats.getMessagesStats().getFree(), 0);
@@ -201,8 +201,8 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW");
- QueueStats stats = queueApi.getStats("jclouds-test");
+ QueueApi queueApi = api.getQueueApiForZoneAndQueue("DFW", "jclouds-test");
+ QueueStats stats = queueApi.getStats();
assertEquals(stats.getMessagesStats().getClaimed(), 0);
assertEquals(stats.getMessagesStats().getFree(), 4);