NIFI-5579: Incorporated review comments

apache · Feb 11, 2025 · 0eca2c7 · 0eca2c7
1 parent 41f9f37
commit 0eca2c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 25 deletions.
diff --git a/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml b/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml
@@ -67,12 +67,6 @@
             <artifactId>nifi-record</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-dbcp-service</artifactId>
-            <version>2.3.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-mock-record-utils</artifactId>

diff --git a/...-processors/src/test/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScriptTest.java b/...-processors/src/test/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScriptTest.java
@@ -20,7 +20,6 @@
 import groovy.json.JsonSlurper;
 import org.apache.commons.io.FileUtils;
 import org.apache.nifi.controller.AbstractControllerService;
-import org.apache.nifi.dbcp.DBCPConnectionPoolLookup;
 import org.apache.nifi.dbcp.DBCPService;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.serialization.RecordSetWriterFactory;
@@ -70,7 +69,6 @@ public class ExecuteGroovyScriptTest {
 
     protected TestRunner runner;
     protected static DBCPService dbcp = null;  //to make single initialization
-    protected static MockDBCPConnectionPoolLookup dbcpServiceLookup = new MockDBCPConnectionPoolLookup();
     protected MockRecordParser recordParser = null;
     protected RecordSetWriterFactory recordWriter = null;
     protected ExecuteGroovyScript proc;
@@ -135,10 +133,6 @@ public void setup() throws Exception {
         runner.addControllerService("dbcp", dbcp, new HashMap<>());
         runner.enableControllerService(dbcp);
 
-        runner.addControllerService("dbcpLookup", dbcpServiceLookup, new HashMap<>());
-        runner.setProperty(dbcpServiceLookup, "testDB", "dbcp");
-        runner.enableControllerService(dbcpServiceLookup);
-
         List<RecordField> recordFields = Arrays.asList(
                 new RecordField("id", RecordFieldType.INT.getDataType()),
                 new RecordField("name", RecordFieldType.STRING.getDataType()),
@@ -554,12 +548,11 @@ public void test_onUnscheduled() {
     public void test_attribute_passed_to_SQL() {
         runner.setProperty(ExecuteGroovyScript.SCRIPT_FILE, TEST_RESOURCE_LOCATION + "test_attributes_passed_to_SQL.groovy");
         runner.setProperty("database.name", "testDB");
-        runner.setProperty("SQL.mydb", "dbcpLookup");
-
+        runner.setProperty("SQL.mydb", "dbcp");
         runner.assertValid();
 
         runner.run();
-        assertEquals("testDB", dbcpServiceLookup.getDatabaseName());
+        assertEquals("testDB", ((DBCPServiceSimpleImpl) dbcp).getDatabaseName());
     }
 
 
@@ -571,6 +564,8 @@ private HashMap<String, String> map(String key, String value) {
 
     private static class DBCPServiceSimpleImpl extends AbstractControllerService implements DBCPService {
 
+        private String dbName;
+
         @Override
         public String getIdentifier() {
             return "dbcp";
@@ -585,19 +580,10 @@ public Connection getConnection() throws ProcessException {
                 throw new ProcessException("getConnection failed: " + e);
             }
         }
-    }
-
-    private static class MockDBCPConnectionPoolLookup extends DBCPConnectionPoolLookup {
-        private String dbName;
-
-        @Override
-        public String getIdentifier() {
-            return "dbcpLookup";
-        }
 
         @Override
         public Connection getConnection(Map<String, String> attributes) throws ProcessException {
-            dbName = attributes.get(DBCPConnectionPoolLookup.DATABASE_NAME_ATTRIBUTE);
+            dbName = attributes.get("database.name");
             try {
                 Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
                 return DriverManager.getConnection("jdbc:derby:" + DB_LOCATION + ";create=true");