CAMEL-23443: camel-pulsar - expose enableBatchIndexAcknowledgment

components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarComponentConfigurer.java

@@ -71,6 +71,8 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj
         case "consumerQueueSize": getOrCreateConfiguration(target).setConsumerQueueSize(property(camelContext, int.class, value)); return true;
         case "deadlettertopic":
         case "deadLetterTopic": getOrCreateConfiguration(target).setDeadLetterTopic(property(camelContext, java.lang.String.class, value)); return true;
+        case "enablebatchindexacknowledgment":
+        case "enableBatchIndexAcknowledgment": getOrCreateConfiguration(target).setEnableBatchIndexAcknowledgment(property(camelContext, boolean.class, value)); return true;
         case "enableretry":
         case "enableRetry": getOrCreateConfiguration(target).setEnableRetry(property(camelContext, boolean.class, value)); return true;
         case "hashingscheme":
@@ -180,6 +182,8 @@ public Class<?> getOptionType(String name, boolean ignoreCase) {
         case "consumerQueueSize": return int.class;
         case "deadlettertopic":
         case "deadLetterTopic": return java.lang.String.class;
+        case "enablebatchindexacknowledgment":
+        case "enableBatchIndexAcknowledgment": return boolean.class;
         case "enableretry":
         case "enableRetry": return boolean.class;
         case "hashingscheme":
@@ -285,6 +289,8 @@ public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
         case "consumerQueueSize": return getOrCreateConfiguration(target).getConsumerQueueSize();
         case "deadlettertopic":
         case "deadLetterTopic": return getOrCreateConfiguration(target).getDeadLetterTopic();
+        case "enablebatchindexacknowledgment":
+        case "enableBatchIndexAcknowledgment": return getOrCreateConfiguration(target).isEnableBatchIndexAcknowledgment();
         case "enableretry":
         case "enableRetry": return getOrCreateConfiguration(target).isEnableRetry();
         case "hashingscheme":

components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointConfigurer.java

@@ -59,6 +59,8 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj
         case "consumerQueueSize": target.getPulsarConfiguration().setConsumerQueueSize(property(camelContext, int.class, value)); return true;
         case "deadlettertopic":
         case "deadLetterTopic": target.getPulsarConfiguration().setDeadLetterTopic(property(camelContext, java.lang.String.class, value)); return true;
+        case "enablebatchindexacknowledgment":
+        case "enableBatchIndexAcknowledgment": target.getPulsarConfiguration().setEnableBatchIndexAcknowledgment(property(camelContext, boolean.class, value)); return true;
         case "enableretry":
         case "enableRetry": target.getPulsarConfiguration().setEnableRetry(property(camelContext, boolean.class, value)); return true;
         case "exceptionhandler":
@@ -158,6 +160,8 @@ public Class<?> getOptionType(String name, boolean ignoreCase) {
         case "consumerQueueSize": return int.class;
         case "deadlettertopic":
         case "deadLetterTopic": return java.lang.String.class;
+        case "enablebatchindexacknowledgment":
+        case "enableBatchIndexAcknowledgment": return boolean.class;
         case "enableretry":
         case "enableRetry": return boolean.class;
         case "exceptionhandler":
@@ -258,6 +262,8 @@ public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
         case "consumerQueueSize": return target.getPulsarConfiguration().getConsumerQueueSize();
         case "deadlettertopic":
         case "deadLetterTopic": return target.getPulsarConfiguration().getDeadLetterTopic();
+        case "enablebatchindexacknowledgment":
+        case "enableBatchIndexAcknowledgment": return target.getPulsarConfiguration().isEnableBatchIndexAcknowledgment();
         case "enableretry":
         case "enableRetry": return target.getPulsarConfiguration().isEnableRetry();
         case "exceptionhandler":

components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriFactory.java

@@ -23,7 +23,7 @@ public class PulsarEndpointUriFactory extends org.apache.camel.support.component
     private static final Set<String> SECRET_PROPERTY_NAMES;
     private static final Map<String, String> MULTI_VALUE_PREFIXES;
     static {
-        Set<String> props = new HashSet<>(50);
+        Set<String> props = new HashSet<>(51);
         props.add("ackGroupTimeMillis");
         props.add("ackTimeoutMillis");
         props.add("ackTimeoutRedeliveryBackoff");
@@ -42,6 +42,7 @@ public class PulsarEndpointUriFactory extends org.apache.camel.support.component
         props.add("consumerNamePrefix");
         props.add("consumerQueueSize");
         props.add("deadLetterTopic");
+        props.add("enableBatchIndexAcknowledgment");
         props.add("enableRetry");
         props.add("exceptionHandler");
         props.add("exchangePattern");

components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarConfiguration.java

@@ -82,6 +82,12 @@ public class PulsarConfiguration implements Cloneable {
     private SubscriptionInitialPosition subscriptionInitialPosition = LATEST;
     @UriParam(label = "consumer", defaultValue = "false")
     private boolean readCompacted;
+    @UriParam(label = "consumer", defaultValue = "false",
+              description = "When enabled, allows each individual message in a batch to be acknowledged independently."
+                            + " By default Pulsar redelivers the entire batch when any single message in the batch is"
+                            + " not acknowledged. This option also requires the Pulsar broker to be configured with"
+                            + " acknowledgmentAtBatchIndexLevelEnabled=true.")
+    private boolean enableBatchIndexAcknowledgment;
     @UriParam(label = "consumer",
               description = "Maximum number of times that a message will be redelivered before being sent to the dead letter queue. If this value is not set, no Dead Letter Policy will be created")
     private Integer maxRedeliverCount;
@@ -435,6 +441,17 @@ public void setReadCompacted(boolean readCompacted) {
         this.readCompacted = readCompacted;
     }
 
+    /**
+     * Whether each message in a batch can be acknowledged independently.
+     */
+    public boolean isEnableBatchIndexAcknowledgment() {
+        return enableBatchIndexAcknowledgment;
+    }
+
+    public void setEnableBatchIndexAcknowledgment(boolean enableBatchIndexAcknowledgment) {
+        this.enableBatchIndexAcknowledgment = enableBatchIndexAcknowledgment;
+    }
+
     /**
      * Set the baseline for the sequence ids for messages published by the producer. First message will be using
      * (initialSequenceId 1) as its sequence id and subsequent messages will be assigned incremental sequence ids, if

components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/consumers/CommonCreationStrategyImpl.java

@@ -64,7 +64,8 @@ protected static ConsumerBuilder<byte[]> getBuilder(
                 .subscriptionMode(endpointConfiguration.getSubscriptionMode().toPulsarSubscriptionMode())
                 .acknowledgmentGroupTime(endpointConfiguration.getAckGroupTimeMillis(), TimeUnit.MILLISECONDS)
                 .negativeAckRedeliveryDelay(endpointConfiguration.getNegativeAckRedeliveryDelayMicros(), TimeUnit.MICROSECONDS)
-                .readCompacted(endpointConfiguration.isReadCompacted());
+                .readCompacted(endpointConfiguration.isReadCompacted())
+                .enableBatchIndexAcknowledgment(endpointConfiguration.isEnableBatchIndexAcknowledgment());
 
         if (endpointConfiguration.isMessageListener()) {
             builder.messageListener(new PulsarMessageListener(pulsarEndpoint, pulsarConsumer));

components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java

@@ -70,9 +70,21 @@ public void testPulsarEndpointDefaultConfiguration() throws Exception {
         assertEquals(SubscriptionMode.DURABLE, endpoint.getPulsarConfiguration().getSubscriptionMode());
         assertFalse(endpoint.getPulsarConfiguration().isAllowManualAcknowledgement());
         assertFalse(endpoint.getPulsarConfiguration().isReadCompacted());
+        assertFalse(endpoint.getPulsarConfiguration().isEnableBatchIndexAcknowledgment());
         assertTrue(endpoint.getPulsarConfiguration().isMessageListener());
     }
 
+    @Test
+    public void testPulsarEndpointEnableBatchIndexAcknowledgment() throws Exception {
+        PulsarComponent component = context.getComponent("pulsar", PulsarComponent.class);
+
+        PulsarEndpoint endpoint = (PulsarEndpoint) component
+                .createEndpoint("pulsar://persistent/test/foobar/BatchCreated?enableBatchIndexAcknowledgment=true");
+
+        assertNotNull(endpoint);
+        assertTrue(endpoint.getPulsarConfiguration().isEnableBatchIndexAcknowledgment());
+    }
+
     @Test
     public void testProducerAutoConfigures() throws Exception {
         when(autoConfiguration.isAutoConfigurable()).thenReturn(true);

dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PulsarComponentBuilderFactory.java

@@ -286,6 +286,27 @@ default PulsarComponentBuilder deadLetterTopic(java.lang.String deadLetterTopic)
         }
 
 
+        /**
+         * When enabled, allows each individual message in a batch to be
+         * acknowledged independently. By default Pulsar redelivers the entire
+         * batch when any single message in the batch is not acknowledged. This
+         * option also requires the Pulsar broker to be configured with
+         * acknowledgmentAtBatchIndexLevelEnabled=true.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: consumer
+         * 
+         * @param enableBatchIndexAcknowledgment the value to set
+         * @return the dsl builder
+         */
+        default PulsarComponentBuilder enableBatchIndexAcknowledgment(boolean enableBatchIndexAcknowledgment) {
+            doSetProperty("enableBatchIndexAcknowledgment", enableBatchIndexAcknowledgment);
+            return this;
+        }
+
+
         /**
          * To enable retry letter topic mode. The default retry letter topic
          * uses this format: topicname-subscriptionname-RETRY.
@@ -966,6 +987,7 @@ protected boolean setPropertyOnComponent(
             case "consumerNamePrefix": getOrCreateConfiguration((PulsarComponent) component).setConsumerNamePrefix((java.lang.String) value); return true;
             case "consumerQueueSize": getOrCreateConfiguration((PulsarComponent) component).setConsumerQueueSize((int) value); return true;
             case "deadLetterTopic": getOrCreateConfiguration((PulsarComponent) component).setDeadLetterTopic((java.lang.String) value); return true;
+            case "enableBatchIndexAcknowledgment": getOrCreateConfiguration((PulsarComponent) component).setEnableBatchIndexAcknowledgment((boolean) value); return true;
             case "enableRetry": getOrCreateConfiguration((PulsarComponent) component).setEnableRetry((boolean) value); return true;
             case "keySharedPolicy": getOrCreateConfiguration((PulsarComponent) component).setKeySharedPolicy((java.lang.String) value); return true;
             case "maxRedeliverCount": getOrCreateConfiguration((PulsarComponent) component).setMaxRedeliverCount((java.lang.Integer) value); return true;

dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java

@@ -298,6 +298,44 @@ default PulsarEndpointConsumerBuilder deadLetterTopic(String deadLetterTopic) {
             doSetProperty("deadLetterTopic", deadLetterTopic);
             return this;
         }
+        /**
+         * When enabled, allows each individual message in a batch to be
+         * acknowledged independently. By default Pulsar redelivers the entire
+         * batch when any single message in the batch is not acknowledged. This
+         * option also requires the Pulsar broker to be configured with
+         * acknowledgmentAtBatchIndexLevelEnabled=true.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: consumer
+         * 
+         * @param enableBatchIndexAcknowledgment the value to set
+         * @return the dsl builder
+         */
+        default PulsarEndpointConsumerBuilder enableBatchIndexAcknowledgment(boolean enableBatchIndexAcknowledgment) {
+            doSetProperty("enableBatchIndexAcknowledgment", enableBatchIndexAcknowledgment);
+            return this;
+        }
+        /**
+         * When enabled, allows each individual message in a batch to be
+         * acknowledged independently. By default Pulsar redelivers the entire
+         * batch when any single message in the batch is not acknowledged. This
+         * option also requires the Pulsar broker to be configured with
+         * acknowledgmentAtBatchIndexLevelEnabled=true.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: consumer
+         * 
+         * @param enableBatchIndexAcknowledgment the value to set
+         * @return the dsl builder
+         */
+        default PulsarEndpointConsumerBuilder enableBatchIndexAcknowledgment(String enableBatchIndexAcknowledgment) {
+            doSetProperty("enableBatchIndexAcknowledgment", enableBatchIndexAcknowledgment);
+            return this;
+        }
         /**
          * To enable retry letter topic mode. The default retry letter topic
          * uses this format: topicname-subscriptionname-RETRY.