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/12/19 03:05:03 UTC
git commit: Naming methods consistently in the MarconiApi.
Updated Branches:
refs/heads/master 23d8fa3d7 -> c64cd4a85
Naming methods consistently in the 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/c64cd4a8
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/c64cd4a8
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/c64cd4a8
Branch: refs/heads/master
Commit: c64cd4a85007a12a7f2aed3d597d865a47acd26e
Parents: 23d8fa3
Author: Everett Toews <ev...@rackspace.com>
Authored: Wed Dec 18 17:45:46 2013 -0600
Committer: Everett Toews <ev...@rackspace.com>
Committed: Wed Dec 18 20:04:38 2013 -0600
----------------------------------------------------------------------
.../openstack/marconi/v1/MarconiApi.java | 8 +++---
.../v1/functions/QueuesToPagedIterable.java | 2 +-
.../marconi/v1/features/ClaimApiLiveTest.java | 6 ++--
.../marconi/v1/features/MessageApiLiveTest.java | 22 +++++++-------
.../marconi/v1/features/MessageApiMockTest.java | 18 ++++++------
.../marconi/v1/features/QueueApiLiveTest.java | 30 ++++++++++----------
.../marconi/v1/features/QueueApiMockTest.java | 24 ++++++++--------
7 files changed, 55 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/c64cd4a8/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 e482211..854da91 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
@@ -57,24 +57,24 @@ public interface MarconiApi extends Closeable {
* are not echoed back to the client that posted them, unless the client explicitly requests this.
*/
@Delegate
- QueueApi getQueueApiForZone(
+ QueueApi getQueueApiForZoneAndClient(
@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone,
@HeaderParam("Client-ID") UUID clientId);
/**
* Provides access to Message features.
*
- * @param zone The zone where this queue lives.
+ * @param zone The zone where this queue lives.
* @param clientId A UUID for each client instance. The UUID must be submitted in its canonical form (for example,
* 3381af92-2b9e-11e3-b191-71861300734c). The client generates the Client-ID once. Client-ID
* persists between restarts of the client so the client should reuse that same Client-ID. All
* message-related operations require the use of Client-ID in the headers to ensure that messages
* are not echoed back to the client that posted them, unless the client explicitly requests this.
- * @param name Name of the queue.
+ * @param name Name of the queue.
*/
@Delegate
@Path("/queues/{name}")
- MessageApi getMessageApiForZoneAndQueue(
+ MessageApi getMessageApiForZoneAndClientAndQueue(
@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone,
@HeaderParam("Client-ID") UUID clientId,
@PathParam("name") String name);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/c64cd4a8/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/QueuesToPagedIterable.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/QueuesToPagedIterable.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/QueuesToPagedIterable.java
index 290cd41..138ef43 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/QueuesToPagedIterable.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/QueuesToPagedIterable.java
@@ -52,7 +52,7 @@ public class QueuesToPagedIterable extends ArgsToPagedIterable.FromCaller<Queue,
String zone = String.class.cast(args.get(0));
UUID clientId = UUID.class.cast(args.get(1));
- return new ListQueuesAtMarker(api.getQueueApiForZone(zone, clientId));
+ return new ListQueuesAtMarker(api.getQueueApiForZoneAndClient(zone, clientId));
}
private static class ListQueuesAtMarker implements Function<Object, IterableWithMarker<Queue>> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/c64cd4a8/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
index f765bc4..9bc5f8c 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiLiveTest.java
@@ -42,7 +42,7 @@ public class ClaimApiLiveTest extends BaseMarconiApiLiveTest {
public void createQueues() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
boolean success = queueApi.create("jclouds-test");
assertTrue(success);
@@ -52,7 +52,7 @@ public class ClaimApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "createQueues" })
public void createMessages() throws Exception {
for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
String json1 = "{\"event\":{\"name\":\"Austin Java User Group\",\"attendees\":[\"bob\",\"jim\",\"sally\"]}}";
CreateMessage message1 = CreateMessage.builder().ttl(86400).body(json1).build();
@@ -133,7 +133,7 @@ public class ClaimApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "releaseClaim" })
public void delete() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
boolean success = queueApi.delete("jclouds-test");
assertTrue(success);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/c64cd4a8/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 3b0b08b..c14d339 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
@@ -47,7 +47,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
public void createQueues() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
boolean success = queueApi.create("jclouds-test");
assertTrue(success);
@@ -57,7 +57,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "createQueues" })
public void streamZeroPagesOfMessages() throws Exception {
for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
MessageStream messageStream = messageApi.stream(echo(true));
@@ -69,7 +69,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "streamZeroPagesOfMessages" })
public void createMessage() throws Exception {
for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
String json1 = "{\"event\":{\"name\":\"Edmonton Java User Group\",\"attendees\":[\"bob\",\"jim\",\"sally\"]}}";
CreateMessage message1 = CreateMessage.builder().ttl(120).body(json1).build();
@@ -85,7 +85,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "createMessage" })
public void streamOnePageOfMessages() throws Exception {
for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
MessageStream messageStream = messageApi.stream(echo(true));
@@ -102,7 +102,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "streamOnePageOfMessages" })
public void createMessages() throws Exception {
for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
String json1 = "{\"event\":{\"name\":\"Austin Java User Group\",\"attendees\":[\"bob\",\"jim\",\"sally\"]}}";
CreateMessage message1 = CreateMessage.builder().ttl(120).body(json1).build();
@@ -122,7 +122,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "createMessages" })
public void streamManyPagesOfMessages() throws Exception {
for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
messageIds.put(zoneId, new ArrayList<String>());
MessageStream messageStream = messageApi.stream(echo(true).limit(2));
@@ -144,7 +144,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "streamManyPagesOfMessages" })
public void listMessagesByIds() throws Exception {
for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
List<Message> messages = messageApi.list(messageIds.get(zoneId));
@@ -160,7 +160,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listMessagesByIds" })
public void getMessage() throws Exception {
for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
Message message = messageApi.get(getLast(messageIds.get(zoneId)));
@@ -173,7 +173,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
public void deleteMessagesByClaimId() throws Exception {
for (String zoneId : zones) {
UUID clientId = UUID.fromString("3381af92-2b9e-11e3-b191-71861300734c");
- MessageApi messageApi = api.getMessageApiForZoneAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
ClaimApi claimApi = api.getClaimApiForZoneAndClientAndQueue(zoneId, clientId, "jclouds-test");
Message message = getOnlyElement(claimApi.claim(300, 100, 1));
@@ -186,7 +186,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "deleteMessagesByClaimId" })
public void deleteMessages() throws Exception {
for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
boolean success = messageApi.delete(messageIds.get(zoneId));
@@ -197,7 +197,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "deleteMessages" })
public void delete() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
boolean success = queueApi.delete("jclouds-test");
assertTrue(success);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/c64cd4a8/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java
index c540e67..1960d03 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java
@@ -51,7 +51,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
String json1 = "{\"event\":{\"name\":\"Edmonton Java User Group\",\"attendees\":[\"bob\",\"jim\",\"sally\"]}}";
CreateMessage createMessage1 = CreateMessage.builder().ttl(120).body(json1).build();
@@ -79,7 +79,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
String json1 = "{\"event\":{\"name\":\"Austin Java User Group\",\"attendees\":[\"bob\",\"jim\",\"sally\"]}}";
CreateMessage createMessage1 = CreateMessage.builder().ttl(120).body(json1).build();
@@ -113,7 +113,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
MessageStream messageStream = messageApi.stream();
@@ -137,7 +137,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
MessageStream messageStream = messageApi.stream();
@@ -169,7 +169,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
MessageStream messageStream = messageApi.stream(limit(2));
@@ -200,7 +200,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
List<String> ids = ImmutableList.of("52928896b04a584f24883227", "52928896b04a584f24883228", "52928896b04a584f24883229");
List<Message> messages = messageApi.list(ids);
@@ -230,7 +230,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
Message message = messageApi.get("5292b30cef913e6d026f4dec");
@@ -255,7 +255,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
List<String> ids = ImmutableList.of("52936b8a3ac24e6ef4c067dd", "5292b30cef913e6d026f4dec");
boolean success = messageApi.delete(ids);
@@ -278,7 +278,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
boolean success = messageApi.deleteByClaim("52936b8a3ac24e6ef4c067dd", "5292b30cef913e6d026f4dec");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/c64cd4a8/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 04eff1d..8e2ae80 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
@@ -41,7 +41,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
public void listZeroPagesOfQueues() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
assertTrue(queues.isEmpty());
@@ -51,7 +51,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listZeroPagesOfQueues" })
public void create() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
for (int i=0; i < 6; i++) {
boolean success = queueApi.create("jclouds-test-" + i);
@@ -64,7 +64,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "create" })
public void listOnePageOfQueues() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
assertEquals(queues.size(), 6);
@@ -79,7 +79,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listOnePageOfQueues" })
public void createMore() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
for (int i=6; i < 12; i++) {
boolean success = queueApi.create("jclouds-test-" + i);
@@ -92,7 +92,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "createMore" })
public void listManyPagesOfQueues() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
assertEquals(queues.size(), 12);
@@ -107,7 +107,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listManyPagesOfQueues" })
public void listManyPagesOfQueuesManually() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
Queues queues = queueApi.list(limit(6));
@@ -127,7 +127,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listManyPagesOfQueuesManually" })
public void exists() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
boolean success = queueApi.exists("jclouds-test-1");
assertTrue(success);
@@ -137,7 +137,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "exists" })
public void setMetadata() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
Map<String, String> metadata = ImmutableMap.of("key1", "value1");
boolean success = queueApi.setMetadata("jclouds-test-1", metadata);
@@ -148,7 +148,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "setMetadata" })
public void listManyPagesOfQueuesWithDetails() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
List<Queue> queues = queueApi.list(true).concat().toList();
assertEquals(queues.size(), 12);
@@ -170,7 +170,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listManyPagesOfQueuesWithDetails" })
public void getMetadata() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
Map<String, String> metadata = queueApi.getMetadata("jclouds-test-1");
assertEquals(metadata.get("key1"), "value1");
@@ -180,7 +180,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "getMetadata" })
public void getStatsWithoutTotal() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
QueueStats stats = queueApi.getStats("jclouds-test-1");
assertEquals(stats.getMessagesStats().getClaimed(), 0);
@@ -194,7 +194,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "getStatsWithoutTotal" })
public void getStatsWithTotal() throws Exception {
for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndQueue(zoneId, CLIENT_ID, "jclouds-test-1");
+ MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test-1");
String json1 = "{\"event\":{\"type\":\"hockey\",\"players\":[\"bob\",\"jim\",\"sally\"]}}";
CreateMessage message1 = CreateMessage.builder().ttl(120).body(json1).build();
@@ -202,7 +202,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
messageApi.create(message);
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
QueueStats stats = queueApi.getStats("jclouds-test-1");
assertEquals(stats.getMessagesStats().getClaimed(), 0);
@@ -218,7 +218,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "getStatsWithTotal" })
public void delete() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
for (int i=0; i < 12; i++) {
boolean success = queueApi.delete("jclouds-test-" + i);
@@ -231,7 +231,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "delete" })
public void doesNotExist() throws Exception {
for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZone(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
boolean success = queueApi.exists("jclouds-test-1");
assertFalse(success);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/c64cd4a8/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 d0d305f..fb535b7 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
@@ -53,7 +53,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
boolean success = queueApi.create("jclouds-test");
assertTrue(success);
@@ -74,7 +74,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
boolean success = queueApi.delete("jclouds-test");
assertTrue(success);
@@ -95,7 +95,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
boolean success = queueApi.exists("jclouds-test");
assertTrue(success);
@@ -116,7 +116,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
boolean success = queueApi.exists("jclouds-blerg");
assertFalse(success);
@@ -137,7 +137,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
@@ -160,7 +160,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
@@ -187,7 +187,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
@@ -218,7 +218,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
Queues queues = queueApi.list(limit(6));
@@ -251,7 +251,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
Map<String, String> metadata = ImmutableMap.of("key1", "value1");
boolean success = queueApi.setMetadata("jclouds-test", metadata);
@@ -275,7 +275,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
Map<String, String> metadata = queueApi.getMetadata("jclouds-test");
assertEquals(metadata.get("key1"), "value1");
@@ -296,7 +296,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
QueueStats stats = queueApi.getStats("jclouds-test");
assertEquals(stats.getMessagesStats().getClaimed(), 0);
@@ -321,7 +321,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZone("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
QueueStats stats = queueApi.getStats("jclouds-test");
assertEquals(stats.getMessagesStats().getClaimed(), 0);