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 2019/07/18 19:13:33 UTC
[camel] 01/02: CAMEL-13760: camel3 - Remove configuring prefix and
suffix token on property placeholder as it clashes and causes problems such
as with simple language, and potentially elsewhere.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13760
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 313cfaee46bf2966adfbae5852b9854553b33e81
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 18 21:06:31 2019 +0200
CAMEL-13760: camel3 - Remove configuring prefix and suffix token on property placeholder as it clashes and causes problems such as with simple language, and potentially elsewhere.
---
.../main/java/org/apache/camel/CamelContext.java | 18 ------------------
.../org/apache/camel/spi/PropertiesComponent.java | 14 --------------
.../camel/impl/engine/AbstractCamelContext.java | 22 ----------------------
3 files changed, 54 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 d2db232..05a2be9 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
@@ -738,24 +738,6 @@ public interface CamelContext extends StatefulService, RuntimeConfiguration {
String resolvePropertyPlaceholders(String text);
/**
- * Returns the configured property placeholder prefix token if and only if the CamelContext has
- * property placeholder abilities, otherwise returns {@code null}.
- *
- * @return the prefix token or {@code null}
- */
- @Deprecated
- String getPropertyPrefixToken();
-
- /**
- * Returns the configured property placeholder suffix token if and only if the CamelContext has
- * property placeholder abilities, otherwise returns {@code null}.
- *
- * @return the suffix token or {@code null}
- */
- @Deprecated
- String getPropertySuffixToken();
-
- /**
* Returns the configured properties component or create one if none has been configured.
*
* @return the properties component
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
index 247c6b1..b063778 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
@@ -45,20 +45,6 @@ public interface PropertiesComponent extends Component, StaticService {
String DEFAULT_CREATED = "PropertiesComponentDefaultCreated";
/**
- * The value of the prefix token used to identify properties to replace.
- * Is default {@link #PREFIX_TOKEN}
- */
- @Deprecated
- String getPrefixToken();
-
- /**
- * The value of the suffix token used to identify properties to replace.
- * Is default {@link #SUFFIX_TOKEN}
- */
- @Deprecated
- String getSuffixToken();
-
- /**
* Parses the input text and resolve all property placeholders from within the text.
*
* @param uri input text
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 583bb8f..4350919 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -1637,28 +1637,6 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
return answer;
}
- @Deprecated
- public String getPropertyPrefixToken() {
- PropertiesComponent pc = getPropertiesComponent(false);
-
- if (pc != null) {
- return pc.getPrefixToken();
- } else {
- return null;
- }
- }
-
- @Deprecated
- public String getPropertySuffixToken() {
- PropertiesComponent pc = getPropertiesComponent(false);
-
- if (pc != null) {
- return pc.getSuffixToken();
- } else {
- return null;
- }
- }
-
public String resolvePropertyPlaceholders(String text) {
// While it is more efficient to only do the lookup if we are sure we
// need the component,