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 e1e755aba539 CAMEL-23359: Jetty Endpoint should return effective port
number when using 0 (#22736)
e1e755aba539 is described below
commit e1e755aba53976b2a01835974b5334eb7592d011
Author: Bartosz Popiela <[email protected]>
AuthorDate: Wed Apr 29 18:05:23 2026 +0200
CAMEL-23359: Jetty Endpoint should return effective port number when using
0 (#22736)
* CAMEL-23359: override JettyHttpEndpoint#getServiceUrl to return the
effective port number when 0 is used
* CAMEL-23359: fix compilation error
* CAMEL-23359: commit autogenerated files
* CAMEL-23359: commit autogenerated files
---
.../org/apache/camel/catalog/components/jetty.json | 4 +-
.../camel/component/jetty/JettyHttpComponent.java | 45 ++++++++++++++--------
.../camel/component/jetty/JettyHttpEndpoint.java | 24 ++++++++++++
.../jetty12/JettyHttpComponent12Configurer.java | 4 +-
.../org/apache/camel/component/jetty12/jetty.json | 4 +-
.../component/jetty12/JettyHttpComponent12.java | 3 +-
.../component/jetty/ExplicitHttpsRouteTest.java | 6 +--
...ExplicitHttpsSslContextParametersRouteTest.java | 6 +--
.../dsl/JettyComponentBuilderFactory.java | 8 ++--
9 files changed, 69 insertions(+), 35 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
index f2df7afa12f0..5bd69100294b 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
@@ -56,12 +56,12 @@
"proxyPort": { "index": 28, "kind": "property", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "To
use a http proxy to configure the port number." },
"keystore": { "index": 29, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Specifies the location of
the Java keystore file, which contains the Jetty server's own X.509 certificate
in a key entry." },
"socketConnectorProperties": { "index": 30, "kind": "property",
"displayName": "Socket Connector Properties", "group": "security", "label":
"security", "required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "A
map which contains general HTTP connector properties. Uses the same principle
as sslSocketConnectorProperties." },
- "socketConnectors": { "index": 31, "kind": "property", "displayName":
"Socket Connectors", "group": "security", "label": "security", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.Connector>", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "A map which contains
per port number specific HTTP connectors. Uses the same principle as
sslSocketConnectors." },
+ "socketConnectors": { "index": 31, "kind": "property", "displayName":
"Socket Connectors", "group": "security", "label": "security", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.ServerConnector>", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "A
map which contains per port number specific HTTP connectors. Uses the same
principle as sslSocketConnectors." },
"sslContextParameters": { "index": 32, "kind": "property", "displayName":
"Ssl Context Parameters", "group": "security", "label": "security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "To
configure security using SSLContextParameters" },
"sslKeyPassword": { "index": 33, "kind": "property", "displayName": "Ssl
Key Password", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": true, "security":
"secret", "description": "The key password, which is used to access the
certificate's key entry in the keystore (this is the same password that is
supplied to the keystore command's -keypass option)." },
"sslPassword": { "index": 34, "kind": "property", "displayName": "Ssl
Password", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": true, "security":
"secret", "description": "The ssl password, which is required to access the
keystore file (this is the same password that is supplied to the keystore
command's -storepass option)." },
"sslSocketConnectorProperties": { "index": 35, "kind": "property",
"displayName": "Ssl Socket Connector Properties", "group": "security", "label":
"security", "required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "A
map which contains general SSL connector properties." },
- "sslSocketConnectors": { "index": 36, "kind": "property", "displayName":
"Ssl Socket Connectors", "group": "security", "label": "security", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.Connector>", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "A map which contains
per port number specific SSL connectors." },
+ "sslSocketConnectors": { "index": 36, "kind": "property", "displayName":
"Ssl Socket Connectors", "group": "security", "label": "security", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.ServerConnector>", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "A
map which contains per port number specific SSL connectors." },
"useGlobalSslContextParameters": { "index": 37, "kind": "property",
"displayName": "Use Global Ssl Context Parameters", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "defaultValue": false, "description": "Enable usage of global
SSL context parameters" }
},
"headers": {
diff --git
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 065fa191ff89..5e03d9b8cf77 100644
---
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -101,8 +101,8 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
protected String sslKeyPassword;
protected String sslPassword;
protected String sslKeystore;
- protected Map<Integer, Connector> sslSocketConnectors;
- protected Map<Integer, Connector> socketConnectors;
+ protected Map<Integer, ServerConnector> sslSocketConnectors;
+ protected Map<Integer, ServerConnector> socketConnectors;
protected Map<String, Object> sslSocketConnectorProperties;
protected Map<String, Object> socketConnectorProperties;
protected Integer minThreads;
@@ -135,11 +135,11 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
static class ConnectorRef {
final Server server;
- final Connector connector;
+ final ServerConnector connector;
final CamelServlet servlet;
int refCount;
- ConnectorRef(Server server, Connector connector, CamelServlet servlet)
{
+ ConnectorRef(Server server, ServerConnector connector, CamelServlet
servlet) {
this.server = server;
this.connector = connector;
this.servlet = servlet;
@@ -157,6 +157,10 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
public int getRefCount() {
return refCount;
}
+
+ public ServerConnector getConnector() {
+ return connector;
+ }
}
@Override
@@ -338,7 +342,7 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
throws Exception {
if (connectorRef == null) {
Server server = createServer();
- Connector connector = getConnector(server, endpoint);
+ ServerConnector connector = getConnector(server, endpoint);
if ("localhost".equalsIgnoreCase(endpoint.getHttpUri().getHost()))
{
LOG.warn("You use localhost interface! It means that no
external connections will be available. "
+ "Don't you want to use 0.0.0.0 instead (all network
interfaces)? {}",
@@ -603,8 +607,8 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
this.errorHandler = errorHandler;
}
- protected Connector getConnector(Server server, JettyHttpEndpoint
endpoint) {
- Connector connector;
+ protected ServerConnector getConnector(Server server, JettyHttpEndpoint
endpoint) {
+ ServerConnector connector;
if ("https".equals(endpoint.getProtocol())) {
connector = getSslSocketConnector(server, endpoint);
} else {
@@ -613,8 +617,8 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
return connector;
}
- protected Connector getSocketConnector(Server server, JettyHttpEndpoint
endpoint) {
- Connector answer = null;
+ protected ServerConnector getSocketConnector(Server server,
JettyHttpEndpoint endpoint) {
+ ServerConnector answer = null;
if (socketConnectors != null) {
answer = socketConnectors.get(endpoint.getPort());
}
@@ -624,8 +628,8 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
return answer;
}
- protected Connector getSslSocketConnector(Server server, JettyHttpEndpoint
endpoint) {
- Connector answer = null;
+ protected ServerConnector getSslSocketConnector(Server server,
JettyHttpEndpoint endpoint) {
+ ServerConnector answer = null;
if (sslSocketConnectors != null) {
answer = sslSocketConnectors.get(endpoint.getPort());
}
@@ -635,7 +639,7 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
return answer;
}
- protected Connector createConnector(Server server, JettyHttpEndpoint
endpoint) {
+ protected ServerConnector createConnector(Server server, JettyHttpEndpoint
endpoint) {
// now we just use the SelectChannelConnector as the default connector
SslContextFactory.Server sslcf = null;
@@ -680,7 +684,7 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
return createConnectorJettyInternal(server, endpoint, sslcf);
}
- protected abstract AbstractConnector createConnectorJettyInternal(
+ protected abstract ServerConnector createConnectorJettyInternal(
Server server, JettyHttpEndpoint endpoint,
SslContextFactory.Server sslcf);
private SslContextFactory createSslContextFactory(SSLContextParameters
ssl, boolean client)
@@ -742,7 +746,7 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
return false;
}
- public Map<Integer, Connector> getSslSocketConnectors() {
+ public Map<Integer, ServerConnector> getSslSocketConnectors() {
return sslSocketConnectors;
}
@@ -750,7 +754,7 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
* A map which contains per port number specific SSL connectors.
*/
@Metadata(description = "A map which contains per port number specific SSL
connectors.", label = "security")
- public void setSslSocketConnectors(Map<Integer, Connector> connectors) {
+ public void setSslSocketConnectors(Map<Integer, ServerConnector>
connectors) {
sslSocketConnectors = connectors;
}
@@ -759,11 +763,11 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
*/
@Metadata(description = "A map which contains per port number specific
HTTP connectors. Uses the same principle as sslSocketConnectors.",
label = "security")
- public void setSocketConnectors(Map<Integer, Connector> socketConnectors) {
+ public void setSocketConnectors(Map<Integer, ServerConnector>
socketConnectors) {
this.socketConnectors = socketConnectors;
}
- public Map<Integer, Connector> getSocketConnectors() {
+ public Map<Integer, ServerConnector> getSocketConnectors() {
return socketConnectors;
}
@@ -1448,4 +1452,11 @@ public abstract class JettyHttpComponent extends
HttpCommonComponent
}
}
+ ServerConnector findServerConnector(JettyHttpEndpoint endpoint) {
+ var connectorRef = CONNECTORS.get(getConnectorKey(endpoint));
+ if (connectorRef != null) {
+ return connectorRef.getConnector();
+ }
+ return null;
+ }
}
diff --git
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
index 3c5a24eee272..dbc9cf3a7861 100644
---
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
+++
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.jetty;
import java.net.URI;
+import java.net.URISyntaxException;
import java.util.List;
import java.util.Map;
@@ -317,4 +318,27 @@ public abstract class JettyHttpEndpoint extends
HttpCommonEndpoint {
public void setMaxRequestSize(Long maxRequestSize) {
this.maxRequestSize = maxRequestSize;
}
+
+ @Override
+ public String getServiceUrl() {
+ if (getPort() == 0) {
+ var httpUri = getHttpUri();
+ var serverConnector = getComponent().findServerConnector(this);
+ if (httpUri != null && serverConnector != null) {
+ try {
+ return new URI(
+ httpUri.getScheme(),
+ httpUri.getUserInfo(),
+ httpUri.getHost(),
+ serverConnector.getLocalPort(),
+ httpUri.getPath(),
+ httpUri.getQuery(),
+ httpUri.getFragment()).toString();
+ } catch (URISyntaxException e) {
+ throw new IllegalStateException("Invalid service URL", e);
+ }
+ }
+ }
+ return super.getServiceUrl();
+ }
}
diff --git
a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty12/JettyHttpComponent12Configurer.java
b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty12/JettyHttpComponent12Configurer.java
index 9566432c9549..13fc261e12e8 100644
---
a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty12/JettyHttpComponent12Configurer.java
+++
b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty12/JettyHttpComponent12Configurer.java
@@ -273,11 +273,11 @@ public class JettyHttpComponent12Configurer extends
PropertyConfigurerSupport im
case "socketconnectorproperties":
case "socketConnectorProperties": return java.lang.Object.class;
case "socketconnectors":
- case "socketConnectors": return
org.eclipse.jetty.server.Connector.class;
+ case "socketConnectors": return
org.eclipse.jetty.server.ServerConnector.class;
case "sslsocketconnectorproperties":
case "sslSocketConnectorProperties": return java.lang.Object.class;
case "sslsocketconnectors":
- case "sslSocketConnectors": return
org.eclipse.jetty.server.Connector.class;
+ case "sslSocketConnectors": return
org.eclipse.jetty.server.ServerConnector.class;
default: return null;
}
}
diff --git
a/components/camel-jetty/src/generated/resources/META-INF/org/apache/camel/component/jetty12/jetty.json
b/components/camel-jetty/src/generated/resources/META-INF/org/apache/camel/component/jetty12/jetty.json
index f2df7afa12f0..5bd69100294b 100644
---
a/components/camel-jetty/src/generated/resources/META-INF/org/apache/camel/component/jetty12/jetty.json
+++
b/components/camel-jetty/src/generated/resources/META-INF/org/apache/camel/component/jetty12/jetty.json
@@ -56,12 +56,12 @@
"proxyPort": { "index": 28, "kind": "property", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "To
use a http proxy to configure the port number." },
"keystore": { "index": 29, "kind": "property", "displayName": "Keystore",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Specifies the location of
the Java keystore file, which contains the Jetty server's own X.509 certificate
in a key entry." },
"socketConnectorProperties": { "index": 30, "kind": "property",
"displayName": "Socket Connector Properties", "group": "security", "label":
"security", "required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "A
map which contains general HTTP connector properties. Uses the same principle
as sslSocketConnectorProperties." },
- "socketConnectors": { "index": 31, "kind": "property", "displayName":
"Socket Connectors", "group": "security", "label": "security", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.Connector>", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "A map which contains
per port number specific HTTP connectors. Uses the same principle as
sslSocketConnectors." },
+ "socketConnectors": { "index": 31, "kind": "property", "displayName":
"Socket Connectors", "group": "security", "label": "security", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.ServerConnector>", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "A
map which contains per port number specific HTTP connectors. Uses the same
principle as sslSocketConnectors." },
"sslContextParameters": { "index": 32, "kind": "property", "displayName":
"Ssl Context Parameters", "group": "security", "label": "security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "To
configure security using SSLContextParameters" },
"sslKeyPassword": { "index": 33, "kind": "property", "displayName": "Ssl
Key Password", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": true, "security":
"secret", "description": "The key password, which is used to access the
certificate's key entry in the keystore (this is the same password that is
supplied to the keystore command's -keypass option)." },
"sslPassword": { "index": 34, "kind": "property", "displayName": "Ssl
Password", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": true, "security":
"secret", "description": "The ssl password, which is required to access the
keystore file (this is the same password that is supplied to the keystore
command's -storepass option)." },
"sslSocketConnectorProperties": { "index": 35, "kind": "property",
"displayName": "Ssl Socket Connector Properties", "group": "security", "label":
"security", "required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "A
map which contains general SSL connector properties." },
- "sslSocketConnectors": { "index": 36, "kind": "property", "displayName":
"Ssl Socket Connectors", "group": "security", "label": "security", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.Connector>", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "A map which contains
per port number specific SSL connectors." },
+ "sslSocketConnectors": { "index": 36, "kind": "property", "displayName":
"Ssl Socket Connectors", "group": "security", "label": "security", "required":
false, "type": "object", "javaType": "java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.ServerConnector>", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "A
map which contains per port number specific SSL connectors." },
"useGlobalSslContextParameters": { "index": 37, "kind": "property",
"displayName": "Use Global Ssl Context Parameters", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "defaultValue": false, "description": "Enable usage of global
SSL context parameters" }
},
"headers": {
diff --git
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty12/JettyHttpComponent12.java
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty12/JettyHttpComponent12.java
index 223644a03925..66853dd3ca46 100644
---
a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty12/JettyHttpComponent12.java
+++
b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty12/JettyHttpComponent12.java
@@ -29,7 +29,6 @@ import org.apache.camel.component.jetty.JettyHttpEndpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.PropertyBindingSupport;
-import org.eclipse.jetty.server.AbstractConnector;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.ForwardedRequestCustomizer;
import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -56,7 +55,7 @@ public class JettyHttpComponent12 extends JettyHttpComponent {
}
@Override
- protected AbstractConnector createConnectorJettyInternal(
+ protected ServerConnector createConnectorJettyInternal(
Server server, JettyHttpEndpoint endpoint,
SslContextFactory.Server sslcf) {
try {
String host = endpoint.getHttpUri().getHost();
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
index 0a6bd8d47dd4..233a74feaf19 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
@@ -22,13 +22,13 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.ServerConnector;
import org.junit.jupiter.api.Disabled;
@Disabled
public class ExplicitHttpsRouteTest extends HttpsRouteTest {
- private Connector createSslSocketConnector(int port) {
+ private ServerConnector createSslSocketConnector(int port) {
/*
* SslSelectChannelConnector sslSocketConnector = new
* SslSelectChannelConnector();
@@ -44,7 +44,7 @@ public class ExplicitHttpsRouteTest extends HttpsRouteTest {
public void configure() {
// START SNIPPET: e1
// create SSL select channel connectors for port 9080 and 9090
- Map<Integer, Connector> connectors = new HashMap<>();
+ Map<Integer, ServerConnector> connectors = new HashMap<>();
connectors.put(port1.getPort(),
createSslSocketConnector(port1.getPort()));
connectors.put(port2.getPort(),
createSslSocketConnector(port2.getPort()));
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java
index b82bd9c13af8..86adcae3554b 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java
@@ -26,14 +26,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.jsse.KeyManagersParameters;
import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
-import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.ServerConnector;
import org.junit.jupiter.api.Disabled;
@Disabled
public class ExplicitHttpsSslContextParametersRouteTest extends HttpsRouteTest
{
// START SNIPPET: e2
- private Connector createSslSocketConnector(CamelContext context, int port)
{
+ private ServerConnector createSslSocketConnector(CamelContext context, int
port) {
KeyStoreParameters ksp = new KeyStoreParameters();
ksp.setResource("file://" +
this.getClass().getClassLoader().getResource("jsse/localhost.p12").toString());
ksp.setPassword(pwd);
@@ -55,7 +55,7 @@ public class ExplicitHttpsSslContextParametersRouteTest
extends HttpsRouteTest {
public void configure() {
// START SNIPPET: e1
// create SSL select channel connectors for port 9080 and 9090
- Map<Integer, Connector> connectors = new HashMap<>();
+ Map<Integer, ServerConnector> connectors = new HashMap<>();
connectors.put(port1.getPort(),
createSslSocketConnector(getContext(), port1.getPort()));
connectors.put(port2.getPort(),
createSslSocketConnector(getContext(), port2.getPort()));
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
index dcb638a8d496..17e519c41ff4 100644
---
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
+++
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
@@ -602,14 +602,14 @@ public interface JettyComponentBuilderFactory {
* the same principle as sslSocketConnectors.
*
* The option is a: <code>java.util.Map&lt;java.lang.Integer,
- * org.eclipse.jetty.server.Connector&gt;</code> type.
+ * org.eclipse.jetty.server.ServerConnector&gt;</code> type.
*
* Group: security
*
* @param socketConnectors the value to set
* @return the dsl builder
*/
- default JettyComponentBuilder
socketConnectors(java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.Connector> socketConnectors) {
+ default JettyComponentBuilder
socketConnectors(java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.ServerConnector> socketConnectors) {
doSetProperty("socketConnectors", socketConnectors);
return this;
}
@@ -684,14 +684,14 @@ public interface JettyComponentBuilderFactory {
* A map which contains per port number specific SSL connectors.
*
* The option is a: <code>java.util.Map&lt;java.lang.Integer,
- * org.eclipse.jetty.server.Connector&gt;</code> type.
+ * org.eclipse.jetty.server.ServerConnector&gt;</code> type.
*
* Group: security
*
* @param sslSocketConnectors the value to set
* @return the dsl builder
*/
- default JettyComponentBuilder
sslSocketConnectors(java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.Connector> sslSocketConnectors) {
+ default JettyComponentBuilder
sslSocketConnectors(java.util.Map<java.lang.Integer,
org.eclipse.jetty.server.ServerConnector> sslSocketConnectors) {
doSetProperty("sslSocketConnectors", sslSocketConnectors);
return this;
}
