From a6b3d141dd67782f559dd25ac52c6e70fbccf054 Mon Sep 17 00:00:00 2001
From: Jens Wille <jens.wille@hbz-nrw.de>
Date: Tue, 28 Jan 2025 16:05:49 +0100
Subject: [PATCH] Upgrade Checkstyle tool version to 10.21.2. (#577)

New violations:

- UnnecessaryParentheses (8.42)
- EmptyLineSeparator (10.0)
---
 build.gradle                                                  | 2 +-
 .../src/main/java/org/metafacture/triples/TripleFilter.java   | 2 +-
 metafix/src/main/java/org/metafacture/metafix/FixPath.java    | 1 +
 .../main/java/org/metafacture/metamorph/collectors/Range.java | 2 +-
 .../src/main/java/org/metafacture/metamorph/maps/FileMap.java | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3a08dde1c..cd2d49de2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -165,7 +165,7 @@ subprojects {
   }
 
   checkstyle {
-    toolVersion '8.30'
+    toolVersion '10.21.2'
     checkstyleTest.enabled = false
   }
 
diff --git a/metafacture-triples/src/main/java/org/metafacture/triples/TripleFilter.java b/metafacture-triples/src/main/java/org/metafacture/triples/TripleFilter.java
index 39180118d..437ced05b 100644
--- a/metafacture-triples/src/main/java/org/metafacture/triples/TripleFilter.java
+++ b/metafacture-triples/src/main/java/org/metafacture/triples/TripleFilter.java
@@ -134,7 +134,7 @@ public void process(final Triple obj) {
 
         final boolean matches = subjectMatcher.matches() || predicateMatcher.matches() || objectMatcher.matches();
 
-        if ((matches && passMatches) || (!matches && !passMatches)) {
+        if (matches == passMatches) {
             getReceiver().process(obj);
         }
     }
diff --git a/metafix/src/main/java/org/metafacture/metafix/FixPath.java b/metafix/src/main/java/org/metafacture/metafix/FixPath.java
index 7b5846eeb..0b96b8410 100644
--- a/metafix/src/main/java/org/metafacture/metafix/FixPath.java
+++ b/metafix/src/main/java/org/metafacture/metafix/FixPath.java
@@ -324,6 +324,7 @@ private enum ReservedField {
         $prepend, $append, $first, $last;
 
         private static final Map<String, ReservedField> STRING_TO_ENUM = new HashMap<>();
+
         static {
             for (final ReservedField f : values()) {
                 STRING_TO_ENUM.put(f.toString(), f);
diff --git a/metamorph/src/main/java/org/metafacture/metamorph/collectors/Range.java b/metamorph/src/main/java/org/metafacture/metamorph/collectors/Range.java
index fd700b5aa..0dfa042e0 100644
--- a/metamorph/src/main/java/org/metafacture/metamorph/collectors/Range.java
+++ b/metamorph/src/main/java/org/metafacture/metamorph/collectors/Range.java
@@ -78,7 +78,7 @@ protected void receive(final String name, final String value, final NamedValueSo
         }
         else {
             final int last = Integer.valueOf(value).intValue();
-            for (int i = first.intValue(); (increment > 0 && i <= last) || (increment < 0 && i >= last); i += increment) {
+            for (int i = first.intValue(); i == last || increment > 0 == i < last; i += increment) {
                 values.add(Integer.valueOf(i));
             }
             first = null;
diff --git a/metamorph/src/main/java/org/metafacture/metamorph/maps/FileMap.java b/metamorph/src/main/java/org/metafacture/metamorph/maps/FileMap.java
index 8462007ee..b67693252 100644
--- a/metamorph/src/main/java/org/metafacture/metamorph/maps/FileMap.java
+++ b/metamorph/src/main/java/org/metafacture/metamorph/maps/FileMap.java
@@ -197,11 +197,11 @@ private void loadFile(final String file) {
     }
 
     private boolean ignore(final String line) {
-        return line.isEmpty() || (ignoreMatcher != null && ignoreMatcher.reset(line).matches());
+        return line.isEmpty() || ignoreMatcher != null && ignoreMatcher.reset(line).matches();
     }
 
     private boolean ignore(final int partsLength, final int minColumns, final int expColumns) {
-        return partsLength < minColumns || (expColumns > 0 && partsLength != expColumns);
+        return partsLength < minColumns || expColumns > 0 && partsLength != expColumns;
     }
 
     private InputStream openStream(final String file) {