Repository: camel Updated Branches: refs/heads/master cd7b6d2ca -> dba22f93a
accepted secs as well for seconds based on unittest in catalog Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dba22f93 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dba22f93 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dba22f93 Branch: refs/heads/master Commit: dba22f93ad9f063fb4226e38e3732b5fe62f2fc9 Parents: 5bd87e8 Author: Arno Noordover <a...@noordover.net> Authored: Mon May 23 16:35:01 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon May 23 17:21:24 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/converter/TimePatternConverter.java | 2 +- .../apache/camel/converter/TimePatternConverterTest.java | 11 +++++++++++ .../org/apache/camel/catalog/TimePatternConverter.java | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dba22f93/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java b/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java index d70275e..ffc061a 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java @@ -33,7 +33,7 @@ public final class TimePatternConverter { private static final String NUMBERS_ONLY_STRING_PATTERN = "^[-]?(\\d)+$"; private static final String HOUR_REGEX_PATTERN = "((\\d)*(\\d))h(our(s)?)?"; private static final String MINUTES_REGEX_PATTERN = "((\\d)*(\\d))m(in(ute(s)?)?)?"; - private static final String SECONDS_REGEX_PATTERN = "((\\d)*(\\d))s(ec(ond(s)?)?)?"; + private static final String SECONDS_REGEX_PATTERN = "((\\d)*(\\d))s(ec(ond)?(s)?)?"; /** * Utility classes should not have a public constructor. http://git-wip-us.apache.org/repos/asf/camel/blob/dba22f93/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java index 3ef82c8..4e6ef9a 100644 --- a/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java +++ b/camel-core/src/test/java/org/apache/camel/converter/TimePatternConverterTest.java @@ -47,6 +47,12 @@ public class TimePatternConverterTest extends ContextTestSupport { assertEquals(35000, milliseconds); } + public void testSecsTimePattern() throws Exception { + String source = "35secs"; + long milliseconds = TimePatternConverter.toMilliSeconds(source); + assertEquals(35000, milliseconds); + } + public void testSecondTimePattern() throws Exception { String source = "35second"; long milliseconds = TimePatternConverter.toMilliSeconds(source); @@ -206,6 +212,11 @@ public class TimePatternConverterTest extends ContextTestSupport { checkForIllegalArgument(source, "Illegal characters: " + source); } + public void testSsCharacters() throws Exception { + String source = "5ss"; + checkForIllegalArgument(source, "Illegal characters: " + source); + } + private void checkForIllegalArgument(String source, String expectedMessage) { try { TimePatternConverter.toMilliSeconds(source); http://git-wip-us.apache.org/repos/asf/camel/blob/dba22f93/platforms/catalog/src/main/java/org/apache/camel/catalog/TimePatternConverter.java ---------------------------------------------------------------------- diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/TimePatternConverter.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/TimePatternConverter.java index 659b441..3f08d45 100644 --- a/platforms/catalog/src/main/java/org/apache/camel/catalog/TimePatternConverter.java +++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/TimePatternConverter.java @@ -26,7 +26,7 @@ public final class TimePatternConverter { private static final String NUMBERS_ONLY_STRING_PATTERN = "^[-]?(\\d)+$"; private static final String HOUR_REGEX_PATTERN = "((\\d)*(\\d))h(our(s)?)?"; private static final String MINUTES_REGEX_PATTERN = "((\\d)*(\\d))m(in(ute(s)?)?)?"; - private static final String SECONDS_REGEX_PATTERN = "((\\d)*(\\d))s(ec(ond(s)?)?)?"; + private static final String SECONDS_REGEX_PATTERN = "((\\d)*(\\d))s(ec(ond)?(s)?)?"; /** * Utility classes should not have a public constructor.
