From ba5eaec957404d9a0e7147b2a55a2cdccd769d27 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 29 Jan 2024 10:33:22 +0100 Subject: [PATCH] RED-8085 pmd checkup/cleanup --- .../com.iqser.red.service.java-conventions.gradle.kts | 4 ++++ config/pmd/pmd.xml | 7 +++---- config/pmd/test_pmd.xml | 8 +++----- .../service/redaction/v1/server/model/ManualEntity.java | 1 + .../redaction/v1/server/model/document/TextRange.java | 1 + .../v1/server/model/document/entity/TextEntity.java | 1 + redaction-service-v1/rules-management/build.gradle.kts | 2 +- .../utility/rules/management/models/RuleType.java | 1 + 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts index 6514689a..1814943c 100644 --- a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts @@ -11,6 +11,10 @@ group = "com.iqser.red.service" java.sourceCompatibility = JavaVersion.VERSION_17 java.targetCompatibility = JavaVersion.VERSION_17 +pmd { + isConsoleOutput = true +} + tasks.pmdMain { pmd.ruleSetFiles = files("${rootDir}/config/pmd/pmd.xml") } diff --git a/config/pmd/pmd.xml b/config/pmd/pmd.xml index 22d6d4cd..7537e1ca 100644 --- a/config/pmd/pmd.xml +++ b/config/pmd/pmd.xml @@ -9,13 +9,12 @@ - - - + + - \ No newline at end of file + diff --git a/config/pmd/test_pmd.xml b/config/pmd/test_pmd.xml index 56d37d9e..be4aa924 100644 --- a/config/pmd/test_pmd.xml +++ b/config/pmd/test_pmd.xml @@ -10,15 +10,13 @@ - - - - + + - \ No newline at end of file + diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/ManualEntity.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/ManualEntity.java index daa5df20..5b47e232 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/ManualEntity.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/ManualEntity.java @@ -22,6 +22,7 @@ import lombok.experimental.FieldDefaults; @Builder @AllArgsConstructor @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE) +@SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName") public class ManualEntity implements IEntity { // The id must be mapped into a TextEntity as is for comments to work correctly diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/TextRange.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/TextRange.java index 370d19d7..9ec00087 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/TextRange.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/TextRange.java @@ -13,6 +13,7 @@ import lombok.Setter; @Setter @EqualsAndHashCode +@SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName") public class TextRange implements Comparable { private int start; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/TextEntity.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/TextEntity.java index 29ce6aee..a0a0c5c9 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/TextEntity.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/entity/TextEntity.java @@ -28,6 +28,7 @@ import lombok.experimental.FieldDefaults; @AllArgsConstructor @FieldDefaults(level = AccessLevel.PRIVATE) @EqualsAndHashCode(onlyExplicitlyIncluded = true) +@SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName") public class TextEntity implements IEntity { // primary key diff --git a/redaction-service-v1/rules-management/build.gradle.kts b/redaction-service-v1/rules-management/build.gradle.kts index a3fbfdfc..3f2a5597 100644 --- a/redaction-service-v1/rules-management/build.gradle.kts +++ b/redaction-service-v1/rules-management/build.gradle.kts @@ -1,6 +1,7 @@ plugins { application id("com.iqser.red.service.java-conventions") + id("io.freefair.lombok") version "8.4" } group = "com.knecon.fforesight.utility" @@ -27,7 +28,6 @@ sourceSets { dependencies { implementation(project(":redaction-service-server-v1")) - implementation("org.projectlombok:lombok:1.18.28") testImplementation(platform("org.junit:junit-bom:5.10.0")) testImplementation("org.junit.jupiter:junit-jupiter") diff --git a/redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/RuleType.java b/redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/RuleType.java index 8118e085..46ff26cf 100644 --- a/redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/RuleType.java +++ b/redaction-service-v1/rules-management/src/main/java/com/knecon/fforesight/utility/rules/management/models/RuleType.java @@ -9,6 +9,7 @@ import lombok.experimental.FieldDefaults; @AllArgsConstructor @EqualsAndHashCode(onlyExplicitlyIncluded = true) +@SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName") @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE) public class RuleType {