[camel] branch master updated: CAMEL-14671: Make PropertiesFunction part of the PropertiesComponent SPI

[davsclaus]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 3f3c15e  CAMEL-14671: Make PropertiesFunction part of the 
PropertiesComponent SPI
3f3c15e is described below

commit 3f3c15eb403ccb197586ebc04027626c2aadc8b2
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Mar 15 14:57:59 2020 +0100

    CAMEL-14671: Make PropertiesFunction part of the PropertiesComponent SPI
---
 .../camel/test/testcontainers/junit5/ContainerAwareTestSupport.java | 6 +++---
 .../test/testcontainers/junit5/ContainerPropertiesFunction.java     | 2 +-
 .../spring/junit5/ContainerAwareSpringTestSupport.java              | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupport.java
 
b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupport.java
index 3c4a13a..924e83c 100644
--- 
a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupport.java
+++ 
b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerAwareTestSupport.java
@@ -22,7 +22,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.component.properties.PropertiesComponent;
+import org.apache.camel.spi.PropertiesComponent;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
@@ -57,9 +57,9 @@ public class ContainerAwareTestSupport extends 
CamelTestSupport {
     @Override
     protected CamelContext createCamelContext() throws Exception {
         final CamelContext context = super.createCamelContext();
-        final PropertiesComponent pc = 
(PropertiesComponent)context.getPropertiesComponent();
+        final PropertiesComponent pc = context.getPropertiesComponent();
 
-        pc.addFunction(new ContainerPropertiesFunction(containers));
+        pc.addPropertiesFunction(new ContainerPropertiesFunction(containers));
 
         return context;
     }
diff --git 
a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerPropertiesFunction.java
 
b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerPropertiesFunction.java
index cb2862c..aa6cdda 100644
--- 
a/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerPropertiesFunction.java
+++ 
b/components/camel-testcontainers-junit5/src/main/java/org/apache/camel/test/testcontainers/junit5/ContainerPropertiesFunction.java
@@ -18,7 +18,7 @@ package org.apache.camel.test.testcontainers.junit5;
 
 import java.util.List;
 
-import org.apache.camel.component.properties.PropertiesFunction;
+import org.apache.camel.spi.PropertiesFunction;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.StringHelper;
 import org.testcontainers.containers.GenericContainer;
diff --git 
a/components/camel-testcontainers-spring-junit5/src/main/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupport.java
 
b/components/camel-testcontainers-spring-junit5/src/main/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupport.java
index 7d8630c..528694d 100644
--- 
a/components/camel-testcontainers-spring-junit5/src/main/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupport.java
+++ 
b/components/camel-testcontainers-spring-junit5/src/main/java/org/apache/camel/test/testcontainers/spring/junit5/ContainerAwareSpringTestSupport.java
@@ -22,7 +22,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.component.properties.PropertiesComponent;
+import org.apache.camel.spi.PropertiesComponent;
 import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
 import org.apache.camel.test.testcontainers.junit5.ContainerPropertiesFunction;
 import org.apache.camel.test.testcontainers.junit5.Containers;
@@ -59,9 +59,9 @@ public abstract class ContainerAwareSpringTestSupport extends 
CamelSpringTestSup
     @Override
     protected CamelContext createCamelContext() throws Exception {
         final CamelContext context = super.createCamelContext();
-        final PropertiesComponent pc = 
(PropertiesComponent)context.getPropertiesComponent();
+        final PropertiesComponent pc = context.getPropertiesComponent();
 
-        pc.addFunction(new ContainerPropertiesFunction(containers));
+        pc.addPropertiesFunction(new ContainerPropertiesFunction(containers));
 
         return context;
     }