WIP, will force push later

Author: henry701

src/main/java/com/rabbitmq/stream/AbstractFlowControlStrategy.java

@@ -0,0 +1,30 @@
+package com.rabbitmq.stream;
+
+import com.rabbitmq.stream.impl.Client;
+
+import java.util.Objects;
+import java.util.function.Supplier;
+
+public class AbstractFlowControlStrategy implements ConsumerFlowControlStrategy {
+
+    private Supplier<Client> clientSupplier;
+    private volatile Client client;
+
+    public AbstractFlowControlStrategy(Supplier<Client> clientSupplier) {
+        this.clientSupplier = Objects.requireNonNull(clientSupplier, "clientSupplier");
+    }
+
+    protected Client mandatoryClient() {
+        Client localClient = this.client;
+        if(localClient != null) {
+            return localClient;
+        }
+        localClient = clientSupplier.get();
+        if(localClient == null) {
+            throw new IllegalStateException("Requested client, but client is not yet available! Supplier: " + this.clientSupplier);
+        }
+        this.client = localClient;
+        return localClient;
+    }
+
+}

src/main/java/com/rabbitmq/stream/ClientDataHandler.java

@@ -0,0 +1,91 @@
+package com.rabbitmq.stream;
+
+import com.rabbitmq.stream.impl.Client;
+
+/**
+ * Exposes callbacks to handle events from a specific Client, with a leaner interface.
+ */
+public interface ClientDataHandler extends
+        Client.PublishConfirmListener,
+        Client.PublishErrorListener,
+        Client.ChunkListener,
+        Client.MessageListener,
+        Client.CreditNotification,
+        Client.ConsumerUpdateListener,
+        Client.ShutdownListener,
+        Client.MetadataListener {
+
+    @Override
+    default void handle(byte publisherId, long publishingId) {
+        this.handlePublishConfirm(publisherId, publishingId);
+    }
+
+    default void handlePublishConfirm(byte publisherId, long publishingId) {
+        // No-op by default
+    }
+
+    @Override
+    default void handle(byte publisherId, long publishingId, short errorCode) {
+        this.handlePublishError(publisherId, publishingId, errorCode);
+    }
+
+    default void handlePublishError(byte publisherId, long publishingId, short errorCode) {
+        // No-op by default
+    }
+
+    @Override
+    default void handle(Client client, byte subscriptionId, long offset, long messageCount, long dataSize) {
+        this.handleChunk(subscriptionId, offset, messageCount, dataSize);
+    }
+
+    default void handleChunk(byte subscriptionId, long offset, long messageCount, long dataSize) {
+        // No-op by default
+    }
+
+    @Override
+    default void handle(byte subscriptionId, long offset, long chunkTimestamp, long committedChunkId, Message message) {
+        this.handleMessage(subscriptionId, offset, chunkTimestamp, committedChunkId, message);
+    }
+
+    default void handleMessage(byte subscriptionId, long offset, long chunkTimestamp, long committedChunkId, Message message) {
+        // No-op by default
+    }
+
+    @Override
+    default void handle(byte subscriptionId, short responseCode) {
+        this.handleCreditNotification(subscriptionId, responseCode);
+    }
+
+    default void handleCreditNotification(byte subscriptionId, short responseCode) {
+        // No-op by default
+    }
+
+    @Override
+    default OffsetSpecification handle(Client client, byte subscriptionId, boolean active) {
+        this.handleConsumerUpdate(subscriptionId, active);
+        return null;
+    }
+
+    default void handleConsumerUpdate(byte subscriptionId, boolean active) {
+        // No-op by default
+    }
+
+    @Override
+    default void handle(Client.ShutdownContext shutdownContext) {
+        this.handleShutdown(shutdownContext);
+    }
+
+    default void handleShutdown(Client.ShutdownContext shutdownContext) {
+        // No-op by default
+    }
+
+    @Override
+    default void handle(String stream, short code) {
+        this.handleMetadata(stream, code);
+    }
+
+    default void handleMetadata(String stream, short code) {
+        // No-op by default
+    }
+
+}

src/main/java/com/rabbitmq/stream/ConsumerBuilder.java

@@ -59,6 +59,14 @@ public interface ConsumerBuilder {
    */
   ConsumerBuilder messageHandler(MessageHandler messageHandler);
 
+  /**
+   * Factory for the flow control strategy to be used when consuming messages.
+   * @param consumerFlowControlStrategyBuilderFactory the factory
+   * @return a fluent configurable builder for the flow control strategy
+   * @param <T>
+   */
+  <T extends ConsumerFlowControlStrategyBuilder<?>> T flowControlStrategy(ConsumerFlowControlStrategyBuilderFactory<?, T> consumerFlowControlStrategyBuilderFactory);
+
   /**
    * The logical name of the {@link Consumer}.
    *
@@ -159,7 +167,7 @@ public interface ConsumerBuilder {
   Consumer build();
 
   /** Manual tracking strategy. */
-  interface ManualTrackingStrategy {
+  interface ManualTrackingStrategy extends ConsumerBuilderAccessor {
 
     /**
      * Interval to check if the last requested stored offset has been actually stored.
@@ -170,17 +178,10 @@ interface ManualTrackingStrategy {
      * @return the manual tracking strategy
      */
     ManualTrackingStrategy checkInterval(Duration checkInterval);
-
-    /**
-     * Go back to the builder.
-     *
-     * @return the consumer builder
-     */
-    ConsumerBuilder builder();
   }
 
   /** Auto-tracking strategy. */
-  interface AutoTrackingStrategy {
+  interface AutoTrackingStrategy extends ConsumerBuilderAccessor {
 
     /**
      * Number of messages before storing.
@@ -201,12 +202,15 @@ interface AutoTrackingStrategy {
      * @return the auto-tracking strategy
      */
     AutoTrackingStrategy flushInterval(Duration flushInterval);
+  }
 
+  interface ConsumerBuilderAccessor {
     /**
      * Go back to the builder.
      *
      * @return the consumer builder
      */
     ConsumerBuilder builder();
   }
+
 }

src/main/java/com/rabbitmq/stream/ConsumerFlowControlStrategy.java

@@ -0,0 +1,21 @@
+package com.rabbitmq.stream;
+
+import com.rabbitmq.stream.impl.Client;
+
+/**
+ * A built and configured flow control strategy for consumers.
+ * Implementations may freely implement reactions to the various client callbacks.
+ * When defined by each implementation, it may internally call {@link Client#credit} to ask for credits.
+ */
+public interface ConsumerFlowControlStrategy extends ClientDataHandler, AutoCloseable {
+
+    default void handleShutdown(Client.ShutdownContext shutdownContext) {
+        this.close();
+    }
+
+    @Override
+    default void close() {
+        // Override with cleanup logic, if applicable
+    }
+
+}

src/main/java/com/rabbitmq/stream/ConsumerFlowControlStrategyBuilder.java

@@ -0,0 +1,21 @@
+package com.rabbitmq.stream;
+
+import com.rabbitmq.stream.impl.Client;
+
+import java.util.function.Supplier;
+
+/**
+ * Fluent builder for a {@link ConsumerFlowControlStrategyBuilderFactory}.
+ *
+ * @param <T> the type of {@link ConsumerFlowControlStrategy} to be built
+ */
+public interface ConsumerFlowControlStrategyBuilder<T extends ConsumerFlowControlStrategy> extends ConsumerBuilder.ConsumerBuilderAccessor {
+    /**
+     * Builds the actual FlowControlStrategy instance, for the Client with which it interoperates
+     *
+     * @param clientSupplier {@link Supplier <Client>} for retrieving the {@link Client}.
+     *                       Is not a {@link Client} instance because the {@link Client} may be lazily initialized.
+     * @return the FlowControlStrategy
+     */
+    T build(Supplier<Client> clientSupplier);
+}

src/main/java/com/rabbitmq/stream/ConsumerFlowControlStrategyBuilderFactory.java

@@ -0,0 +1,14 @@
+package com.rabbitmq.stream;
+
+/**
+ * A strategy for regulating consumer flow when consuming from a RabbitMQ Stream.
+ * @param <T> the type of {@link ConsumerFlowControlStrategy} to be built
+ * @param <C> the type of fluent builder exposed by this factory. Must subclass {@link ConsumerFlowControlStrategyBuilder}
+ */
+public interface ConsumerFlowControlStrategyBuilderFactory<T extends ConsumerFlowControlStrategy, C extends ConsumerFlowControlStrategyBuilder<T>> {
+    /**
+     * Accessor for configuration builder with settings specific to each implementing strategy
+     * @return {@link C} the specific consumer flow control strategy configuration builder
+     */
+    C builder(ConsumerBuilder consumerBuilder);
+}

src/main/java/com/rabbitmq/stream/LegacyFlowControlStrategy.java

@@ -0,0 +1,25 @@
+package com.rabbitmq.stream;
+
+import com.rabbitmq.stream.impl.Client;
+
+import java.util.function.Supplier;
+
+/**
+ * The flow control strategy that was always applied before the flow control strategy mechanism existed in the codebase.
+ * Requests a set amount of credits after each chunk arrives.
+ */
+public class LegacyFlowControlStrategy extends AbstractFlowControlStrategy {
+
+    private final int additionalCredits;
+
+    public LegacyFlowControlStrategy(Supplier<Client> clientSupplier, int additionalCredits) {
+        super(clientSupplier);
+        this.additionalCredits = additionalCredits;
+    }
+
+    @Override
+    public void handleChunk(byte subscriptionId, long offset, long messageCount, long dataSize) {
+        mandatoryClient().credit(subscriptionId, this.additionalCredits);
+    }
+
+}

src/main/java/com/rabbitmq/stream/LegacyFlowControlStrategyBuilderFactory.java

@@ -0,0 +1,43 @@
+package com.rabbitmq.stream;
+
+import com.rabbitmq.stream.impl.Client;
+
+import java.util.function.Supplier;
+
+public class LegacyFlowControlStrategyBuilderFactory implements ConsumerFlowControlStrategyBuilderFactory<LegacyFlowControlStrategy, LegacyFlowControlStrategyBuilderFactory.LegacyFlowControlStrategyBuilder> {
+
+    public static final LegacyFlowControlStrategyBuilderFactory INSTANCE = new LegacyFlowControlStrategyBuilderFactory();
+
+    @Override
+    public LegacyFlowControlStrategyBuilder builder(ConsumerBuilder consumerBuilder) {
+        return new LegacyFlowControlStrategyBuilder(consumerBuilder);
+    }
+
+    public static class LegacyFlowControlStrategyBuilder implements ConsumerFlowControlStrategyBuilder<LegacyFlowControlStrategy> {
+
+        private final ConsumerBuilder consumerBuilder;
+
+        private int additionalCredits = 1;
+
+        public LegacyFlowControlStrategyBuilder(ConsumerBuilder consumerBuilder) {
+            this.consumerBuilder = consumerBuilder;
+        }
+
+        @Override
+        public ConsumerBuilder builder() {
+            return this.consumerBuilder;
+        }
+
+        public LegacyFlowControlStrategyBuilder additionalCredits(int additionalCredits) {
+            this.additionalCredits = additionalCredits;
+            return this;
+        }
+
+        @Override
+        public LegacyFlowControlStrategy build(Supplier<Client> clientSupplier) {
+            return new LegacyFlowControlStrategy(clientSupplier, this.additionalCredits);
+        }
+
+    }
+
+}