Deprecate exchangeDeletion and queueDeletion methods

src/main/java/com/rabbitmq/client/amqp/Management.java

@@ -55,9 +55,25 @@ public interface Management extends AutoCloseable {
    * Delete a queue.
    *
    * @return the queue deletion
+   * @deprecated use {@link #queueDelete(String)} instead
    */
+  @Deprecated(forRemoval = true)
   QueueDeletion queueDeletion();
 
+  /**
+   * Delete a queue.
+   *
+   * @param name the name of the queue
+   */
+  void queueDelete(String name);
+
+  /**
+   * Purge (delete all messages) from a queue.
+   *
+   * @param queue queue to delete messages from
+   */
+  void queuePurge(String queue);
+
   /**
    * Start exchange specification.
    *
@@ -77,9 +93,18 @@ public interface Management extends AutoCloseable {
    * Delete an exchange.
    *
    * @return the exchange deletion
+   * @deprecated use {@link #exchangeDelete(String)} instead
    */
+  @Deprecated(forRemoval = true)
   ExchangeDeletion exchangeDeletion();
 
+  /**
+   * Delete an exchange.
+   *
+   * @param name the name of the exchange
+   */
+  void exchangeDelete(String name);
+
   /**
    * Start binding specification.
    *
@@ -94,8 +119,6 @@ public interface Management extends AutoCloseable {
    */
   UnbindSpecification unbind();
 
-  void queuePurge(String queue);
-
   /** Close the management instance and release its resources. */
   @Override
   void close();
@@ -575,7 +598,12 @@ public int version() {
     }
   }
 
-  /** Queue deletion. */
+  /**
+   * Queue deletion.
+   *
+   * @deprecated use {@link #queueDelete(String)} instead
+   */
+  @Deprecated(forRemoval = true)
   interface QueueDeletion {
 
     /**
@@ -674,7 +702,12 @@ enum ExchangeType {
     HEADERS
   }
 
-  /** Exchange deletion. */
+  /**
+   * Exchange deletion.
+   *
+   * @deprecated use {@link #exchangeDelete(String)} instead
+   */
+  @Deprecated(forRemoval = true)
   interface ExchangeDeletion {
 
     /**

src/main/java/com/rabbitmq/client/amqp/impl/AmqpManagement.java

@@ -130,15 +130,19 @@ public QueueInfo queueInfo(String name) {
   }
 
   @Override
+  @SuppressWarnings("removal")
   public QueueDeletion queueDeletion() {
+    return this::queueDelete;
+  }
+
+  @Override
+  public void queueDelete(String name) {
     checkAvailable();
-    return name -> {
-      Map<String, Object> responseBody = delete(queueLocation(name), CODE_200);
-      this.topologyListener.queueDeleted(name);
-      if (!responseBody.containsKey("message_count")) {
-        throw new AmqpException("Response body should contain message_count");
-      }
-    };
+    Map<String, Object> responseBody = delete(queueLocation(name), CODE_200);
+    this.topologyListener.queueDeleted(name);
+    if (!responseBody.containsKey("message_count")) {
+      throw new AmqpException("Response body should contain message_count");
+    }
   }
 
   @Override
@@ -154,12 +158,16 @@ public ExchangeSpecification exchange(String name) {
   }
 
   @Override
+  @SuppressWarnings("removal")
   public ExchangeDeletion exchangeDeletion() {
+    return this::exchangeDelete;
+  }
+
+  @Override
+  public void exchangeDelete(String name) {
     checkAvailable();
-    return name -> {
-      this.delete(exchangeLocation(name), CODE_204);
-      this.topologyListener.exchangeDeleted(name);
-    };
+    this.delete(exchangeLocation(name), CODE_204);
+    this.topologyListener.exchangeDeleted(name);
   }
 
   @Override

src/test/java/com/rabbitmq/client/amqp/docs/WebsiteDocumentation.java

@@ -188,7 +188,7 @@ void managementExchange() {
         .argument("x-delayed-type", "direct")
         .declare();
 
-    management.exchangeDeletion().delete("my-exchange");
+    management.exchangeDelete("my-exchange");
   }
 
   void managementQueues() {
@@ -222,7 +222,7 @@ void managementQueues() {
     int consumerCount = info.consumerCount();
     String leaderNode = info.leader();
 
-    management.queueDeletion().delete("my-queue");
+    management.queueDelete("my-queue");
   }
 
   void binding() {

src/test/java/com/rabbitmq/client/amqp/impl/AddressFormatTest.java

@@ -67,8 +67,8 @@ void exchangeKeyInAddress(TestInfo info) {
       publisher.publish(publisher.message(), ctx -> {});
       Assertions.assertThat(consumeLatch).completes();
     } finally {
-      management.queueDeletion().delete(q);
-      management.exchangeDeletion().delete(e);
+      management.queueDelete(q);
+      management.exchangeDelete(e);
     }
   }
 
@@ -108,8 +108,8 @@ void exchangeInAddress(TestInfo info) {
       publisher.publish(publisher.message(), ctx -> {});
       Assertions.assertThat(consumeLatch).completes();
     } finally {
-      management.queueDeletion().delete(q);
-      management.exchangeDeletion().delete(e);
+      management.queueDelete(q);
+      management.exchangeDelete(e);
     }
   }
 
@@ -136,7 +136,7 @@ void queueInTargetAddress(TestInfo info) {
       publisher.publish(publisher.message(), ctx -> {});
       Assertions.assertThat(consumeLatch).completes();
     } finally {
-      management.queueDeletion().delete(q);
+      management.queueDelete(q);
     }
   }
 
@@ -185,8 +185,8 @@ void exchangeKeyInToField(TestInfo info) {
       publisher.publish(publisher.message().toAddress().queue(q).message(), ctx -> {});
       Assertions.assertThat(consumeLatch).completes();
     } finally {
-      management.queueDeletion().delete(q);
-      management.exchangeDeletion().delete(e);
+      management.queueDelete(q);
+      management.exchangeDelete(e);
     }
   }
 

src/test/java/com/rabbitmq/client/amqp/impl/AffinityTest.java

@@ -59,7 +59,7 @@ void sameConnectionShouldBeReturnedIfSameAffinityAndReuseActivated(
       assertThat(c1.id()).isNotEqualTo(c2.id());
       assertThat(c3.id()).isIn(c1.id(), c2.id());
     } finally {
-      management.queueDeletion().delete(name);
+      management.queueDelete(name);
     }
   }
 

src/test/java/com/rabbitmq/client/amqp/impl/AmqpConnectionRecoveryTest.java

@@ -167,7 +167,7 @@ void connectionShouldRecoverAfterClosingIt(boolean isolateResources, TestInfo in
           .hasSameSizeAs(publishedMessageIds)
           .containsAll(publishedMessageIds);
     } finally {
-      c.management().queueDeletion().delete(q);
+      c.management().queueDelete(q);
       c.close();
     }
   }

src/test/java/com/rabbitmq/client/amqp/impl/AmqpConsumerTest.java

@@ -55,7 +55,7 @@ void init(TestInfo info) {
   @AfterEach
   void tearDown() {
     waitAtMost(Duration.ofSeconds(5), () -> ((ResourceBase) connection).state() == OPEN);
-    connection.management().queueDeletion().delete(this.q);
+    connection.management().queueDelete(this.q);
   }
 
   @Test

src/test/java/com/rabbitmq/client/amqp/impl/AmqpTest.java

@@ -76,7 +76,7 @@ void queueInfoTest() {
           .hasArgument("x-queue-type", "quorum");
 
     } finally {
-      management.queueDeletion().delete(name);
+      management.queueDelete(name);
     }
   }
 
@@ -131,7 +131,7 @@ void queueDeclareDeletePublishConsume(String subject) {
       consumer.close();
       publisher.close();
     } finally {
-      connection.management().queueDeletion().delete(name);
+      connection.management().queueDelete(name);
     }
   }
 
@@ -215,9 +215,9 @@ void binding(String prefix, boolean addBindingArguments, TestInfo info) {
           .key(rk)
           .arguments(bindingArguments)
           .unbind();
-      management.exchangeDeletion().delete(e2);
-      management.exchangeDeletion().delete(e1);
-      management.queueDeletion().delete(q);
+      management.exchangeDelete(e2);
+      management.exchangeDelete(e1);
+      management.queueDelete(q);
     }
   }
 
@@ -313,7 +313,7 @@ void publisherSendingShouldThrowWhenExchangeHasBeenDeleted() {
       publisher.publish(publisher.message(), acceptedCallback(sync));
       assertThat(sync).completes();
     } finally {
-      connection.management().exchangeDeletion().delete(name);
+      connection.management().exchangeDelete(name);
     }
     AtomicReference<Exception> exception = new AtomicReference<>();
     waitAtMost(
@@ -361,7 +361,7 @@ void publisherSendingShouldThrowWhenQueueHasBeenDeleted() {
       publisher.publish(publisher.message(), acceptedCallback(sync));
       assertThat(sync).completes();
     } finally {
-      connection.management().queueDeletion().delete(name);
+      connection.management().queueDelete(name);
     }
     AtomicReference<Exception> exception = new AtomicReference<>();
     waitAtMost(
@@ -461,7 +461,7 @@ void consumerShouldGetClosedWhenQueueIsDeleted() {
     Publisher publisher = connection.publisherBuilder().queue(name).build();
     publisher.publish(publisher.message(), ctx -> {});
     assertThat(consumeSync).completes();
-    connection.management().queueDeletion().delete(name);
+    connection.management().queueDelete(name);
     assertThat(closedSync).completes();
     org.assertj.core.api.Assertions.assertThat(exception.get())
         .isInstanceOf(AmqpException.AmqpEntityDoesNotExistException.class)
@@ -642,7 +642,7 @@ void redeclareQueueWithDifferentArguments() {
     } catch (AmqpException e) {
       // OK
     } finally {
-      management.queueDeletion().delete(name);
+      management.queueDelete(name);
     }
   }
 
@@ -657,7 +657,7 @@ void redeclareExchangesWithDifferentArguments() {
       org.assertj.core.api.Assertions.assertThat(e).hasMessageContaining("409");
       // OK
     } finally {
-      management.exchangeDeletion().delete(name);
+      management.exchangeDelete(name);
     }
   }
 
@@ -703,7 +703,7 @@ void publishedMessageShouldBeRejectedWhenQueueLimitIsReached(TestInfo info) {
           .forEach(ignored -> publisher.publish(publisher.message(), callback));
       assertThat(rejectedLatch).completes();
     } finally {
-      management.queueDeletion().delete(q);
+      management.queueDelete(q);
     }
   }
 

src/test/java/com/rabbitmq/client/amqp/impl/AuthorizationTest.java

@@ -87,7 +87,7 @@ void entityCreationAttemptWithoutAuthorizationShouldThrow() {
       waitAtMost(
           () -> {
             try {
-              c.management().queueDeletion().delete(authorizedName);
+              c.management().queueDelete(authorizedName);
               return true;
             } catch (AmqpException e) {
               return false;
@@ -121,7 +121,7 @@ void publishingToUnauthorizedExchangeShouldThrow() {
             .hasMessageContaining("access")
             .hasMessageContaining(this.name);
       } finally {
-        gc.management().exchangeDeletion().delete(this.name);
+        gc.management().exchangeDelete(this.name);
       }
     }
   }
@@ -136,7 +136,7 @@ void publishingToUnauthorizedQueueShouldThrow() {
             .isInstanceOf(AmqpException.AmqpSecurityException.class)
             .hasMessageContaining("access");
       } finally {
-        gc.management().queueDeletion().delete(this.name);
+        gc.management().queueDelete(this.name);
       }
     }
   }
@@ -165,7 +165,7 @@ void publishingToUnauthorizedExchangeWithToPropertyShouldThrow() throws Exceptio
             .hasMessageContaining("access")
             .hasMessageContaining(this.name);
       } finally {
-        gc.management().exchangeDeletion().delete(this.name);
+        gc.management().exchangeDelete(this.name);
       }
     }
   }
@@ -183,7 +183,7 @@ void consumingFromUnauthorizedQueueShouldThrow() {
             .hasMessageContaining("access")
             .hasMessageContaining(this.name);
       } finally {
-        gc.management().queueDeletion().delete(this.name);
+        gc.management().queueDelete(this.name);
       }
     }
   }

src/test/java/com/rabbitmq/client/amqp/impl/ClientTest.java

@@ -68,7 +68,7 @@ void init(TestInfo info) {
 
   @AfterEach
   void tearDown() {
-    management.queueDeletion().delete(q);
+    management.queueDelete(q);
   }
 
   @AfterAll
@@ -272,7 +272,7 @@ void queueDeletionImpactOnReceiver(TestInfo info) throws Exception {
       receiver.openFuture().get();
       Delivery delivery = receiver.tryReceive();
       assertThat(delivery).isNull();
-      connection.management().queueDeletion().delete(queue);
+      connection.management().queueDelete(queue);
       try {
         receiver.receive(10, SECONDS);
         fail("Receiver should have been closed after queue deletion");
@@ -306,7 +306,7 @@ void exchangeDeletionImpactOnSender(TestInfo info) throws Exception {
       tracker.awaitSettlement(10, SECONDS);
       assertThat(tracker.remoteState()).isEqualTo(DeliveryState.accepted());
 
-      connection.management().exchangeDeletion().delete(exchange);
+      connection.management().exchangeDelete(exchange);
       try {
         int count = 0;
         while (count++ < 10) {