You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/02/27 09:53:17 UTC
[camel] 02/02: CAMEL-19090: Remove deprecated apis in core
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
commit 3e500bf13f3746b8174d7cb578df05a340c7511a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Feb 27 10:52:51 2023 +0100
CAMEL-19090: Remove deprecated apis in core
---
.../apache/camel/catalog/models/description.json | 3 +--
.../apache/camel/catalog/schemas/camel-spring.xsd | 20 +++------------
.../src/main/docs/modules/eips/nav.adoc | 2 --
.../main/docs/modules/eips/pages/inOnly-eip.adoc | 18 --------------
.../main/docs/modules/eips/pages/inOut-eip.adoc | 19 --------------
.../main/docs/modules/eips/pages/threads-eip.adoc | 3 +--
.../org/apache/camel/model/description.json | 3 +--
.../apache/camel/model/DescriptionDefinition.java | 19 +-------------
.../camel/model/OptionalIdentifiedDefinition.java | 29 ----------------------
.../apache/camel/model/rest/RestDefinition.java | 13 ----------
.../rest/FromRestIdAndDescriptionTest.java | 3 +--
.../org/apache/camel/model/GenerateXmlTest.java | 4 +--
.../mbean/ManagedBacklogDebuggerMBean.java | 21 ----------------
.../DefaultManagementLifecycleStrategy.java | 24 ------------------
.../management/ManagedManagementStrategy.java | 24 ------------------
.../management/mbean/ManagedBacklogDebugger.java | 15 -----------
.../java/org/apache/camel/xml/in/ModelParser.java | 9 ++-----
.../java/org/apache/camel/xml/out/ModelWriter.java | 1 -
.../ROOT/pages/camel-4-migration-guide.adoc | 2 ++
.../dsl/yaml/deserializers/ModelDeserializers.java | 10 +-------
.../generated/resources/schema/camel-yaml-dsl.json | 3 ---
.../generated/resources/schema/camelYamlDsl.json | 3 ---
22 files changed, 15 insertions(+), 233 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/description.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/description.json
index a5407750cf4..32b705a05e7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/description.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/description.json
@@ -12,7 +12,6 @@
"output": false
},
"properties": {
- "lang": { "kind": "attribute", "displayName": "Lang", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Language, such as en for english." },
- "text": { "kind": "value", "displayName": "Text", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The description as human readable text" }
+ "text": { "kind": "value", "displayName": "Text", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The description as human-readable text" }
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 0a6c78e736a..c51f68bd82d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -3270,25 +3270,11 @@ Sets the id of this node.
</xs:complexType>
- <xs:complexType name="descriptionDefinition">
+ <xs:simpleType name="descriptionDefinition">
- <xs:simpleContent>
-
- <xs:extension base="xs:string">
-
- <xs:attribute name="lang" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Deprecated: Language, such as en for english.
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- </xs:extension>
-
- </xs:simpleContent>
+ <xs:restriction base="xs:string"/>
- </xs:complexType>
+ </xs:simpleType>
<xs:complexType name="aggregateDefinition">
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc b/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
index 0a86a485130..c4ddc9384fd 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/nav.adoc
@@ -26,8 +26,6 @@
** xref:eips:from-eip.adoc[From]
** xref:eips:guaranteed-delivery.adoc[Guaranteed Delivery]
** xref:eips:idempotentConsumer-eip.adoc[Idempotent Consumer]
- ** xref:eips:inOnly-eip.adoc[In Only]
- ** xref:eips:inOut-eip.adoc[In Out]
** xref:eips:intercept.adoc[Intercept]
** xref:eips:kamelet-eip.adoc[Kamelet]
** xref:eips:loadBalance-eip.adoc[Load Balance]
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/inOnly-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/inOnly-eip.adoc
deleted file mode 100644
index 9826d1615f2..00000000000
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/inOnly-eip.adoc
+++ /dev/null
@@ -1,18 +0,0 @@
-= In Only EIP (deprecated)
-:doctitle: In Only
-:shortname: inOnly
-:description: Marks the exchange pattern for the route to one way
-:since:
-:supportlevel: Stable-deprecated
-:deprecated: *deprecated*
-
-The *inOnly:* EIP define an InOnly ExchangePattern.
-
-WARNING: inOnly is deprecated in Camel 3.x and removed in Camel 4 onwards.
-Use xref:event-message.adoc[setExchangePattern] instead.
-
-== EIP options
-
-// eip options: START
-include::partial$eip-options.adoc[]
-// eip options: END
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/inOut-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/inOut-eip.adoc
deleted file mode 100644
index 554ec9d563c..00000000000
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/inOut-eip.adoc
+++ /dev/null
@@ -1,19 +0,0 @@
-= In Out EIP (deprecated)
-:doctitle: In Out
-:shortname: inOut
-:description: Marks the exchange pattern for the route to request/reply
-:since:
-:supportlevel: Stable-deprecated
-:deprecated: *deprecated*
-
-The *inOut:* EIP define an InOut ExchangePattern.
-
-WARNING: inOut is deprecated in Camel 3.x and removed in Camel 4 onwards.
-Use xref:event-message.adoc[setExchangePattern] instead.
-
-
-== EIP options
-
-// eip options: START
-include::partial$eip-options.adoc[]
-// eip options: END
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/threads-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/threads-eip.adoc
index 707da76f77f..39ce56e5ee5 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/threads-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/threads-eip.adoc
@@ -97,8 +97,7 @@ behavior.
The `Abort` policy, means the task is rejected, and a
`RejectedExecutionException` is thrown.
-The other options `Discard` and `DiscardOldest`
-is *deprecated* and should not be used.
+IMPORTANT: The reject policy options `Discard` and `DiscardOldest` is deprecated in Camel 3.x and removed in Camel 4 onwards.
=== Default values
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/description.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/description.json
index a5407750cf4..32b705a05e7 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/description.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/description.json
@@ -12,7 +12,6 @@
"output": false
},
"properties": {
- "lang": { "kind": "attribute", "displayName": "Lang", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": true, "autowired": false, "secret": false, "description": "Language, such as en for english." },
- "text": { "kind": "value", "displayName": "Text", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The description as human readable text" }
+ "text": { "kind": "value", "displayName": "Text", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The description as human-readable text" }
}
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/DescriptionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/DescriptionDefinition.java
index a698c55ef0f..013c93a8919 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/DescriptionDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/DescriptionDefinition.java
@@ -32,10 +32,6 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class DescriptionDefinition {
- @XmlAttribute
- @Metadata(label = "advanced")
- @Deprecated
- private String lang;
@XmlValue
private String text;
@@ -46,25 +42,12 @@ public class DescriptionDefinition {
this.text = text;
}
- @Deprecated
- public String getLang() {
- return lang;
- }
-
- /**
- * Language, such as en for english.
- */
- @Deprecated
- public void setLang(String lang) {
- this.lang = lang;
- }
-
public String getText() {
return text;
}
/**
- * The description as human readable text
+ * The description as human-readable text
*/
public void setText(String text) {
this.text = text;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
index 5c55c3d80a3..1aa20b6d133 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
@@ -140,35 +140,6 @@ public abstract class OptionalIdentifiedDefinition<T extends OptionalIdentifiedD
return (T) this;
}
- /**
- * Sets the description of this node
- *
- * @param id sets the id, use null to not set an id
- * @param text sets the text description, use null to not set a text
- * @param lang sets the language for the description, use null to not set a language
- * @return the builder
- */
- @SuppressWarnings("unchecked")
- @Deprecated
- public T description(String id, String text, String lang) {
- if (id != null) {
- setId(id);
- }
- if (text != null) {
- if (description == null) {
- description = new DescriptionDefinition();
- }
- description.setText(text);
- }
- if (lang != null) {
- if (description == null) {
- description = new DescriptionDefinition();
- }
- description.setLang(lang);
- }
- return (T) this;
- }
-
/**
* Sets the id of this node.
* <p/>
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index 18779b3cf61..bcd4cd9615b 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -414,19 +414,6 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition>
return this;
}
- @Override
- public RestDefinition description(String id, String text, String lang) {
- if (getVerbs().isEmpty()) {
- super.description(id, text, lang);
- } else {
- // add on last verb as that is how the Java DSL works
- VerbDefinition verb = getVerbs().get(getVerbs().size() - 1);
- verb.description(id, text, lang);
- }
-
- return this;
- }
-
public RestDefinition consumes(String mediaType) {
if (getVerbs().isEmpty()) {
this.consumes = mediaType;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java
index 4fc77b4c78f..11c63bcdf9e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestIdAndDescriptionTest.java
@@ -41,7 +41,6 @@ public class FromRestIdAndDescriptionTest extends FromRestGetTest {
RestDefinition rest2 = context.getRestDefinitions().get(1);
assertEquals("bye", rest2.getId());
assertEquals("Bye Service", rest2.getDescriptionText());
- assertEquals("en", rest2.getDescription().getLang());
assertEquals("Says bye to you", rest2.getVerbs().get(0).getDescriptionText());
assertEquals("Updates the bye message", rest2.getVerbs().get(1).getDescriptionText());
@@ -58,7 +57,7 @@ public class FromRestIdAndDescriptionTest extends FromRestGetTest {
rest("/say/hello").id("hello").description("Hello Service").get().id("get-say").description("Says hello to you")
.to("direct:hello");
- rest("/say/bye").description("bye", "Bye Service", "en")
+ rest("/say/bye").id("bye").description("Bye Service")
.get().id("{{mySpecialId}}").description("Says bye to you")
.consumes("application/json").param().type(RestParamType.header)
.description("header param description1").dataType("integer").allowableValues("1", "2", "3", "4")
diff --git a/core/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java b/core/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java
index 802279a268e..e683f68b7dc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/model/GenerateXmlTest.java
@@ -35,7 +35,7 @@ public class GenerateXmlTest extends XmlTestSupport {
RouteDefinition route = context.route();
route.from("seda:a");
route.filter(new XQueryExpression("in.header.foo == 'bar'")).to("seda:b");
- route.description(null, "This is a description of the route", "en");
+ route.description("This is a description of the route");
dump(context);
}
@@ -45,7 +45,7 @@ public class GenerateXmlTest extends XmlTestSupport {
RouteDefinition route = context.route();
route.from("seda:a");
route.filter(new GroovyExpression("in.headers.any { h -> h.startsWith('foo') }")).to("seda:b");
- route.description(null, "This is a description of the route", "en");
+ route.description("This is a description of the route");
List<?> list = route.getOutputs();
assertEquals(1, list.size(), "Size of list: " + list);
diff --git a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java
index 57c2f7573e8..cd0cc910af4 100644
--- a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java
+++ b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java
@@ -89,23 +89,9 @@ public interface ManagedBacklogDebuggerMBean {
@ManagedOperation(description = "Steps to next node in step mode")
void step();
- /**
- * @deprecated use {@link #breakpoints()}
- */
- @ManagedOperation(description = "Return the node ids which has breakpoints")
- @Deprecated
- Set<String> getBreakpoints();
-
@ManagedOperation(description = "Return the node ids which has breakpoints")
Set<String> breakpoints();
- /**
- * @deprecated use {@link #suspendedBreakpointNodeIds()}
- */
- @ManagedOperation(description = "Return the node ids which is currently suspended")
- @Deprecated
- Set<String> getSuspendedBreakpointNodeIds();
-
@ManagedOperation(description = "Return the node ids which is currently suspended")
Set<String> suspendedBreakpointNodeIds();
@@ -139,13 +125,6 @@ public interface ManagedBacklogDebuggerMBean {
@ManagedAttribute(description = "Whether to include file based message body in the trace message.")
void setBodyIncludeFiles(boolean bodyIncludeFiles);
- /**
- * @deprecated use {@link #dumpTracedMessagesAsXml(String, boolean)}
- */
- @ManagedOperation(description = "Dumps the messages in xml format from the suspended breakpoint at the given node")
- @Deprecated
- String dumpTracedMessagesAsXml(String nodeId);
-
@ManagedOperation(description = "Dumps the messages in xml format from the suspended breakpoint at the given node, optionally including the exchange properties")
String dumpTracedMessagesAsXml(String nodeId, boolean includeExchangeProperties);
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
deleted file mode 100644
index dc758a65867..00000000000
--- a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.management;
-
-/**
- * @deprecated use JmxManagementLifecycleStrategy
- */
-@Deprecated
-public class DefaultManagementLifecycleStrategy extends JmxManagementLifecycleStrategy {
-}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
deleted file mode 100644
index 43e64d0d0a7..00000000000
--- a/core/camel-management/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.management;
-
-/**
- * @deprecated use {@link JmxManagementStrategy}
- */
-@Deprecated
-public class ManagedManagementStrategy extends JmxManagementStrategy {
-}
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
index a4a2d649b9e..891d3f1683e 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
@@ -121,11 +121,6 @@ public class ManagedBacklogDebugger implements ManagedBacklogDebuggerMBean {
backlogDebugger.removeAllBreakpoints();
}
- @Override
- public Set<String> getBreakpoints() {
- return breakpoints();
- }
-
@Override
public Set<String> breakpoints() {
return backlogDebugger.getBreakpoints();
@@ -200,11 +195,6 @@ public class ManagedBacklogDebugger implements ManagedBacklogDebuggerMBean {
backlogDebugger.step();
}
- @Override
- public Set<String> getSuspendedBreakpointNodeIds() {
- return suspendedBreakpointNodeIds();
- }
-
@Override
public Set<String> suspendedBreakpointNodeIds() {
return backlogDebugger.getSuspendedBreakpointNodeIds();
@@ -250,11 +240,6 @@ public class ManagedBacklogDebugger implements ManagedBacklogDebuggerMBean {
backlogDebugger.setBodyIncludeFiles(bodyIncludeFiles);
}
- @Override
- public String dumpTracedMessagesAsXml(String nodeId) {
- return dumpTracedMessagesAsXml(nodeId, false);
- }
-
@Override
public String dumpTracedMessagesAsXml(String nodeId, boolean includeExchangeProperties) {
String messageAsXml = backlogDebugger.dumpTracedMessagesAsXml(nodeId);
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index b3d6bd27bb8..ec3f3ecb43c 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -186,13 +186,8 @@ public class ModelParser extends BaseParser {
};
}
protected DescriptionDefinition doParseDescriptionDefinition() throws IOException, XmlPullParserException {
- return doParse(new DescriptionDefinition(), (def, key, val) -> {
- if ("lang".equals(key)) {
- def.setLang(val);
- return true;
- }
- return false;
- }, noElementHandler(), (def, val) -> def.setText(val));
+ return doParse(new DescriptionDefinition(),
+ noAttributeHandler(), noElementHandler(), (def, val) -> def.setText(val));
}
protected BeanDefinition doParseBeanDefinition() throws IOException, XmlPullParserException {
return doParse(new BeanDefinition(), (def, key, val) -> {
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
index dac620217fc..0a597421cb9 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
@@ -1181,7 +1181,6 @@ public class ModelWriter extends BaseWriter {
DescriptionDefinition def)
throws IOException {
startElement(name);
- doWriteAttribute("lang", def.getLang());
doWriteValue(def.getText());
endElement();
}
diff --git a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
index 514469aadc9..a8933c541fe 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
@@ -75,6 +75,8 @@ We have removed deprecated APIs such as the following:
== EIP Changes
+Removed `lang` attribute for the `<description>` on every EIPs.
+
The `InOnly` and `InOut` EIPs has been removed.
Instead, use `SetExchangePattern` or `To` where you can specify exchange pattern to use.
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index d2310da3ebe..00eeda7a617 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -4201,10 +4201,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
inline = true,
types = org.apache.camel.model.DescriptionDefinition.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
- properties = {
- @YamlProperty(name = "lang", type = "string", deprecated = true),
- @YamlProperty(name = "text", type = "string")
- }
+ properties = @YamlProperty(name = "text", type = "string")
)
public static class DescriptionDefinitionDeserializer extends YamlDeserializerBase<DescriptionDefinition> {
public DescriptionDefinitionDeserializer() {
@@ -4225,11 +4222,6 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
protected boolean setProperty(DescriptionDefinition target, String propertyKey,
String propertyName, Node node) {
switch(propertyKey) {
- case "lang": {
- String val = asText(node);
- target.setLang(val);
- break;
- }
case "text": {
String val = asText(node);
target.setText(val);
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
index 286fa0df97f..698dc036cc4 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
@@ -756,9 +756,6 @@
}, {
"type" : "object",
"properties" : {
- "lang" : {
- "type" : "string"
- },
"text" : {
"type" : "string"
}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index 6c44512e54b..be6f28b1129 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -669,9 +669,6 @@
}, {
"type" : "object",
"properties" : {
- "lang" : {
- "type" : "string"
- },
"text" : {
"type" : "string"
}