NIFI-15018 Modified property names.

Author: dan-s1

nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java

@@ -139,7 +139,7 @@ abstract class AbstractEmailProcessor<T extends AbstractMailReceiver> extends Ab
             .addValidator(StandardValidators.BOOLEAN_VALIDATOR)
             .build();
     static final PropertyDescriptor CONNECTION_TIMEOUT = new PropertyDescriptor.Builder()
-            .name("Connection timeout")
+            .name("Connection Timeout")
             .description("The amount of time to wait to connect to Email server")
             .required(true)
             .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)

nifi-extension-bundles/nifi-extension-utils/nifi-database-utils/src/main/java/org/apache/nifi/util/db/JdbcProperties.java

@@ -27,7 +27,7 @@ public class JdbcProperties {
     public static final String OLD_DEFAULT_SCALE_PROPERTY_NAME = "dbf-default-scale";
 
     public static final PropertyDescriptor NORMALIZE_NAMES_FOR_AVRO = new PropertyDescriptor.Builder()
-            .name("Normalize Table/Column Names")
+            .name("Normalize Table and Column Names")
             .description("Whether to change non-Avro-compatible characters in column names to Avro-compatible characters. For example, colons and periods "
                     + "will be changed to underscores in order to build a valid Avro record.")
             .allowableValues("true", "false")

nifi-extension-bundles/nifi-extension-utils/nifi-dbcp-base/src/main/java/org/apache/nifi/dbcp/utils/DBCPProperties.java

@@ -110,7 +110,7 @@ private DBCPProperties() {
             .build();
 
     public static final PropertyDescriptor VALIDATION_QUERY = new PropertyDescriptor.Builder()
-            .name("Validation query")
+            .name("Validation Query")
             .description("Validation query used to validate connections before returning them. "
                     + "When connection is invalid, it gets dropped and new valid connection will be returned. "
                     + "Note!! Using validation might have some performance penalty.")
@@ -130,7 +130,7 @@ private DBCPProperties() {
             .build();
 
     public static final PropertyDescriptor MAX_IDLE = new PropertyDescriptor.Builder()
-            .name("Max Idle Connections")
+            .name("Maximum Idle Connections")
             .description("The maximum number of connections that can remain idle in the pool without extra ones being " +
                     "released. Set to any negative value to allow unlimited idle connections.")
             .defaultValue(DefaultDataSourceValues.MAX_IDLE.getValue())
@@ -140,7 +140,7 @@ private DBCPProperties() {
             .build();
 
     public static final PropertyDescriptor MAX_CONN_LIFETIME = new PropertyDescriptor.Builder()
-            .name("Max Connection Lifetime")
+            .name("Maximum Connection Lifetime")
             .description("The maximum lifetime of a connection. After this time is exceeded the " +
                     "connection will fail the next activation, passivation or validation test. A value of zero or less " +
                     "means the connection has an infinite lifetime.")

nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/ListenerProperties.java

@@ -125,7 +125,7 @@ public class ListenerProperties {
             .required(true)
             .build();
     public static final PropertyDescriptor WORKER_THREADS = new PropertyDescriptor.Builder()
-            .name("Max Number of Worker Threads")
+            .name("Worker Threads")
             .description("The maximum number of worker threads available for servicing TCP connections.")
             .addValidator(StandardValidators.createLongValidator(1, 65535, true))
             .defaultValue("2")

nifi-extension-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/FetchFileTransfer.java

@@ -117,7 +117,7 @@ public abstract class FetchFileTransfer extends AbstractProcessor {
         .build();
 
     public static final PropertyDescriptor FILE_NOT_FOUND_LOG_LEVEL = new PropertyDescriptor.Builder()
-        .name("Log level when file not found")
+        .name("Log Level When File Not Found")
         .description("Log level to use in case the file does not exist when the processor is triggered")
         .allowableValues(LogLevel.values())
         .defaultValue(LogLevel.ERROR.toString()) // backward compatibility support

nifi-extension-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/FileTransfer.java

@@ -142,7 +142,7 @@ default String getAbsolutePath(FlowFile flowFile, String remotePath) throws IOEx
     String OLD_FOLLOW_SYMLINK_PROPERTY_NAME = "follow-symlink";
 
     PropertyDescriptor FOLLOW_SYMLINK = new PropertyDescriptor.Builder()
-            .name("Follow symlink")
+            .name("Follow Symbolic Links")
             .description("If true, will pull even symbolic files and also nested symbolic subdirectories; otherwise, will not read symbolic files and will not traverse symbolic link subdirectories")
             .required(true)
             .defaultValue("false")

nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractPutHDFSRecord.java

@@ -86,7 +86,7 @@ public abstract class AbstractPutHDFSRecord extends AbstractHadoopProcessor {
             .build();
 
     public static final PropertyDescriptor UMASK = new PropertyDescriptor.Builder()
-            .name("Permissions umask")
+            .name("Permissions Umask")
             .description("A umask represented as an octal number which determines the permissions of files written to HDFS. " +
                     "This overrides the Hadoop Configuration dfs.umaskmode")
             .addValidator(HadoopValidators.UMASK_VALIDATOR)

nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-services/src/main/java/org/apache/nifi/snowflake/service/SnowflakeComputingConnectionPool.java

@@ -37,6 +37,7 @@
 import org.apache.nifi.expression.AttributeExpression;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.key.service.api.PrivateKeyService;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.util.StandardValidators;
@@ -200,6 +201,17 @@ public class SnowflakeComputingConnectionPool extends AbstractDBCPConnectionPool
             SOFT_MIN_EVICTABLE_IDLE_TIME
     );
 
+    @Override
+    public void migrateProperties(PropertyConfiguration config) {
+        config.renameProperty(DBCPProperties.OLD_VALIDATION_QUERY_PROPERTY_NAME, VALIDATION_QUERY.getName());
+        config.renameProperty(DBCPProperties.OLD_MIN_IDLE_PROPERTY_NAME, MIN_IDLE.getName());
+        config.renameProperty(DBCPProperties.OLD_MAX_IDLE_PROPERTY_NAME, MAX_IDLE.getName());
+        config.renameProperty(DBCPProperties.OLD_MAX_CONN_LIFETIME_PROPERTY_NAME, MAX_CONN_LIFETIME.getName());
+        config.renameProperty(DBCPProperties.OLD_EVICTION_RUN_PERIOD_PROPERTY_NAME, EVICTION_RUN_PERIOD.getName());
+        config.renameProperty(DBCPProperties.OLD_MIN_EVICTABLE_IDLE_TIME_PROPERTY_NAME, MIN_EVICTABLE_IDLE_TIME.getName());
+        config.renameProperty(DBCPProperties.OLD_SOFT_MIN_EVICTABLE_IDLE_TIME_PROPERTY_NAME, SOFT_MIN_EVICTABLE_IDLE_TIME.getName());
+    }
+
     @Override
     protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
         return PROPERTY_DESCRIPTORS;