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

NIFI-13728 Remove deprecated property KERBEROS_RELOGIN_PERIOD in AbstractHadoopProcessor 

This closes #9247.

Signed-off-by: Peter Turcsanyi <turcsanyi@apache.org>
This commit is contained in:
EndzeitBegins 2024-09-08 15:57:13 +02:00 committed by Peter Turcsanyi
parent fafdb96a50
commit 61aeb7af39
No known key found for this signature in database
GPG Key ID: 55A813F1C3E553DC
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
View File

@ -56,7 +56,6 @@ import java.net.URI;
import java.security.PrivilegedExceptionAction; import java.security.PrivilegedExceptionAction;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@ -116,20 +115,6 @@ public abstract class AbstractHadoopProcessor extends AbstractProcessor implemen
.defaultValue(CompressionType.NONE.toString()) .defaultValue(CompressionType.NONE.toString())
.build(); .build();
/*
* TODO This property has been deprecated, remove for NiFi 2.0
*/
public static final PropertyDescriptor KERBEROS_RELOGIN_PERIOD = new PropertyDescriptor.Builder()
.name("Kerberos Relogin Period")
.required(false)
.description("Period of time which should pass before attempting a kerberos relogin.\n\nThis property has been deprecated, and has no effect on processing. " +
"Relogins now occur automatically.")
.defaultValue("4 hours")
.addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
.build();
public static final PropertyDescriptor ADDITIONAL_CLASSPATH_RESOURCES = new PropertyDescriptor.Builder() public static final PropertyDescriptor ADDITIONAL_CLASSPATH_RESOURCES = new PropertyDescriptor.Builder()
.name("Additional Classpath Resources") .name("Additional Classpath Resources")
.description("A comma-separated list of paths to files and/or directories that will be added to the classpath and used for loading native libraries. " + .description("A comma-separated list of paths to files and/or directories that will be added to the classpath and used for loading native libraries. " +
@ -169,12 +154,11 @@ public abstract class AbstractHadoopProcessor extends AbstractProcessor implemen
protected void init(ProcessorInitializationContext context) { protected void init(ProcessorInitializationContext context) {
hdfsResources.set(EMPTY_HDFS_RESOURCES); hdfsResources.set(EMPTY_HDFS_RESOURCES);
List<PropertyDescriptor> props = new ArrayList<>(); properties = List.of(
props.add(HADOOP_CONFIGURATION_RESOURCES); HADOOP_CONFIGURATION_RESOURCES,
props.add(KERBEROS_USER_SERVICE); KERBEROS_USER_SERVICE,
props.add(KERBEROS_RELOGIN_PERIOD); ADDITIONAL_CLASSPATH_RESOURCES
props.add(ADDITIONAL_CLASSPATH_RESOURCES); );
properties = Collections.unmodifiableList(props);
} }
@Override @Override
@ -183,6 +167,7 @@ public abstract class AbstractHadoopProcessor extends AbstractProcessor implemen
config.removeProperty("Kerberos Password"); config.removeProperty("Kerberos Password");
config.removeProperty("Kerberos Keytab"); config.removeProperty("Kerberos Keytab");
config.removeProperty("kerberos-credentials-service"); config.removeProperty("kerberos-credentials-service");
config.removeProperty("Kerberos Relogin Period");
} }
@Override @Override