[camel-spring-boot] branch master updated: CAMEL-14539: Regen

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[camel-spring-boot] branch master updated: CAMEL-14539: Regen

davsclaus-2
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


The following commit(s) were added to refs/heads/master by this push:
     new fd6012f  CAMEL-14539: Regen
fd6012f is described below

commit fd6012fcbde9d8a0b90a449f39ec3f28c7b7fd4a
Author: Claus Ibsen <[hidden email]>
AuthorDate: Fri Feb 14 16:18:40 2020 +0100

    CAMEL-14539: Regen
---
 .../src/main/docs/netty-http-starter.adoc          | 16 +++++------
 .../NettyHttpComponentConfiguration.java           | 31 +++++++++++++++-------
 .../src/main/docs/netty-starter.adoc               |  5 +---
 .../springboot/NettyComponentConfiguration.java    | 19 -------------
 docs/modules/ROOT/pages/braintree-starter.adoc     |  5 ++--
 docs/modules/ROOT/pages/docker-starter.adoc        |  3 +--
 docs/modules/ROOT/pages/etcd-starter.adoc          |  7 +++--
 7 files changed, 36 insertions(+), 50 deletions(-)

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 4fba5b8..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,15 +51,13 @@ 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
 |===
-
 // spring-boot-auto-configure options: END
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 4b306a6..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
@@ -105,5 +103,4 @@ The component supports 80 options, which are listed below.
 | *camel.component.netty.configuration.server-pipeline-factory* | *Deprecated*  |  | ServerInitializerFactory
 | *camel.component.netty.configuration.trust-store-file* | *Deprecated* Server side certificate keystore to be used for encryption |  | File
 |===
-
 // spring-boot-auto-configure options: END
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;
         }
diff --git a/docs/modules/ROOT/pages/braintree-starter.adoc b/docs/modules/ROOT/pages/braintree-starter.adoc
index 36f99ef..935bb93 100644
--- a/docs/modules/ROOT/pages/braintree-starter.adoc
+++ b/docs/modules/ROOT/pages/braintree-starter.adoc
@@ -30,7 +30,7 @@ The component supports 18 options, which are listed below.
 | *camel.component.braintree.configuration.api-name* | What kind of operation to perform |  | BraintreeApiName
 | *camel.component.braintree.configuration.environment* | The environment Either SANDBOX or PRODUCTION |  | String
 | *camel.component.braintree.configuration.http-log-level* | Set logging level for http calls, see java.util.logging.Level |  | Level
-| *camel.component.braintree.configuration.http-log-name* |  |  | String
+| *camel.component.braintree.configuration.http-log-name* | Set log category to use to log http calls. | Braintree | String
 | *camel.component.braintree.configuration.http-read-timeout* | Set read timeout for http calls. |  | Integer
 | *camel.component.braintree.configuration.log-handler-enabled* | Sets whether to enable the BraintreeLogHandler. It may be desirable to set this to 'false' where an existing JUL - SLF4J logger bridge is on the classpath. This option can also be configured globally on the BraintreeComponent. | true | Boolean
 | *camel.component.braintree.configuration.merchant-id* | The merchant id provided by Braintree. |  | String
@@ -41,7 +41,6 @@ The component supports 18 options, which are listed below.
 | *camel.component.braintree.configuration.public-key* | The public key provided by Braintree. |  | String
 | *camel.component.braintree.enabled* | Whether to enable auto configuration of the braintree component. This is enabled by default. |  | Boolean
 | *camel.component.braintree.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.braintree.log-handler-enabled* | Sets whether to enable the BraintreeLogHandler. It may be desirable to set this to 'false' where an existing JUL - SLF4J logger bridge is on the classpath. | true | Boolean
+| *camel.component.braintree.log-handler-enabled* | Sets whether to enable the BraintreeLogHandler. It may be desirable to set this to false where an existing JUL - SLF4J logger bridge is on the classpath. | true | Boolean
 |===
-
 // spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/docker-starter.adoc b/docs/modules/ROOT/pages/docker-starter.adoc
index 8e14b0e..fd3d10c 100644
--- a/docs/modules/ROOT/pages/docker-starter.adoc
+++ b/docs/modules/ROOT/pages/docker-starter.adoc
@@ -35,7 +35,7 @@ The component supports 22 options, which are listed below.
 | *camel.component.docker.configuration.max-per-route-connections* | Maximum route connections | 100 | Integer
 | *camel.component.docker.configuration.max-total-connections* | Maximum total connections | 100 | Integer
 | *camel.component.docker.configuration.operation* | Which operation to use |  | DockerOperation
-| *camel.component.docker.configuration.parameters* |  |  | Map
+| *camel.component.docker.configuration.parameters* | Additional configuration parameters as key/value pairs |  | Map
 | *camel.component.docker.configuration.password* | Password to authenticate with |  | String
 | *camel.component.docker.configuration.port* | Docker port | 2375 | Integer
 | *camel.component.docker.configuration.request-timeout* | Request timeout for response (in seconds) |  | Integer
@@ -47,5 +47,4 @@ The component supports 22 options, which are listed below.
 | *camel.component.docker.enabled* | Whether to enable auto configuration of the docker component. This is enabled by default. |  | Boolean
 | *camel.component.docker.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/docs/modules/ROOT/pages/etcd-starter.adoc b/docs/modules/ROOT/pages/etcd-starter.adoc
index f1b5edc..aa6e545 100644
--- a/docs/modules/ROOT/pages/etcd-starter.adoc
+++ b/docs/modules/ROOT/pages/etcd-starter.adoc
@@ -25,10 +25,10 @@ The component supports 55 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.etcd-keys.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.etcd-keys.configuration.from-index* |  |  | Long
+| *camel.component.etcd-keys.configuration.from-index* | The index to watch from |  | Long
 | *camel.component.etcd-keys.configuration.password* | The password to use for basic authentication. |  | String
 | *camel.component.etcd-keys.configuration.recursive* | To apply an action recursively. | false | Boolean
-| *camel.component.etcd-keys.configuration.send-empty-exchange-on-timeout* |  |  | Boolean
+| *camel.component.etcd-keys.configuration.send-empty-exchange-on-timeout* | To send an empty message in case of timeout watching for a key. |  | Boolean
 | *camel.component.etcd-keys.configuration.service-path* | The path to look for for service discovery | /services/ | String
 | *camel.component.etcd-keys.configuration.ssl-context-parameters* | To configure security using SSLContextParameters. |  | SSLContextParameters
 | *camel.component.etcd-keys.configuration.time-to-live* | To set the lifespan of a key in milliseconds. |  | Integer
@@ -69,7 +69,7 @@ The component supports 55 options, which are listed below.
 | *camel.component.etcd-watch.configuration.send-empty-exchange-on-timeout* | To send an empty message in case of timeout watching for a key. | false | Boolean
 | *camel.component.etcd-watch.configuration.service-path* | The path to look for for service discovery | /services/ | String
 | *camel.component.etcd-watch.configuration.ssl-context-parameters* | To configure security using SSLContextParameters. |  | SSLContextParameters
-| *camel.component.etcd-watch.configuration.time-to-live* |  |  | Integer
+| *camel.component.etcd-watch.configuration.time-to-live* | To set the lifespan of a key in milliseconds. |  | Integer
 | *camel.component.etcd-watch.configuration.timeout* | To set the maximum time an action could take to complete. |  | Long
 | *camel.component.etcd-watch.configuration.uris* | To set the URIs the client connects. | <a href="http://localhost:2379,http://localhost:4001">http://localhost:2379,http://localhost:4001 | String
 | *camel.component.etcd-watch.configuration.user-name* | The user name to use for basic authentication. |  | String
@@ -80,5 +80,4 @@ The component supports 55 options, which are listed below.
 | *camel.component.etcd-watch.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
 | *camel.component.etcd-watch.user-name* | The user name to use for basic authentication. |  | String
 |===
-
 // spring-boot-auto-configure options: END