NIFI-9770 Updated dependencies and made changes requested in a PR

Author: MikeThomsen

nifi-code-coverage/pom.xml

@@ -720,11 +720,6 @@
             <artifactId>nifi-box-services-api</artifactId>
             <version>2.5.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-cql-cache-services</artifactId>
-            <version>2.5.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-cql-processors</artifactId>

nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/pom.xml

@@ -25,7 +25,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <driver.version>4.17.0</driver.version>
+        <driver.version>4.19.0</driver.version>
     </properties>
 
     <dependencies>
@@ -45,7 +45,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.datastax.oss</groupId>
+            <groupId>org.apache.cassandra</groupId>
             <artifactId>java-driver-core</artifactId>
             <version>${driver.version}</version>
         </dependency>

nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/main/java/org/apache/nifi/service/CassandraCQLExecutionService.java renamed to nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/main/java/org/apache/nifi/service/cassandra/CassandraCQLExecutionService.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.nifi.service;
+package org.apache.nifi.service.cassandra;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.CqlSessionBuilder;
@@ -53,23 +53,22 @@
 import org.apache.nifi.annotation.lifecycle.OnDisabled;
 import org.apache.nifi.annotation.lifecycle.OnEnabled;
 import org.apache.nifi.avro.AvroTypeUtil;
-import org.apache.nifi.cassandra.api.CQLExecutionService;
-import org.apache.nifi.cassandra.api.CqlFieldInfo;
-import org.apache.nifi.cassandra.api.CqlQueryCallback;
-import org.apache.nifi.cassandra.api.UpdateMethod;
-import org.apache.nifi.cassandra.api.exception.QueryFailureException;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.PropertyValue;
 import org.apache.nifi.controller.AbstractControllerService;
 import org.apache.nifi.controller.ConfigurationContext;
-import org.apache.nifi.controller.ControllerServiceInitializationContext;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.serialization.record.MapRecord;
 import org.apache.nifi.serialization.record.RecordFieldType;
 import org.apache.nifi.serialization.record.RecordSchema;
 import org.apache.nifi.serialization.record.type.ArrayDataType;
-import org.apache.nifi.service.mapping.FlexibleCounterCodec;
-import org.apache.nifi.service.mapping.JavaSQLTimestampCodec;
+import org.apache.nifi.service.cassandra.mapping.FlexibleCounterCodec;
+import org.apache.nifi.service.cassandra.mapping.JavaSQLTimestampCodec;
+import org.apache.nifi.service.cql.api.CQLExecutionService;
+import org.apache.nifi.service.cql.api.CQLFieldInfo;
+import org.apache.nifi.service.cql.api.CQLQueryCallback;
+import org.apache.nifi.service.cql.api.UpdateMethod;
+import org.apache.nifi.service.cql.api.exception.QueryFailureException;
 import org.apache.nifi.ssl.SSLContextService;
 
 import javax.net.ssl.SSLContext;
@@ -94,37 +93,31 @@ public class CassandraCQLExecutionService extends AbstractControllerService impl
 
     // Common descriptors
 
-    private List<PropertyDescriptor> properties;
     private CqlSession cassandraSession;
 
     private Map<String, PreparedStatement> statementCache;
 
     private String keyspace;
     private int pageSize;
 
-    @Override
-    public void init(final ControllerServiceInitializationContext context) {
-        List<PropertyDescriptor> props = new ArrayList<>();
-
-        props.add(CONTACT_POINTS);
-        props.add(CLIENT_AUTH);
-        props.add(DATACENTER);
-        props.add(KEYSPACE);
-        props.add(USERNAME);
-        props.add(PASSWORD);
-        props.add(PROP_SSL_CONTEXT_SERVICE);
-        props.add(FETCH_SIZE);
-        props.add(READ_TIMEOUT);
-        props.add(CONNECT_TIMEOUT);
-        props.add(CONSISTENCY_LEVEL);
-        props.add(COMPRESSION_TYPE);
-
-        properties = props;
-    }
+    public static final List<PropertyDescriptor> PROPERTY_DESCRIPTORS = List.of(
+            CONTACT_POINTS,
+            CLIENT_AUTH,
+            DATACENTER,
+            KEYSPACE,
+            USERNAME,
+            PASSWORD,
+            PROP_SSL_CONTEXT_SERVICE,
+            FETCH_SIZE,
+            READ_TIMEOUT,
+            CONNECT_TIMEOUT,
+            CONSISTENCY_LEVEL,
+            COMPRESSION_TYPE
+    );
 
     @Override
     public List<PropertyDescriptor> getSupportedPropertyDescriptors() {
-        return properties;
+        return PROPERTY_DESCRIPTORS;
     }
 
     @OnEnabled
@@ -233,7 +226,7 @@ private List<InetSocketAddress> getContactPoints(String contactPointList) {
     }
 
     @Override
-    public void query(String cql, boolean cacheStatement, List parameters, CqlQueryCallback callback) throws QueryFailureException {
+    public void query(String cql, boolean cacheStatement, List parameters, CQLQueryCallback callback) throws QueryFailureException {
         SimpleStatement statement = SimpleStatement.builder(cql)
                 .setPageSize(pageSize).build();
         PreparedStatement preparedStatement = cassandraSession.prepare(statement);
@@ -247,7 +240,7 @@ public void query(String cql, boolean cacheStatement, List parameters, CqlQueryC
         Iterator<Row> resultsIterator = results.iterator();
         long rowNumber = 0;
 
-        List<CqlFieldInfo> columnDefinitions = new ArrayList<>();
+        List<CQLFieldInfo> columnDefinitions = new ArrayList<>();
         AtomicReference<RecordSchema> schemaReference = new AtomicReference<>();
 
         try {
@@ -263,7 +256,7 @@ public void query(String cql, boolean cacheStatement, List parameters, CqlQueryC
 
                     if (columnDefinitions.isEmpty()) {
                         row.getColumnDefinitions().forEach(def -> {
-                            CqlFieldInfo info = new CqlFieldInfo(def.getName().toString(),
+                            CQLFieldInfo info = new CQLFieldInfo(def.getName().toString(),
                                     def.getType().toString(), def.getType().getProtocolCode());
                             columnDefinitions.add(info);
                         });

nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/main/java/org/apache/nifi/service/mapping/FlexibleCounterCodec.java renamed to nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/main/java/org/apache/nifi/service/cassandra/mapping/FlexibleCounterCodec.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.nifi.service.mapping;
+package org.apache.nifi.service.cassandra.mapping;
 
 import com.datastax.oss.driver.api.core.ProtocolVersion;
 import com.datastax.oss.driver.api.core.type.DataType;

nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/main/java/org/apache/nifi/service/mapping/JavaSQLTimestampCodec.java renamed to nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/main/java/org/apache/nifi/service/cassandra/mapping/JavaSQLTimestampCodec.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.nifi.service.mapping;
+package org.apache.nifi.service.cassandra.mapping;
 
 import com.datastax.oss.driver.api.core.ProtocolVersion;
 import com.datastax.oss.driver.api.core.type.DataType;

nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.nifi.service.CassandraCQLExecutionService
+org.apache.nifi.service.cassandra.CassandraCQLExecutionService

nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/AbstractTestCassandraCQLExecutionService.java renamed to nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/cassandra/AbstractTestCassandraCQLExecutionService.java

@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package org.apache.nifi.service;
+package org.apache.nifi.service.cassandra;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.Row;
-import org.apache.nifi.cassandra.api.CqlQueryCallback;
-import org.apache.nifi.cassandra.api.UpdateMethod;
 import org.apache.nifi.security.cert.builder.StandardCertificateBuilder;
 import org.apache.nifi.serialization.SimpleRecordSchema;
 import org.apache.nifi.serialization.record.MapRecord;
 import org.apache.nifi.serialization.record.RecordField;
 import org.apache.nifi.serialization.record.RecordFieldType;
 import org.apache.nifi.serialization.record.RecordSchema;
-import org.apache.nifi.service.mock.MockCassandraProcessor;
+import org.apache.nifi.service.cassandra.mock.MockCassandraProcessor;
+import org.apache.nifi.service.cql.api.CQLQueryCallback;
+import org.apache.nifi.service.cql.api.UpdateMethod;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
 import org.junit.jupiter.api.AfterAll;
@@ -243,7 +243,7 @@ public void testQueryRecord() {
         }
 
         List<org.apache.nifi.serialization.record.Record> records = new ArrayList<>();
-        CqlQueryCallback callback = (rowNumber, result, fields, isExhausted) -> records.add(result);
+        CQLQueryCallback callback = (rowNumber, result, fields, isExhausted) -> records.add(result);
 
         sessionProvider.query("select * from testspace.query_test", false, null, callback);
     }
@@ -277,7 +277,7 @@ private static String getKeyEncoded(final Key key) {
     }
 
     private static Path writeCertificateEncoded(final String certificateEncoded) throws IOException {
-        final Path certificateFile = Files.createTempFile(TestCassandraCQLExecutionServiceV3.class.getSimpleName(), ".crt");
+        final Path certificateFile = Files.createTempFile(AbstractTestCassandraCQLExecutionService.class.getSimpleName(), ".crt");
         Files.write(certificateFile, certificateEncoded.getBytes(StandardCharsets.UTF_8));
         certificateFile.toFile().deleteOnExit();
         return certificateFile;

nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/TestCassandraCQLExecutionServiceV3.java renamed to nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/cassandra/CassandraCQLExecutionServiceV3IT.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.nifi.service;
+package org.apache.nifi.service.cassandra;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 @Testcontainers
-public class TestCassandraCQLExecutionServiceV3 extends AbstractTestCassandraCQLExecutionService {
+public class CassandraCQLExecutionServiceV3IT extends AbstractTestCassandraCQLExecutionService {
     public static final String CASSANDRA_IMAGE = "cassandra:3.11";
 
     @BeforeAll

nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/TestCassandraCQLExecutionServiceV4.java renamed to nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/cassandra/CassandraCQLExecutionServiceV4IT.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.nifi.service;
+package org.apache.nifi.service.cassandra;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 @Testcontainers
-public class TestCassandraCQLExecutionServiceV4 extends AbstractTestCassandraCQLExecutionService {
+public class CassandraCQLExecutionServiceV4IT extends AbstractTestCassandraCQLExecutionService {
     public static String CASSANDRA_IMAGE = "cassandra:4.1";
 
     @BeforeAll

nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/TestCassandraCQLExecutionServiceV5.java renamed to nifi-extension-bundles/nifi-cql-bundle/nifi-cassandra-session-provider-service/src/test/java/org/apache/nifi/service/cassandra/CassandraCQLExecutionServiceV5IT.java

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.nifi.service;
+package org.apache.nifi.service.cassandra;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 @Testcontainers
-public class TestCassandraCQLExecutionServiceV5 extends AbstractTestCassandraCQLExecutionService {
+public class CassandraCQLExecutionServiceV5IT extends AbstractTestCassandraCQLExecutionService {
     public static final String CASSANDRA_IMAGE = "cassandra:5.0";
 
     @BeforeAll