From 960c5e49662dd009c54859d42b3949b1db8cf886 Mon Sep 17 00:00:00 2001 From: Tim Chagnon Date: Mon, 25 Nov 2013 21:03:46 -0800 Subject: [PATCH 1/2] Add optional prefix argument to list-queues --- src/main/clojure/cemerick/bandalore.clj | 7 ++++--- src/test/clojure/cemerick/bandalore_test.clj | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/clojure/cemerick/bandalore.clj b/src/main/clojure/cemerick/bandalore.clj index 23272db..26d01c4 100644 --- a/src/main/clojure/cemerick/bandalore.clj +++ b/src/main/clojure/cemerick/bandalore.clj @@ -50,9 +50,10 @@ (.deleteQueue client (DeleteQueueRequest. queue-url))) (defn list-queues - "Returns a seq of all queues' URL strings." - [^AmazonSQSClient client] - (->> (ListQueuesRequest.) + "Returns a seq of all queues' URL strings. Takes an optional string prefix + argument to only list queues with names that start with the prefix." + [^AmazonSQSClient client &[prefix]] + (->> (ListQueuesRequest. prefix) (.listQueues client) .getQueueUrls seq)) diff --git a/src/test/clojure/cemerick/bandalore_test.clj b/src/test/clojure/cemerick/bandalore_test.clj index 2d36309..c6c3c29 100644 --- a/src/test/clojure/cemerick/bandalore_test.clj +++ b/src/test/clojure/cemerick/bandalore_test.clj @@ -59,7 +59,9 @@ ; sending a msg seems to "force" the queue's existence in listings (send client *test-queue-url* msg) (wait-for-condition #((set (list-queues client)) *test-queue-url*) - "Created queue not visible in result of list-queues"))) + "Created queue not visible in result of list-queues") + (wait-for-condition #((set (list-queues client test-queue-name-prefix)) *test-queue-url*) + "Created queue not visible in result of list-queues with prefix"))) (defsqstest test-queue-attrs (let [{:strs [MaximumMessageSize] :as base-attrs} (queue-attrs client *test-queue-url*) From 382fd2041804b51bafbba8bd25de397543272fbd Mon Sep 17 00:00:00 2001 From: Tim Chagnon Date: Tue, 26 Nov 2013 10:21:16 -0800 Subject: [PATCH 2/2] Make :prefix a keyword argument of list-queues --- src/main/clojure/cemerick/bandalore.clj | 2 +- src/test/clojure/cemerick/bandalore_test.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/clojure/cemerick/bandalore.clj b/src/main/clojure/cemerick/bandalore.clj index 26d01c4..d97e9e4 100644 --- a/src/main/clojure/cemerick/bandalore.clj +++ b/src/main/clojure/cemerick/bandalore.clj @@ -52,7 +52,7 @@ (defn list-queues "Returns a seq of all queues' URL strings. Takes an optional string prefix argument to only list queues with names that start with the prefix." - [^AmazonSQSClient client &[prefix]] + [^AmazonSQSClient client & {:keys [prefix]}] (->> (ListQueuesRequest. prefix) (.listQueues client) .getQueueUrls diff --git a/src/test/clojure/cemerick/bandalore_test.clj b/src/test/clojure/cemerick/bandalore_test.clj index c6c3c29..b69338f 100644 --- a/src/test/clojure/cemerick/bandalore_test.clj +++ b/src/test/clojure/cemerick/bandalore_test.clj @@ -60,7 +60,7 @@ (send client *test-queue-url* msg) (wait-for-condition #((set (list-queues client)) *test-queue-url*) "Created queue not visible in result of list-queues") - (wait-for-condition #((set (list-queues client test-queue-name-prefix)) *test-queue-url*) + (wait-for-condition #((set (list-queues client :prefix test-queue-name-prefix)) *test-queue-url*) "Created queue not visible in result of list-queues with prefix"))) (defsqstest test-queue-attrs