This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new c13051d Upgrade Apache Pulsar c13051d is described below commit c13051da2460a31a1778f8fa937c293b1e869e65 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri May 31 07:20:58 2019 +0200 Upgrade Apache Pulsar --- components/camel-pulsar/src/main/docs/pulsar-component.adoc | 6 +++--- .../java/org/apache/camel/component/pulsar/PulsarComponent.java | 7 +++++++ .../org/apache/camel/component/pulsar/PulsarComponentTest.java | 2 +- .../component/pulsar/springboot/PulsarComponentConfiguration.java | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/components/camel-pulsar/src/main/docs/pulsar-component.adoc b/components/camel-pulsar/src/main/docs/pulsar-component.adoc index 70ae3b4..58ace4d 100644 --- a/components/camel-pulsar/src/main/docs/pulsar-component.adoc +++ b/components/camel-pulsar/src/main/docs/pulsar-component.adoc @@ -35,8 +35,8 @@ The Apache Pulsar component supports 4 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *autoConfiguration* (common) | The pulsar autoconfiguration | | AutoConfiguration -| *pulsarClient* (common) | The pulsar client | | PulsarClient +| *autoConfiguration* (advanced) | The pulsar auto configuration | | AutoConfiguration +| *pulsarClient* (advanced) | The pulsar client | | PulsarClient | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean |=== @@ -76,7 +76,7 @@ with the following path and query parameters: | *consumerNamePrefix* (consumer) | Prefix to add to consumer names when a SHARED or FAILOVER subscription is used | cons | String | *consumerQueueSize* (consumer) | Size of the consumer queue - defaults to 10 | 10 | int | *numberOfConsumers* (consumer) | Number of consumers - defaults to 1 | 1 | int -| *subscriptionName* (consumer) | Name of the subscription to use | subscription | String +| *subscriptionName* (consumer) | Name of the subscription to use | subs | String | *subscriptionType* (consumer) | Type of the subscription EXCLUSIVESHAREDFAILOVER, defaults to EXCLUSIVE | EXCLUSIVE | SubscriptionType | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern diff --git a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java index e02de5c..7244fdb 100644 --- a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java +++ b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/PulsarComponent.java @@ -35,6 +35,13 @@ public class PulsarComponent extends DefaultComponent { @Metadata(label = "advanced") private PulsarClient pulsarClient; + public PulsarComponent() { + } + + public PulsarComponent(CamelContext context) { + super(context); + } + @Override protected Endpoint createEndpoint(final String uri, final String path, final Map<String, Object> parameters) throws Exception { final PulsarConfiguration configuration = new PulsarConfiguration(); diff --git a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java index 620ea2c..7a9adc2 100644 --- a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java +++ b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarComponentTest.java @@ -39,7 +39,7 @@ public class PulsarComponentTest extends CamelTestSupport { @Test public void testPulsarEndpointConfiguration() throws Exception { - PulsarComponent component = new PulsarComponent(context); + PulsarComponent component = new PulsarComponent(); component.setAutoConfiguration(autoConfiguration); PulsarEndpoint endpoint = (PulsarEndpoint)component diff --git a/platforms/spring-boot/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentConfiguration.java index 160ee2e..c36f30a 100644 --- a/platforms/spring-boot/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-pulsar-starter/src/main/java/org/apache/camel/component/pulsar/springboot/PulsarComponentConfiguration.java @@ -37,7 +37,7 @@ public class PulsarComponentConfiguration */ private Boolean enabled; /** - * The pulsar autoconfiguration. The option is a + * The pulsar auto configuration. The option is a * org.apache.camel.component.pulsar.utils.AutoConfiguration type. */ private String autoConfiguration;