Polish queue delete with parameters

References rabbitmq#217

src/main/java/com/rabbitmq/http/client/Client.java

@@ -1198,7 +1198,7 @@ private URI uriWithPath(final String path) {
   }
 
   private URI uriWithPath(final String path, final Map<String, String> queryParams) {
-    LinkedMultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+    MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
     queryParams.entrySet()
             .forEach(e -> map.add(e.getKey(), e.getValue()));
 

src/main/java/com/rabbitmq/http/client/ReactorNettyClient.java

@@ -29,7 +29,6 @@
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpMethod;
 import org.reactivestreams.Publisher;
-import org.springframework.util.MultiValueMap;
 import reactor.core.Exceptions;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -874,13 +873,16 @@ private Mono<HttpResponse> doPut(String... pathSegments) {
     }
 
     private Mono<HttpResponse> doDelete(Consumer<? super HttpHeaders> headerBuilder, Map<String, String> queryParams, String... pathSegments) {
-        String query = queryParams.entrySet().stream()
-                .map(e -> String.format("%s=%s", e.getKey(), enc(e.getValue())))
-                .collect(Collectors.joining("&", "?", ""));
+        String uri = uri(pathSegments);
+        if (queryParams != null && !queryParams.isEmpty()) {
+            uri += queryParams.entrySet().stream()
+                    .map(e -> String.format("%s=%s", e.getKey(), enc(e.getValue())))
+                    .collect(Collectors.joining("&", "?", ""));
+        }
         return client.headersWhen(authorizedHeader())
                 .headers(headerBuilder)
                 .delete()
-                .uri(uri(pathSegments) + query)
+                .uri(uri)
                 .response()
                 .doOnNext(applyResponseCallback())
                 .map(ReactorNettyClient::toHttpResponse);

src/main/java/com/rabbitmq/http/client/domain/DeleteQueueParameters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@
 import java.util.Map;
 
 public class DeleteQueueParameters {
-    private boolean ifEmpty;
-    private boolean ifUnused;
+    private final boolean ifEmpty;
+    private final boolean ifUnused;
 
     public DeleteQueueParameters(boolean ifEmpty, boolean ifUnused) {
         this.ifEmpty = ifEmpty;
@@ -39,10 +39,10 @@ public boolean isIfUnused() {
     public Map<String, String> getAsQueryParams() {
         Map<String, String> params = new LinkedHashMap<>();
         if (ifEmpty) {
-            params.put("if-empty", "true");
+            params.put("if-empty", Boolean.TRUE.toString());
         }
         if (ifUnused) {
-            params.put("if-unused", "true");
+            params.put("if-unused", Boolean.TRUE.toString());
         }
         return params;
     }

src/test/groovy/com/rabbitmq/http/client/ClientSpec.groovy

@@ -907,26 +907,29 @@ class ClientSpec extends Specification {
 
   @Unroll
   def "DELETE /api/queues/{vhost}/{name}?if-empty=true"() {
-    final String s = UUID.randomUUID().toString()
-    given: "queue ${s} in vhost /"
+    final String queue = UUID.randomUUID().toString()
+    given: "queue ${queue} in vhost /"
     final v = "/"
-    client.declareQueue(v, s, new QueueInfo(false, false, false))
+    client.declareQueue(v, queue, new QueueInfo(false, false, false))
 
     List<QueueInfo> xs = client.getQueues(v)
-    QueueInfo x = xs.find { (it.name == s) }
+    QueueInfo x = xs.find { (it.name == queue) }
     x != null
     verifyQueueInfo(x)
 
     and: "queue has a message"
-    client.publish(v, "amq.default", s, new OutboundMessage().payload("test"))
+    client.publish(v, "amq.default", queue, new OutboundMessage().payload("test"))
 
-    when: "client tries to delete queue ${s} in vhost /"
-    client.deleteQueue(v, s, new DeleteQueueParameters(true, false))
+    when: "client tries to delete queue ${queue} in vhost /"
+    client.deleteQueue(v, queue, new DeleteQueueParameters(true, false))
 
     then: "an exception is thrown"
     final e = thrown(HttpClientErrorException)
     e.getStatusCode() == HttpStatus.BAD_REQUEST
 
+    cleanup:
+    client.deleteQueue(v, queue)
+
     where:
     client << clients()
   }

src/test/groovy/com/rabbitmq/http/client/ReactorNettyClientSpec.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,6 +61,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 import java.nio.charset.Charset
+import java.time.Duration
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
@@ -1288,27 +1289,30 @@ class ReactorNettyClientSpec extends Specification {
     }
 
     def "DELETE /api/queues/{vhost}/{name}?if-empty=true"() {
-        final String s = UUID.randomUUID().toString()
-        given: "queue ${s} in vhost /"
+        final String queue = UUID.randomUUID().toString()
+        given: "queue ${queue} in vhost /"
         final v = "/"
-        client.declareQueue(v, s, new QueueInfo(false, false, false)).block()
+        client.declareQueue(v, queue, new QueueInfo(false, false, false)).block()
 
         Flux<QueueInfo> xs = client.getQueues(v)
-        QueueInfo x = xs.filter( { q -> q.name.equals(s) } ).blockFirst()
+        QueueInfo x = xs.filter( { q -> q.name.equals(queue) } ).blockFirst()
         x != null
         verifyQueueInfo(x)
 
         and: "queue has a message"
-        client.publish(v, "amq.default", s, new OutboundMessage().payload("test")).block()
+        client.publish(v, "amq.default", queue, new OutboundMessage().payload("test")).block()
 
-        when: "client tries to delete queue ${s} in vhost /"
-        def status = client.deleteQueue(v, s, new DeleteQueueParameters(true, false))
+        when: "client tries to delete queue ${queue} in vhost /"
+        def status = client.deleteQueue(v, queue, new DeleteQueueParameters(true, false))
                 .flatMap({ r -> Mono.just(r.status) })
                 .onErrorReturn({ t -> "Connection prematurely closed BEFORE response".equals(t.getMessage()) }, 500)
                 .block()
 
         then: "HTTP status is 400 BAD REQUEST"
         status == 400
+
+        cleanup:
+        client.deleteQueue(v, queue).block(Duration.ofSeconds(10))
     }
 
     def "GET /api/bindings"() {