Merge pull request #80 from rabbitmq/rename-to-initial-member-count

Add initialMemberCount(int) in quorum queue and stream specification

Author: acogoluegnes

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

@@ -317,15 +317,26 @@ interface QuorumQueueSpecification {
     QuorumQueueSpecification deliveryLimit(int limit);
 
     /**
-     * Set the number of quorum queue members.
+     * Deprecated, use {@link #initialMemberCount(int)} instead.
      *
      * @param size group size
      * @return quorum queue specification
      * @see <a href="https://www.rabbitmq.com/docs/quorum-queues#replication-factor">Initial
      *     Replication Factor</a>
      */
+    @Deprecated(forRemoval = true)
     QuorumQueueSpecification quorumInitialGroupSize(int size);
 
+    /**
+     * Set the number of initial members the quorum queue should have.
+     *
+     * @param initialMemberCount initial number of nodes
+     * @return quorum queue specification
+     * @see <a href="https://www.rabbitmq.com/docs/quorum-queues#replication-factor">Initial
+     *     Replication Factor</a>
+     */
+    QuorumQueueSpecification initialMemberCount(int initialMemberCount);
+
     /**
      * Go back to the queue specification.
      *
@@ -397,15 +408,26 @@ interface StreamSpecification {
     StreamSpecification maxSegmentSizeBytes(ByteCapacity maxSegmentSize);
 
     /**
-     * Set the number of nodes the initial stream cluster should span.
+     * Deprecated, use {@link #initialMemberCount(int)} instead.
      *
      * @param initialClusterSize initial number of nodes
      * @return the stream specification
      * @see <a href="https://www.rabbitmq.com/docs/streams#replication-factor">Initial Replication
      *     Factor</a>
      */
+    @Deprecated(forRemoval = true)
     StreamSpecification initialClusterSize(int initialClusterSize);
 
+    /**
+     * Set the number of initial members the stream should have.
+     *
+     * @param initialMemberCount initial number of nodes
+     * @return the stream specification
+     * @see <a href="https://www.rabbitmq.com/docs/streams#replication-factor">Initial Replication
+     *     Factor</a>
+     */
+    StreamSpecification initialMemberCount(int initialMemberCount);
+
     /**
      * Go back to the queue specification.
      *

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

@@ -272,9 +272,15 @@ public Management.QuorumQueueSpecification deliveryLimit(int limit) {
     }
 
     @Override
+    @SuppressWarnings("removal")
     public Management.QuorumQueueSpecification quorumInitialGroupSize(int size) {
-      validatePositive("x-quorum-initial-group-size", size);
-      this.parent.arg("x-quorum-initial-group-size", size);
+      return this.initialMemberCount(size);
+    }
+
+    @Override
+    public Management.QuorumQueueSpecification initialMemberCount(int initialMemberCount) {
+      validatePositive("x-quorum-initial-group-size", initialMemberCount);
+      this.parent.arg("x-quorum-initial-group-size", initialMemberCount);
       return this;
     }
 
@@ -339,9 +345,15 @@ public Management.StreamSpecification maxSegmentSizeBytes(ByteCapacity maxSegmen
     }
 
     @Override
+    @SuppressWarnings("removal")
     public Management.StreamSpecification initialClusterSize(int initialClusterSize) {
-      validatePositive("x-initial-cluster-size", initialClusterSize);
-      this.parent.arg("x-initial-cluster-size", initialClusterSize);
+      return this.initialMemberCount(initialClusterSize);
+    }
+
+    @Override
+    public Management.StreamSpecification initialMemberCount(int initialMemberCount) {
+      validatePositive("x-initial-cluster-size", initialMemberCount);
+      this.parent.arg("x-initial-cluster-size", initialMemberCount);
       return this;
     }
 

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

@@ -212,7 +212,7 @@ void managementQueues() {
         .queue()
         .name("my-quorum-queue")
         .quorum() // set queue type to 'quorum'
-          .quorumInitialGroupSize(3) // specific to quorum queues
+          .initialMemberCount(3) // specific to quorum queues
           .deliveryLimit(3) // specific to quorum queues
         .queue()
         .declare();