This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-4.8.x by
this push:
new c9816046152 Fix build
c9816046152 is described below
commit c98160461523b21e33bdbf8c1573a67fc0e69732
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat Oct 19 10:04:26 2024 +0200
Fix build
---
.../catalog/SpringBootRuntimeProvider.java | 20 -----------------
.../camel/springboot/catalog/components/jetty.json | 25 +++++++++++-----------
.../catalog/SpringBootRuntimeProviderTest.java | 15 -------------
.../camel-jetty-starter/src/main/docs/jetty.json | 6 ++++++
.../JettyHttpComponentConfiguration12.java | 16 ++++++++++++++
.../springboot/JettyHttpComponentConverter12.java | 2 ++
6 files changed, 37 insertions(+), 47 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/java/org/apache/camel/springboot/catalog/SpringBootRuntimeProvider.java
b/catalog/camel-catalog-provider-springboot/src/main/java/org/apache/camel/springboot/catalog/SpringBootRuntimeProvider.java
index bb4ae199c9f..ecf5da39f30 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/java/org/apache/camel/springboot/catalog/SpringBootRuntimeProvider.java
+++
b/catalog/camel-catalog-provider-springboot/src/main/java/org/apache/camel/springboot/catalog/SpringBootRuntimeProvider.java
@@ -20,9 +20,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.TreeMap;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.RuntimeProvider;
@@ -48,7 +45,6 @@ public class SpringBootRuntimeProvider implements
RuntimeProvider {
private static final String CONSOLES_CATALOG =
"org/apache/camel/springboot/catalog/dev-consoles.properties";
private static final String OTHER_CATALOG =
"org/apache/camel/springboot/catalog/others.properties";
private static final String BEAN_CATALOG =
"org/apache/camel/springboot/catalog/beans.properties";
- private static final String CAPABILITIES_CATALOG =
"org/apache/camel/springboot/catalog/capabilities.properties";
private CamelCatalog camelCatalog;
@@ -147,22 +143,6 @@ public class SpringBootRuntimeProvider implements
RuntimeProvider {
return findNames(BEAN_CATALOG);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
- @Override
- public Map<String, String> findCapabilities() {
- final Properties properties = new Properties();
-
- try (InputStream is =
getCamelCatalog().getVersionManager().getResourceAsStream(CAPABILITIES_CATALOG))
{
- if (is != null) {
- properties.load(is);
- }
- } catch (IOException e) {
- // ignore
- }
-
- return new TreeMap<>((Map<String, String>) (Map) properties);
- }
-
private List<String> findNames(String pathToPropertyCatalogDescriptor) {
List<String> names = new ArrayList<>();
try (InputStream is =
camelCatalog.getVersionManager().getResourceAsStream(pathToPropertyCatalogDescriptor))
{
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
index 02ca7b21877..25bc5e23dd2 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
@@ -48,18 +48,19 @@
"httpBinding": { "index": 21, "kind": "property", "displayName": "Http
Binding", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.http.common.HttpBinding", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "Not to be used - use JettyHttpBinding instead." },
"httpConfiguration": { "index": 22, "kind": "property", "displayName":
"Http Configuration", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType":
"org.apache.camel.http.common.HttpConfiguration", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Jetty component does not use HttpConfiguration." },
"mbContainer": { "index": 23, "kind": "property", "displayName": "Mb
Container", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "org.eclipse.jetty.jmx.MBeanContainer",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "To use a existing configured
org.eclipse.jetty.jmx.MBeanContainer if JMX is enabled that Jetty uses for
registering mbeans." },
- "headerFilterStrategy": { "index": 24, "kind": "property", "displayName":
"Header Filter Strategy", "group": "filter", "label": "filter", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired":
false, "secret": false, "description": "To use a custom
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel
message." },
- "proxyHost": { "index": 25, "kind": "property", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "To use a http proxy to
configure the hostname." },
- "proxyPort": { "index": 26, "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": 27, "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": 28, "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": 29, "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." },
- "sslContextParameters": { "index": 30, "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": 31, "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, "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": 32, "kind": "property", "displayName": "Ssl
Password", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": true, "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": 33, "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": 34, "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." },
- "useGlobalSslContextParameters": { "index": 35, "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" }
+ "secureRequestCustomizer": { "index": 24, "kind": "property",
"displayName": "Secure Request Customizer", "group": "advanced", "label":
"advanced", "required": false, "type": "object", "javaType":
"org.eclipse.jetty.server.SecureRequestCustomizer", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "To
use a custom SecureRequestCustomizer. The option is a
org.eclipse.jetty.server.SecureRequestCustomizer type." },
+ "headerFilterStrategy": { "index": 25, "kind": "property", "displayName":
"Header Filter Strategy", "group": "filter", "label": "filter", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired":
false, "secret": false, "description": "To use a custom
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel
message." },
+ "proxyHost": { "index": 26, "kind": "property", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "To use a http proxy to
configure the hostname." },
+ "proxyPort": { "index": 27, "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": 28, "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": 29, "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": 30, "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." },
+ "sslContextParameters": { "index": 31, "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": 32, "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, "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": 33, "kind": "property", "displayName": "Ssl
Password", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": true, "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": 34, "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": 35, "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." },
+ "useGlobalSslContextParameters": { "index": 36, "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": {
"CamelServletContextPath": { "index": 0, "kind": "header", "displayName":
"", "group": "consumer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The servlet context path used", "constantName":
"org.apache.camel.component.jetty.JettyHttpConstants#SERVLET_CONTEXT_PATH" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/test/java/org/apache/camel/springboot/catalog/SpringBootRuntimeProviderTest.java
b/catalog/camel-catalog-provider-springboot/src/test/java/org/apache/camel/springboot/catalog/SpringBootRuntimeProviderTest.java
index 833783a6085..4ca0cfd2fc1 100644
---
a/catalog/camel-catalog-provider-springboot/src/test/java/org/apache/camel/springboot/catalog/SpringBootRuntimeProviderTest.java
+++
b/catalog/camel-catalog-provider-springboot/src/test/java/org/apache/camel/springboot/catalog/SpringBootRuntimeProviderTest.java
@@ -21,7 +21,6 @@ import java.util.Optional;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
-import org.apache.camel.tooling.model.EntityRef;
import org.apache.camel.tooling.model.Kind;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
@@ -138,18 +137,4 @@ public class SpringBootRuntimeProviderTest {
assertTrue(json.contains("camel-lra-starter"));
}
- @Test
- public void capabilities() {
- List<String> list = catalog.findCapabilityNames();
- Assertions.assertEquals(1, list.size());
-
- Optional<EntityRef> ref = catalog.findCapabilityRef("platform-http");
- Assertions.assertTrue(ref.isPresent());
- Assertions.assertEquals(Kind.component, ref.get().kind());
- Assertions.assertEquals("platform-http", ref.get().name());
-
- Optional<EntityRef> ref2 =
catalog.findCapabilityRef("not-implemented");
- Assertions.assertFalse(ref2.isPresent());
- }
-
}
diff --git a/components-starter/camel-jetty-starter/src/main/docs/jetty.json
b/components-starter/camel-jetty-starter/src/main/docs/jetty.json
index b62a471507e..ac2cf094d6d 100644
--- a/components-starter/camel-jetty-starter/src/main/docs/jetty.json
+++ b/components-starter/camel-jetty-starter/src/main/docs/jetty.json
@@ -177,6 +177,12 @@
"description": "Allows to configure a custom value of the response
header size on the Jetty connectors.",
"sourceType":
"org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
},
+ {
+ "name": "camel.component.jetty.secure-request-customizer",
+ "type": "org.eclipse.jetty.server.SecureRequestCustomizer",
+ "description": "To use a custom SecureRequestCustomizer. The option is a
org.eclipse.jetty.server.SecureRequestCustomizer type. The option is a
org.eclipse.jetty.server.SecureRequestCustomizer type.",
+ "sourceType":
"org.apache.camel.component.jetty12.springboot.JettyHttpComponentConfiguration12"
+ },
{
"name": "camel.component.jetty.send-server-version",
"type": "java.lang.Boolean",
diff --git
a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConfiguration12.java
b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConfiguration12.java
index 547c772ddf1..6519eb50eb8 100644
---
a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConfiguration12.java
+++
b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConfiguration12.java
@@ -24,6 +24,7 @@ import
org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.eclipse.jetty.jmx.MBeanContainer;
import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.util.thread.ThreadPool;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -184,6 +185,12 @@ public class JettyHttpComponentConfiguration12
* org.eclipse.jetty.jmx.MBeanContainer type.
*/
private MBeanContainer mbContainer;
+ /**
+ * To use a custom SecureRequestCustomizer. The option is a
+ * org.eclipse.jetty.server.SecureRequestCustomizer type. The option is a
+ * org.eclipse.jetty.server.SecureRequestCustomizer type.
+ */
+ private SecureRequestCustomizer secureRequestCustomizer;
/**
* To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
* header to and from Camel message. The option is a
@@ -435,6 +442,15 @@ public class JettyHttpComponentConfiguration12
this.mbContainer = mbContainer;
}
+ public SecureRequestCustomizer getSecureRequestCustomizer() {
+ return secureRequestCustomizer;
+ }
+
+ public void setSecureRequestCustomizer(
+ SecureRequestCustomizer secureRequestCustomizer) {
+ this.secureRequestCustomizer = secureRequestCustomizer;
+ }
+
public HeaderFilterStrategy getHeaderFilterStrategy() {
return headerFilterStrategy;
}
diff --git
a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConverter12.java
b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConverter12.java
index f901ab1b647..7b05e051ee1 100644
---
a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConverter12.java
+++
b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty12/springboot/JettyHttpComponentConverter12.java
@@ -44,6 +44,7 @@ public class JettyHttpComponentConverter12 implements
GenericConverter {
answer.add(new ConvertiblePair(String.class,
org.apache.camel.http.common.HttpBinding.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.http.common.HttpConfiguration.class));
answer.add(new ConvertiblePair(String.class,
org.eclipse.jetty.jmx.MBeanContainer.class));
+ answer.add(new ConvertiblePair(String.class,
org.eclipse.jetty.server.SecureRequestCustomizer.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.spi.HeaderFilterStrategy.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.support.jsse.SSLContextParameters.class));
return answer;
@@ -67,6 +68,7 @@ public class JettyHttpComponentConverter12 implements
GenericConverter {
case "org.apache.camel.http.common.HttpBinding": return
applicationContext.getBean(ref, org.apache.camel.http.common.HttpBinding.class);
case "org.apache.camel.http.common.HttpConfiguration": return
applicationContext.getBean(ref,
org.apache.camel.http.common.HttpConfiguration.class);
case "org.eclipse.jetty.jmx.MBeanContainer": return
applicationContext.getBean(ref, org.eclipse.jetty.jmx.MBeanContainer.class);
+ case "org.eclipse.jetty.server.SecureRequestCustomizer": return
applicationContext.getBean(ref,
org.eclipse.jetty.server.SecureRequestCustomizer.class);
case "org.apache.camel.spi.HeaderFilterStrategy": return
applicationContext.getBean(ref,
org.apache.camel.spi.HeaderFilterStrategy.class);
case "org.apache.camel.support.jsse.SSLContextParameters": return
applicationContext.getBean(ref,
org.apache.camel.support.jsse.SSLContextParameters.class);
}
