Repository: nifi Updated Branches: refs/heads/master 9238fdb49 -> fb925fc18
NIFI-3867: Fixed issue with getConnectionURL in HiveConnectionPool using Expression Language Signed-off-by: Pierre Villard <[email protected]> This closes #1847. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/fb925fc1 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/fb925fc1 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/fb925fc1 Branch: refs/heads/master Commit: fb925fc182c78cdb31c699c203657ac55ec774a9 Parents: 9238fdb Author: Matt Burgess <[email protected]> Authored: Tue May 23 15:21:10 2017 -0400 Committer: Pierre Villard <[email protected]> Committed: Tue May 23 21:28:59 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java | 6 ++---- .../java/org/apache/nifi/dbcp/hive/HiveConnectionPoolTest.java | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/fb925fc1/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java index c3724c3..bdf2f10 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java @@ -213,8 +213,6 @@ public class HiveConnectionPool extends AbstractControllerService implements Hiv @OnEnabled public void onConfigured(final ConfigurationContext context) throws InitializationException { - connectionUrl = context.getProperty(DATABASE_URL).getValue(); - ComponentLog log = getLogger(); final String configFiles = context.getProperty(HIVE_CONFIGURATION_RESOURCES).evaluateAttributeExpressions().getValue(); @@ -251,7 +249,7 @@ public class HiveConnectionPool extends AbstractControllerService implements Hiv dataSource = new BasicDataSource(); dataSource.setDriverClassName(drv); - final String dburl = context.getProperty(DATABASE_URL).evaluateAttributeExpressions().getValue(); + connectionUrl = context.getProperty(DATABASE_URL).evaluateAttributeExpressions().getValue(); dataSource.setMaxWait(maxWaitMillis); dataSource.setMaxActive(maxTotal); @@ -261,7 +259,7 @@ public class HiveConnectionPool extends AbstractControllerService implements Hiv dataSource.setTestOnBorrow(true); } - dataSource.setUrl(dburl); + dataSource.setUrl(connectionUrl); dataSource.setUsername(user); dataSource.setPassword(passw); } http://git-wip-us.apache.org/repos/asf/nifi/blob/fb925fc1/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/dbcp/hive/HiveConnectionPoolTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/dbcp/hive/HiveConnectionPoolTest.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/dbcp/hive/HiveConnectionPoolTest.java index 79bcb7a..96dfb4f 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/dbcp/hive/HiveConnectionPoolTest.java +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/dbcp/hive/HiveConnectionPoolTest.java @@ -133,5 +133,6 @@ public class HiveConnectionPoolTest { assertEquals(PASS, basicDataSource.getPassword()); assertEquals(MAX_CONN, basicDataSource.getMaxActive()); assertEquals(10000L, basicDataSource.getMaxWait()); + assertEquals(URL, hiveConnectionPool.getConnectionURL()); } }
