This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
The following commit(s) were added to refs/heads/master by this push:
new 730d880 Apply OpenRewrite static analysis cleanups
730d880 is described below
commit 730d88074d124d16bfcc450d5b373e87718a0aaf
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Mon Nov 16 15:00:39 2026 +0000
Apply OpenRewrite static analysis cleanups
---
src/main/java/org/apache/maven/shared/filtering/BaseFilter.java | 2 +-
.../java/org/apache/maven/shared/filtering/ChangeDetection.java | 2 +-
.../maven/shared/filtering/DefaultMavenResourcesFiltering.java | 6 +++---
.../java/org/apache/maven/shared/filtering/FilteringUtils.java | 7 ++++---
.../java/org/apache/maven/shared/filtering/PropertyUtils.java | 3 ++-
.../java/org/apache/maven/shared/filtering/ConsoleHolder.java | 2 +-
.../maven/shared/filtering/TestIncrementalBuildContext.java | 8 ++++----
.../apache/maven/shared/filtering/TestReflectionProperties.java | 2 +-
8 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
index abbfc47..13fe1d2 100644
--- a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
@@ -321,7 +321,7 @@ class BaseFilter implements DefaultFilterInfo {
if (escapeWindowsPaths) {
interpolator.addPostProcessor((expression, value) ->
- (value instanceof String) ?
FilteringUtils.escapeWindowsPath((String) value) : value);
+ value instanceof String ?
FilteringUtils.escapeWindowsPath((String) value) : value);
}
return interpolator;
}
diff --git
a/src/main/java/org/apache/maven/shared/filtering/ChangeDetection.java
b/src/main/java/org/apache/maven/shared/filtering/ChangeDetection.java
index 98ef9a9..b8cbdf1 100644
--- a/src/main/java/org/apache/maven/shared/filtering/ChangeDetection.java
+++ b/src/main/java/org/apache/maven/shared/filtering/ChangeDetection.java
@@ -43,5 +43,5 @@ public enum ChangeDetection {
/**
* Disable change detection; never overwrite existing file.
*/
- NEVER;
+ NEVER
}
diff --git
a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
index 3fbe213..1118418 100644
---
a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++
b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -190,7 +190,7 @@ public class DefaultMavenResourcesFiltering implements
MavenResourcesFiltering {
String targetPath = resource.getTargetPath();
- File resourceDirectory = (resource.getDirectory() == null) ? null
: new File(resource.getDirectory());
+ File resourceDirectory = resource.getDirectory() == null ? null :
new File(resource.getDirectory());
if (resourceDirectory != null && !resourceDirectory.isAbsolute()) {
resourceDirectory =
@@ -362,7 +362,7 @@ public class DefaultMavenResourcesFiltering implements
MavenResourcesFiltering {
||
mavenResourcesExecution.getPropertiesEncoding().length() < 1)
&&
!mavenResourcesExecution.getNonFilteredFileExtensions().contains("properties")
&& isFilteringUsed
- && propertiesFiles.size() > 0) {
+ && !propertiesFiles.isEmpty()) {
// @todo Sometime in the future we should change this to be a
warning
LOGGER.info("The encoding used to copy filtered properties files
has not been set."
+ " This means that the same encoding will be used to copy
filtered properties files"
@@ -440,7 +440,7 @@ public class DefaultMavenResourcesFiltering implements
MavenResourcesFiltering {
}
if (mavenResourcesExecution.isFilterFilenames()
- && mavenResourcesExecution.getFilterWrappers().size() > 0) {
+ && !mavenResourcesExecution.getFilterWrappers().isEmpty()) {
destination = filterFileName(destination,
mavenResourcesExecution.getFilterWrappers());
}
diff --git
a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
index 9d1638b..09d935a 100644
--- a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
@@ -82,7 +82,8 @@ public final class FilteringUtils {
if (!isEmpty(val) && PATTERN.matcher(val).matches()) {
// Adapted from StringUtils.replace in plexus-utils to accommodate
pre-escaped backslashes.
StringBuilder buf = new StringBuilder(val.length());
- int start = 0, end = 0;
+ int start = 0;
+ int end = 0;
while ((end = val.indexOf('\\', start)) != -1) {
buf.append(val, start, end).append("\\\\");
start = end + 1;
@@ -119,7 +120,7 @@ public final class FilteringUtils {
}
// deal with absolute files
- if (filenm.startsWith(File.separator) || (IS_WINDOWS &&
filenm.indexOf(":") > 0)) {
+ if (filenm.startsWith(File.separator) || (IS_WINDOWS &&
filenm.indexOf(":") >= 1)) {
File file = new File(filenm);
try {
@@ -155,7 +156,7 @@ public final class FilteringUtils {
filenm = sb.toString();
// must be relative
- File file = (new File(baseFile, filenm)).getAbsoluteFile();
+ File file = new File(baseFile, filenm).getAbsoluteFile();
try {
file = file.getCanonicalFile();
diff --git a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
index 933256f..dc6ccf4 100644
--- a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
@@ -182,7 +182,8 @@ public final class PropertyUtils {
}
String defaultValue = v;
StringBuilder ret = new StringBuilder();
- int idx, idx2;
+ int idx;
+ int idx2;
while ((idx = v.indexOf("${")) >= 0) {
// append prefix to result
diff --git a/src/test/java/org/apache/maven/shared/filtering/ConsoleHolder.java
b/src/test/java/org/apache/maven/shared/filtering/ConsoleHolder.java
index bf9a2e9..f46737b 100644
--- a/src/test/java/org/apache/maven/shared/filtering/ConsoleHolder.java
+++ b/src/test/java/org/apache/maven/shared/filtering/ConsoleHolder.java
@@ -29,7 +29,7 @@ import java.io.PrintStream;
* @author abelsromero
* @since 3.3.2
*/
-class ConsoleHolder {
+final class ConsoleHolder {
private PrintStream originalOut;
private PrintStream originalErr;
diff --git
a/src/test/java/org/apache/maven/shared/filtering/TestIncrementalBuildContext.java
b/src/test/java/org/apache/maven/shared/filtering/TestIncrementalBuildContext.java
index f04b8e5..bf1d67a 100644
---
a/src/test/java/org/apache/maven/shared/filtering/TestIncrementalBuildContext.java
+++
b/src/test/java/org/apache/maven/shared/filtering/TestIncrementalBuildContext.java
@@ -51,9 +51,9 @@ import org.sonatype.plexus.build.incremental.BuildContext;
public class TestIncrementalBuildContext implements BuildContext {
private final Path basedir;
- private final Set<Path> refresh = new HashSet<Path>();
- private final Set<Path> changedFiles = new HashSet<Path>();
- private final Set<Path> deletedFiles = new HashSet<Path>();
+ private final Set<Path> refresh = new HashSet<>();
+ private final Set<Path> changedFiles = new HashSet<>();
+ private final Set<Path> deletedFiles = new HashSet<>();
private final Map<String, Object> context = new HashMap<>();
public TestIncrementalBuildContext(Path basedir, Set<Path> changedFiles) {
@@ -200,7 +200,7 @@ public class TestIncrementalBuildContext implements
BuildContext {
public String[] getIncludedFiles() {
return files.stream()
.filter(p -> p.startsWith(basedir))
- .map(p -> basedir.relativize(p))
+ .map(basedir::relativize)
.map(Path::toString)
.toArray(i -> new String[i]);
}
diff --git
a/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
b/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
index a2926ff..41f5dd3 100644
---
a/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
+++
b/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
@@ -92,7 +92,7 @@ class TestReflectionProperties {
Properties reading = new Properties();
- try (FileInputStream readFileInputStream = new FileInputStream(to); ) {
+ try (FileInputStream readFileInputStream = new FileInputStream(to)) {
reading.load(readFileInputStream);
}