You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/03/30 07:33:50 UTC
[camel] branch main created (now 78a7dccddf5)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
at 78a7dccddf5 Regen for commit 7b5426af654a04744458d82f3758f5e4e0902097
This branch includes the following new commits:
new d1a230699a7 CAMEL-19090: camel-core - Remove deprecated APIs
new 66a44cbced8 CAMEL-19090: camel-core - Remove deprecated APIs
new e4414f26df1 removed unused variable in EntityParser CAMEL-19221 (#9700)
new 78a7dccddf5 Regen for commit 7b5426af654a04744458d82f3758f5e4e0902097
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/04: CAMEL-19090: camel-core - Remove deprecated APIs
Posted by ac...@apache.org.
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.git
commit d1a230699a7002dcdf34674033389c210c5a5880
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 30 08:43:20 2023 +0200
CAMEL-19090: camel-core - Remove deprecated APIs
---
.../src/main/java/org/apache/camel/CamelContext.java | 17 -----------------
.../apache/camel/impl/engine/SimpleCamelContext.java | 6 ------
.../java/org/apache/camel/impl/DefaultCamelContext.java | 9 ---------
.../apache/camel/impl/lw/LightweightCamelContext.java | 6 ------
.../camel/impl/lw/LightweightRuntimeCamelContext.java | 6 ------
.../src/main/java/org/apache/camel/model/Model.java | 12 ------------
6 files changed, 56 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index f0d5f028c6d..f3e81d9d7f2 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -627,23 +627,6 @@ public interface CamelContext extends CamelContextLifecycle, RuntimeConfiguratio
Map<String, Object> parameters)
throws Exception;
- /**
- * Adds a new route from a given route template.
- *
- * Camel end users should favour using {@link org.apache.camel.builder.TemplatedRouteBuilder} which is a fluent
- * builder with more functionality than this API.
- *
- * @param routeId the id of the new route to add (optional)
- * @param routeTemplateId the id of the route template (mandatory)
- * @param routeTemplateContext the route template context (mandatory)
- * @return the id of the route added (for example when an id was auto assigned)
- * @throws Exception is thrown if error creating and adding the new route
- * @deprecated use {@link #addRouteFromTemplate(String, String, String, RouteTemplateContext)}
- */
- @Deprecated
- String addRouteFromTemplate(String routeId, String routeTemplateId, RouteTemplateContext routeTemplateContext)
- throws Exception;
-
/**
* Adds a new route from a given route template.
*
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
index ee5df1e23c3..182a0552987 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
@@ -693,12 +693,6 @@ public class SimpleCamelContext extends AbstractCamelContext {
throw new UnsupportedOperationException();
}
- @Override
- public String addRouteFromTemplate(String routeId, String routeTemplateId, RouteTemplateContext routeTemplateContext)
- throws Exception {
- throw new UnsupportedOperationException();
- }
-
@Override
public String addRouteFromTemplate(
String routeId, String routeTemplateId, String prefixId, RouteTemplateContext routeTemplateContext)
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 05d4f790825..a800b7557f7 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -480,15 +480,6 @@ public class DefaultCamelContext extends SimpleCamelContext implements ModelCame
return model.addRouteFromTemplate(routeId, routeTemplateId, prefixId, parameters);
}
- @Override
- public String addRouteFromTemplate(String routeId, String routeTemplateId, RouteTemplateContext routeTemplateContext)
- throws Exception {
- if (model == null && isLightweight()) {
- throw new IllegalStateException("Access to model not supported in lightweight mode");
- }
- return model.addRouteFromTemplate(routeId, routeTemplateId, routeTemplateContext);
- }
-
@Override
public String addRouteFromTemplate(
String routeId, String routeTemplateId, String prefixId, RouteTemplateContext routeTemplateContext)
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
index 7c948278d95..aa6423fc0fb 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
@@ -1270,12 +1270,6 @@ public class LightweightCamelContext implements CamelContext, CatalogCamelContex
return getModelCamelContext().addRouteFromTemplate(routeId, routeTemplateId, prefixId, parameters);
}
- @Override
- public String addRouteFromTemplate(String routeId, String routeTemplateId, RouteTemplateContext routeTemplateContext)
- throws Exception {
- return getModelCamelContext().addRouteFromTemplate(routeId, routeTemplateId, routeTemplateContext);
- }
-
@Override
public String addRouteFromTemplate(
String routeId, String routeTemplateId, String prefixId, RouteTemplateContext routeTemplateContext)
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
index 31842e54e5e..4e2b0edddb0 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
@@ -1319,12 +1319,6 @@ public class LightweightRuntimeCamelContext implements CamelContext, CatalogCame
throw new UnsupportedOperationException();
}
- @Override
- public String addRouteFromTemplate(String routeId, String routeTemplateId, RouteTemplateContext routeTemplateContext)
- throws Exception {
- throw new UnsupportedOperationException();
- }
-
@Override
public String addRouteFromTemplate(
String routeId, String routeTemplateId, String prefixId, RouteTemplateContext routeTemplateContext)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/Model.java b/core/camel-core-model/src/main/java/org/apache/camel/model/Model.java
index a3148f46153..7008c586159 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/Model.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/Model.java
@@ -238,18 +238,6 @@ public interface Model {
Map<String, Object> parameters)
throws Exception;
- /**
- * Adds a new route from a given route template
- *
- * @param routeId the id of the new route to add (optional)
- * @param routeTemplateId the id of the route template (mandatory)
- * @param routeTemplateContext the route template context (mandatory)
- * @return the id of the route added (for example when an id was auto assigned)
- * @throws Exception is thrown if error creating and adding the new route
- */
- String addRouteFromTemplate(String routeId, String routeTemplateId, RouteTemplateContext routeTemplateContext)
- throws Exception;
-
/**
* Adds a new route from a given route template
*
[camel] 03/04: removed unused variable in EntityParser CAMEL-19221 (#9700)
Posted by ac...@apache.org.
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.git
commit e4414f26df1f4d6ba6c35d0fa70e763d0f21c1e4
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Thu Mar 30 09:52:14 2023 +0300
removed unused variable in EntityParser CAMEL-19221 (#9700)
Co-authored-by: dk2k <dk...@ya.ru>
---
.../java/org/apache/camel/component/as2/api/entity/EntityParser.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
index 605e15cce18..842596e5430 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
@@ -678,12 +678,9 @@ public final class EntityParser {
// Get Content-Type and Content-Transfer-Encoding
ContentType dispositionNotificationContentType = null;
- String dispositionNotificationContentTransferEncoding = null;
for (Header header : headers) {
if (header.getName().equalsIgnoreCase(AS2Header.CONTENT_TYPE)) {
dispositionNotificationContentType = ContentType.parse(header.getValue());
- } else if (header.getName().equalsIgnoreCase(AS2Header.CONTENT_TRANSFER_ENCODING)) {
- dispositionNotificationContentTransferEncoding = header.getValue();
}
}
if (dispositionNotificationContentType == null) {
[camel] 04/04: Regen for commit 7b5426af654a04744458d82f3758f5e4e0902097
Posted by ac...@apache.org.
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.git
commit 78a7dccddf58a3ef96c6b8e37aae9ced3dd96b4e
Author: oscerd <os...@users.noreply.github.com>
AuthorDate: Thu Mar 30 07:20:05 2023 +0000
Regen for commit 7b5426af654a04744458d82f3758f5e4e0902097
Signed-off-by: GitHub <no...@github.com>
---
.../resources/org/apache/camel/catalog/others.properties | 1 +
.../org/apache/camel/catalog/others/componentdsl.json | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index 2377361ba4b..ae3a8d69eeb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -4,6 +4,7 @@ cli-connector
cloud
cloudevents
cluster
+componentdsl
console
csimple-joor
debug
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
new file mode 100644
index 00000000000..3799e772735
--- /dev/null
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "componentdsl",
+ "title": "Java Component DSL",
+ "description": "The Camel Component DSL",
+ "deprecated": false,
+ "firstVersion": "3.1.0",
+ "label": "dsl",
+ "supportLevel": "Stable",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-componentdsl",
+ "version": "4.0.0-SNAPSHOT"
+ }
+}
[camel] 02/04: CAMEL-19090: camel-core - Remove deprecated APIs
Posted by ac...@apache.org.
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.git
commit 66a44cbced8bd515f6e43f119cb5b8764822e29d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 30 08:49:10 2023 +0200
CAMEL-19090: camel-core - Remove deprecated APIs
---
core/camel-api/src/main/java/org/apache/camel/CamelContext.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index f3e81d9d7f2..ed740e19aa7 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -604,9 +604,7 @@ public interface CamelContext extends CamelContextLifecycle, RuntimeConfiguratio
* @param parameters parameters to use for the route template when creating the new route
* @return the id of the route added (for example when an id was auto assigned)
* @throws Exception is thrown if error creating and adding the new route
- * @deprecated use {@link #addRouteFromTemplate(String, String, String, Map)}
*/
- @Deprecated
String addRouteFromTemplate(String routeId, String routeTemplateId, Map<String, Object> parameters) throws Exception;
/**