Repository: nifi Updated Branches: refs/heads/master 3d1a24ab7 -> 7bc7b7f68
NIFI-2584 Fixing date format in PutSQL This closes #878. Signed-off-by: Bryan Bende <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7bc7b7f6 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7bc7b7f6 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7bc7b7f6 Branch: refs/heads/master Commit: 7bc7b7f6836b44403d525f089bc6f610f9b3802e Parents: 3d1a24a Author: Peter Wicks <[email protected]> Authored: Tue Aug 16 19:16:44 2016 -0600 Committer: Bryan Bende <[email protected]> Committed: Wed Aug 17 16:10:56 2016 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/processors/standard/PutSQL.java | 2 +- .../java/org/apache/nifi/processors/standard/TestPutSQL.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/7bc7b7f6/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java index 55d3855..910112e 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java @@ -779,7 +779,7 @@ public class PutSQL extends AbstractProcessor { if(LONG_PATTERN.matcher(parameterValue).matches()){ lTimestamp = Long.parseLong(parameterValue); }else { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); java.util.Date parsedDate = dateFormat.parse(parameterValue); lTimestamp = parsedDate.getTime(); } http://git-wip-us.apache.org/repos/asf/nifi/blob/7bc7b7f6/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutSQL.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutSQL.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutSQL.java index 592d329..533961c 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutSQL.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutSQL.java @@ -276,9 +276,9 @@ public class TestPutSQL { runner.enableControllerService(service); runner.setProperty(PutSQL.CONNECTION_POOL, "dbcp"); - final String arg2TS = "2001-01-01 23:01:01.001"; - final String art3TS = "2002-02-02 22:02:02.002"; - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS"); + final String arg2TS = "2001-01-01 00:01:01.001"; + final String art3TS = "2002-02-02 12:02:02.002"; + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); java.util.Date parsedDate = dateFormat.parse(arg2TS); final Map<String, String> attributes = new HashMap<>();
