[camel] branch CAMEL-13947 updated: CAMEL-13947: PropertiesComponent should be a static service and resolved like other similar features.

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch CAMEL-13947
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/CAMEL-13947 by this push:
     new f0ab9d0  CAMEL-13947: PropertiesComponent should be a static service 
and resolved like other similar features.
f0ab9d0 is described below

commit f0ab9d078bda975964b5eed7f64df8460438f296
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Sep 26 13:34:07 2019 +0200

    CAMEL-13947: PropertiesComponent should be a static service and resolved 
like other similar features.
---
 .../src/main/java/org/apache/camel/spi/PropertiesComponent.java   | 8 --------
 .../camel/component/properties/DefaultPropertiesParser.java       | 4 ----
 2 files changed, 12 deletions(-)

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 fc937e4..72ec892 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
@@ -23,8 +23,6 @@ import java.util.function.Predicate;
 
 import org.apache.camel.StaticService;
 
-// TODO: Rename to PropertiesService
-
 /**
  * Component for property placeholders and loading properties from sources
  * (such as .properties file from classpath or file system)
@@ -42,12 +40,6 @@ public interface PropertiesComponent extends StaticService {
     String SUFFIX_TOKEN = "}}";
 
     /**
-     * Has the component been created as a default by {@link 
org.apache.camel.CamelContext} during starting up Camel.
-     */
-    @Deprecated
-    String DEFAULT_CREATED = "PropertiesComponentDefaultCreated";
-
-    /**
      * 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/component/properties/DefaultPropertiesParser.java
 
b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
index 972012a..a72e178 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
@@ -237,10 +237,6 @@ public class DefaultPropertiesParser implements 
PropertiesParser {
 
             if (value == null) {
                 StringBuilder esb = new StringBuilder();
-                if (propertiesComponent == null || 
"true".equals(propertiesComponent.getCamelContext().getGlobalOption(PropertiesComponent.DEFAULT_CREATED)))
 {
-                    // if the component was auto created then include more 
information that the end user should define it
-                    esb.append("PropertiesComponent with name properties must 
be defined in CamelContext to support property placeholders. ");
-                }
                 esb.append("Property with key [").append(key).append("] ");
                 esb.append("not found in properties from text: 
").append(input);
                 throw new IllegalArgumentException(esb.toString());