This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new adbd21b61b0 [create-pull-request] automated change adbd21b61b0 is described below commit adbd21b61b0a96e1e359a5186e0b35fca19305e5 Author: oscerd <osc...@users.noreply.github.com> AuthorDate: Thu Mar 23 01:14:22 2023 +0000 [create-pull-request] automated change --- .../apache/camel/springboot/catalog/components/jetty.json | 1 - .../camel-jetty-starter/src/main/docs/jetty.json | 6 ------ .../springboot/JettyHttpComponentConfiguration11.java | 15 --------------- .../jetty11/springboot/JettyHttpComponentConverter11.java | 2 -- 4 files changed, 24 deletions(-) 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 152baa08812..a05c1d9a035 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 @@ -42,7 +42,6 @@ "errorHandler": { "kind": "property", "displayName": "Error Handler", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.eclipse.jetty.server.handler.ErrorHandler", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "This option is used to set the ErrorHandler that Jetty server uses." }, "httpBinding": { "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": { "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." }, - "jettyHttpBinding": { "kind": "property", "displayName": "Jetty Http Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jetty.JettyHttpBinding", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which are used to customize how a response should be written for the producer." }, "mbContainer": { "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": { "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": { "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." }, 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 a6159129eba..0f64bd56cca 100644 --- a/components-starter/camel-jetty-starter/src/main/docs/jetty.json +++ b/components-starter/camel-jetty-starter/src/main/docs/jetty.json @@ -83,12 +83,6 @@ "description": "Jetty component does not use HttpConfiguration. The option is a org.apache.camel.http.common.HttpConfiguration type.", "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11" }, - { - "name": "camel.component.jetty.jetty-http-binding", - "type": "org.apache.camel.component.jetty.JettyHttpBinding", - "description": "To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which are used to customize how a response should be written for the producer. The option is a org.apache.camel.component.jetty.JettyHttpBinding type.", - "sourceType": "org.apache.camel.component.jetty11.springboot.JettyHttpComponentConfiguration11" - }, { "name": "camel.component.jetty.keystore", "type": "java.lang.String", diff --git a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConfiguration11.java b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConfiguration11.java index 357304218f4..a247ee1e2b3 100644 --- a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConfiguration11.java +++ b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConfiguration11.java @@ -17,7 +17,6 @@ package org.apache.camel.component.jetty11.springboot; import java.util.Map; -import org.apache.camel.component.jetty.JettyHttpBinding; import org.apache.camel.http.common.HttpBinding; import org.apache.camel.http.common.HttpConfiguration; import org.apache.camel.spi.HeaderFilterStrategy; @@ -154,12 +153,6 @@ public class JettyHttpComponentConfiguration11 * org.apache.camel.http.common.HttpConfiguration type. */ private HttpConfiguration httpConfiguration; - /** - * To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which - * are used to customize how a response should be written for the producer. - * The option is a org.apache.camel.component.jetty.JettyHttpBinding type. - */ - private JettyHttpBinding jettyHttpBinding; /** * To use a existing configured org.eclipse.jetty.jmx.MBeanContainer if JMX * is enabled that Jetty uses for registering mbeans. The option is a @@ -377,14 +370,6 @@ public class JettyHttpComponentConfiguration11 this.httpConfiguration = httpConfiguration; } - public JettyHttpBinding getJettyHttpBinding() { - return jettyHttpBinding; - } - - public void setJettyHttpBinding(JettyHttpBinding jettyHttpBinding) { - this.jettyHttpBinding = jettyHttpBinding; - } - public MBeanContainer getMbContainer() { return mbContainer; } diff --git a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConverter11.java b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConverter11.java index d4fe35ffe2b..680035ca8ee 100644 --- a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConverter11.java +++ b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty11/springboot/JettyHttpComponentConverter11.java @@ -43,7 +43,6 @@ public class JettyHttpComponentConverter11 implements GenericConverter { answer.add(new ConvertiblePair(String.class, org.eclipse.jetty.server.handler.ErrorHandler.class)); 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.apache.camel.component.jetty.JettyHttpBinding.class)); answer.add(new ConvertiblePair(String.class, org.eclipse.jetty.jmx.MBeanContainer.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)); @@ -67,7 +66,6 @@ public class JettyHttpComponentConverter11 implements GenericConverter { case "org.eclipse.jetty.server.handler.ErrorHandler": return applicationContext.getBean(ref, org.eclipse.jetty.server.handler.ErrorHandler.class); 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.apache.camel.component.jetty.JettyHttpBinding": return applicationContext.getBean(ref, org.apache.camel.component.jetty.JettyHttpBinding.class); case "org.eclipse.jetty.jmx.MBeanContainer": return applicationContext.getBean(ref, org.eclipse.jetty.jmx.MBeanContainer.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);