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-spring-boot.git
commit e3b573a1830f7c3442d3f87d0f41c075bbbf5e07
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Feb 15 10:52:56 2020 +0100
CAMEL-14565: Add docs for missing option
---
components-starter/README.adoc | 5 +++-
components-starter/camel-corda-starter/pom.xml | 12 ---------
.../src/main/docs/lucene-starter.adoc | 6 +----
.../springboot/LuceneComponentConfiguration.java | 29 --------------------
.../src/main/docs/nagios-starter.adoc | 4 +--
.../springboot/NagiosComponentConfiguration.java | 10 -------
.../src/main/docs/netty-http-starter.adoc | 15 +++++------
.../NettyHttpComponentConfiguration.java | 31 +++++++++++++++-------
.../src/main/docs/netty-starter.adoc | 4 +--
.../springboot/NettyComponentConfiguration.java | 19 -------------
10 files changed, 36 insertions(+), 99 deletions(-)
diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index 02fa33c..0a5645f 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -5,7 +5,7 @@ Apache Camel Spring Boot supports the following Camel artifacts
as Spring Boot S
== Camel Components
// components: START
-Number of Camel components: 321 in 255 JAR artifacts (1 deprecated)
+Number of Camel components: 322 in 256 JAR artifacts (1 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -95,6 +95,9 @@ Number of Camel components: 321 in 255 JAR artifacts (1
deprecated)
| link:https://camel.apache.org/components/latest/aws2-ses-component.html[AWS
2 Simple Email Service] (camel-aws2-ses-starter) +
`aws2-ses:from` | 3.1 | The aws2-ses component is used for sending emails with
Amazon's SES service.
+| link:https://camel.apache.org/components/latest/aws2-sns-component.html[AWS
2 Simple Notification System] (camel-aws2-sns-starter) +
+`aws2-sns:topicNameOrArn` | 3.1 | The aws2-sns component is used for sending
messages to an Amazon Simple Notification Topic.
+
|
link:https://camel.apache.org/components/latest/aws2-translate-component.html[AWS
2 Translate] (camel-aws2-translate-starter) +
`aws2-translate:label` | 3.1 | The aws2-translate component is used for
managing Amazon Translate
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index d834111..47eae69 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,18 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</artifactId>
<version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/components-starter/camel-lucene-starter/src/main/docs/lucene-starter.adoc
b/components-starter/camel-lucene-starter/src/main/docs/lucene-starter.adoc
index 8742a13..66f9ca5 100644
--- a/components-starter/camel-lucene-starter/src/main/docs/lucene-starter.adoc
+++ b/components-starter/camel-lucene-starter/src/main/docs/lucene-starter.adoc
@@ -17,7 +17,7 @@ When using lucene with Spring Boot make sure to use the
following Maven dependen
----
-The component supports 12 options, which are listed below.
+The component supports 9 options, which are listed below.
@@ -26,16 +26,12 @@ The component supports 12 options, which are listed below.
| Name | Description | Default | Type
| *camel.component.lucene.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
| *camel.component.lucene.config.analyzer* | An Analyzer builds TokenStreams,
which analyze text. It thus represents a policy for extracting index terms from
text. The value for analyzer can be any class that extends the abstract class
org.apache.lucene.analysis.Analyzer. Lucene also offers a rich set of analyzers
out of the box | | Analyzer
-| *camel.component.lucene.config.authority* | | | String
| *camel.component.lucene.config.host* | The URL to the lucene server | |
String
| *camel.component.lucene.config.index-dir* | A file system directory in which
index files are created upon analysis of the document by the specified analyzer
| | File
-| *camel.component.lucene.config.lucene-version* | | | Version
| *camel.component.lucene.config.max-hits* | An integer value that limits the
result set of the search operation | | Integer
| *camel.component.lucene.config.operation* | Operation to do such as insert
or query. | | LuceneOperation
| *camel.component.lucene.config.src-dir* | An optional directory containing
files to be used to be analyzed and added to the index at producer startup. |
| File
-| *camel.component.lucene.config.uri* | | | URI
| *camel.component.lucene.enabled* | Whether to enable auto configuration of
the lucene component. This is enabled by default. | | Boolean
| *camel.component.lucene.lazy-start-producer* | Whether the producer should
be started lazy (on the first message). By starting lazy you can use this to
allow CamelContext and routes to startup in situations where a producer may
otherwise fail during starting and cause the route to fail being started. By
deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed the [...]
|===
-
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java
b/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java
index 50dc0c5..36b9e8b 100644
---
a/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java
+++
b/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java
@@ -17,12 +17,10 @@
package org.apache.camel.component.lucene.springboot;
import java.io.File;
-import java.net.URI;
import javax.annotation.Generated;
import org.apache.camel.component.lucene.LuceneOperation;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.util.Version;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
@@ -96,7 +94,6 @@ public class LuceneComponentConfiguration
* analyzers out of the box
*/
private Analyzer analyzer;
- private String authority;
/**
* The URL to the lucene server
*/
@@ -106,7 +103,6 @@ public class LuceneComponentConfiguration
* analysis of the document by the specified analyzer
*/
private File indexDir;
- private Version luceneVersion;
/**
* An integer value that limits the result set of the search operation
*/
@@ -120,7 +116,6 @@ public class LuceneComponentConfiguration
* added to the index at producer startup.
*/
private File srcDir;
- private URI uri;
public Analyzer getAnalyzer() {
return analyzer;
@@ -130,14 +125,6 @@ public class LuceneComponentConfiguration
this.analyzer = analyzer;
}
- public String getAuthority() {
- return authority;
- }
-
- public void setAuthority(String authority) {
- this.authority = authority;
- }
-
public String getHost() {
return host;
}
@@ -154,14 +141,6 @@ public class LuceneComponentConfiguration
this.indexDir = indexDir;
}
- public Version getLuceneVersion() {
- return luceneVersion;
- }
-
- public void setLuceneVersion(Version luceneVersion) {
- this.luceneVersion = luceneVersion;
- }
-
public Integer getMaxHits() {
return maxHits;
}
@@ -185,13 +164,5 @@ public class LuceneComponentConfiguration
public void setSrcDir(File srcDir) {
this.srcDir = srcDir;
}
-
- public URI getUri() {
- return uri;
- }
-
- public void setUri(URI uri) {
- this.uri = uri;
- }
}
}
\ No newline at end of file
diff --git
a/components-starter/camel-nagios-starter/src/main/docs/nagios-starter.adoc
b/components-starter/camel-nagios-starter/src/main/docs/nagios-starter.adoc
index 965595c..b8fc0c9 100644
--- a/components-starter/camel-nagios-starter/src/main/docs/nagios-starter.adoc
+++ b/components-starter/camel-nagios-starter/src/main/docs/nagios-starter.adoc
@@ -17,7 +17,7 @@ When using nagios with Spring Boot make sure to use the
following Maven dependen
----
-The component supports 10 options, which are listed below.
+The component supports 9 options, which are listed below.
@@ -28,12 +28,10 @@ The component supports 10 options, which are listed below.
| *camel.component.nagios.configuration.connection-timeout* | Connection
timeout in millis. | 5000 | Integer
| *camel.component.nagios.configuration.encryption* | To specify an encryption
method. | | Encryption
| *camel.component.nagios.configuration.host* | This is the address of the
Nagios host where checks should be send. | | String
-| *camel.component.nagios.configuration.nagios-settings* | | | NagiosSettings
| *camel.component.nagios.configuration.password* | Password to be
authenticated when sending checks to Nagios. | | String
| *camel.component.nagios.configuration.port* | The port number of the host. |
| Integer
| *camel.component.nagios.configuration.timeout* | Sending timeout in millis.
| 5000 | Integer
| *camel.component.nagios.enabled* | Whether to enable auto configuration of
the nagios component. This is enabled by default. | | Boolean
| *camel.component.nagios.lazy-start-producer* | Whether the producer should
be started lazy (on the first message). By starting lazy you can use this to
allow CamelContext and routes to startup in situations where a producer may
otherwise fail during starting and cause the route to fail being started. By
deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed the [...]
|===
-
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
b/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
index 9a55e16..9b16c7a 100644
---
a/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
+++
b/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.nagios.springboot;
import javax.annotation.Generated;
-import com.googlecode.jsendnsca.NagiosSettings;
import com.googlecode.jsendnsca.encryption.Encryption;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -98,7 +97,6 @@ public class NagiosComponentConfiguration
* This is the address of the Nagios host where checks should be send.
*/
private String host;
- private NagiosSettings nagiosSettings;
/**
* Password to be authenticated when sending checks to Nagios.
*/
@@ -136,14 +134,6 @@ public class NagiosComponentConfiguration
this.host = host;
}
- public NagiosSettings getNagiosSettings() {
- return nagiosSettings;
- }
-
- public void setNagiosSettings(NagiosSettings nagiosSettings) {
- this.nagiosSettings = nagiosSettings;
- }
-
public String getPassword() {
return password;
}
diff --git
a/components-starter/camel-netty-http-starter/src/main/docs/netty-http-starter.adoc
b/components-starter/camel-netty-http-starter/src/main/docs/netty-http-starter.adoc
index 093a7de..1e2261f 100644
---
a/components-starter/camel-netty-http-starter/src/main/docs/netty-http-starter.adoc
+++
b/components-starter/camel-netty-http-starter/src/main/docs/netty-http-starter.adoc
@@ -17,7 +17,7 @@ When using netty-http with Spring Boot make sure to use the
following Maven depe
----
-The component supports 36 options, which are listed below.
+The component supports 35 options, which are listed below.
@@ -51,13 +51,12 @@ The component supports 36 options, which are listed below.
| *camel.component.netty-http.lazy-start-producer* | Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during starting and cause the route to fail being started.
By deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed [...]
| *camel.component.netty-http.maximum-pool-size* | Sets a maximum thread pool
size for the netty consumer ordered thread pool. The default size is 2 x
cpu_core plus 1. Setting this value to eg 10 will then use 10 threads unless 2
x cpu_core plus 1 is a higher value, which then will override and be used. For
example if there are 8 cores, then the consumer thread pool will be 17. This
thread pool is used to route messages received from Netty by Camel. We use a
separate thread pool to ensur [...]
| *camel.component.netty-http.netty-http-binding* | To use a custom
org.apache.camel.component.netty.http.NettyHttpBinding for binding to/from
Netty and Camel Message API. The option is a
org.apache.camel.component.netty.http.NettyHttpBinding type. | | String
-| *camel.component.netty-http.security-configuration.authenticate* | | |
Boolean
-| *camel.component.netty-http.security-configuration.constraint* | | | String
-|
*camel.component.netty-http.security-configuration.login-denied-logging-level*
| | | LoggingLevel
-| *camel.component.netty-http.security-configuration.realm* | | | String
-| *camel.component.netty-http.security-configuration.role-class-name* | | |
String
-| *camel.component.netty-http.security-configuration.security-authenticator* |
| | SecurityAuthenticator
-| *camel.component.netty-http.security-configuration.security-constraint* | |
| SecurityConstraint
+| *camel.component.netty-http.security-configuration.authenticate* | Whether
to enable authentication | | Boolean
+| *camel.component.netty-http.security-configuration.constraint* | Security
constraint. Currently only Basic is supported. | | String
+|
*camel.component.netty-http.security-configuration.login-denied-logging-level*
| Sets a logging level to use for logging denied login attempts (incl
stacktraces) | | LoggingLevel
+| *camel.component.netty-http.security-configuration.realm* | Name of security
realm | | String
+| *camel.component.netty-http.security-configuration.security-authenticator* |
Sets the SecurityAuthenticator to use for authenticating the HttpPrincipal. |
| SecurityAuthenticator
+| *camel.component.netty-http.security-configuration.security-constraint* |
Sets a SecurityConstraint to use for checking if a web resource is restricted
or not. By default this is null, which means all resources is restricted. | |
SecurityConstraint
| *camel.component.netty-http.ssl-context-parameters* | To configure security
using SSLContextParameters. The option is a
org.apache.camel.support.jsse.SSLContextParameters type. | | String
| *camel.component.netty-http.use-global-ssl-context-parameters* | Enable
usage of global SSL context parameters. | false | Boolean
|===
diff --git
a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
index 46cf12d..32f29d5 100644
---
a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
+++
b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
@@ -493,12 +493,33 @@ public class NettyHttpComponentConfiguration
public static class NettyHttpSecurityConfigurationNestedConfiguration {
public static final Class CAMEL_NESTED_CLASS =
org.apache.camel.component.netty.http.NettyHttpSecurityConfiguration.class;
+ /**
+ * Whether to enable authentication
+ */
private Boolean authenticate;
+ /**
+ * Security constraint. Currently only Basic is supported.
+ */
private String constraint;
+ /**
+ * Sets a logging level to use for logging denied login attempts (incl
+ * stacktraces)
+ */
private LoggingLevel loginDeniedLoggingLevel;
+ /**
+ * Name of security realm
+ */
private String realm;
- private String roleClassName;
+ /**
+ * Sets the SecurityAuthenticator to use for authenticating the
+ * HttpPrincipal.
+ */
private SecurityAuthenticator securityAuthenticator;
+ /**
+ * Sets a SecurityConstraint to use for checking if a web resource is
+ * restricted or not. By default this is null, which means all
resources
+ * is restricted.
+ */
private SecurityConstraint securityConstraint;
public Boolean getAuthenticate() {
@@ -534,14 +555,6 @@ public class NettyHttpComponentConfiguration
this.realm = realm;
}
- public String getRoleClassName() {
- return roleClassName;
- }
-
- public void setRoleClassName(String roleClassName) {
- this.roleClassName = roleClassName;
- }
-
public SecurityAuthenticator getSecurityAuthenticator() {
return securityAuthenticator;
}
diff --git
a/components-starter/camel-netty-starter/src/main/docs/netty-starter.adoc
b/components-starter/camel-netty-starter/src/main/docs/netty-starter.adoc
index 71720f0..90a0d32 100644
--- a/components-starter/camel-netty-starter/src/main/docs/netty-starter.adoc
+++ b/components-starter/camel-netty-starter/src/main/docs/netty-starter.adoc
@@ -17,7 +17,7 @@ When using netty with Spring Boot make sure to use the
following Maven dependenc
----
-The component supports 80 options, which are listed below.
+The component supports 78 options, which are listed below.
@@ -38,14 +38,12 @@ The component supports 80 options, which are listed below.
| *camel.component.netty.configuration.client-mode* | If the clientMode is
true, netty consumer will connect the address as a TCP client. | false | Boolean
| *camel.component.netty.configuration.connect-timeout* | Time to wait for a
socket connection to be available. Value is in milliseconds. | 10000 | Integer
| *camel.component.netty.configuration.correlation-manager* | To use a custom
correlation manager to manage how request and reply messages are mapped when
using request/reply with the netty producer. This should only be used if you
have a way to map requests together with replies such as if there is
correlation ids in both the request and reply messages. This can be used if you
want to multiplex concurrent messages on the same channel (aka connection) in
netty. When doing this you must h [...]
-| *camel.component.netty.configuration.decoder* | | | ChannelHandler
| *camel.component.netty.configuration.decoder-max-line-length* | The max line
length to use for the textline codec. | 1024 | Integer
| *camel.component.netty.configuration.decoders* | A list of decoders to be
used. You can use a String which have values separated by comma, and have the
values be looked up in the Registry. Just remember to prefix the value with #
so Camel knows it should lookup. | | List
| *camel.component.netty.configuration.delimiter* | The delimiter to use for
the textline codec. Possible values are LINE and NULL. | | TextLineDelimiter
| *camel.component.netty.configuration.disconnect* | Whether or not to
disconnect(close) from Netty Channel right after use. Can be used for both
consumer and producer. | false | Boolean
| *camel.component.netty.configuration.disconnect-on-no-reply* | If sync is
enabled then this option dictates NettyConsumer if it should disconnect where
there is no reply to send back. | true | Boolean
| *camel.component.netty.configuration.enabled-protocols* | Which protocols to
enable when using SSL | TLSv1,TLSv1.1,TLSv1.2 | String
-| *camel.component.netty.configuration.encoder* | | | ChannelHandler
| *camel.component.netty.configuration.encoders* | A list of encoders to be
used. You can use a String which have values separated by comma, and have the
values be looked up in the Registry. Just remember to prefix the value with #
so Camel knows it should lookup. | | List
| *camel.component.netty.configuration.encoding* | The encoding (a charset
name) to use for the textline codec. If not provided, Camel will use the JVM
default Charset. | | String
| *camel.component.netty.configuration.host* | The hostname. For the consumer
the hostname is localhost or 0.0.0.0. For the producer the hostname is the
remote host to connect to | | String
diff --git
a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
index 132714c..b8eda0f 100644
---
a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
+++
b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
@@ -20,7 +20,6 @@ import java.io.File;
import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
-import io.netty.channel.ChannelHandler;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.group.ChannelGroup;
import io.netty.handler.ssl.SslHandler;
@@ -220,7 +219,6 @@ public class NettyComponentConfiguration
* producerPoolEnabled option for more details.
*/
private NettyCamelStateCorrelationManager correlationManager;
- private ChannelHandler decoder;
/**
* The max line length to use for the textline codec.
*/
@@ -247,7 +245,6 @@ public class NettyComponentConfiguration
* should disconnect where there is no reply to send back.
*/
private Boolean disconnectOnNoReply = true;
- private ChannelHandler encoder;
/**
* A list of encoders to be used. You can use a String which have
values
* separated by comma, and have the values be looked up in the
Registry.
@@ -631,14 +628,6 @@ public class NettyComponentConfiguration
this.correlationManager = correlationManager;
}
- public ChannelHandler getDecoder() {
- return decoder;
- }
-
- public void setDecoder(ChannelHandler decoder) {
- this.decoder = decoder;
- }
-
public Integer getDecoderMaxLineLength() {
return decoderMaxLineLength;
}
@@ -679,14 +668,6 @@ public class NettyComponentConfiguration
this.disconnectOnNoReply = disconnectOnNoReply;
}
- public ChannelHandler getEncoder() {
- return encoder;
- }
-
- public void setEncoder(ChannelHandler encoder) {
- this.encoder = encoder;
- }
-
public List getEncoders() {
return encoders;
}
