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/03/30 06:50:47 UTC
[camel] 01/02: CAMEL-19090: camel-core - Remove deprecated APIs
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 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
*