This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/creadur-rat.git
The following commit(s) were added to refs/heads/master by this push:
new 0be6046f RAT-398: Apply checkstyle warning fixes
0be6046f is described below
commit 0be6046f7e4774193ea42bc8eb3a6c459b5e6e5a
Author: P. Ottlinger <[email protected]>
AuthorDate: Sun May 4 22:43:23 2025 +0200
RAT-398: Apply checkstyle warning fixes
---
.../src/main/java/org/apache/rat/analysis/license/BaseLicense.java | 2 +-
.../org/apache/rat/analysis/license/FullTextMatchingLicense.java | 4 ++--
.../org/apache/rat/analysis/license/SimplePatternBasedLicense.java | 4 +---
.../main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java | 4 ++--
.../src/main/java/org/apache/rat/header/ArrayCharFilter.java | 2 +-
.../main/java/org/apache/rat/header/FilteringSequenceFactory.java | 5 ++---
.../src/main/java/org/apache/rat/header/LineNumberReader.java | 2 +-
.../src/main/java/org/apache/rat/mp/EnclosingMatcher.java | 4 ++--
.../src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java | 6 ++----
apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java | 2 +-
apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Help.java | 3 ++-
apache-rat-tools/src/main/resources/Ant.tpl | 6 +++---
apache-rat-tools/src/main/resources/Args.tpl | 4 ++--
apache-rat-tools/src/main/resources/Maven.tpl | 6 +++---
14 files changed, 25 insertions(+), 29 deletions(-)
diff --git
a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
index 388b3ee0..83b8494b 100644
---
a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
+++
b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/BaseLicense.java
@@ -57,7 +57,7 @@ public abstract class BaseLicense implements DeprecatedConfig
{
}
@Override
- final public ILicenseFamily getLicenseFamily() {
+ public final ILicenseFamily getLicenseFamily() {
return ILicenseFamily.builder()
.setLicenseFamilyCategory(licenseFamilyCategory)
.setLicenseFamilyName(licenseFamilyName)
diff --git
a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
index 0f966048..8a16c272 100644
---
a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
+++
b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
@@ -27,7 +27,7 @@ import org.apache.rat.license.ILicense;
* compares it to the full text of a given license (after reducing it
* to letters and numbers as well).
*
- * <p>The text comparison is case insensitive but assumes only
+ * <p>The text comparison is case-insensitive but assumes only
* characters in the US-ASCII charset are being matched.</p>
*
* @deprecated Use new configuration options
@@ -56,7 +56,7 @@ public class FullTextMatchingLicense extends BaseLicense {
return ILicense.builder()
.setFamily(getLicenseFamilyCategory())
.setName(getLicenseFamilyName())
- .setMatcher( new TextBuilder().setSimpleText(text) )
+ .setMatcher(new TextBuilder().setSimpleText(text))
.setNote(getNotes());
}
}
diff --git
a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
index 9c72f52b..21a3230e 100644
---
a/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
+++
b/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
@@ -36,12 +36,10 @@ import org.apache.rat.license.ILicense;
public class SimplePatternBasedLicense extends BaseLicense {
private String[] patterns;
-
public SimplePatternBasedLicense() {
DeprecationReporter.logDeprecated(SimplePatternBasedLicense.class);
}
-
public String[] getPatterns() {
return patterns;
}
@@ -65,7 +63,7 @@ public class SimplePatternBasedLicense extends BaseLicense {
return ILicense.builder()
.setFamily(getLicenseFamilyCategory())
.setName(getLicenseFamilyName())
- .setMatcher( getMatcher() )
+ .setMatcher(getMatcher())
.setNote(getNotes());
}
}
diff --git
a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
index f61b4d75..8259bfb4 100644
---
a/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
+++
b/apache-rat-core/src/main/java/org/apache/rat/analysis/matchers/FullTextMatcher.java
@@ -27,13 +27,13 @@ import org.apache.rat.analysis.IHeaders;
* it to the full text of a given license (after reducing it to letters and
* numbers as well).
* <p>
- * The text comparison is case insensitive but assumes only characters in the
+ * The text comparison is case-insensitive but assumes only characters in the
* US-ASCII charset are being matched.
* </p>
*/
public class FullTextMatcher extends SimpleTextMatcher {
/**
- * The text that we are searching for. This text has been pruned and
converted to lower case.
+ * The text that we are searching for. This text has been pruned and
converted to lower case.
*/
private final String prunedText;
diff --git
a/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java
b/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java
index e2799708..d30d6beb 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/header/ArrayCharFilter.java
@@ -36,7 +36,7 @@ class ArrayCharFilter implements CharFilter {
public boolean isFilteredOut(char character) {
boolean result = false;
- for(int i=0; i<length ;i++) {
+ for(int i = 0; i < length; i++) {
if (character == filtered[i]) {
result = true;
break;
diff --git
a/apache-rat-core/src/main/java/org/apache/rat/header/FilteringSequenceFactory.java
b/apache-rat-core/src/main/java/org/apache/rat/header/FilteringSequenceFactory.java
index 2ff79186..07213bf1 100644
---
a/apache-rat-core/src/main/java/org/apache/rat/header/FilteringSequenceFactory.java
+++
b/apache-rat-core/src/main/java/org/apache/rat/header/FilteringSequenceFactory.java
@@ -49,14 +49,13 @@ class FilteringSequenceFactory {
public CharSequence filter(LineNumberReader reader) throws IOException {
buffer.clear();
boolean eof = false;
- while(!eof) {
+ while (!eof) {
final int next = reader.read();
if (next == -1 || !buffer.hasRemaining()) {
eof = true;
} else {
final char character = (char) next;
- if (!filter.isFilteredOut(character))
- {
+ if (!filter.isFilteredOut(character)) {
buffer.put(character);
}
}
diff --git
a/apache-rat-core/src/main/java/org/apache/rat/header/LineNumberReader.java
b/apache-rat-core/src/main/java/org/apache/rat/header/LineNumberReader.java
index 1aa3f113..cbf26e24 100644
--- a/apache-rat-core/src/main/java/org/apache/rat/header/LineNumberReader.java
+++ b/apache-rat-core/src/main/java/org/apache/rat/header/LineNumberReader.java
@@ -45,7 +45,7 @@ public class LineNumberReader {
public int read() throws IOException {
final int c = parent.read();
- switch(c) {
+ switch (c) {
case 13:
previousCharWasCR = true;
++lineNumber;
diff --git
a/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
b/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
index 49fe0b8f..9312e3fe 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/EnclosingMatcher.java
@@ -30,12 +30,12 @@ abstract class EnclosingMatcher {
protected abstract void setMatcher(IHeaderMatcher.Builder builder);
@Parameter(required = false)
- public void setAll(All all) {
+ public void setAll(final All all) {
setMatcher(all);
}
@Parameter(required = false)
- public void setAny(Any any) {
+ public void setAny(final Any any) {
setMatcher(any);
}
diff --git
a/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java
b/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java
index f761d8fd..381f8433 100644
---
a/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java
+++
b/apache-rat-plugin/src/main/java/org/apache/rat/mp/HeaderMatcherSpecification.java
@@ -36,8 +36,7 @@ public class HeaderMatcherSpecification {
*
* @return Class name of the license matcher.
*/
- public String getClassName()
- {
+ public String getClassName() {
return className;
}
@@ -47,8 +46,7 @@ public class HeaderMatcherSpecification {
* @param pClassName
* Class name of the license matcher.
*/
- public void setClassName( String pClassName )
- {
+ public void setClassName(String pClassName) {
className = pClassName;
}
}
diff --git a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
index f2198cf3..f8d19a2c 100644
--- a/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
+++ b/apache-rat-plugin/src/main/java/org/apache/rat/mp/Spdx.java
@@ -27,7 +27,7 @@ import org.apache.rat.configuration.builders.SpdxBuilder;
@Deprecated
public class Spdx extends SpdxBuilder {
- @Parameter(name="name")
+ @Parameter(name = "name")
public void set(String name) {
super.setName(name);
}
diff --git a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Help.java
b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Help.java
index b534e561..b48ff79d 100644
--- a/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Help.java
+++ b/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Help.java
@@ -23,6 +23,7 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
+
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
@@ -201,7 +202,7 @@ public class Help extends BaseAntTask {
.append(getNewLine());
int x = 0;
- for (final Iterator<AntOption> it = optList.iterator();
it.hasNext(); ) {
+ for (final Iterator<AntOption> it = optList.iterator();
it.hasNext();) {
final AntOption option = it.next();
String name = option.cleanupName();
String example = exampleList.get(x++);
diff --git a/apache-rat-tools/src/main/resources/Ant.tpl
b/apache-rat-tools/src/main/resources/Ant.tpl
index 5360ba63..407bc164 100644
--- a/apache-rat-tools/src/main/resources/Ant.tpl
+++ b/apache-rat-tools/src/main/resources/Ant.tpl
@@ -47,11 +47,11 @@ import java.util.stream.Collectors;
*/
${class}
- private final static Map<String,String> xlateName = new HashMap<>();
+ private static final Map<String, String> xlateName = new HashMap<>();
- private final static List<String> unsupportedArgs = new ArrayList<>();
+ private static final List<String> unsupportedArgs = new ArrayList<>();
- private final static Map<String, String> deprecatedArgs = new HashMap<>();
+ private static final Map<String, String> deprecatedArgs = new HashMap<>();
static {
${static}
diff --git a/apache-rat-tools/src/main/resources/Args.tpl
b/apache-rat-tools/src/main/resources/Args.tpl
index 0b3e1bde..d21bc579 100644
--- a/apache-rat-tools/src/main/resources/Args.tpl
+++ b/apache-rat-tools/src/main/resources/Args.tpl
@@ -19,7 +19,7 @@
}
/**
- * A map of CLI based arguments to values.
+ * A map of CLI-based arguments to values.
*/
protected final Map<String, List<String>> args = new HashMap<>();
@@ -89,7 +89,7 @@
/**
* Add values to the key in the argument list.
- * empty values are ignored. If no non-empty values are present no change
is made.
+ * empty values are ignored. If no non-empty values are present no change
is made.
* If the key does not exist, adds it.
* @param key the key for the map.
* @param value the array of values to set.
diff --git a/apache-rat-tools/src/main/resources/Maven.tpl
b/apache-rat-tools/src/main/resources/Maven.tpl
index 5ec7c60f..0d5d420e 100644
--- a/apache-rat-tools/src/main/resources/Maven.tpl
+++ b/apache-rat-tools/src/main/resources/Maven.tpl
@@ -45,11 +45,11 @@ import java.util.stream.Collectors;
*/
${class}
- private final static Map<String,String> xlateName = new HashMap<>();
+ private static final Map<String, String> xlateName = new HashMap<>();
- private final static List<String> unsupportedArgs = new ArrayList<>();
+ private static final List<String> unsupportedArgs = new ArrayList<>();
- private final static Map<String, String> deprecatedArgs = new HashMap<>();
+ private static final Map<String, String> deprecatedArgs = new HashMap<>();
static {
${static}
