diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 5e4c223e9393..87f6fbb7ae07 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -548,6 +548,12 @@ language governing permissions and limitations under the License. --> 2.0.0-SNAPSHOT nar + + org.apache.nifi + nifi-cassandra4-services-nar + 2.0.0-SNAPSHOT + nar + org.apache.nifi nifi-registry-nar diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java index 844f0c5925b3..9e36282831a6 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessor.java @@ -16,20 +16,6 @@ */ package org.apache.nifi.processors.cassandra; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.CodecRegistry; -import com.datastax.driver.core.ConsistencyLevel; -import com.datastax.driver.core.DataType; -import com.datastax.driver.core.Metadata; -import com.datastax.driver.core.ProtocolOptions; -import com.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions; -import com.datastax.driver.core.Row; -import com.datastax.driver.core.SSLOptions; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.TypeCodec; -import com.datastax.driver.core.exceptions.AuthenticationException; -import com.datastax.driver.core.exceptions.NoHostAvailableException; -import com.datastax.driver.extras.codecs.arrays.ObjectArrayCodec; import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Collection; @@ -38,11 +24,17 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import javax.net.ssl.SSLContext; + +import com.datastax.driver.core.DataType; import org.apache.avro.Schema; import org.apache.avro.SchemaBuilder; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.annotation.lifecycle.OnScheduled; +import org.apache.nifi.cassandra.AuthenticationException; +import org.apache.nifi.cassandra.CassandraRow; +import org.apache.nifi.cassandra.CassandraSession; import org.apache.nifi.cassandra.CassandraSessionProviderService; +import org.apache.nifi.cassandra.NoHostAvailableException; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.components.PropertyValue; import org.apache.nifi.components.ValidationContext; @@ -134,7 +126,7 @@ public abstract class AbstractCassandraProcessor extends AbstractProcessor { .name("Consistency Level") .description("The strategy for how many replicas must respond before results are returned.") .required(false) - .allowableValues(ConsistencyLevel.values()) + .allowableValues("ANY", "ONE", "TWO", "THREE", "QUORUM", "ALL", "LOCAL_QUORUM", "EACH_QUORUM", "SERIAL", "LOCAL_SERIAL", "LOCAL_ONE") .defaultValue("ONE") .build(); @@ -142,7 +134,7 @@ public abstract class AbstractCassandraProcessor extends AbstractProcessor { .name("Compression Type") .description("Enable compression at transport-level requests and responses") .required(false) - .allowableValues(ProtocolOptions.Compression.values()) + .allowableValues("NONE", "SNAPPY", "LZ4") .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .defaultValue("NONE") .build(); @@ -186,10 +178,7 @@ public abstract class AbstractCassandraProcessor extends AbstractProcessor { descriptors.add(CHARSET); } - protected final AtomicReference cluster = new AtomicReference<>(null); - protected final AtomicReference cassandraSession = new AtomicReference<>(null); - - protected static final CodecRegistry codecRegistry = new CodecRegistry(); + protected final AtomicReference cassandraSession = new AtomicReference<>(null); @Override protected Collection customValidate(ValidationContext validationContext) { @@ -229,7 +218,6 @@ public void onScheduled(ProcessContext context) { if (connectionProviderIsSet) { CassandraSessionProviderService sessionProvider = context.getProperty(CONNECTION_PROVIDER_SERVICE).asControllerService(CassandraSessionProviderService.class); - cluster.set(sessionProvider.getCluster()); cassandraSession.set(sessionProvider.getCassandraSession()); return; } @@ -247,97 +235,53 @@ public void onScheduled(ProcessContext context) { } void connectToCassandra(ProcessContext context) { - if (cluster.get() == null) { - ComponentLog log = getLogger(); - final String contactPointList = context.getProperty(CONTACT_POINTS).evaluateAttributeExpressions().getValue(); - final String consistencyLevel = context.getProperty(CONSISTENCY_LEVEL).getValue(); - final String compressionType = context.getProperty(COMPRESSION_TYPE).getValue(); - List contactPoints = getContactPoints(contactPointList); - - // Set up the client for secure (SSL/TLS communications) if configured to do so - final SSLContextService sslService = context.getProperty(PROP_SSL_CONTEXT_SERVICE).asControllerService(SSLContextService.class); - final SSLContext sslContext; - - if (sslService != null) { - sslContext = sslService.createContext(); - } else { - sslContext = null; - } - - final String username, password; - PropertyValue usernameProperty = context.getProperty(USERNAME).evaluateAttributeExpressions(); - PropertyValue passwordProperty = context.getProperty(PASSWORD).evaluateAttributeExpressions(); + ComponentLog log = getLogger(); + final String contactPointList = context.getProperty(CONTACT_POINTS).evaluateAttributeExpressions().getValue(); + final String consistencyLevel = context.getProperty(CONSISTENCY_LEVEL).getValue(); + final String compressionType = context.getProperty(COMPRESSION_TYPE).getValue(); + List contactPoints = getContactPoints(contactPointList); + + // Set up the client for secure (SSL/TLS communications) if configured to do so + final SSLContextService sslService = context.getProperty(PROP_SSL_CONTEXT_SERVICE).asControllerService(SSLContextService.class); + final SSLContext sslContext; + + if (sslService != null) { + sslContext = sslService.createContext(); + } else { + sslContext = null; + } - if (usernameProperty != null && passwordProperty != null) { - username = usernameProperty.getValue(); - password = passwordProperty.getValue(); - } else { - username = null; - password = null; - } + final String username, password; + PropertyValue usernameProperty = context.getProperty(USERNAME).evaluateAttributeExpressions(); + PropertyValue passwordProperty = context.getProperty(PASSWORD).evaluateAttributeExpressions(); - // Create the cluster and connect to it - Cluster newCluster = createCluster(contactPoints, sslContext, username, password, compressionType); - PropertyValue keyspaceProperty = context.getProperty(KEYSPACE).evaluateAttributeExpressions(); + if (usernameProperty != null && passwordProperty != null) { + username = usernameProperty.getValue(); + password = passwordProperty.getValue(); + } else { + username = null; + password = null; + } - final Session newSession; - // For Java 11, the getValue() call was added so the test could pass - if (keyspaceProperty != null && keyspaceProperty.getValue() != null) { - newSession = newCluster.connect(keyspaceProperty.getValue()); - } else { - newSession = newCluster.connect(); - } + // Create the cluster and connect to it + CassandraSession cassandraSession = createSession(contactPoints, sslContext, username, password, compressionType); + PropertyValue keyspaceProperty = context.getProperty(KEYSPACE).evaluateAttributeExpressions(); - newCluster.getConfiguration().getQueryOptions().setConsistencyLevel(ConsistencyLevel.valueOf(consistencyLevel)); - Metadata metadata = newCluster.getMetadata(); + if (keyspaceProperty != null && keyspaceProperty.getValue() != null) { + newSession = cassandraSession.connect(keyspaceProperty.getValue()); + } else { + newSession = cassandraSession.connect(null); + } - log.info("Connected to Cassandra cluster: {}", new Object[]{metadata.getClusterName()}); + cassandraSession.setConsistencyLevel(consistencyLevel); - cluster.set(newCluster); - cassandraSession.set(newSession); - } - } + log.info("Connected to Cassandra cluster: {}", cassandraSession.getClusterName()); - protected void registerAdditionalCodecs() { - // Conversion between a String[] and a list of varchar - CodecRegistry.DEFAULT_INSTANCE.register(new ObjectArrayCodec<>( - DataType.list(DataType.varchar()), - String[].class, - TypeCodec.varchar())); + this.cassandraSession.set(newSession); } - /** - * Uses a Cluster.Builder to create a Cassandra cluster reference using the given parameters - * - * @param contactPoints The contact points (hostname:port list of Cassandra nodes) - * @param sslContext The SSL context (used for secure connections) - * @param username The username for connection authentication - * @param password The password for connection authentication - * @param compressionType Enable compression at transport-level requests and responses. - * @return A reference to the Cluster object associated with the given Cassandra configuration - */ - protected Cluster createCluster(List contactPoints, SSLContext sslContext, - String username, String password, String compressionType) { - Cluster.Builder builder = Cluster.builder().addContactPointsWithPorts(contactPoints); - if (sslContext != null) { - final SSLOptions sslOptions = RemoteEndpointAwareJdkSSLOptions.builder() - .withSSLContext(sslContext) - .build(); - - builder = builder.withSSL(sslOptions); - if (ProtocolOptions.Compression.SNAPPY.name().equals(compressionType)) { - builder = builder.withCompression(ProtocolOptions.Compression.SNAPPY); - } else if (ProtocolOptions.Compression.LZ4.name().equals(compressionType)) { - builder = builder.withCompression(ProtocolOptions.Compression.LZ4); - } - } - - if (username != null && password != null) { - builder = builder.withCredentials(username, password); - } + protected abstract void registerAdditionalCodecs(); - return builder.build(); - } public void stop(ProcessContext context) { // We don't want to close the connection when using 'Cassandra Connection Provider' @@ -349,15 +293,11 @@ public void stop(ProcessContext context) { cassandraSession.get().close(); cassandraSession.set(null); } - if (cluster.get() != null) { - cluster.get().close(); - cluster.set(null); - } } } - protected static Object getCassandraObject(Row row, int i, DataType dataType) { + protected static Object getCassandraObject(CassandraRow row, int i, DataType dataType) { if (dataType.equals(DataType.blob())) { return row.getBytes(i); diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java index cb00be83ce5c..1fb9cc8ebeab 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraQL.java @@ -16,11 +16,7 @@ */ package org.apache.nifi.processors.cassandra; -import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.DataType; -import com.datastax.driver.core.PreparedStatement; -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.Session; import com.datastax.driver.core.TypeCodec; import com.datastax.driver.core.exceptions.InvalidTypeException; import com.datastax.driver.core.exceptions.NoHostAvailableException; @@ -38,6 +34,10 @@ import org.apache.nifi.annotation.documentation.Tags; import org.apache.nifi.annotation.lifecycle.OnScheduled; import org.apache.nifi.annotation.lifecycle.OnStopped; +import org.apache.nifi.cassandra.CassandraBoundStatement; +import org.apache.nifi.cassandra.CassandraPreparedStatement; +import org.apache.nifi.cassandra.CassandraResultSetFuture; +import org.apache.nifi.cassandra.CassandraSession; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.expression.ExpressionLanguageScope; import org.apache.nifi.flowfile.FlowFile; @@ -128,7 +128,7 @@ public class PutCassandraQL extends AbstractCassandraProcessor { * LRU cache for the compiled patterns. The size of the cache is determined by the value of the Statement Cache Size property */ @VisibleForTesting - private ConcurrentMap statementCache; + private ConcurrentMap statementCache; /* * Will ensure that the list of property descriptors is build only once. @@ -167,7 +167,7 @@ public void onScheduled(final ProcessContext context) { int statementCacheSize = context.getProperty(STATEMENT_CACHE_SIZE).evaluateAttributeExpressions().asInteger(); statementCache = CacheBuilder.newBuilder() .maximumSize(statementCacheSize) - .build() + .build() .asMap(); } @@ -185,16 +185,16 @@ public void onTrigger(final ProcessContext context, final ProcessSession session // The documentation for the driver recommends the session remain open the entire time the processor is running // and states that it is thread-safe. This is why connectionSession is not in a try-with-resources. - final Session connectionSession = cassandraSession.get(); + final CassandraSession connectionSession = cassandraSession.get(); String cql = getCQL(session, flowFile, charset); try { - PreparedStatement statement = statementCache.get(cql); + CassandraPreparedStatement statement = statementCache.get(cql); if(statement == null) { statement = connectionSession.prepare(cql); statementCache.put(cql, statement); } - BoundStatement boundStatement = statement.bind(); + CassandraBoundStatement boundStatement = statement.bind(); Map attributes = flowFile.getAttributes(); for (final Map.Entry entry : attributes.entrySet()) { @@ -221,7 +221,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session } try { - ResultSetFuture future = connectionSession.executeAsync(boundStatement); + CassandraResultSetFuture future = connectionSession.executeAsync(boundStatement); if (statementTimeout > 0) { future.getUninterruptibly(statementTimeout, TimeUnit.MILLISECONDS); } else { @@ -231,7 +231,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session final long transmissionMillis = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos); // This isn't a real URI but since Cassandra is distributed we just use the cluster name - String transitUri = "cassandra://" + connectionSession.getCluster().getMetadata().getClusterName(); + String transitUri = "cassandra://" + connectionSession.getClusterName(); session.getProvenanceReporter().send(flowFile, transitUri, transmissionMillis, true); session.transfer(flowFile, REL_SUCCESS); @@ -295,14 +295,14 @@ public void process(final InputStream in) throws IOException { * Determines how to map the given value to the appropriate Cassandra data type and returns the object as * represented by the given type. This can be used in a Prepared/BoundStatement. * - * @param statement the BoundStatement for setting objects on + * @param statement the CassandraBoundStatement for setting objects on * @param paramIndex the index of the parameter at which to set the object * @param attrName the name of the attribute that the parameter is coming from - for logging purposes * @param paramValue the value of the CQL parameter to set * @param paramType the Cassandra data type of the CQL parameter to set * @throws IllegalArgumentException if the PreparedStatement throws a CQLException when calling the appropriate setter */ - protected void setStatementObject(final BoundStatement statement, final int paramIndex, final String attrName, + protected void setStatementObject(final CassandraBoundStatement statement, final int paramIndex, final String attrName, final String paramValue, final String paramType) throws IllegalArgumentException { if (paramValue == null) { statement.setToNull(paramIndex); diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessorTest.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessorTest.java index ce21961316c1..30df6f4de906 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessorTest.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/AbstractCassandraProcessorTest.java @@ -286,7 +286,7 @@ public void onTrigger(ProcessContext context, ProcessSession session) throws Pro } @Override - protected Cluster createCluster(List contactPoints, SSLContext sslContext, + protected Cluster createSession(List contactPoints, SSLContext sslContext, String username, String password, String compressionType) { Cluster mockCluster = mock(Cluster.class); Metadata mockMetadata = mock(Metadata.class); diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/PutCassandraQLTest.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/PutCassandraQLTest.java index 8b3534855783..9a18cb3f7fe1 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/PutCassandraQLTest.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/PutCassandraQLTest.java @@ -386,7 +386,7 @@ private static class MockPutCassandraQL extends PutCassandraQL { private Session mockSession = mock(Session.class); @Override - protected Cluster createCluster(List contactPoints, SSLContext sslContext, + protected Cluster createSession(List contactPoints, SSLContext sslContext, String username, String password, String compressionType) { Cluster mockCluster = mock(Cluster.class); try { diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/PutCassandraRecordTest.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/PutCassandraRecordTest.java index db1727bd0b6a..9c3970aacb4c 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/PutCassandraRecordTest.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/PutCassandraRecordTest.java @@ -511,7 +511,7 @@ private static class MockPutCassandraRecord extends PutCassandraRecord { private Session mockSession = mock(Session.class); @Override - protected Cluster createCluster(List contactPoints, SSLContext sslContext, + protected Cluster createSession(List contactPoints, SSLContext sslContext, String username, String password, String compressionType) { Cluster mockCluster = mock(Cluster.class); try { diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java index fa3505b83143..491ac3cb0018 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java @@ -505,7 +505,7 @@ private static class MockQueryCassandra extends QueryCassandra { private Exception exceptionToThrow = null; @Override - protected Cluster createCluster(List contactPoints, SSLContext sslContext, + protected Cluster createSession(List contactPoints, SSLContext sslContext, String username, String password, String compressionType) { Cluster mockCluster = mock(Cluster.class); try { @@ -550,7 +550,7 @@ private static class MockQueryCassandraTwoRounds extends MockQueryCassandra { private Exception exceptionToThrow = null; @Override - protected Cluster createCluster(List contactPoints, SSLContext sslContext, + protected Cluster createSession(List contactPoints, SSLContext sslContext, String username, String password, String compressionType) { Cluster mockCluster = mock(Cluster.class); try { diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml index 0ad093bbc757..2c9da63db36c 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml @@ -30,11 +30,9 @@ nifi-api provided - - com.datastax.cassandra - cassandra-driver-core - ${cassandra.sdk.version} + org.apache.nifi + nifi-ssl-context-service-api \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/AbstractCassandraSessionProvider.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/AbstractCassandraSessionProvider.java new file mode 100644 index 000000000000..eb807e96ac4e --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/AbstractCassandraSessionProvider.java @@ -0,0 +1,99 @@ +package org.apache.nifi.cassandra; + +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.security.util.ClientAuth; +import org.apache.nifi.ssl.SSLContextService; + +public abstract class AbstractCassandraSessionProvider extends AbstractControllerService implements CassandraSessionProviderService { + + public static final int DEFAULT_CASSANDRA_PORT = 9042; + + // Common descriptors + public static final PropertyDescriptor CONTACT_POINTS = new PropertyDescriptor.Builder() + .name("Cassandra Contact Points") + .description("Contact points are addresses of Cassandra nodes. The list of contact points should be " + + "comma-separated and in hostname:port format. Example node1:port,node2:port,...." + + " The default client port for Cassandra is 9042, but the port(s) must be explicitly specified.") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) + .addValidator(StandardValidators.HOSTNAME_PORT_LIST_VALIDATOR) + .build(); + + public static final PropertyDescriptor KEYSPACE = new PropertyDescriptor.Builder() + .name("Keyspace") + .description("The Cassandra Keyspace to connect to. If no keyspace is specified, the query will need to " + + "include the keyspace name before any table reference, in case of 'query' native processors or " + + "if the processor supports the 'Table' property, the keyspace name has to be provided with the " + + "table name in the form of .") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + + public static final PropertyDescriptor PROP_SSL_CONTEXT_SERVICE = new PropertyDescriptor.Builder() + .name("SSL Context Service") + .description("The SSL Context Service used to provide client certificate information for TLS/SSL " + + "connections.") + .required(false) + .identifiesControllerService(SSLContextService.class) + .build(); + + public static final PropertyDescriptor CLIENT_AUTH = new PropertyDescriptor.Builder() + .name("Client Auth") + .description("Client authentication policy when connecting to secure (TLS/SSL) cluster. " + + "Possible values are REQUIRED, WANT, NONE. This property is only used when an SSL Context " + + "has been defined and enabled.") + .required(false) + .allowableValues(ClientAuth.values()) + .defaultValue("REQUIRED") + .build(); + + public static final PropertyDescriptor USERNAME = new PropertyDescriptor.Builder() + .name("Username") + .description("Username to access the Cassandra cluster") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + + public static final PropertyDescriptor PASSWORD = new PropertyDescriptor.Builder() + .name("Password") + .description("Password to access the Cassandra cluster") + .required(false) + .sensitive(true) + .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + + public final PropertyDescriptor CONSISTENCY_LEVEL = new PropertyDescriptor.Builder() + .name("Consistency Level") + .description("The strategy for how many replicas must respond before results are returned.") + .required(true) + .allowableValues(this.getConsistencyLevelValues()) + .defaultValue("ONE") + .build(); + + public static final PropertyDescriptor READ_TIMEOUT_MS = new PropertyDescriptor.Builder() + .name("read-timeout-ms") + .displayName("Read Timout (ms)") + .description("Read timeout (in milliseconds). 0 means no timeout. If no value is set, the underlying default will be used.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) + .addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR) + .build(); + + public static final PropertyDescriptor CONNECT_TIMEOUT_MS = new PropertyDescriptor.Builder() + .name("connect-timeout-ms") + .displayName("Connect Timeout (ms)") + .description("Connection timeout (in milliseconds). 0 means no timeout. If no value is set, the underlying default will be used.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) + .addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR) + .build(); + + protected abstract Object[] getConsistencyLevelValues(); + +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/AuthenticationException.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/AuthenticationException.java new file mode 100644 index 000000000000..5d30ba904b1b --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/AuthenticationException.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.cassandra; + +public abstract class AuthenticationException extends RuntimeException { + + public abstract void setCause(RuntimeException authenticationException); +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraBoundStatement.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraBoundStatement.java new file mode 100644 index 000000000000..0b597f352be1 --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraBoundStatement.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.cassandra; + +import java.nio.ByteBuffer; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +public interface CassandraBoundStatement { + void setToNull(int index); + void setString(int paramIndex, String paramValue); + void setBool(int paramIndex, boolean paramValue); + void setInt(int paramIndex, int paramValue); + void setLong(int paramIndex, long paramValue); + void setFloat(int paramIndex, float paramValue); + void setDouble(int paramIndex, double paramValue); + void setBytes(int paramIndex, ByteBuffer paramValue); + void setTimestamp(int paramIndex, Date paramValue); + void setUUID(int paramIndex, UUID paramValue); + void setMap(int paramIndex, Map paramValue); + void setSet(int paramIndex, Set paramValue); + void setList(int paramIndex, List paramValue); +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraPreparedStatement.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraPreparedStatement.java new file mode 100644 index 000000000000..f874c9eabd94 --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraPreparedStatement.java @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.cassandra; + +public interface CassandraPreparedStatement { + CassandraBoundStatement bind(Object... objects); +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraResultSet.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraResultSet.java new file mode 100644 index 000000000000..a528389f2a80 --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraResultSet.java @@ -0,0 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.cassandra; + +public interface CassandraResultSet { +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraResultSetFuture.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraResultSetFuture.java new file mode 100644 index 000000000000..32fb97b8b367 --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraResultSetFuture.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.cassandra; + +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +public interface CassandraResultSetFuture { + + CassandraResultSet getUninterruptibly(); + CassandraResultSet getUninterruptibly(long timeout, TimeUnit unit) throws TimeoutException; +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraRow.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraRow.java new file mode 100644 index 000000000000..bf16575ea52c --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraRow.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.cassandra; + +import java.nio.ByteBuffer; + +public interface CassandraRow { + + Object getObject(int index); + ByteBuffer getBytes(int index); + int getInt(int index); + boolean getBool(int index); +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraSession.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraSession.java new file mode 100644 index 000000000000..dcc364e85bcb --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraSession.java @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.cassandra; + +import java.util.Optional; + +public interface CassandraSession { + + CassandraPreparedStatement prepare(String s); + + CassandraResultSetFuture executeAsync(CassandraBoundStatement boundStatement); + + void close(); + + Optional getClusterName(); + +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraSessionProviderService.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraSessionProviderService.java index fc2d22204af8..25104482a4de 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraSessionProviderService.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/CassandraSessionProviderService.java @@ -16,20 +16,16 @@ */ package org.apache.nifi.cassandra; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; import org.apache.nifi.controller.ControllerService; +import java.util.Optional; + public interface CassandraSessionProviderService extends ControllerService { /** * Obtains a Cassandra session instance - * @return {@link Session} + * @return {@link CassandraSession} */ - Session getCassandraSession(); + CassandraSession getCassandraSession(); - /** - * Obtains a Cassandra cluster instance - * @return {@link Cluster} - */ - Cluster getCluster(); + Optional getClusterName(); } diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/ClusterBuilder.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/ClusterBuilder.java new file mode 100644 index 000000000000..8af4103b001f --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/ClusterBuilder.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.cassandra; + + +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.ProtocolOptions; +import com.datastax.driver.core.SSLOptions; + +public interface ClusterBuilder { + + CassandraCluster build(); + + ClusterBuilder withCompression(String compressionValueString); + + ClusterBuilder withSSL(); + + + /** + * Enable the use of SSL for the created {@code CassandraCluster} using the provided options. + * + * @param sslOptions the SSL options to use. + * @return this builder. + */ + ClusterBuilder withSSL(SSLOptions sslOptions); + +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/NoHostAvailableException.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/NoHostAvailableException.java new file mode 100644 index 000000000000..2198f6638d9e --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/src/main/java/org/apache/nifi/cassandra/NoHostAvailableException.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.cassandra; + +public abstract class NoHostAvailableException extends RuntimeException { + public abstract void setCause(RuntimeException cassandraException); + + public abstract String getCustomMessage(Object... args); +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml index f2029682d188..79098f17951b 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml @@ -24,6 +24,10 @@ nifi-cassandra-services jar + + 3.11.5 + + org.apache.nifi diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/src/main/java/org/apache/nifi/service/CassandraSessionProvider.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/src/main/java/org/apache/nifi/service/CassandraSessionProvider.java index 9a394539f570..57b8a88d0f39 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/src/main/java/org/apache/nifi/service/CassandraSessionProvider.java +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/src/main/java/org/apache/nifi/service/CassandraSessionProvider.java @@ -27,96 +27,28 @@ import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.net.ssl.SSLContext; import org.apache.nifi.annotation.documentation.CapabilityDescription; import org.apache.nifi.annotation.documentation.Tags; import org.apache.nifi.annotation.lifecycle.OnDisabled; import org.apache.nifi.annotation.lifecycle.OnEnabled; -import org.apache.nifi.cassandra.CassandraSessionProviderService; +import org.apache.nifi.cassandra.AbstractCassandraSessionProvider; +import org.apache.nifi.cassandra.CassandraSession; 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.expression.ExpressionLanguageScope; import org.apache.nifi.logging.ComponentLog; import org.apache.nifi.processor.exception.ProcessException; import org.apache.nifi.processor.util.StandardValidators; -import org.apache.nifi.security.util.ClientAuth; import org.apache.nifi.ssl.SSLContextService; @Tags({"cassandra", "dbcp", "database", "connection", "pooling"}) @CapabilityDescription("Provides connection session for Cassandra processors to work with Apache Cassandra.") -public class CassandraSessionProvider extends AbstractControllerService implements CassandraSessionProviderService { - - public static final int DEFAULT_CASSANDRA_PORT = 9042; - - // Common descriptors - public static final PropertyDescriptor CONTACT_POINTS = new PropertyDescriptor.Builder() - .name("Cassandra Contact Points") - .description("Contact points are addresses of Cassandra nodes. The list of contact points should be " - + "comma-separated and in hostname:port format. Example node1:port,node2:port,...." - + " The default client port for Cassandra is 9042, but the port(s) must be explicitly specified.") - .required(true) - .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) - .addValidator(StandardValidators.HOSTNAME_PORT_LIST_VALIDATOR) - .build(); +public class CassandraSessionProvider extends AbstractCassandraSessionProvider { - public static final PropertyDescriptor KEYSPACE = new PropertyDescriptor.Builder() - .name("Keyspace") - .description("The Cassandra Keyspace to connect to. If no keyspace is specified, the query will need to " + - "include the keyspace name before any table reference, in case of 'query' native processors or " + - "if the processor supports the 'Table' property, the keyspace name has to be provided with the " + - "table name in the form of .
") - .required(false) - .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) - .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) - .build(); - - public static final PropertyDescriptor PROP_SSL_CONTEXT_SERVICE = new PropertyDescriptor.Builder() - .name("SSL Context Service") - .description("The SSL Context Service used to provide client certificate information for TLS/SSL " - + "connections.") - .required(false) - .identifiesControllerService(SSLContextService.class) - .build(); - - public static final PropertyDescriptor CLIENT_AUTH = new PropertyDescriptor.Builder() - .name("Client Auth") - .description("Client authentication policy when connecting to secure (TLS/SSL) cluster. " - + "Possible values are REQUIRED, WANT, NONE. This property is only used when an SSL Context " - + "has been defined and enabled.") - .required(false) - .allowableValues(ClientAuth.values()) - .defaultValue("REQUIRED") - .build(); - - public static final PropertyDescriptor USERNAME = new PropertyDescriptor.Builder() - .name("Username") - .description("Username to access the Cassandra cluster") - .required(false) - .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) - .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) - .build(); - - public static final PropertyDescriptor PASSWORD = new PropertyDescriptor.Builder() - .name("Password") - .description("Password to access the Cassandra cluster") - .required(false) - .sensitive(true) - .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) - .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) - .build(); - - public static final PropertyDescriptor CONSISTENCY_LEVEL = new PropertyDescriptor.Builder() - .name("Consistency Level") - .description("The strategy for how many replicas must respond before results are returned.") - .required(true) - .allowableValues(ConsistencyLevel.values()) - .defaultValue("ONE") - .build(); - - static final PropertyDescriptor COMPRESSION_TYPE = new PropertyDescriptor.Builder() + public static final PropertyDescriptor COMPRESSION_TYPE = new PropertyDescriptor.Builder() .name("Compression Type") .description("Enable compression at transport-level requests and responses") .required(false) @@ -125,27 +57,10 @@ public class CassandraSessionProvider extends AbstractControllerService implemen .defaultValue("NONE") .build(); - static final PropertyDescriptor READ_TIMEOUT_MS = new PropertyDescriptor.Builder() - .name("read-timeout-ms") - .displayName("Read Timout (ms)") - .description("Read timeout (in milliseconds). 0 means no timeout. If no value is set, the underlying default will be used.") - .required(false) - .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) - .addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR) - .build(); - - static final PropertyDescriptor CONNECT_TIMEOUT_MS = new PropertyDescriptor.Builder() - .name("connect-timeout-ms") - .displayName("Connect Timeout (ms)") - .description("Connection timeout (in milliseconds). 0 means no timeout. If no value is set, the underlying default will be used.") - .required(false) - .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) - .addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR) - .build(); - private List properties; private Cluster cluster; - private Session cassandraSession; + private Session session; + private CassandraSession cassandraSession; @Override public void init(final ControllerServiceInitializationContext context) { @@ -188,16 +103,16 @@ public void onDisabled(){ } @Override - public Cluster getCluster() { + public Optional getClusterName() { if (cluster != null) { - return cluster; + return Optional.ofNullable(cluster.getClusterName()); } else { throw new ProcessException("Unable to get the Cassandra cluster detail."); } } @Override - public Session getCassandraSession() { + public CassandraSession getCassandraSession() { if (cassandraSession != null) { return cassandraSession; } else { @@ -254,7 +169,8 @@ private void connectToCassandra(ConfigurationContext context) { log.info("Connected to Cassandra cluster: {}", new Object[]{metadata.getClusterName()}); cluster = newCluster; - cassandraSession = newSession; + session = newSession; + cassandraSession = new Cassandra3Session(session); } } @@ -312,4 +228,9 @@ private Cluster createCluster(final List contactPoints, final return builder.build(); } + + @Override + protected Object[] getConsistencyLevelValues() { + return ConsistencyLevel.values(); + } } diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services-nar/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services-nar/pom.xml new file mode 100644 index 000000000000..64a647636206 --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services-nar/pom.xml @@ -0,0 +1,56 @@ + + + + + nifi-cassandra-bundle + org.apache.nifi + 2.0.0-SNAPSHOT + + 4.0.0 + + nifi-cassandra4-services-nar + nar + + + + + + com.google.guava + guava + provided + + + + + + + org.apache.nifi + nifi-cassandra-services-api-nar + 2.0.0-SNAPSHOT + nar + + + org.apache.nifi + nifi-cassandra4-services + 2.0.0-SNAPSHOT + + + org.apache.nifi + nifi-cassandra-distributedmapcache-service + 2.0.0-SNAPSHOT + + + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services-nar/src/main/resources/META-INF/LICENSE new file mode 100644 index 000000000000..04416de4c91f --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services-nar/src/main/resources/META-INF/LICENSE @@ -0,0 +1,352 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +APACHE NIFI SUBCOMPONENTS: + +The Apache NiFi project contains subcomponents with separate copyright +notices and license terms. Your use of the source code for the these +subcomponents is subject to the terms and conditions of the following +licenses. + +This product bundles 'libffi' which is available under an MIT style license. + libffi - Copyright (c) 1996-2014 Anthony Green, Red Hat, Inc and others. + see https://github.com/java-native-access/jna/blob/master/native/libffi/LICENSE + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + ``Software''), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +This product bundles 'asm' which is available under a 3-Clause BSD style license. +For details see http://asm.ow2.org/asmdex-license.html + + Copyright (c) 2012 France Télécom + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. + + The binary distribution of this product bundles 'Bouncy Castle JDK 1.5' + under an MIT style license. + + Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +The binary distribution of this product bundles 'JNR x86asm' under an MIT +style license. + + Copyright (C) 2010 Wayne Meissner + Copyright (c) 2008-2009, Petr Kobalicek + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +This product bundles 'logback' which is dual-licensed under the EPL v1.0 +and the LGPL 2.1. + + Logback: the reliable, generic, fast and flexible logging framework. + + Copyright (C) 1999-2017, QOS.ch. All rights reserved. + + This program and the accompanying materials are dual-licensed under + either the terms of the Eclipse Public License v1.0 as published by + the Eclipse Foundation or (per the licensee's choosing) under the + terms of the GNU Lesser General Public License version 2.1 as + published by the Free Software Foundation. + +The binary distribution of this product bundles 'ANTLR 3' which is available +under a "3-clause BSD" license. For details see http://www.antlr.org/license.html + + Copyright (c) 2012 Terence Parr and Sam Harwell + All rights reserved. + Redistribution and use in source and binary forms, with or without modification, are permitted + provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this list of + conditions and the following disclaimer. + Redistributions in binary form must reproduce the above copyright notice, this list of + conditions and the following disclaimer in the documentation and/or other materials + provided with the distribution. + + Neither the name of the author nor the names of its contributors may be used to endorse + or promote products derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services-nar/src/main/resources/META-INF/NOTICE new file mode 100644 index 000000000000..f2261add8685 --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services-nar/src/main/resources/META-INF/NOTICE @@ -0,0 +1,292 @@ +nifi-cassandra-services-nar +Copyright 2016-2020 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +****************** +Apache Software License v2 +****************** + +The following binary components are provided under the Apache Software License v2 + + (ASLv2) DataStax Java Driver for Apache Cassandra - Core + The following NOTICE information applies: + DataStax Java Driver for Apache Cassandra - Core + Copyright (C) 2012-2017 DataStax Inc. + + (ASLv2) Jackson JSON processor + The following NOTICE information applies: + # Jackson JSON processor + + Jackson is a high-performance, Free/Open Source JSON processing library. + It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has + been in development since 2007. + It is currently developed by a community of developers, as well as supported + commercially by FasterXML.com. + + ## Licensing + + Jackson core and extension components may licensed under different licenses. + To find the details that apply to this artifact see the accompanying LICENSE file. + For more information, including possible other licensing options, contact + FasterXML.com (http://fasterxml.com). + + ## Credits + + A list of contributors may be found from CREDITS file, which is included + in some artifacts (usually source distributions); but is always available + from the source code management (SCM) system project uses. + + (ASLv2) Apache Commons Codec + The following NOTICE information applies: + Apache Commons Codec + Copyright 2002-2014 The Apache Software Foundation + + src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java + contains test data from http://aspell.net/test/orig/batch0.tab. + Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org) + + =============================================================================== + + The content of package org.apache.commons.codec.language.bm has been translated + from the original php source code available at http://stevemorse.org/phoneticinfo.htm + with permission from the original authors. + Original source copyright: + Copyright (c) 2008 Alexander Beider & Stephen P. Morse. + + (ASLv2) Apache Commons Lang + The following NOTICE information applies: + Apache Commons Lang + Copyright 2001-2017 The Apache Software Foundation + + This product includes software from the Spring Framework, + under the Apache License 2.0 (see: StringUtils.containsWhitespace()) + + (ASLv2) Guava + The following NOTICE information applies: + Guava + Copyright 2015 The Guava Authors + + (ASLv2) JSON-SMART + The following NOTICE information applies: + Copyright 2011 JSON-SMART authors + + (ASLv2) Dropwizard Metrics + The following NOTICE information applies: + Copyright (c) 2010-2013 Coda Hale, Yammer.com + + This product includes software developed by Coda Hale and Yammer, Inc. + + This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64, + LongAdder), which was released with the following comments: + + Written by Doug Lea with assistance from members of JCP JSR-166 + Expert Group and released to the public domain, as explained at + http://creativecommons.org/publicdomain/zero/1.0/ + + (ASLv2) The Netty Project + The following NOTICE information applies: + Copyright 2014 The Netty Project + ------------------------------------------------------------------------------- + This product contains the extensions to Java Collections Framework which has + been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene: + + * LICENSE: + * license/LICENSE.jsr166y.txt (Public Domain) + * HOMEPAGE: + * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/ + * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/ + + This product contains a modified version of Robert Harder's Public Domain + Base64 Encoder and Decoder, which can be obtained at: + + * LICENSE: + * license/LICENSE.base64.txt (Public Domain) + * HOMEPAGE: + * http://iharder.sourceforge.net/current/java/base64/ + + This product contains a modified portion of 'Webbit', an event based + WebSocket and HTTP server, which can be obtained at: + + * LICENSE: + * license/LICENSE.webbit.txt (BSD License) + * HOMEPAGE: + * https://github.com/joewalnes/webbit + + This product contains a modified portion of 'SLF4J', a simple logging + facade for Java, which can be obtained at: + + * LICENSE: + * license/LICENSE.slf4j.txt (MIT License) + * HOMEPAGE: + * http://www.slf4j.org/ + + This product contains a modified portion of 'Apache Harmony', an open source + Java SE, which can be obtained at: + + * LICENSE: + * license/LICENSE.harmony.txt (Apache License 2.0) + * HOMEPAGE: + * http://archive.apache.org/dist/harmony/ + + This product contains a modified portion of 'jbzip2', a Java bzip2 compression + and decompression library written by Matthew J. Francis. It can be obtained at: + + * LICENSE: + * license/LICENSE.jbzip2.txt (MIT License) + * HOMEPAGE: + * https://code.google.com/p/jbzip2/ + + This product contains a modified portion of 'libdivsufsort', a C API library to construct + the suffix array and the Burrows-Wheeler transformed string for any input string of + a constant-size alphabet written by Yuta Mori. It can be obtained at: + + * LICENSE: + * license/LICENSE.libdivsufsort.txt (MIT License) + * HOMEPAGE: + * https://github.com/y-256/libdivsufsort + + This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM, + which can be obtained at: + + * LICENSE: + * license/LICENSE.jctools.txt (ASL2 License) + * HOMEPAGE: + * https://github.com/JCTools/JCTools + + This product optionally depends on 'JZlib', a re-implementation of zlib in + pure Java, which can be obtained at: + + * LICENSE: + * license/LICENSE.jzlib.txt (BSD style License) + * HOMEPAGE: + * http://www.jcraft.com/jzlib/ + + This product optionally depends on 'Compress-LZF', a Java library for encoding and + decoding data in LZF format, written by Tatu Saloranta. It can be obtained at: + + * LICENSE: + * license/LICENSE.compress-lzf.txt (Apache License 2.0) + * HOMEPAGE: + * https://github.com/ning/compress + + This product optionally depends on 'lz4', a LZ4 Java compression + and decompression library written by Adrien Grand. It can be obtained at: + + * LICENSE: + * license/LICENSE.lz4.txt (Apache License 2.0) + * HOMEPAGE: + * https://github.com/jpountz/lz4-java + + This product optionally depends on 'lzma-java', a LZMA Java compression + and decompression library, which can be obtained at: + + * LICENSE: + * license/LICENSE.lzma-java.txt (Apache License 2.0) + * HOMEPAGE: + * https://github.com/jponge/lzma-java + + This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression + and decompression library written by William Kinney. It can be obtained at: + + * LICENSE: + * license/LICENSE.jfastlz.txt (MIT License) + * HOMEPAGE: + * https://code.google.com/p/jfastlz/ + + This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data + interchange format, which can be obtained at: + + * LICENSE: + * license/LICENSE.protobuf.txt (New BSD License) + * HOMEPAGE: + * https://github.com/google/protobuf + + This product optionally depends on 'Bouncy Castle Crypto APIs' to generate + a temporary self-signed X.509 certificate when the JVM does not provide the + equivalent functionality. It can be obtained at: + + * LICENSE: + * license/LICENSE.bouncycastle.txt (MIT License) + * HOMEPAGE: + * http://www.bouncycastle.org/ + + This product optionally depends on 'Snappy', a compression library produced + by Google Inc, which can be obtained at: + + * LICENSE: + * license/LICENSE.snappy.txt (New BSD License) + * HOMEPAGE: + * https://github.com/google/snappy + + This product optionally depends on 'JBoss Marshalling', an alternative Java + serialization API, which can be obtained at: + + * LICENSE: + * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1) + * HOMEPAGE: + * http://www.jboss.org/jbossmarshalling + + This product optionally depends on 'Caliper', Google's micro- + benchmarking framework, which can be obtained at: + + * LICENSE: + * license/LICENSE.caliper.txt (Apache License 2.0) + * HOMEPAGE: + * https://github.com/google/caliper + + This product optionally depends on 'Apache Log4J', a logging framework, which + can be obtained at: + + * LICENSE: + * license/LICENSE.log4j.txt (Apache License 2.0) + * HOMEPAGE: + * http://logging.apache.org/log4j/ + + This product optionally depends on 'Aalto XML', an ultra-high performance + non-blocking XML processor, which can be obtained at: + + * LICENSE: + * license/LICENSE.aalto-xml.txt (Apache License 2.0) + * HOMEPAGE: + * http://wiki.fasterxml.com/AaltoHome + + This product contains a modified version of 'HPACK', a Java implementation of + the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at: + + * LICENSE: + * license/LICENSE.hpack.txt (Apache License 2.0) + * HOMEPAGE: + * https://github.com/twitter/hpack + + This product contains a modified portion of 'Apache Commons Lang', a Java library + provides utilities for the java.lang API, which can be obtained at: + + * LICENSE: + * license/LICENSE.commons-lang.txt (Apache License 2.0) + * HOMEPAGE: + * https://commons.apache.org/proper/commons-lang/ + + This product contains a forked and modified version of Tomcat Native + + * LICENSE: + * ASL2 + * HOMEPAGE: + * http://tomcat.apache.org/native-doc/ + * https://svn.apache.org/repos/asf/tomcat/native/ + + (ASLv2) Objenesis + The following NOTICE information applies: + Objenesis + Copyright 2006-2013 Joe Walnes, Henri Tremblay, Leonardo Mesquita + +************************ +Eclipse Public License 1.0 +************************ + +The following binary components are provided under the Eclipse Public License 1.0. See project link for details. + + (EPL 2.0)(GPL 2)(LGPL 2.1) JNR Posix ( jnr.posix ) https://github.com/jnr/jnr-posix/blob/master/LICENSE.txt + (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.2.6 - http://logback.qos.ch/) + (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.2.6 - http://logback.qos.ch/) diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/pom.xml new file mode 100644 index 000000000000..3beea0b7aef2 --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/pom.xml @@ -0,0 +1,66 @@ + + + + + nifi-cassandra-bundle + org.apache.nifi + 2.0.0-SNAPSHOT + + 4.0.0 + + nifi-cassandra4-services + jar + + + 4.17.0 + + + + + org.apache.nifi + nifi-api + + + org.apache.nifi + nifi-utils + + + org.apache.nifi + nifi-cassandra-services-api + provided + + + + com.datastax.oss + java-driver-core + ${cassandra4.sdk.version} + provided + + + + org.apache.nifi + nifi-ssl-context-service-api + + + org.apache.nifi + nifi-framework-api + + + org.apache.nifi + nifi-mock + + + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/java/org/apache/nifi/service/Cassandra4PreparedStatement.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/java/org/apache/nifi/service/Cassandra4PreparedStatement.java new file mode 100644 index 000000000000..0e1576ff988b --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/java/org/apache/nifi/service/Cassandra4PreparedStatement.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.service; + +import com.datastax.oss.driver.api.core.cql.PreparedStatement; +import org.apache.nifi.cassandra.CassandraBoundStatement; +import org.apache.nifi.cassandra.CassandraPreparedStatement; + +public class Cassandra4PreparedStatement implements CassandraPreparedStatement { + private PreparedStatement + + public Cassandra4PreparedStatement(PreparedStatement preparedStatement) { + + } + @Override + public CassandraBoundStatement bind(Object... objects) { + return null; + } +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/java/org/apache/nifi/service/Cassandra4Session.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/java/org/apache/nifi/service/Cassandra4Session.java new file mode 100644 index 000000000000..76c22e504aa2 --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/java/org/apache/nifi/service/Cassandra4Session.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.service; + +import com.datastax.oss.driver.api.core.CqlSession; +import com.datastax.oss.driver.api.core.session.Session; +import com.datastax.oss.driver.api.core.session.SessionBuilder; +import org.apache.nifi.cassandra.CassandraBoundStatement; +import org.apache.nifi.cassandra.CassandraPreparedStatement; +import org.apache.nifi.cassandra.CassandraResultSetFuture; +import org.apache.nifi.cassandra.CassandraSession; + +import java.util.Optional; + + +public class Cassandra4Session implements CassandraSession { + + protected CqlSession session; + + public Cassandra4Session(CqlSession session) { + this.session = session; + } + + @Override + public CassandraPreparedStatement prepare(String s) { + return () -> new Cassandra4PreparedStatement(session.prepare(s)); + } + + @Override + public CassandraResultSetFuture executeAsync(CassandraBoundStatement boundStatement) { + // TODO + } + + @Override + public void close() { + session.close(); + } + + @Override + public Optional getClusterName() { + return session.getMetadata().getClusterName(); + } +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/java/org/apache/nifi/service/Cassandra4SessionProvider.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/java/org/apache/nifi/service/Cassandra4SessionProvider.java new file mode 100644 index 000000000000..b4b4460cadb8 --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/java/org/apache/nifi/service/Cassandra4SessionProvider.java @@ -0,0 +1,226 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.service; + +import java.net.InetSocketAddress; +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import javax.net.ssl.SSLContext; + +import com.datastax.oss.driver.api.core.CqlSession; +import com.datastax.oss.driver.api.core.CqlSessionBuilder; +import com.datastax.oss.driver.api.core.DefaultConsistencyLevel; +import com.datastax.oss.driver.api.core.config.DriverConfigLoader; +import com.datastax.oss.driver.api.core.config.ProgrammaticDriverConfigLoaderBuilder; +import com.datastax.oss.driver.api.core.session.Session; +import org.apache.nifi.annotation.documentation.CapabilityDescription; +import org.apache.nifi.annotation.documentation.Tags; +import org.apache.nifi.annotation.lifecycle.OnDisabled; +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.cassandra.AbstractCassandraSessionProvider; +import org.apache.nifi.cassandra.CassandraSession; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.PropertyValue; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.controller.ControllerServiceInitializationContext; +import org.apache.nifi.logging.ComponentLog; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.ssl.SSLContextService; + +import static com.datastax.oss.driver.api.core.config.DefaultDriverOption.CONNECTION_CONNECT_TIMEOUT; +import static com.datastax.oss.driver.api.core.config.DefaultDriverOption.PROTOCOL_COMPRESSION; +import static com.datastax.oss.driver.api.core.config.DefaultDriverOption.REQUEST_CONSISTENCY; +import static com.datastax.oss.driver.api.core.config.DefaultDriverOption.REQUEST_SERIAL_CONSISTENCY; +import static com.datastax.oss.driver.api.core.config.DefaultDriverOption.REQUEST_TIMEOUT; +import static com.datastax.oss.driver.api.core.config.DefaultDriverOption.REQUEST_TRACE_CONSISTENCY; + +@Tags({"cassandra", "dbcp", "database", "connection", "pooling"}) +@CapabilityDescription("Provides connection session for Cassandra processors to work with Apache Cassandra.") +public class Cassandra4SessionProvider extends AbstractCassandraSessionProvider { + + public static final PropertyDescriptor COMPRESSION_TYPE = new PropertyDescriptor.Builder() + .name("Compression Type") + .description("Enable compression at transport-level requests and responses") + .required(false) + .allowableValues("NONE", "LZ4", "SNAPPY") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("NONE") + .build(); + private List properties; + private Session session; + private CassandraSession cassandraSession; + + @Override + public void init(final ControllerServiceInitializationContext context) { + List props = new ArrayList<>(); + + props.add(CONTACT_POINTS); + props.add(CLIENT_AUTH); + props.add(CONSISTENCY_LEVEL); + props.add(COMPRESSION_TYPE); + props.add(KEYSPACE); + props.add(USERNAME); + props.add(PASSWORD); + props.add(PROP_SSL_CONTEXT_SERVICE); + props.add(READ_TIMEOUT_MS); + props.add(CONNECT_TIMEOUT_MS); + + properties = props; + } + + @Override + public List getSupportedPropertyDescriptors() { + return properties; + } + + @OnEnabled + public void onEnabled(final ConfigurationContext context) { + connectToCassandra(context); + } + + @OnDisabled + public void onDisabled() { + if (cassandraSession != null) { + cassandraSession.close(); + cassandraSession = null; + } + } + + @Override + public CassandraSession getCassandraSession() { + if (cassandraSession != null) { + return cassandraSession; + } else { + throw new ProcessException("Unable to get the Cassandra session."); + } + } + + private void connectToCassandra(ConfigurationContext context) { + if (session == null) { + ComponentLog log = getLogger(); + final String contactPointList = context.getProperty(CONTACT_POINTS).evaluateAttributeExpressions().getValue(); + final String consistencyLevel = context.getProperty(CONSISTENCY_LEVEL).getValue(); + final String compressionType = context.getProperty(COMPRESSION_TYPE).getValue(); + + List contactPoints = getContactPoints(contactPointList); + + // Set up the client for secure (SSL/TLS communications) if configured to do so + final SSLContextService sslService = + context.getProperty(PROP_SSL_CONTEXT_SERVICE).asControllerService(SSLContextService.class); + final SSLContext sslContext; + + if (sslService == null) { + sslContext = null; + } else { + sslContext = sslService.createContext(); + } + + final String username, password; + PropertyValue usernameProperty = context.getProperty(USERNAME).evaluateAttributeExpressions(); + PropertyValue passwordProperty = context.getProperty(PASSWORD).evaluateAttributeExpressions(); + + if (usernameProperty != null && passwordProperty != null) { + username = usernameProperty.getValue(); + password = passwordProperty.getValue(); + } else { + username = null; + password = null; + } + + final Integer readTimeoutMillis = context.getProperty(READ_TIMEOUT_MS).evaluateAttributeExpressions().asInteger(); + final Integer connectTimeoutMillis = context.getProperty(CONNECT_TIMEOUT_MS).evaluateAttributeExpressions().asInteger(); + + // Connect to the cluster + PropertyValue keyspaceProperty = context.getProperty(KEYSPACE).evaluateAttributeExpressions(); + session = createSession(contactPoints, sslContext, username, password, compressionType, readTimeoutMillis, + connectTimeoutMillis, consistencyLevel, keyspaceProperty.getValue()); + + cassandraSession = new Cassandra4Session(session); + log.info("Connected to Cassandra cluster: {}", getClusterName()); + } + } + + private List getContactPoints(String contactPointList) { + + if (contactPointList == null) { + return null; + } + + final String[] contactPointStringList = contactPointList.split(","); + List contactPoints = new ArrayList<>(); + + for (String contactPointEntry : contactPointStringList) { + String[] addresses = contactPointEntry.split(":"); + final String hostName = addresses[0].trim(); + final int port = (addresses.length > 1) ? Integer.parseInt(addresses[1].trim()) : DEFAULT_CASSANDRA_PORT; + + contactPoints.add(new InetSocketAddress(hostName, port)); + } + + return contactPoints; + } + + private Session createSession(final List contactPoints, final SSLContext sslContext, + final String username, final String password, final String compressionType, + final Integer readTimeoutMillis, final Integer connectTimeoutMillis, + final String consistencyLevel, final String keyspaceName) { + + ProgrammaticDriverConfigLoaderBuilder driverConfigLoaderBuilder = + DriverConfigLoader.programmaticBuilder().withString(PROTOCOL_COMPRESSION, compressionType); + if (connectTimeoutMillis != null) { + driverConfigLoaderBuilder.withDuration(CONNECTION_CONNECT_TIMEOUT, Duration.ofMillis(connectTimeoutMillis)); + } + if (readTimeoutMillis != null) { + driverConfigLoaderBuilder.withDuration(REQUEST_TIMEOUT, Duration.ofMillis(readTimeoutMillis)); + } + if (consistencyLevel != null) { + driverConfigLoaderBuilder.withString(REQUEST_CONSISTENCY, consistencyLevel); + driverConfigLoaderBuilder.withString(REQUEST_SERIAL_CONSISTENCY, consistencyLevel); + driverConfigLoaderBuilder.withString(REQUEST_TRACE_CONSISTENCY, consistencyLevel); + } + CqlSessionBuilder builder = CqlSession.builder() + .withConfigLoader(driverConfigLoaderBuilder.build()) + .addContactPoints(contactPoints) + .withKeyspace(keyspaceName); + if (sslContext != null) { + builder = builder.withSslContext(sslContext); + } + + if (username != null && password != null) { + builder = builder.withAuthCredentials(username, password); + } + + return builder.build(); + } + + @Override + public Optional getClusterName() { + if (session != null) { + return session.getMetadata().getClusterName(); + } + return Optional.empty(); + } + + @Override + protected Object[] getConsistencyLevelValues() { + return DefaultConsistencyLevel.values(); + } + +} diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService new file mode 100644 index 000000000000..2e8d654fc3c7 --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +org.apache.nifi.service.Cassandra4SessionProvider \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/test/java/org/apache/nifi/service/MockCassandra4Processor.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/test/java/org/apache/nifi/service/MockCassandra4Processor.java new file mode 100644 index 000000000000..29586e03515e --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/test/java/org/apache/nifi/service/MockCassandra4Processor.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.service; + +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.processor.AbstractProcessor; +import org.apache.nifi.processor.ProcessContext; +import org.apache.nifi.processor.ProcessSession; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; + +import java.util.Collections; +import java.util.List; + +/** + * Mock Cassandra processor for testing Cassandra4SessionProvider + */ +public class MockCassandra4Processor extends AbstractProcessor{ + private static PropertyDescriptor CASSANDRA_SESSION_PROVIDER = new PropertyDescriptor.Builder() + .name("cassandra4-session-provider") + .displayName("Cassandra Session Provider") + .required(true) + .description("Controller Service to obtain a Cassandra connection session") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .identifiesControllerService(Cassandra4SessionProvider.class) + .build(); + + @Override + public List getSupportedPropertyDescriptors() { + return Collections.singletonList(CASSANDRA_SESSION_PROVIDER); + } + + @Override + public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException { + + } +} diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/test/java/org/apache/nifi/service/TestCassandra4SessionProvider.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/test/java/org/apache/nifi/service/TestCassandra4SessionProvider.java new file mode 100644 index 000000000000..1e3bed66f103 --- /dev/null +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra4-services/src/test/java/org/apache/nifi/service/TestCassandra4SessionProvider.java @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.service; + +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.reporting.InitializationException; +import org.apache.nifi.util.TestRunner; +import org.apache.nifi.util.TestRunners; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class TestCassandra4SessionProvider { + + private static TestRunner runner; + private static Cassandra4SessionProvider sessionProvider; + + @BeforeAll + public static void setup() throws InitializationException { + MockCassandra4Processor mockCassandra4Processor = new MockCassandra4Processor(); + sessionProvider = new Cassandra4SessionProvider(); + + runner = TestRunners.newTestRunner(mockCassandra4Processor); + runner.addControllerService("cassandra-session-provider", sessionProvider); + } + + @Test + public void testGetPropertyDescriptors() { + List properties = sessionProvider.getPropertyDescriptors(); + + assertEquals(10, properties.size()); + assertTrue(properties.contains(Cassandra4SessionProvider.CLIENT_AUTH)); + assertTrue(properties.contains(Cassandra4SessionProvider.CONSISTENCY_LEVEL)); + assertTrue(properties.contains(Cassandra4SessionProvider.CONTACT_POINTS)); + assertTrue(properties.contains(Cassandra4SessionProvider.KEYSPACE)); + assertTrue(properties.contains(Cassandra4SessionProvider.PASSWORD)); + assertTrue(properties.contains(Cassandra4SessionProvider.PROP_SSL_CONTEXT_SERVICE)); + assertTrue(properties.contains(Cassandra4SessionProvider.USERNAME)); + } + +} diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml index 0107c8de154e..224aa707b7e2 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml @@ -24,7 +24,6 @@ - 3.11.5 19.0 @@ -39,6 +38,8 @@ nifi-cassandra-services-api-nar nifi-cassandra-services nifi-cassandra-services-nar + nifi-cassandra4-services + nifi-cassandra4-services-nar