This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 6bd2504efe NIFI-14830 Implemented use of PMD rule
AvoidAssertAsIdentifier.
6bd2504efe is described below
commit 6bd2504efea092799aa9416b645983c65c8d22c3
Author: dan-s1 <[email protected]>
AuthorDate: Thu Aug 7 22:06:14 2025 +0000
NIFI-14830 Implemented use of PMD rule AvoidAssertAsIdentifier.
Signed-off-by: Pierre Villard <[email protected]>
This closes #10180.
---
.../org/apache/nifi/parquet/ParquetTestUtils.java | 4 +++-
.../nifi/script/impl/ValidationContextAdapter.java | 6 +++---
.../org/apache/nifi/processors/standard/TestFTP.java | 4 ++--
.../queue/clustered/TestSwappablePriorityQueue.java | 2 +-
.../analytics/models/TestOrdinaryLeastSquares.java | 19 ++++++++-----------
.../status/analytics/models/TestSimpleRegression.java | 10 ++++++----
pmd-ruleset.xml | 1 +
7 files changed, 24 insertions(+), 22 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/ParquetTestUtils.java
b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/ParquetTestUtils.java
index 283bc88656..14cc1c569a 100644
---
a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/ParquetTestUtils.java
+++
b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/ParquetTestUtils.java
@@ -35,6 +35,8 @@ import org.apache.parquet.avro.AvroParquetWriter;
import org.apache.parquet.hadoop.ParquetWriter;
import org.apache.parquet.hadoop.util.HadoopOutputFile;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class ParquetTestUtils {
public static File createUsersParquetFile(int numUsers) throws IOException
{
@@ -70,7 +72,7 @@ public class ParquetTestUtils {
private static Schema getSchema() throws IOException {
try (InputStream schemaInputStream =
ParquetTestUtils.class.getClassLoader().getResourceAsStream("avro/user.avsc")) {
- assert schemaInputStream != null;
+ assertNotNull(schemaInputStream);
final String schemaString = IOUtils.toString(schemaInputStream,
StandardCharsets.UTF_8);
return new Schema.Parser().parse(schemaString);
}
diff --git
a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/impl/ValidationContextAdapter.java
b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/impl/ValidationContextAdapter.java
index 9a8f49cd9d..d78d013478 100644
---
a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/impl/ValidationContextAdapter.java
+++
b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/impl/ValidationContextAdapter.java
@@ -25,15 +25,15 @@ import
org.apache.nifi.expression.ExpressionLanguageCompiler;
import java.util.Collection;
import java.util.Map;
+import java.util.Objects;
import java.util.function.Function;
public abstract class ValidationContextAdapter implements ValidationContext {
- private ValidationContext innerValidationContext;
+ private final ValidationContext innerValidationContext;
public ValidationContextAdapter(ValidationContext innerValidationContext) {
- assert innerValidationContext != null;
- this.innerValidationContext = innerValidationContext;
+ this.innerValidationContext =
Objects.requireNonNull(innerValidationContext);
}
@Override
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestFTP.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestFTP.java
index d378bdde84..89791ebaca 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestFTP.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestFTP.java
@@ -197,8 +197,8 @@ public class TestFTP {
runner.run();
runner.assertTransferCount(PutFTP.REL_SUCCESS, 2);
- assert
(runner.getProvenanceEvents().get(0).getTransitUri().contains("ftp://localhost";));
- assert
(runner.getProvenanceEvents().get(1).getTransitUri().contains("ftp://127.0.0.1";));
+
assertTrue(runner.getProvenanceEvents().get(0).getTransitUri().contains("ftp://localhost";));
+
assertTrue(runner.getProvenanceEvents().get(1).getTransitUri().contains("ftp://127.0.0.1";));
}
@Test
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/queue/clustered/TestSwappablePriorityQueue.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/queue/clustered/TestSwappablePriorityQueue.java
index 68bab06e16..9504667ebf 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/queue/clustered/TestSwappablePriorityQueue.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/queue/clustered/TestSwappablePriorityQueue.java
@@ -782,7 +782,7 @@ public class TestSwappablePriorityQueue {
assertEquals(9998, queue.getActiveFlowFiles().size());
assertEquals(1, queue.getFlowFileQueueSize().getSwappedCount());
assertEquals(0, queue.getFlowFileQueueSize().getSwapFileCount());
- assert (swapManager.recoverSwapLocations(flowFileQueue,
"testGetMinLastQueueDate").isEmpty());
+ assertTrue(swapManager.recoverSwapLocations(flowFileQueue,
"testGetMinLastQueueDate").isEmpty());
// Ensure that the min and total are still correct
flowFileRecords.removeAll(polledRecords);
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/models/TestOrdinaryLeastSquares.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/models/TestOrdinaryLeastSquares.java
index aa2e03172b..f19fb81adb 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/models/TestOrdinaryLeastSquares.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/models/TestOrdinaryLeastSquares.java
@@ -26,6 +26,7 @@ import java.util.Map;
import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestOrdinaryLeastSquares {
@@ -82,10 +83,10 @@ public class TestOrdinaryLeastSquares {
predictorVars.put(1, 200 / 800.0);
Double target = model.predictVariable(0, predictorVars, 750.0);
Double rSquared = model.getScores().get("rSquared");
- assert (rSquared > .90);
+ assertTrue(rSquared > .90);
Date targetDate = new Date(target.longValue());
Date testDate = new Date(timestamp.longValue());
- assert (DateUtils.isSameDay(targetDate, testDate) &&
targetDate.after(testDate));
+ assertTrue(DateUtils.isSameDay(targetDate, testDate) &&
targetDate.after(testDate));
}
@@ -112,8 +113,8 @@ public class TestOrdinaryLeastSquares {
model.learn(Stream.of(features), Stream.of(labels));
Double target = model.predict(predictor);
Double rSquared = model.getScores().get("rSquared");
- assert (rSquared > .90);
- assert (target >= 950);
+ assertTrue(rSquared > .90);
+ assertTrue(target >= 950);
}
@@ -140,13 +141,9 @@ public class TestOrdinaryLeastSquares {
simpleRegression.learn(Stream.of(features), Stream.of(labels));
double olsR2 = ordinaryLeastSquares.getScores().get("rSquared");
double srR2 = simpleRegression.getScores().get("rSquared");
- assert (!Double.isNaN(olsR2));
- assert (!Double.isNaN(srR2));
- Map<String, Double> olsScores = ordinaryLeastSquares.getScores();
- Map<String, Double> srScores = simpleRegression.getScores();
- System.out.print(olsScores.toString());
- System.out.print(srScores.toString());
- assert (olsR2 > srR2);
+ assertFalse(Double.isNaN(olsR2));
+ assertFalse(Double.isNaN(srR2));
+ assertTrue(olsR2 > srR2);
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/models/TestSimpleRegression.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/models/TestSimpleRegression.java
index 847f9e2923..d97dc4556a 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/models/TestSimpleRegression.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/analytics/models/TestSimpleRegression.java
@@ -20,7 +20,9 @@ import org.junit.jupiter.api.Test;
import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestSimpleRegression {
@@ -45,7 +47,7 @@ public class TestSimpleRegression {
Double[] predictor = {timestamp + 5000};
Double target = model.predict(predictor);
assertNotNull(target);
- assert (target == 50);
+ assertEquals(50, (double) target);
}
@@ -70,7 +72,7 @@ public class TestSimpleRegression {
Double target = model.predictX(1000.0);
Double minTimeMillis = 1565343920000.0;
Double maxTimeMillis = 1565516720000.0;
- assert (target >= minTimeMillis && target <= maxTimeMillis);
+ assertTrue(target >= minTimeMillis && target <= maxTimeMillis);
}
@@ -97,7 +99,7 @@ public class TestSimpleRegression {
Double rSquared = model.getScores().get("rSquared");
Double minCount = -1265.0;
Double maxCount = 3235.0;
- assert (rSquared > .60);
- assert (target >= minCount && target <= maxCount);
+ assertTrue(rSquared > .60);
+ assertTrue(target >= minCount && target <= maxCount);
}
}
diff --git a/pmd-ruleset.xml b/pmd-ruleset.xml
index 9b59461b28..8caca386c8 100644
--- a/pmd-ruleset.xml
+++ b/pmd-ruleset.xml
@@ -79,6 +79,7 @@ under the License.
<rule ref="category/java/codestyle.xml/UseDiamondOperator" />
<rule ref="category/java/codestyle.xml/UseExplicitTypes" />
+ <rule ref="category/java/errorprone.xml/AvoidAssertAsIdentifier" />
<rule
ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor"
/>
<rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators" />
<rule ref="category/java/errorprone.xml/AvoidUsingOctalValues" />
