Repository: camel Updated Branches: refs/heads/master a9095b9d0 -> 3bb1039a9
Fix tests failures Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3bb1039a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3bb1039a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3bb1039a Branch: refs/heads/master Commit: 3bb1039a9734f3301eceabd624ac823b3e31aa6f Parents: 47163cd Author: lburgazzoli <lburgazz...@gmail.com> Authored: Wed Feb 8 13:36:19 2017 +0100 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Wed Feb 8 13:36:57 2017 +0100 ---------------------------------------------------------------------- .../camel/component/telegram/TelegramComponent.java | 5 ++++- .../telegram/TelegramComponentParametersTest.java | 16 ++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3bb1039a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java index 07d5d6e..3f1fe2d 100644 --- a/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java +++ b/components/camel-telegram/src/main/java/org/apache/camel/component/telegram/TelegramComponent.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.spi.Metadata; +import org.apache.camel.util.ObjectHelper; /** * The Camel component for Telegram. @@ -38,7 +39,9 @@ public class TelegramComponent extends UriEndpointComponent { protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { TelegramConfiguration configuration = new TelegramConfiguration(); setProperties(configuration, parameters); - configuration.updatePathConfig(remaining, this.getAuthorizationToken()); + if (ObjectHelper.isNotEmpty(remaining)) { + configuration.updatePathConfig(remaining, this.getAuthorizationToken()); + } if (TelegramConfiguration.ENDPOINT_TYPE_BOTS.equals(configuration.getType())) { return new TelegramEndpoint(uri, this, configuration); http://git-wip-us.apache.org/repos/asf/camel/blob/3bb1039a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java ---------------------------------------------------------------------- diff --git a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java index 1d7c63f..d712f17 100644 --- a/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java +++ b/components/camel-telegram/src/test/java/org/apache/camel/component/telegram/TelegramComponentParametersTest.java @@ -23,44 +23,40 @@ import org.junit.Test; * Tests the usage of defaults in the component configuration */ public class TelegramComponentParametersTest extends TelegramTestSupport { - @Test public void testDefaultsAndOverrides() throws Exception { - TelegramComponent component = (TelegramComponent) context().getComponent("telegram"); - component.setAuthorizationToken("DEFAULT"); - TelegramEndpoint ep1 = (TelegramEndpoint) component.createEndpoint("bots"); + TelegramEndpoint ep1 = (TelegramEndpoint) component.createEndpoint("telegram:bots"); assertEquals("DEFAULT", ep1.getConfiguration().getAuthorizationToken()); - TelegramEndpoint ep2 = (TelegramEndpoint) component.createEndpoint("bots/CUSTOM"); + TelegramEndpoint ep2 = (TelegramEndpoint) component.createEndpoint("telegram:bots/CUSTOM"); assertEquals("CUSTOM", ep2.getConfiguration().getAuthorizationToken()); - TelegramEndpoint ep3 = (TelegramEndpoint) component.createEndpoint("bots/ANOTHER?chatId=123"); + TelegramEndpoint ep3 = (TelegramEndpoint) component.createEndpoint("telegram:bots/ANOTHER?chatId=123"); assertEquals("ANOTHER", ep3.getConfiguration().getAuthorizationToken()); - } @Test(expected = IllegalArgumentException.class) public void testNonDefaultConfig() throws Exception { TelegramComponent component = (TelegramComponent) context().getComponent("telegram"); component.setAuthorizationToken(null); - component.createEndpoint("bots"); + component.createEndpoint("telegram:bots"); } @Test(expected = IllegalArgumentException.class) public void testWrongURI1() throws Exception { TelegramComponent component = (TelegramComponent) context().getComponent("telegram"); component.setAuthorizationToken("ANY"); - component.createEndpoint("bots/ "); + component.createEndpoint("telegram:bots/ "); } @Test(expected = IllegalArgumentException.class) public void testWrongURI2() throws Exception { TelegramComponent component = (TelegramComponent) context().getComponent("telegram"); component.setAuthorizationToken("ANY"); - component.createEndpoint("bots/token/s"); + component.createEndpoint("telegram:bots/token/s"); } }
