Repository: camel Updated Branches: refs/heads/master 273c30d4e -> 9209bab5a
CAMEL-9307: Remove unnecessary call to setCamelContext when adding a component by name Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9209bab5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9209bab5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9209bab5 Branch: refs/heads/master Commit: 9209bab5a8da7960e4f3102ecc54e13cb6eb7bb0 Parents: 273c30d Author: Antonin Stefanutti <anto...@stefanutti.fr> Authored: Tue Nov 10 16:09:57 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Nov 11 08:02:15 2015 +0100 ---------------------------------------------------------------------- .../properties/PropertiesComponentEIPChoiceConvertBodyToTest.java | 1 - .../properties/PropertiesComponentEIPChoiceSimpleTest.java | 1 - .../properties/PropertiesComponentEIPConvertBodyToTest.java | 1 - .../component/properties/PropertiesComponentEIPRoutingSlipTest.java | 1 - .../properties/PropertiesComponentLoadPropertiesFromFileTest.java | 1 - .../PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java | 1 - .../properties/PropertiesComponentOnExceptionDelayPatternTest.java | 1 - .../component/properties/PropertiesComponentOnExceptionTest.java | 1 - .../camel/component/properties/PropertiesComponentRefTest.java | 1 - .../camel/component/properties/PropertiesComponentRegistryTest.java | 1 - .../properties/PropertiesComponentSetHeaderSimpleTest.java | 1 - .../component/properties/PropertiesComponentSimpleLanguageTest.java | 1 - .../properties/PropertiesEnvironmentVariableOverrideTest.java | 1 - .../apache/camel/component/properties/PropertiesResolverTest.java | 1 - .../apache/camel/language/simple/SimplePropertiesNestedTest.java | 1 - .../org/apache/camel/language/simple/SimpleWithPropertiesTest.java | 1 - .../java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java | 1 - .../org/apache/camel/component/mail/MailUsingOwnComponentTest.java | 1 - 18 files changed, 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceConvertBodyToTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceConvertBodyToTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceConvertBodyToTest.java index 6c58d87..e3dcf3d 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceConvertBodyToTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceConvertBodyToTest.java @@ -68,7 +68,6 @@ public class PropertiesComponentEIPChoiceConvertBodyToTest extends ContextTestSu CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocations(new String[]{"classpath:org/apache/camel/component/properties/myproperties.properties"}); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceSimpleTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceSimpleTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceSimpleTest.java index 77f97b5..91c4347 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceSimpleTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPChoiceSimpleTest.java @@ -55,7 +55,6 @@ public class PropertiesComponentEIPChoiceSimpleTest extends ContextTestSupport { CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocations(new String[]{"classpath:org/apache/camel/component/properties/myproperties.properties"}); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPConvertBodyToTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPConvertBodyToTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPConvertBodyToTest.java index 6fde782..04443d1 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPConvertBodyToTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPConvertBodyToTest.java @@ -54,7 +54,6 @@ public class PropertiesComponentEIPConvertBodyToTest extends ContextTestSupport CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocations(new String[]{"classpath:org/apache/camel/component/properties/myproperties.properties"}); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPRoutingSlipTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPRoutingSlipTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPRoutingSlipTest.java index 744274e..84d5582 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPRoutingSlipTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEIPRoutingSlipTest.java @@ -50,7 +50,6 @@ public class PropertiesComponentEIPRoutingSlipTest extends ContextTestSupport { CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocations(new String[]{"classpath:org/apache/camel/component/properties/myproperties.properties"}); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTest.java index b7c0c1f..3c1dad2 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTest.java @@ -31,7 +31,6 @@ public class PropertiesComponentLoadPropertiesFromFileTest extends PropertiesCom context.removeComponent("properties"); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocations(new String[]{"file:./src/test/resources/org/apache/camel/component/properties/myproperties.properties"}); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java index d578181..8b12ac7 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java @@ -57,7 +57,6 @@ public class PropertiesComponentLoadPropertiesFromFileTrimValuesTest extends Con fos.close(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocation("file:target/space/space.properties"); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentOnExceptionDelayPatternTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentOnExceptionDelayPatternTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentOnExceptionDelayPatternTest.java index b812f77..6716489 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentOnExceptionDelayPatternTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentOnExceptionDelayPatternTest.java @@ -55,7 +55,6 @@ public class PropertiesComponentOnExceptionDelayPatternTest extends ContextTestS CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocations(new String[]{"classpath:org/apache/camel/component/properties/myproperties.properties"}); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentOnExceptionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentOnExceptionTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentOnExceptionTest.java index 3883fb8..cf4c2ce 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentOnExceptionTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentOnExceptionTest.java @@ -79,7 +79,6 @@ public class PropertiesComponentOnExceptionTest extends ContextTestSupport { CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocations(new String[]{"ref:myprop"}); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRefTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRefTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRefTest.java index f9f2e4a..58d937b 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRefTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRefTest.java @@ -88,7 +88,6 @@ public class PropertiesComponentRefTest extends ContextTestSupport { CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocations(new String[]{"ref:myCoolProperties"}); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRegistryTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRegistryTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRegistryTest.java index 3ceec8a..eafd8e2 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRegistryTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRegistryTest.java @@ -52,7 +52,6 @@ public class PropertiesComponentRegistryTest extends ContextTestSupport { CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocation("classpath:org/apache/camel/component/properties/cheese.properties"); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSetHeaderSimpleTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSetHeaderSimpleTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSetHeaderSimpleTest.java index 3595f98..2dcd59b 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSetHeaderSimpleTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSetHeaderSimpleTest.java @@ -38,7 +38,6 @@ public class PropertiesComponentSetHeaderSimpleTest extends ContextTestSupport { CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocation("classpath:org/apache/camel/component/properties/cheese.properties"); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSimpleLanguageTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSimpleLanguageTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSimpleLanguageTest.java index 80ed133..fd85774 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSimpleLanguageTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSimpleLanguageTest.java @@ -131,7 +131,6 @@ public class PropertiesComponentSimpleLanguageTest extends ContextTestSupport { CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocation("classpath:org/apache/camel/component/properties/cheese.properties"); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java index ddf8fa6..3e1b795 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java @@ -63,7 +63,6 @@ public class PropertiesEnvironmentVariableOverrideTest extends ContextTestSuppor CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocations(new String[]{"classpath:org/apache/camel/component/properties/myproperties.properties"}); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesResolverTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesResolverTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesResolverTest.java index cfae41c..8d2b89a 100644 --- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesResolverTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesResolverTest.java @@ -54,7 +54,6 @@ public class PropertiesResolverTest extends ContextTestSupport { CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocation("foo"); pc.setPropertiesResolver(new MyCustomResolver()); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/language/simple/SimplePropertiesNestedTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimplePropertiesNestedTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimplePropertiesNestedTest.java index 782a96a..d3175bf 100644 --- a/camel-core/src/test/java/org/apache/camel/language/simple/SimplePropertiesNestedTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimplePropertiesNestedTest.java @@ -55,7 +55,6 @@ public class SimplePropertiesNestedTest extends ContextTestSupport { CamelContext context = super.createCamelContext(); PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); pc.setLocations(new String[]{"org/apache/camel/component/properties/bar.properties"}); context.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/language/simple/SimpleWithPropertiesTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleWithPropertiesTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleWithPropertiesTest.java index 19b2d07..8c8fd2c 100644 --- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleWithPropertiesTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleWithPropertiesTest.java @@ -41,7 +41,6 @@ public class SimpleWithPropertiesTest { System.setProperty("test", "testValue"); PropertiesComponent pc = new PropertiesComponent(); CamelContext context = new DefaultCamelContext(); - pc.setCamelContext(context); context.addComponent("properties", pc); // try to setup the property http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java index dec46f8..c0c25d7 100644 --- a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java +++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlPlaceholdersTest.java @@ -53,7 +53,6 @@ public class DumpModelAsXmlPlaceholdersTest extends ContextTestSupport { protected CamelContext createCamelContext() throws Exception { CamelContext context = super.createCamelContext(); PropertiesComponent component = new PropertiesComponent(); - component.setCamelContext(context); component.setLocation("classpath:org/apache/camel/component/properties/cheese.properties"); context.addComponent("properties", component); return context; http://git-wip-us.apache.org/repos/asf/camel/blob/9209bab5/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java index c3dfaaa..af4c706 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingOwnComponentTest.java @@ -47,7 +47,6 @@ public class MailUsingOwnComponentTest extends CamelTestSupport { MailComponent myMailbox = new MailComponent(); myMailbox.setConfiguration(config); - myMailbox.setCamelContext(context); context.addComponent("mailbox", myMailbox);
