From 27fa595b25c848bc06579748c17be2b0bf6dcd2e Mon Sep 17 00:00:00 2001 From: EndzeitBegins <16666115+EndzeitBegins@users.noreply.github.com> Date: Thu, 14 Mar 2024 19:29:38 +0100 Subject: [PATCH] NIFI-12901 Removed time units in description of time period properties This closes #8504 Signed-off-by: David Handermann --- .../main/java/org/apache/nifi/dbcp/utils/DBCPProperties.java | 4 ++-- .../java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java | 4 ++-- .../nifi/processors/standard/ReplaceTextWithMapping.java | 2 +- .../java/org/apache/nifi/dbcp/HikariCPConnectionPool.java | 2 +- .../java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-dbcp-base/src/main/java/org/apache/nifi/dbcp/utils/DBCPProperties.java b/nifi-nar-bundles/nifi-extension-utils/nifi-dbcp-base/src/main/java/org/apache/nifi/dbcp/utils/DBCPProperties.java index 21d6cdde25..0b2bd7d379 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-dbcp-base/src/main/java/org/apache/nifi/dbcp/utils/DBCPProperties.java +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-dbcp-base/src/main/java/org/apache/nifi/dbcp/utils/DBCPProperties.java @@ -136,7 +136,7 @@ public final class DBCPProperties { public static final PropertyDescriptor MAX_CONN_LIFETIME = new PropertyDescriptor.Builder() .displayName("Max Connection Lifetime") .name("dbcp-max-conn-lifetime") - .description("The maximum lifetime in milliseconds of a connection. After this time is exceeded the " + + .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.") .defaultValue(DefaultDataSourceValues.MAX_CONN_LIFETIME.getValue()) @@ -148,7 +148,7 @@ public final class DBCPProperties { public static final PropertyDescriptor EVICTION_RUN_PERIOD = new PropertyDescriptor.Builder() .displayName("Time Between Eviction Runs") .name("dbcp-time-between-eviction-runs") - .description("The number of milliseconds to sleep between runs of the idle connection evictor thread. When " + + .description("The time period to sleep between runs of the idle connection evictor thread. When " + "non-positive, no idle connection evictor thread will be run.") .defaultValue(DefaultDataSourceValues.EVICTION_RUN_PERIOD.getValue()) .required(false) diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java index 94cc1755f8..3f2bbff595 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/main/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPool.java @@ -198,7 +198,7 @@ public class Hive3ConnectionPool extends AbstractControllerService implements Hi public static final PropertyDescriptor MAX_CONN_LIFETIME = new PropertyDescriptor.Builder() .displayName("Max Connection Lifetime") .name("dbcp-max-conn-lifetime") - .description("The maximum lifetime in milliseconds of a connection. After this time is exceeded the " + + .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.") .defaultValue(DEFAULT_MAX_CONN_LIFETIME) @@ -210,7 +210,7 @@ public class Hive3ConnectionPool extends AbstractControllerService implements Hi public static final PropertyDescriptor EVICTION_RUN_PERIOD = new PropertyDescriptor.Builder() .displayName("Time Between Eviction Runs") .name("dbcp-time-between-eviction-runs") - .description("The number of milliseconds to sleep between runs of the idle connection evictor thread. When " + + .description("The time period to sleep between runs of the idle connection evictor thread. When " + "non-positive, no idle connection evictor thread will be run.") .defaultValue(DEFAULT_EVICTION_RUN_PERIOD) .required(false) diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java index fe8c55a509..d62401061c 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java @@ -99,7 +99,7 @@ public class ReplaceTextWithMapping extends AbstractProcessor { .build(); public static final PropertyDescriptor MAPPING_FILE_REFRESH_INTERVAL = new PropertyDescriptor.Builder() .name("Mapping File Refresh Interval") - .description("The polling interval in seconds to check for updates to the mapping file. The default is 60s.") + .description("The polling interval to check for updates to the mapping file. The default is 60s.") .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR) .required(true) .defaultValue("60s") diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java index 128701a610..230df5a6f3 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java +++ b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java @@ -179,7 +179,7 @@ public class HikariCPConnectionPool extends AbstractControllerService implements public static final PropertyDescriptor MAX_CONN_LIFETIME = new PropertyDescriptor.Builder() .name("hikaricp-max-conn-lifetime") .displayName("Max Connection Lifetime") - .description("The maximum lifetime in milliseconds of a connection. After this time is exceeded the " + + .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.") .defaultValue(DEFAULT_MAX_CONN_LIFETIME) diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java index a031f15efb..5d75daf2ca 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java @@ -215,7 +215,7 @@ public class HadoopDBCPConnectionPool extends AbstractControllerService implemen public static final PropertyDescriptor MAX_CONN_LIFETIME = new PropertyDescriptor.Builder() .displayName("Max Connection Lifetime") .name("dbcp-max-conn-lifetime") - .description("The maximum lifetime in milliseconds of a connection. After this time is exceeded the " + + .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.") .defaultValue(DEFAULT_MAX_CONN_LIFETIME) @@ -227,7 +227,7 @@ public class HadoopDBCPConnectionPool extends AbstractControllerService implemen public static final PropertyDescriptor EVICTION_RUN_PERIOD = new PropertyDescriptor.Builder() .displayName("Time Between Eviction Runs") .name("dbcp-time-between-eviction-runs") - .description("The number of milliseconds to sleep between runs of the idle connection evictor thread. When " + + .description("The time period to sleep between runs of the idle connection evictor thread. When " + "non-positive, no idle connection evictor thread will be run.") .defaultValue(DEFAULT_EVICTION_RUN_PERIOD) .required(false)