You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/08/21 08:44:44 UTC
[camel] branch CAMEL-13870 updated (61e02d6 -> 136a6e8)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch CAMEL-13870
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 61e02d6 CAMEL-13870: Fast property configuration of Camel endpoints. Work in progress.
new a10b35b CAMEL-13870: Fast property configuration of Camel endpoints. Work in progress.
new 136a6e8 CAMEL-13870: Fast property configuration of Camel endpoints. Work in progress.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/web3j/Web3jConfiguration.java | 21 ++++++
.../camel/component/web3j/Web3jEndpoint.java | 4 ++
components/camel-websocket-jsr356/pom.xml | 2 +-
.../src/main/docs/websocket-jsr356-component.adoc | 3 +-
.../camel/websocket/jsr356/JSR356Consumer.java | 8 +--
.../camel/websocket/jsr356/JSR356Endpoint.java | 5 +-
.../websocket/jsr356/JSR356WebSocketComponent.java | 6 +-
.../src/main/docs/wordpress-component.adoc | 2 +-
.../wordpress/WordpressComponentConfiguration.java | 18 +++--
.../component/wordpress/WordpressEndpoint.java | 26 ++++----
.../consumer/AbstractWordpressConsumer.java | 4 +-
.../producer/AbstractWordpressProducer.java | 2 +-
.../wordpress/WordpressComponentTest.java | 20 +++---
.../component/xchange/XChangeConfiguration.java | 8 +++
.../xmlsecurity/XmlSignatureEndpoint.java | 8 +++
.../src/main/docs/zookeeper-component.adoc | 3 +-
.../zookeeper/ZooKeeperConfiguration.java | 20 ------
.../component/zookeeper/ZooKeeperEndpoint.java | 16 -----
.../component/zookeeper/ZooKeeperEndpointTest.java | 11 ----
.../dsl/JSR356WebSocketEndpointBuilderFactory.java | 33 ----------
.../dsl/WordpressEndpointBuilderFactory.java | 21 +++---
.../dsl/ZooKeeperEndpointBuilderFactory.java | 76 ----------------------
.../springboot/Web3jComponentConfiguration.java | 19 +++---
.../WordpressComponentConfiguration.java | 13 ++++
.../ZooKeeperComponentConfiguration.java | 17 -----
.../camel-spring-boot-dependencies/pom.xml | 2 +-
26 files changed, 121 insertions(+), 247 deletions(-)
[camel] 02/02: CAMEL-13870: Fast property configuration of Camel
endpoints. Work in progress.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13870
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 136a6e8e90c9f4cf04d01beecb9a68693d3383fc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 21 10:44:30 2019 +0200
CAMEL-13870: Fast property configuration of Camel endpoints. Work in progress.
---
.../component/xchange/XChangeConfiguration.java | 8 +++
.../xmlsecurity/XmlSignatureEndpoint.java | 8 +++
.../src/main/docs/zookeeper-component.adoc | 3 +-
.../zookeeper/ZooKeeperConfiguration.java | 20 ------
.../component/zookeeper/ZooKeeperEndpoint.java | 16 -----
.../component/zookeeper/ZooKeeperEndpointTest.java | 11 ----
.../dsl/ZooKeeperEndpointBuilderFactory.java | 76 ----------------------
.../ZooKeeperComponentConfiguration.java | 17 -----
.../camel-spring-boot-dependencies/pom.xml | 2 +-
9 files changed, 18 insertions(+), 143 deletions(-)
diff --git a/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeConfiguration.java b/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeConfiguration.java
index d832872..7bb8db4 100644
--- a/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeConfiguration.java
+++ b/components/camel-xchange/src/main/java/org/apache/camel/component/xchange/XChangeConfiguration.java
@@ -94,6 +94,10 @@ public class XChangeConfiguration {
return currency;
}
+ public void setCurrency(Currency currency) {
+ this.currency = currency;
+ }
+
public void setCurrency(String curr) {
this.currency = Currency.getInstanceNoCreate(curr);
}
@@ -102,6 +106,10 @@ public class XChangeConfiguration {
return currencyPair;
}
+ public void setCurrencyPair(CurrencyPair currencyPair) {
+ this.currencyPair = currencyPair;
+ }
+
public void setCurrencyPair(String pair) {
this.currencyPair = new CurrencyPair(pair);
}
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java
index e181e20..eecd99d 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureEndpoint.java
@@ -51,6 +51,14 @@ public abstract class XmlSignatureEndpoint extends DefaultEndpoint {
super(uri, component);
}
+ public XmlSignerConfiguration getSignerConfiguration() {
+ return signerConfiguration;
+ }
+
+ public XmlVerifierConfiguration getVerifierConfiguration() {
+ return verifierConfiguration;
+ }
+
public XmlCommand getCommand() {
return command;
}
diff --git a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
index 8317817..0f8ad4a 100644
--- a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
+++ b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc
@@ -71,13 +71,12 @@ with the following path and query parameters:
|===
-=== Query Parameters (14 parameters):
+=== Query Parameters (13 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *awaitExistence* (common) | *Deprecated* Not in use | true | boolean
| *listChildren* (common) | Whether the children of the node should be listed | false | boolean
| *timeout* (common) | The time interval to wait on connection before timing out. | 5000 | int
| *backoff* (consumer) | The time interval to backoff for after an error before retrying. | 5000 | long
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
index 12b107e..287614c 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
@@ -45,9 +45,6 @@ public class ZooKeeperConfiguration implements Cloneable {
private int timeout = 5000;
@UriParam(label = "consumer", defaultValue = "5000")
private long backoff = 5000;
- @UriParam(defaultValue = "true")
- @Deprecated
- private boolean awaitExistence = true;
@UriParam(label = "consumer")
private boolean repeat;
@UriParam
@@ -153,23 +150,6 @@ public class ZooKeeperConfiguration implements Cloneable {
this.repeat = repeat;
}
- /**
- * @deprecated The usage of this option has no effect at all.
- */
- @Deprecated
- public boolean shouldAwaitExistence() {
- return awaitExistence;
- }
-
- /**
- * Not in use
- * @deprecated The usage of this option has no effect at all.
- */
- @Deprecated
- public void setAwaitExistence(boolean awaitExistence) {
- this.awaitExistence = awaitExistence;
- }
-
public long getBackoff() {
return backoff;
}
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java
index 76f5b20..4bb31fc 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java
@@ -131,22 +131,6 @@ public class ZooKeeperEndpoint extends DefaultEndpoint {
getConfiguration().setBackoff(backoff);
}
- /**
- * @deprecated The usage of this property has no effect at all.
- */
- @Deprecated
- public boolean getAwaitExistence() {
- return getConfiguration().shouldAwaitExistence();
- }
-
- /**
- * @deprecated The usage of this property has no effect at all.
- */
- @Deprecated
- public void setAwaitExistence(boolean awaitExistence) {
- getConfiguration().setAwaitExistence(awaitExistence);
- }
-
@ManagedOperation
public void addServer(String server) {
getConfiguration().addZookeeperServer(server);
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
index 0f9c119..6a3dbfd 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
@@ -22,17 +22,6 @@ import org.junit.Test;
public class ZooKeeperEndpointTest extends CamelTestSupport {
@Test
- public void awaitExistenceOptionOnEndpoint() {
- ZooKeeperEndpoint endpoint = context.getEndpoint("zookeeper:someserver/zoo", ZooKeeperEndpoint.class);
- assertTrue("The awaitExistence option should default to true", endpoint.getAwaitExistence());
-
- endpoint = context.getEndpoint("zookeeper:someserver/zoo?awaitExistence=true", ZooKeeperEndpoint.class);
- assertTrue("The awaitExistence option should be true", endpoint.getAwaitExistence());
-
- endpoint = context.getEndpoint("zookeeper:someserver/zoo?awaitExistence=false", ZooKeeperEndpoint.class);
- assertFalse("The awaitExistence option should be false", endpoint.getAwaitExistence());
- }
-
public void multipleZooKeeperServers() {
ZooKeeperEndpoint endpoint = context.getEndpoint("zookeeper:someserver1,someserver2:1234/zoo", ZooKeeperEndpoint.class);
assertEquals("Get wrong number of servers", 2, endpoint.getConfiguration().getServers().size());
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java
index 97a68dc..c219afb 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ZooKeeperEndpointBuilderFactory.java
@@ -42,32 +42,6 @@ public interface ZooKeeperEndpointBuilderFactory {
return (AdvancedZooKeeperEndpointConsumerBuilder) this;
}
/**
- * Not in use.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Group: common
- */
- @Deprecated
- default ZooKeeperEndpointConsumerBuilder awaitExistence(
- boolean awaitExistence) {
- setProperty("awaitExistence", awaitExistence);
- return this;
- }
- /**
- * Not in use.
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Group: common
- */
- @Deprecated
- default ZooKeeperEndpointConsumerBuilder awaitExistence(
- String awaitExistence) {
- setProperty("awaitExistence", awaitExistence);
- return this;
- }
- /**
* Whether the children of the node should be listed.
*
* The option is a: <code>boolean</code> type.
@@ -351,32 +325,6 @@ public interface ZooKeeperEndpointBuilderFactory {
return (AdvancedZooKeeperEndpointProducerBuilder) this;
}
/**
- * Not in use.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Group: common
- */
- @Deprecated
- default ZooKeeperEndpointProducerBuilder awaitExistence(
- boolean awaitExistence) {
- setProperty("awaitExistence", awaitExistence);
- return this;
- }
- /**
- * Not in use.
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Group: common
- */
- @Deprecated
- default ZooKeeperEndpointProducerBuilder awaitExistence(
- String awaitExistence) {
- setProperty("awaitExistence", awaitExistence);
- return this;
- }
- /**
* Whether the children of the node should be listed.
*
* The option is a: <code>boolean</code> type.
@@ -570,30 +518,6 @@ public interface ZooKeeperEndpointBuilderFactory {
return (AdvancedZooKeeperEndpointBuilder) this;
}
/**
- * Not in use.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Group: common
- */
- @Deprecated
- default ZooKeeperEndpointBuilder awaitExistence(boolean awaitExistence) {
- setProperty("awaitExistence", awaitExistence);
- return this;
- }
- /**
- * Not in use.
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Group: common
- */
- @Deprecated
- default ZooKeeperEndpointBuilder awaitExistence(String awaitExistence) {
- setProperty("awaitExistence", awaitExistence);
- return this;
- }
- /**
* Whether the children of the node should be listed.
*
* The option is a: <code>boolean</code> type.
diff --git a/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConfiguration.java
index ead0e39..98700c3 100644
--- a/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentConfiguration.java
@@ -20,7 +20,6 @@ import java.util.List;
import javax.annotation.Generated;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
/**
* The zookeeper component allows interaction with a ZooKeeper cluster.
@@ -88,11 +87,6 @@ public class ZooKeeperComponentConfiguration
*/
private Boolean repeat = false;
/**
- * Not in use
- */
- @Deprecated
- private Boolean awaitExistence = true;
- /**
* The time interval to backoff for after an error before retrying.
*/
private Long backoff = 5000L;
@@ -150,17 +144,6 @@ public class ZooKeeperComponentConfiguration
this.repeat = repeat;
}
- @Deprecated
- @DeprecatedConfigurationProperty
- public Boolean getAwaitExistence() {
- return awaitExistence;
- }
-
- @Deprecated
- public void setAwaitExistence(Boolean awaitExistence) {
- this.awaitExistence = awaitExistence;
- }
-
public Long getBackoff() {
return backoff;
}
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 817ff3e..e353bea 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3768,7 +3768,7 @@
<dependency>
<groupId>org.knowm.xchange</groupId>
<artifactId>xchange-core</artifactId>
- <version>4.3.20</version>
+ <version>4.3.21</version>
</dependency>
<dependency>
<groupId>org.mozilla</groupId>
[camel] 01/02: CAMEL-13870: Fast property configuration of Camel
endpoints. Work in progress.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13870
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a10b35ba4e38f019bb1792637cb393643d21b4b9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 21 10:33:21 2019 +0200
CAMEL-13870: Fast property configuration of Camel endpoints. Work in progress.
---
.../camel/component/web3j/Web3jConfiguration.java | 21 ++++++++++++++
.../camel/component/web3j/Web3jEndpoint.java | 4 +++
components/camel-websocket-jsr356/pom.xml | 2 +-
.../src/main/docs/websocket-jsr356-component.adoc | 3 +-
.../camel/websocket/jsr356/JSR356Consumer.java | 8 ++----
.../camel/websocket/jsr356/JSR356Endpoint.java | 5 +---
.../websocket/jsr356/JSR356WebSocketComponent.java | 6 +---
.../src/main/docs/wordpress-component.adoc | 2 +-
.../wordpress/WordpressComponentConfiguration.java | 18 ++++++++----
.../component/wordpress/WordpressEndpoint.java | 26 ++++++++---------
.../consumer/AbstractWordpressConsumer.java | 4 +--
.../producer/AbstractWordpressProducer.java | 2 +-
.../wordpress/WordpressComponentTest.java | 20 ++++++-------
.../dsl/JSR356WebSocketEndpointBuilderFactory.java | 33 ----------------------
.../dsl/WordpressEndpointBuilderFactory.java | 21 ++++++--------
.../springboot/Web3jComponentConfiguration.java | 19 +++++++------
.../WordpressComponentConfiguration.java | 13 +++++++++
17 files changed, 103 insertions(+), 104 deletions(-)
diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java
index d6a901e..9eebaf1 100644
--- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java
+++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java
@@ -432,6 +432,20 @@ public class Web3jConfiguration implements Cloneable {
/**
* The block number, or the string "latest" for the last mined block or "pending", "earliest" for not yet mined transactions.
*/
+ public void setFromBlock(DefaultBlockParameter fromBlock) {
+ this.fromBlock = fromBlock;
+ }
+
+ /**
+ * The block number, or the string "latest" for the last mined block or "pending", "earliest" for not yet mined transactions.
+ */
+ public void setToBlock(DefaultBlockParameter toBlock) {
+ this.toBlock = toBlock;
+ }
+
+ /**
+ * The block number, or the string "latest" for the last mined block or "pending", "earliest" for not yet mined transactions.
+ */
public void setToBlock(String block) {
this.toBlock = toDefaultBlockParameter(block);
}
@@ -464,6 +478,13 @@ public class Web3jConfiguration implements Cloneable {
/**
* The block number, or the string "latest" for the last mined block or "pending", "earliest" for not yet mined transactions.
*/
+ public void setAtBlock(DefaultBlockParameter atBlock) {
+ this.atBlock = atBlock;
+ }
+
+ /**
+ * The block number, or the string "latest" for the last mined block or "pending", "earliest" for not yet mined transactions.
+ */
public void setAtBlock(String block) {
this.atBlock = toDefaultBlockParameter(block);
}
diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
index be9ed39..d226b5c 100644
--- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
+++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
@@ -62,6 +62,10 @@ public class Web3jEndpoint extends DefaultEndpoint {
this.web3j = buildService(remaining, configuration);
}
+ public Web3jConfiguration getConfiguration() {
+ return configuration;
+ }
+
@Override
public Producer createProducer() throws Exception {
return new Web3jProducer(this, configuration);
diff --git a/components/camel-websocket-jsr356/pom.xml b/components/camel-websocket-jsr356/pom.xml
index 9caf967..91e565a 100644
--- a/components/camel-websocket-jsr356/pom.xml
+++ b/components/camel-websocket-jsr356/pom.xml
@@ -34,7 +34,7 @@
<description>Camel WebSocket using JSR356 (javax)</description>
<properties>
- <tomcat.version>9.0.13</tomcat.version>
+ <tomcat.version>9.0.24</tomcat.version>
<camel.osgi.import.pkg>
!org.apache.camel.component.websocket.jsr356.*,
diff --git a/components/camel-websocket-jsr356/src/main/docs/websocket-jsr356-component.adoc b/components/camel-websocket-jsr356/src/main/docs/websocket-jsr356-component.adoc
index 5848996..04ffa67 100644
--- a/components/camel-websocket-jsr356/src/main/docs/websocket-jsr356-component.adoc
+++ b/components/camel-websocket-jsr356/src/main/docs/websocket-jsr356-component.adoc
@@ -61,13 +61,12 @@ with the following path and query parameters:
|===
-=== Query Parameters (8 parameters):
+=== Query Parameters (7 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *context* (common) | the servlet context to use (represented by its path) | | String
| *sessionCount* (common) | Used when the endpoint is in client mode to populate a pool of sessions | | int
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *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
diff --git a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Consumer.java b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Consumer.java
index df3243c..701b254 100644
--- a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Consumer.java
+++ b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Consumer.java
@@ -21,7 +21,6 @@ import java.util.function.BiConsumer;
import static java.util.Optional.ofNullable;
-
import javax.websocket.ClientEndpointConfig;
import javax.websocket.Session;
import javax.websocket.server.ServerEndpointConfig;
@@ -30,10 +29,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.DefaultConsumer;
-
public class JSR356Consumer extends DefaultConsumer {
private final int sessionCount;
- private final String context;
private ClientSessions manager;
private Runnable closeTask;
@@ -48,10 +45,9 @@ public class JSR356Consumer extends DefaultConsumer {
});
};;
- JSR356Consumer(final JSR356Endpoint jsr356Endpoint, final Processor processor, final int sessionCount, final String context) {
+ JSR356Consumer(final JSR356Endpoint jsr356Endpoint, final Processor processor, final int sessionCount) {
super(jsr356Endpoint, processor);
this.sessionCount = sessionCount;
- this.context = context;
}
@Override
@@ -69,7 +65,7 @@ public class JSR356Consumer extends DefaultConsumer {
manager = new ClientSessions(sessionCount, URI.create(endpointKey), clientConfig.build(), onMessage);
manager.prepare();
} else {
- final JSR356WebSocketComponent.ContextBag bag = JSR356WebSocketComponent.getContext(context);
+ final JSR356WebSocketComponent.ContextBag bag = JSR356WebSocketComponent.getContext(null);
final CamelServerEndpoint endpoint = bag.getEndpoints().get(endpointKey);
if (endpoint == null) {
// todo: make it customizable (the endpoint config)
diff --git a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Endpoint.java b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Endpoint.java
index 8ba00ce..ec90e82 100644
--- a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Endpoint.java
+++ b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356Endpoint.java
@@ -32,9 +32,6 @@ public class JSR356Endpoint extends DefaultEndpoint {
@UriParam(description = "Used when the endpoint is in client mode to populate a pool of sessions")
private int sessionCount = 1;
- @UriParam(description = "the servlet context to use (represented by its path)")
- private String context;
-
private final JSR356WebSocketComponent component;
public JSR356Endpoint(final JSR356WebSocketComponent component, final String uri) {
@@ -49,7 +46,7 @@ public class JSR356Endpoint extends DefaultEndpoint {
@Override
public Consumer createConsumer(final Processor processor) {
- return new JSR356Consumer(this, processor, sessionCount, context);
+ return new JSR356Consumer(this, processor, sessionCount);
}
@Override
diff --git a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356WebSocketComponent.java b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356WebSocketComponent.java
index 531b6dd..2637042 100644
--- a/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356WebSocketComponent.java
+++ b/components/camel-websocket-jsr356/src/main/java/org/apache/camel/websocket/jsr356/JSR356WebSocketComponent.java
@@ -31,7 +31,6 @@ import javax.websocket.server.ServerContainer;
import org.apache.camel.Endpoint;
-import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.util.IOHelper;
@@ -42,7 +41,6 @@ public class JSR356WebSocketComponent extends DefaultComponent {
// CamelContext is in the ServletContext
private static final Map<String, ContextBag> SERVER_CONTAINERS = new ConcurrentHashMap<>();
- @Metadata(label = "sessionCount")
protected int sessionCount;
@Override
@@ -51,9 +49,7 @@ public class JSR356WebSocketComponent extends DefaultComponent {
}
public static void sendMessage(final Session session, final Object message) throws IOException {
- final RemoteEndpoint.Basic basicRemote = session.getBasicRemote(); // todo:
- // handle
- // async?
+ final RemoteEndpoint.Basic basicRemote = session.getBasicRemote(); // todo: handle async?
synchronized (session) {
if (String.class.isInstance(message)) {
basicRemote.sendText(String.valueOf(message));
diff --git a/components/camel-wordpress/src/main/docs/wordpress-component.adoc b/components/camel-wordpress/src/main/docs/wordpress-component.adoc
index 2d1cc1c..268c02a 100644
--- a/components/camel-wordpress/src/main/docs/wordpress-component.adoc
+++ b/components/camel-wordpress/src/main/docs/wordpress-component.adoc
@@ -50,7 +50,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *apiVersion* (common) | The Wordpress REST API version | 2 | String
| *criteria* (common) | The criteria to use with complex searches. | | Map
-| *force* (common) | Whether to bypass trash and force deletion. | false | Boolean
+| *force* (common) | Whether to bypass trash and force deletion. | false | boolean
| *id* (common) | The entity ID. Should be passed when the operation performed requires a specific entity, e.g. deleting a post | | Integer
| *password* (common) | Password from authorized user | | String
| *searchCriteria* (common) | Search criteria | | SearchCriteria
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponentConfiguration.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponentConfiguration.java
index bf1c558..cf06ab7 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponentConfiguration.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressComponentConfiguration.java
@@ -41,12 +41,12 @@ public class WordpressComponentConfiguration {
private String user;
@UriParam(description = "Password from authorized user")
private String password;
- @UriParam(description = "The entity ID. Should be passed when the operation performed requires a specific entity, e.g. deleting a post", javaType = "java.lang.Integer")
+ @UriParam(description = "The entity ID. Should be passed when the operation performed requires a specific entity, e.g. deleting a post")
private Integer id;
@UriParam(description = "The criteria to use with complex searches.", prefix = "criteria.", multiValue = true)
private Map<String, Object> criteria;
- @UriParam(description = "Whether to bypass trash and force deletion.", defaultValue = "false", javaType = "java.lang.Boolean")
- private Boolean force = false;
+ @UriParam(description = "Whether to bypass trash and force deletion.")
+ private boolean force;
@UriParam(description = "Search criteria")
private SearchCriteria searchCriteria;
@@ -94,11 +94,19 @@ public class WordpressComponentConfiguration {
this.id = id;
}
- public Boolean isForce() {
+ public Map<String, Object> getCriteria() {
+ return criteria;
+ }
+
+ public void setCriteria(Map<String, Object> criteria) {
+ this.criteria = criteria;
+ }
+
+ public boolean isForce() {
return force;
}
- public void setForce(Boolean force) {
+ public void setForce(boolean force) {
this.force = force;
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java
index 11b5b73..3f3bd3e 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java
@@ -57,15 +57,15 @@ public class WordpressEndpoint extends DefaultEndpoint {
private String operationDetail;
@UriParam
- private WordpressComponentConfiguration config;
+ private WordpressComponentConfiguration configuration;
public WordpressEndpoint(String uri, WordpressComponent component, WordpressComponentConfiguration configuration) {
super(uri, component);
- this.config = configuration;
+ this.configuration = configuration;
}
- public WordpressComponentConfiguration getConfig() {
- return config;
+ public WordpressComponentConfiguration getConfiguration() {
+ return configuration;
}
public String getOperation() {
@@ -116,12 +116,12 @@ public class WordpressEndpoint extends DefaultEndpoint {
// set configuration properties first
try {
- if (config == null) {
- config = new WordpressComponentConfiguration();
+ if (configuration == null) {
+ configuration = new WordpressComponentConfiguration();
}
- PropertyBindingSupport.bindProperties(getCamelContext(), config, options);
+ PropertyBindingSupport.bindProperties(getCamelContext(), configuration, options);
- if (config.getSearchCriteria() == null) {
+ if (configuration.getSearchCriteria() == null) {
final SearchCriteria searchCriteria = WordpressOperationType.valueOf(operation).getCriteriaType().newInstance();
Map<String, Object> criteriaOptions = IntrospectionSupport.extractProperties(options, "criteria.");
// any property that has a "," should be a List
@@ -132,21 +132,21 @@ public class WordpressEndpoint extends DefaultEndpoint {
return e.getValue();
}));
PropertyBindingSupport.bindProperties(getCamelContext(), searchCriteria, criteriaOptions);
- config.setSearchCriteria(searchCriteria);
+ configuration.setSearchCriteria(searchCriteria);
}
} catch (Exception e) {
throw new IllegalArgumentException(e.getMessage(), e);
}
// validate configuration
- config.validate();
+ configuration.validate();
this.initServiceProvider();
}
private void initServiceProvider() {
- final WordpressAPIConfiguration apiConfiguration = new WordpressAPIConfiguration(config.getUrl(), config.getApiVersion());
+ final WordpressAPIConfiguration apiConfiguration = new WordpressAPIConfiguration(configuration.getUrl(), configuration.getApiVersion());
// basic auth
- if (ObjectHelper.isNotEmpty(config.getUser())) {
- apiConfiguration.setAuthentication(new WordpressBasicAuthentication(config.getUser(), config.getPassword()));
+ if (ObjectHelper.isNotEmpty(configuration.getUser())) {
+ apiConfiguration.setAuthentication(new WordpressBasicAuthentication(configuration.getUser(), configuration.getPassword()));
}
WordpressServiceProvider.getInstance().init(apiConfiguration);
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/consumer/AbstractWordpressConsumer.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/consumer/AbstractWordpressConsumer.java
index b75aac4..7f95886 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/consumer/AbstractWordpressConsumer.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/consumer/AbstractWordpressConsumer.java
@@ -34,13 +34,13 @@ public abstract class AbstractWordpressConsumer extends ScheduledPollConsumer {
public AbstractWordpressConsumer(WordpressEndpoint endpoint, Processor processor) {
super(endpoint, processor);
- this.configuration = endpoint.getConfig();
+ this.configuration = endpoint.getConfiguration();
this.initConsumer();
}
public AbstractWordpressConsumer(WordpressEndpoint endpoint, Processor processor, ScheduledExecutorService scheduledExecutorService) {
super(endpoint, processor, scheduledExecutorService);
- this.configuration = endpoint.getConfig();
+ this.configuration = endpoint.getConfiguration();
this.initConsumer();
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/producer/AbstractWordpressProducer.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/producer/AbstractWordpressProducer.java
index b27c58b..a79b76e 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/producer/AbstractWordpressProducer.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/producer/AbstractWordpressProducer.java
@@ -32,7 +32,7 @@ public abstract class AbstractWordpressProducer<T> extends DefaultProducer {
public AbstractWordpressProducer(WordpressEndpoint endpoint) {
super(endpoint);
- this.configuration = endpoint.getConfig();
+ this.configuration = endpoint.getConfiguration();
if (!WordpressServiceProvider.getInstance().hasAuthentication()) {
LOG.warn("Wordpress Producer hasn't authentication. This may lead to errors during route execution. Wordpress writing operations need authentication.");
}
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java
index 3643deb..3ba998e 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/WordpressComponentTest.java
@@ -40,16 +40,16 @@ public class WordpressComponentTest extends CamelTestSupport {
final WordpressEndpoint endpoint = (WordpressEndpoint)component
.createEndpoint("wordpress:post?apiVersion=2&url=http://mysite.com/&criteria.search=test&criteria.page=1&criteria.perPage=10&criteria.orderBy=author&criteria.categories=camel,dozer,json");
- assertThat(endpoint.getConfig().getSearchCriteria(), instanceOf(PostSearchCriteria.class));
- assertNotNull(endpoint.getConfig().getSearchCriteria());
- assertThat(endpoint.getConfig().getSearchCriteria().getPage(), is(1));
- assertThat(endpoint.getConfig().getSearchCriteria().getPerPage(), is(10));
- assertThat(endpoint.getConfig().getSearchCriteria().getSearch(), is("test"));
- assertThat(((PostSearchCriteria)endpoint.getConfig().getSearchCriteria()).getOrderBy(), is(PostOrderBy.author));
- assertThat(((PostSearchCriteria)endpoint.getConfig().getSearchCriteria()).getCategories(), notNullValue());
- assertThat(((PostSearchCriteria)endpoint.getConfig().getSearchCriteria()).getCategories(), not(emptyCollectionOf(String.class)));
-
- LOGGER.info("Categories are {}", ((PostSearchCriteria)endpoint.getConfig().getSearchCriteria()).getCategories());
+ assertThat(endpoint.getConfiguration().getSearchCriteria(), instanceOf(PostSearchCriteria.class));
+ assertNotNull(endpoint.getConfiguration().getSearchCriteria());
+ assertThat(endpoint.getConfiguration().getSearchCriteria().getPage(), is(1));
+ assertThat(endpoint.getConfiguration().getSearchCriteria().getPerPage(), is(10));
+ assertThat(endpoint.getConfiguration().getSearchCriteria().getSearch(), is("test"));
+ assertThat(((PostSearchCriteria)endpoint.getConfiguration().getSearchCriteria()).getOrderBy(), is(PostOrderBy.author));
+ assertThat(((PostSearchCriteria)endpoint.getConfiguration().getSearchCriteria()).getCategories(), notNullValue());
+ assertThat(((PostSearchCriteria)endpoint.getConfiguration().getSearchCriteria()).getCategories(), not(emptyCollectionOf(String.class)));
+
+ LOGGER.info("Categories are {}", ((PostSearchCriteria)endpoint.getConfiguration().getSearchCriteria()).getCategories());
}
}
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java
index 4ab6894..5e34b2a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java
@@ -42,17 +42,6 @@ public interface JSR356WebSocketEndpointBuilderFactory {
return (AdvancedJSR356WebSocketEndpointConsumerBuilder) this;
}
/**
- * the servlet context to use (represented by its path).
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- */
- default JSR356WebSocketEndpointConsumerBuilder context(String context) {
- setProperty("context", context);
- return this;
- }
- /**
* Used when the endpoint is in client mode to populate a pool of
* sessions.
*
@@ -247,17 +236,6 @@ public interface JSR356WebSocketEndpointBuilderFactory {
return (AdvancedJSR356WebSocketEndpointProducerBuilder) this;
}
/**
- * the servlet context to use (represented by its path).
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- */
- default JSR356WebSocketEndpointProducerBuilder context(String context) {
- setProperty("context", context);
- return this;
- }
- /**
* Used when the endpoint is in client mode to populate a pool of
* sessions.
*
@@ -399,17 +377,6 @@ public interface JSR356WebSocketEndpointBuilderFactory {
return (AdvancedJSR356WebSocketEndpointBuilder) this;
}
/**
- * the servlet context to use (represented by its path).
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Group: common
- */
- default JSR356WebSocketEndpointBuilder context(String context) {
- setProperty("context", context);
- return this;
- }
- /**
* Used when the endpoint is in client mode to populate a pool of
* sessions.
*
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WordpressEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WordpressEndpointBuilderFactory.java
index fd5d8e4..cfcb9f5 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WordpressEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WordpressEndpointBuilderFactory.java
@@ -82,19 +82,18 @@ public interface WordpressEndpointBuilderFactory {
/**
* Whether to bypass trash and force deletion.
*
- * The option is a: <code>java.lang.Boolean</code> type.
+ * The option is a: <code>boolean</code> type.
*
* Group: common
*/
- default WordpressEndpointConsumerBuilder force(Boolean force) {
+ default WordpressEndpointConsumerBuilder force(boolean force) {
setProperty("force", force);
return this;
}
/**
* Whether to bypass trash and force deletion.
*
- * The option will be converted to a <code>java.lang.Boolean</code>
- * type.
+ * The option will be converted to a <code>boolean</code> type.
*
* Group: common
*/
@@ -395,19 +394,18 @@ public interface WordpressEndpointBuilderFactory {
/**
* Whether to bypass trash and force deletion.
*
- * The option is a: <code>java.lang.Boolean</code> type.
+ * The option is a: <code>boolean</code> type.
*
* Group: common
*/
- default WordpressEndpointProducerBuilder force(Boolean force) {
+ default WordpressEndpointProducerBuilder force(boolean force) {
setProperty("force", force);
return this;
}
/**
* Whether to bypass trash and force deletion.
*
- * The option will be converted to a <code>java.lang.Boolean</code>
- * type.
+ * The option will be converted to a <code>boolean</code> type.
*
* Group: common
*/
@@ -654,19 +652,18 @@ public interface WordpressEndpointBuilderFactory {
/**
* Whether to bypass trash and force deletion.
*
- * The option is a: <code>java.lang.Boolean</code> type.
+ * The option is a: <code>boolean</code> type.
*
* Group: common
*/
- default WordpressEndpointBuilder force(Boolean force) {
+ default WordpressEndpointBuilder force(boolean force) {
setProperty("force", force);
return this;
}
/**
* Whether to bypass trash and force deletion.
*
- * The option will be converted to a <code>java.lang.Boolean</code>
- * type.
+ * The option will be converted to a <code>boolean</code> type.
*
* Group: common
*/
diff --git a/platforms/spring-boot/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentConfiguration.java
index 62f6776..759836f 100644
--- a/platforms/spring-boot/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-web3j-starter/src/main/java/org/apache/camel/component/web3j/springboot/Web3jComponentConfiguration.java
@@ -22,6 +22,7 @@ import javax.annotation.Generated;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.web3j.protocol.Web3j;
+import org.web3j.protocol.core.DefaultBlockParameter;
/**
* The web3j component uses the Web3j client API and allows you to add/read
@@ -182,17 +183,17 @@ public class Web3jComponentConfiguration
* The block number, or the string "latest" for the last mined block or
* "pending", "earliest" for not yet mined transactions.
*/
- private String fromBlock = "latest";
+ private DefaultBlockParameter fromBlock;
/**
* The block number, or the string "latest" for the last mined block or
* "pending", "earliest" for not yet mined transactions.
*/
- private String toBlock = "latest";
+ private DefaultBlockParameter toBlock;
/**
* The block number, or the string "latest" for the last mined block or
* "pending", "earliest" for not yet mined transactions.
*/
- private String atBlock = "latest";
+ private DefaultBlockParameter atBlock;
/**
* Contract address or a list of addresses.
*/
@@ -424,27 +425,27 @@ public class Web3jComponentConfiguration
this.position = position;
}
- public String getFromBlock() {
+ public DefaultBlockParameter getFromBlock() {
return fromBlock;
}
- public void setFromBlock(String fromBlock) {
+ public void setFromBlock(DefaultBlockParameter fromBlock) {
this.fromBlock = fromBlock;
}
- public String getToBlock() {
+ public DefaultBlockParameter getToBlock() {
return toBlock;
}
- public void setToBlock(String toBlock) {
+ public void setToBlock(DefaultBlockParameter toBlock) {
this.toBlock = toBlock;
}
- public String getAtBlock() {
+ public DefaultBlockParameter getAtBlock() {
return atBlock;
}
- public void setAtBlock(String atBlock) {
+ public void setAtBlock(DefaultBlockParameter atBlock) {
this.atBlock = atBlock;
}
diff --git a/platforms/spring-boot/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConfiguration.java
index f5b0373..9eb13b6 100644
--- a/platforms/spring-boot/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-wordpress-starter/src/main/java/org/apache/camel/component/wordpress/springboot/WordpressComponentConfiguration.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.wordpress.springboot;
+import java.util.Map;
import javax.annotation.Generated;
import org.apache.camel.component.wordpress.api.model.SearchCriteria;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
@@ -88,6 +89,10 @@ public class WordpressComponentConfiguration
*/
private Integer id;
/**
+ * The criteria to use with complex searches.
+ */
+ private Map criteria;
+ /**
* Whether to bypass trash and force deletion.
*/
private Boolean force = false;
@@ -136,6 +141,14 @@ public class WordpressComponentConfiguration
this.id = id;
}
+ public Map getCriteria() {
+ return criteria;
+ }
+
+ public void setCriteria(Map criteria) {
+ this.criteria = criteria;
+ }
+
public Boolean getForce() {
return force;
}