Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-12515 Removed deprecated Client Auth property from AMQP processors 

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #8162.
This commit is contained in:
Peter Turcsanyi 2023-12-14 22:02:11 +01:00 committed by Pierre Villard
parent 4727d591d1
commit ca4ee2407c
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AbstractAMQPProcessor.java
View File

@ -38,12 +38,12 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.migration.PropertyConfiguration;
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 org.apache.nifi.security.util.ClientAuth;
import org.apache.nifi.ssl.SSLContextService;
@ -125,14 +125,6 @@ abstract class AbstractAMQPProcessor<T extends AMQPWorker> extends AbstractProce
.allowableValues("true", "false")
.addValidator(StandardValidators.BOOLEAN_VALIDATOR)
.build();
public static final PropertyDescriptor CLIENT_AUTH = new PropertyDescriptor.Builder()
.name("ssl-client-auth")
.displayName("Client Auth")
.description("The property has no effect and therefore deprecated.")
.required(false)
.allowableValues(ClientAuth.values())
.defaultValue("NONE")
.build();
private static final List<PropertyDescriptor> propertyDescriptors;
@ -147,7 +139,6 @@ abstract class AbstractAMQPProcessor<T extends AMQPWorker> extends AbstractProce
properties.add(AMQP_VERSION);
properties.add(SSL_CONTEXT_SERVICE);
properties.add(USE_CERT_AUTHENTICATION);
properties.add(CLIENT_AUTH);
propertyDescriptors = Collections.unmodifiableList(properties);
}
@ -157,6 +148,11 @@ abstract class AbstractAMQPProcessor<T extends AMQPWorker> extends AbstractProce
private BlockingQueue<AMQPResource<T>> resourceQueue;
@Override
public void migrateProperties(final PropertyConfiguration config) {
config.removeProperty("ssl-client-auth");
}
@OnScheduled
public void onScheduled(ProcessContext context) {
resourceQueue = new LinkedBlockingQueue<>(context.getMaxConcurrentTasks());