[camel] 05/30: CAMEL-13708: Properties component polished API

[davsclaus]

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

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

commit 9ee07ff9a587b0620238f6ebefa1917e158b6efc
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jul 3 06:51:28 2019 +0200

    CAMEL-13708: Properties component polished API
---
 .../org/apache/camel/component/properties/PropertiesResolver.java    | 2 ++
 .../src/main/java/org/apache/camel/spi/PropertiesComponent.java      | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesResolver.java
 
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesResolver.java
index aa28883..f6f9399 100644
--- 
a/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesResolver.java
+++ 
b/components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesResolver.java
@@ -26,6 +26,7 @@ import org.apache.camel.CamelContext;
  * <p/>
  * Implementations can also load properties from another source source as JNDI.
  */
+@Deprecated
 public interface PropertiesResolver {
 
     /**
@@ -37,5 +38,6 @@ public interface PropertiesResolver {
      * @return the properties
      * @throws java.io.IOError is thrown if resolving the properties failed
      */
+    @Deprecated
     Properties resolveProperties(CamelContext context, boolean 
ignoreMissingLocation, List<PropertiesLocation> locations);
 }
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 c88f72d..d325270 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,6 +23,8 @@ import org.apache.camel.Component;
 
 public interface PropertiesComponent extends Component {
 
+    // TODO: addPropertiesSource to make it easier to add custom sources
+
     /**
      * The default prefix token.
      */
@@ -59,6 +61,7 @@ public interface PropertiesComponent extends Component {
      * @return text with resolved property placeholders
      * @throws IllegalArgumentException is thrown if error during parsing
      */
+    @Deprecated
     String parseUri(String uri, String... locations);
 
     /**
@@ -76,6 +79,7 @@ public interface PropertiesComponent extends Component {
      * @return the properties loaded.
      * @throws IOError is thrown if error loading properties
      */
+    @Deprecated
     Properties loadProperties(String... locations);
 
     /**
@@ -87,7 +91,6 @@ public interface PropertiesComponent extends Component {
     /**
      * Adds the list of locations to the current locations, where to load 
properties.
      * You can use comma to separate multiple locations.
-     * This option will override any default locations and only use the 
locations from this option.
      */
     void addLocation(String location);