Skip to content

Commit a6b3d14

Browse files
committed
Upgrade Checkstyle tool version to 10.21.2. (#577)
New violations: - UnnecessaryParentheses (8.42) - EmptyLineSeparator (10.0)
1 parent 402ee3c commit a6b3d14

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ subprojects {
165165
}
166166

167167
checkstyle {
168-
toolVersion '8.30'
168+
toolVersion '10.21.2'
169169
checkstyleTest.enabled = false
170170
}
171171

metafacture-triples/src/main/java/org/metafacture/triples/TripleFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void process(final Triple obj) {
134134

135135
final boolean matches = subjectMatcher.matches() || predicateMatcher.matches() || objectMatcher.matches();
136136

137-
if ((matches && passMatches) || (!matches && !passMatches)) {
137+
if (matches == passMatches) {
138138
getReceiver().process(obj);
139139
}
140140
}

metafix/src/main/java/org/metafacture/metafix/FixPath.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ private enum ReservedField {
324324
$prepend, $append, $first, $last;
325325

326326
private static final Map<String, ReservedField> STRING_TO_ENUM = new HashMap<>();
327+
327328
static {
328329
for (final ReservedField f : values()) {
329330
STRING_TO_ENUM.put(f.toString(), f);

metamorph/src/main/java/org/metafacture/metamorph/collectors/Range.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected void receive(final String name, final String value, final NamedValueSo
7878
}
7979
else {
8080
final int last = Integer.valueOf(value).intValue();
81-
for (int i = first.intValue(); (increment > 0 && i <= last) || (increment < 0 && i >= last); i += increment) {
81+
for (int i = first.intValue(); i == last || increment > 0 == i < last; i += increment) {
8282
values.add(Integer.valueOf(i));
8383
}
8484
first = null;

metamorph/src/main/java/org/metafacture/metamorph/maps/FileMap.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,11 @@ private void loadFile(final String file) {
197197
}
198198

199199
private boolean ignore(final String line) {
200-
return line.isEmpty() || (ignoreMatcher != null && ignoreMatcher.reset(line).matches());
200+
return line.isEmpty() || ignoreMatcher != null && ignoreMatcher.reset(line).matches();
201201
}
202202

203203
private boolean ignore(final int partsLength, final int minColumns, final int expColumns) {
204-
return partsLength < minColumns || (expColumns > 0 && partsLength != expColumns);
204+
return partsLength < minColumns || expColumns > 0 && partsLength != expColumns;
205205
}
206206

207207
private InputStream openStream(final String file) {

0 commit comments

Comments
 (0)