This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 998603fbebc Regen for commit 13ce22083b8a538794be2533a1588aaeb1908c08
(#8345)
998603fbebc is described below
commit 998603fbebc34856f5eef1a378630adfcf3e16ed
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Sep 9 20:41:33 2022 +0200
Regen for commit 13ce22083b8a538794be2533a1588aaeb1908c08 (#8345)
Signed-off-by: GitHub <nore...@github.com>
Signed-off-by: GitHub <nore...@github.com>
Co-authored-by: davsclaus <davscl...@users.noreply.github.com>
---
.../camel/component/kafka/KafkaConfiguration.java | 41 ++++++++++------------
.../netty/http/HttpServerInitializerFactory.java | 3 +-
.../http/HttpServerSharedInitializerFactory.java | 3 +-
.../netty/http/NettyHttpConfiguration.java | 12 +++----
...ettySharedHttpServerBootstrapConfiguration.java | 1 -
.../NettyHttpComponentWithConfigurationTest.java | 6 ++--
6 files changed, 31 insertions(+), 35 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
index 70aef509670..5216febafa4 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
@@ -1031,8 +1031,8 @@ public class KafkaConfiguration implements Cloneable,
HeaderFilterStrategyAware
/**
* A list of cipher suites. This is a named combination of authentication,
encryption, MAC and key exchange
- * algorithm used to negotiate the security settings for a network
connection using TLS or SSL network protocol.
- * By default all the available cipher suites are supported.
+ * algorithm used to negotiate the security settings for a network
connection using TLS or SSL network protocol. By
+ * default all the available cipher suites are supported.
*/
public void setSslCipherSuites(String sslCipherSuites) {
this.sslCipherSuites = sslCipherSuites;
@@ -1079,11 +1079,10 @@ public class KafkaConfiguration implements Cloneable,
HeaderFilterStrategyAware
}
/**
- * The list of protocols enabled for SSL connections.
- * The default is TLSv1.2,TLSv1.3 when running with Java 11 or newer,
TLSv1.2 otherwise. With the
- * default value for Java 11, clients and servers will prefer TLSv1.3 if
both support it and fallback
- * to TLSv1.2 otherwise (assuming both support at least TLSv1.2). This
default should be fine for most
- * cases. Also see the config documentation for SslProtocol.
+ * The list of protocols enabled for SSL connections. The default is
TLSv1.2,TLSv1.3 when running with Java 11 or
+ * newer, TLSv1.2 otherwise. With the default value for Java 11, clients
and servers will prefer TLSv1.3 if both
+ * support it and fallback to TLSv1.2 otherwise (assuming both support at
least TLSv1.2). This default should be
+ * fine for most cases. Also see the config documentation for SslProtocol.
*/
public void setSslEnabledProtocols(String sslEnabledProtocols) {
this.sslEnabledProtocols = sslEnabledProtocols;
@@ -1105,14 +1104,12 @@ public class KafkaConfiguration implements Cloneable,
HeaderFilterStrategyAware
}
/**
- * The SSL protocol used to generate the SSLContext.
- * The default is TLSv1.3 when running with Java 11 or newer, TLSv1.2
otherwise.
- * This value should be fine for most use cases.
- * Allowed values in recent JVMs are TLSv1.2 and TLSv1.3. TLS, TLSv1.1,
SSL, SSLv2 and SSLv3
- * may be supported in older JVMs, but their usage is discouraged due to
known security vulnerabilities.
- * With the default value for this config and sslEnabledProtocols, clients
will downgrade to TLSv1.2 if
- * the server does not support TLSv1.3. If this config is set to TLSv1.2,
clients will not use TLSv1.3 even
- * if it is one of the values in sslEnabledProtocols and the server only
supports TLSv1.3.
+ * The SSL protocol used to generate the SSLContext. The default is
TLSv1.3 when running with Java 11 or newer,
+ * TLSv1.2 otherwise. This value should be fine for most use cases.
Allowed values in recent JVMs are TLSv1.2 and
+ * TLSv1.3. TLS, TLSv1.1, SSL, SSLv2 and SSLv3 may be supported in older
JVMs, but their usage is discouraged due to
+ * known security vulnerabilities. With the default value for this config
and sslEnabledProtocols, clients will
+ * downgrade to TLSv1.2 if the server does not support TLSv1.3. If this
config is set to TLSv1.2, clients will not
+ * use TLSv1.3 even if it is one of the values in sslEnabledProtocols and
the server only supports TLSv1.3.
*/
public void setSslProtocol(String sslProtocol) {
this.sslProtocol = sslProtocol;
@@ -1208,8 +1205,8 @@ public class KafkaConfiguration implements Cloneable,
HeaderFilterStrategyAware
}
/**
- * The password of the private key in the key store file or
- * the PEM key specified in sslKeystoreKey. This is required for clients
only if two-way authentication is configured.
+ * The password of the private key in the key store file or the PEM key
specified in sslKeystoreKey. This is
+ * required for clients only if two-way authentication is configured.
*/
public void setSslKeyPassword(String sslKeyPassword) {
this.sslKeyPassword = sslKeyPassword;
@@ -1232,9 +1229,8 @@ public class KafkaConfiguration implements Cloneable,
HeaderFilterStrategyAware
}
/**
- * The store password for the key store file.
- * This is optional for client and only needed if sslKeystoreLocation' is
configured.
- * Key store password is not supported for PEM format.
+ * The store password for the key store file. This is optional for client
and only needed if sslKeystoreLocation' is
+ * configured. Key store password is not supported for PEM format.
*/
public void setSslKeystorePassword(String sslKeystorePassword) {
this.sslKeystorePassword = sslKeystorePassword;
@@ -1256,9 +1252,8 @@ public class KafkaConfiguration implements Cloneable,
HeaderFilterStrategyAware
}
/**
- * The password for the trust store file.
- * If a password is not set, trust store file configured will still be
used, but integrity checking is disabled.
- * Trust store password is not supported for PEM format.
+ * The password for the trust store file. If a password is not set, trust
store file configured will still be used,
+ * but integrity checking is disabled. Trust store password is not
supported for PEM format.
*/
public void setSslTruststorePassword(String sslTruststorePassword) {
this.sslTruststorePassword = sslTruststorePassword;
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerInitializerFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerInitializerFactory.java
index eecad067e52..3badc6b9246 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerInitializerFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerInitializerFactory.java
@@ -94,7 +94,8 @@ public class HttpServerInitializerFactory extends
ServerInitializerFactory {
pipeline.addLast("ssl", sslHandler);
}
- pipeline.addLast("decoder", new
HttpRequestDecoder(configuration.getMaxInitialLineLength(),
configuration.getMaxHeaderSize(), configuration.getMaxChunkSize()));
+ pipeline.addLast("decoder", new HttpRequestDecoder(
+ configuration.getMaxInitialLineLength(),
configuration.getMaxHeaderSize(), configuration.getMaxChunkSize()));
List<ChannelHandler> decoders =
consumer.getConfiguration().getDecodersAsList();
for (int x = 0; x < decoders.size(); x++) {
ChannelHandler decoder = decoders.get(x);
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedInitializerFactory.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedInitializerFactory.java
index 24532c7ce7c..3b3f81f6874 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedInitializerFactory.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedInitializerFactory.java
@@ -84,7 +84,8 @@ public class HttpServerSharedInitializerFactory extends
HttpServerInitializerFac
pipeline.addLast("ssl", sslHandler);
}
- pipeline.addLast("decoder", new
HttpRequestDecoder(configuration.getMaxInitialLineLength(),
configuration.getMaxHeaderSize(), configuration.getMaxChunkSize()));
+ pipeline.addLast("decoder", new HttpRequestDecoder(
+ configuration.getMaxInitialLineLength(),
configuration.getMaxHeaderSize(), configuration.getMaxChunkSize()));
pipeline.addLast("encoder", new HttpResponseEncoder());
if (configuration.isChunked()) {
pipeline.addLast("inbound-streamer", new
HttpInboundStreamHandler());
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
index 53fb6febb51..789fb86d99f 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
@@ -326,9 +326,8 @@ public class NettyHttpConfiguration extends
NettyConfiguration {
}
/**
- * The maximum length of the initial line (e.g. {@code "GET / HTTP/1.0"} or
- * {@code "HTTP/1.0 200 OK"}) If the length of the initial line exceeds
this value, a
- * {@link TooLongFrameException} will be raised.
+ * The maximum length of the initial line (e.g. {@code "GET / HTTP/1.0"}
or {@code "HTTP/1.0 200 OK"}) If the length
+ * of the initial line exceeds this value, a {@link TooLongFrameException}
will be raised.
*
* See {@link io.netty.handler.codec.http.HttpObjectDecoder}
*/
@@ -341,10 +340,9 @@ public class NettyHttpConfiguration extends
NettyConfiguration {
}
/**
- * The maximum length of the content or each chunk. If the content length
- * (or the length of each chunk) exceeds this value, the content or chunk
- * will be split into multiple {@link
io.netty.handler.codec.http.HttpContent}s
- * whose length is {@code maxChunkSize} at maximum.
+ * The maximum length of the content or each chunk. If the content length
(or the length of each chunk) exceeds this
+ * value, the content or chunk will be split into multiple {@link
io.netty.handler.codec.http.HttpContent}s whose
+ * length is {@code maxChunkSize} at maximum.
*
* See {@link io.netty.handler.codec.http.HttpObjectDecoder}
*/
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettySharedHttpServerBootstrapConfiguration.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettySharedHttpServerBootstrapConfiguration.java
index 6d92ead2d51..c7f8a122331 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettySharedHttpServerBootstrapConfiguration.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettySharedHttpServerBootstrapConfiguration.java
@@ -26,7 +26,6 @@ public class NettySharedHttpServerBootstrapConfiguration
extends NettyServerBoot
private int maxHeaderSize = 8192;
private int maxInitialLineLength = 4096;
private int maxChunkSize = 8192;
-
public boolean isChunked() {
return chunked;
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentWithConfigurationTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentWithConfigurationTest.java
index 485f2678478..898a604dd48 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentWithConfigurationTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentWithConfigurationTest.java
@@ -35,7 +35,8 @@ public class NettyHttpComponentWithConfigurationTest extends
CamelTestSupport {
assertSame(cfg, comp.getConfiguration());
NettyHttpEndpoint e1 = (NettyHttpEndpoint)
comp.createEndpoint("netty-http://http://localhost:4455";);
- NettyHttpEndpoint e2 = (NettyHttpEndpoint)
comp.createEndpoint("netty-http://http://localhost:5566?sync=false&needClientAuth=true";);
+ NettyHttpEndpoint e2
+ = (NettyHttpEndpoint)
comp.createEndpoint("netty-http://http://localhost:5566?sync=false&needClientAuth=true";);
// should not be same
assertNotSame(e1, e2);
@@ -67,7 +68,8 @@ public class NettyHttpComponentWithConfigurationTest extends
CamelTestSupport {
public void testNettyComponentWithExplicitConfiguration() throws Exception
{
NettyHttpComponent comp = context.getComponent("netty-http",
NettyHttpComponent.class);
- NettyHttpEndpoint e1 = (NettyHttpEndpoint)
comp.createEndpoint("netty-http://tcp://localhost:8899?maxHeaderSize=1024&maxInitialLineLength=2048&maxChunkSize=4096";);
+ NettyHttpEndpoint e1 = (NettyHttpEndpoint) comp.createEndpoint(
+
"netty-http://tcp://localhost:8899?maxHeaderSize=1024&maxInitialLineLength=2048&maxChunkSize=4096";);
e1.getConfiguration().setPort(8899);
