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 8ca15bc40b4e6fbab1a1f0f2271a50899eb1fc15
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Aug 20 21:03:43 2019 +0200
CAMEL-13870: Fast property configuration of Camel endpoints. Work in
progress.
---
.../camel/component/elasticsearch/ElasticsearchComponent.java | 2 +-
.../component/elasticsearch/ElasticsearchConfiguration.java | 10 +++++-----
.../camel/component/elasticsearch/ElasticsearchEndpoint.java | 4 ++++
.../camel/component/elasticsearch/ElasticsearchProducer.java | 8 ++++----
.../facebook/config/FacebookEndpointConfiguration.java | 4 ++--
5 files changed, 16 insertions(+), 12 deletions(-)
diff --git
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
index f1c7f17f..1975c90 100644
---
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
+++
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchComponent.java
@@ -106,7 +106,7 @@ public class ElasticsearchComponent extends
DefaultComponent {
throw new IllegalArgumentException();
}
Integer port = split.length > 1 ? Integer.parseInt(split[1]) :
ElasticsearchConstants.DEFAULT_PORT;
- addressesTrAd.add(new HttpHost(hostname, port,
config.getEnableSSL() ? "HTTPS" : "HTTP"));
+ addressesTrAd.add(new HttpHost(hostname, port,
config.isEnableSSL() ? "HTTPS" : "HTTP"));
}
return addressesTrAd;
}
diff --git
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
index 23525d9..263e4bf 100644
---
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
+++
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
@@ -170,11 +170,11 @@ public class ElasticsearchConfiguration {
/**
* Enable SSL
*/
- public Boolean getEnableSSL() {
+ public boolean isEnableSSL() {
return enableSSL;
}
- public void setEnableSSL(Boolean enableSSL) {
+ public void setEnableSSL(boolean enableSSL) {
this.enableSSL = enableSSL;
}
@@ -192,11 +192,11 @@ public class ElasticsearchConfiguration {
/**
* Disconnect after it finish calling the producer
*/
- public Boolean getDisconnect() {
+ public boolean isDisconnect() {
return disconnect;
}
- public void setDisconnect(Boolean disconnect) {
+ public void setDisconnect(boolean disconnect) {
this.disconnect = disconnect;
}
@@ -237,7 +237,7 @@ public class ElasticsearchConfiguration {
/**
* Enable scroll usage
*/
- public boolean getUseScroll() {
+ public boolean isUseScroll() {
return useScroll;
}
diff --git
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
index 5ff147d..41f7728 100644
---
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
+++
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
@@ -42,6 +42,10 @@ public class ElasticsearchEndpoint extends DefaultEndpoint {
this.client = client;
}
+ public ElasticsearchConfiguration getConfiguration() {
+ return configuration;
+ }
+
@Override
public Producer createProducer() throws Exception {
return new ElasticsearchProducer(this, configuration);
diff --git
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
index 1ba7d30..ab92790 100644
---
a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
+++
b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java
@@ -114,7 +114,7 @@ public class ElasticsearchProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
- if (configuration.getDisconnect() && client == null) {
+ if (configuration.isDisconnect() && client == null) {
startClient();
}
RestHighLevelClient restHighLevelClient = new HighLevelClient(client);
@@ -189,7 +189,7 @@ public class ElasticsearchProducer extends DefaultProducer {
} else if (operation == ElasticsearchOperation.Search) {
SearchRequest searchRequest = message.getBody(SearchRequest.class);
// is it a scroll request ?
- boolean useScroll = message.getHeader(PARAM_SCROLL,
configuration.getUseScroll(), Boolean.class);
+ boolean useScroll = message.getHeader(PARAM_SCROLL,
configuration.isUseScroll(), Boolean.class);
if (useScroll) {
int scrollKeepAliveMs =
message.getHeader(PARAM_SCROLL_KEEP_ALIVE_MS,
configuration.getScrollKeepAliveMs(), Integer.class);
ElasticsearchScrollRequestIterator scrollRequestIterator = new
ElasticsearchScrollRequestIterator(searchRequest, restHighLevelClient,
scrollKeepAliveMs, exchange);
@@ -222,7 +222,7 @@ public class ElasticsearchProducer extends DefaultProducer {
if (configWaitForActiveShards) {
message.removeHeader(ElasticsearchConstants.PARAM_WAIT_FOR_ACTIVE_SHARDS);
}
- if (configuration.getDisconnect()) {
+ if (configuration.isDisconnect()) {
IOHelper.close(client);
IOHelper.close(restHighLevelClient);
client = null;
@@ -238,7 +238,7 @@ public class ElasticsearchProducer extends DefaultProducer {
@SuppressWarnings("unchecked")
protected void doStart() throws Exception {
super.doStart();
- if (!configuration.getDisconnect()) {
+ if (!configuration.isDisconnect()) {
startClient();
}
}
diff --git
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
index 7ff01d4..3273c85 100644
---
a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
+++
b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/config/FacebookEndpointConfiguration.java
@@ -425,7 +425,7 @@ public class FacebookEndpointConfiguration extends
FacebookConfiguration {
this.ids = ids;
}
- public Boolean isIncludeRead() {
+ public Boolean getIncludeRead() {
return includeRead;
}
@@ -920,7 +920,7 @@ public class FacebookEndpointConfiguration extends
FacebookConfiguration {
this.tabId = tabId;
}
- public Boolean isHidden() {
+ public Boolean getIsHidden() {
return isHidden;
}
