This is an automated email from the ASF dual-hosted git repository.
cstamas 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 44606d1 Some modern java sugar syntax, fix some IDE warnings (#41)
44606d1 is described below
commit 44606d129ae2b891f8caf68339df04d6f23f80ee
Author: Olivier Lamy <[email protected]>
AuthorDate: Tue Mar 21 18:50:09 2023 +1000
Some modern java sugar syntax, fix some IDE warnings (#41)
Just dust off the code a bit.
---------
Signed-off-by: Olivier Lamy <[email protected]>
Co-authored-by: Tamas Cservenak <[email protected]>
---
.../java/org/apache/maven/shared/filtering/BaseFilter.java | 13 ++-----------
.../shared/filtering/DefaultMavenResourcesFiltering.java | 10 +++-------
.../org/apache/maven/shared/filtering/FilteringUtils.java | 6 ++----
.../filtering/InterpolatorFilterReaderLineEnding.java | 4 ++--
.../MultiDelimiterInterpolatorFilterReaderLineEnding.java | 8 ++++----
.../org/apache/maven/shared/filtering/PropertyUtils.java | 6 +++---
6 files changed, 16 insertions(+), 31 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 b29bb01..5660869 100644
--- a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
@@ -31,7 +31,6 @@ import java.util.TreeSet;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
-import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
import org.codehaus.plexus.interpolation.Interpolator;
import org.codehaus.plexus.interpolation.PrefixAwareRecursionInterceptor;
import org.codehaus.plexus.interpolation.PrefixedObjectValueSource;
@@ -309,16 +308,8 @@ class BaseFilter implements DefaultFilterInfo {
interpolator.setEscapeString(escapeString);
if (escapeWindowsPaths) {
- interpolator.addPostProcessor(new InterpolationPostProcessor() {
- @Override
- public Object execute(String expression, Object value) {
- if (value instanceof String) {
- return FilteringUtils.escapeWindowsPath((String)
value);
- }
-
- return value;
- }
- });
+ interpolator.addPostProcessor((expression, value) ->
+ (value instanceof String) ?
FilteringUtils.escapeWindowsPath((String) value) : value);
}
return interpolator;
}
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 e56e8e4..5645601 100644
---
a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++
b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -282,9 +282,7 @@ public class DefaultMavenResourcesFiltering implements
MavenResourcesFiltering {
scanner.scan();
- List<String> deletedFiles =
Arrays.asList(scanner.getIncludedFiles());
-
- for (String name : deletedFiles) {
+ for (String name : scanner.getIncludedFiles()) {
File destinationFile = getDestinationFile(outputDirectory,
targetPath, name, mavenResourcesExecution);
destinationFile.delete();
@@ -400,7 +398,7 @@ public class DefaultMavenResourcesFiltering implements
MavenResourcesFiltering {
}
private String[] setupScanner(Resource resource, Scanner scanner, boolean
addDefaultExcludes) {
- String[] includes = null;
+ String[] includes;
if (resource.getIncludes() != null &&
!resource.getIncludes().isEmpty()) {
includes = resource.getIncludes().toArray(EMPTY_STRING_ARRAY);
} else {
@@ -438,9 +436,7 @@ public class DefaultMavenResourcesFiltering implements
MavenResourcesFiltering {
throw new IOException("Source directory doesn't exists (" +
sourceDirectory.getAbsolutePath() + ").");
}
- List<String> includedDirectories =
Arrays.asList(scanner.getIncludedDirectories());
-
- for (String name : includedDirectories) {
+ for (String name : scanner.getIncludedDirectories()) {
File source = new File(sourceDirectory, name);
if (source.equals(sourceDirectory)) {
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 0ac4a9f..b2ce101 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,7 @@ public final class FilteringUtils {
StringBuilder buf = new StringBuilder(val.length());
int start = 0, end = 0;
while ((end = val.indexOf('\\', start)) != -1) {
- buf.append(val.substring(start, end)).append("\\\\");
+ buf.append(val, start, end).append("\\\\");
start = end + 1;
if (val.indexOf('\\', end + 1) == end + 1) {
@@ -334,9 +334,7 @@ public final class FilteringUtils {
} else {
CharsetEncoder encoder = charset.newEncoder();
- int totalBufferSize = FILE_COPY_BUFFER_SIZE;
-
- int charBufferSize = (int) Math.floor(totalBufferSize / (2
+ 2 * encoder.maxBytesPerChar()));
+ int charBufferSize = (int)
Math.floor(FILE_COPY_BUFFER_SIZE / (2 + 2 * encoder.maxBytesPerChar()));
int byteBufferSize = (int) Math.ceil(charBufferSize *
encoder.maxBytesPerChar());
CharBuffer newChars = CharBuffer.allocate(charBufferSize);
diff --git
a/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
b/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
index 8d8a3cc..be2c8e5 100644
---
a/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
+++
b/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
@@ -157,7 +157,7 @@ public class InterpolatorFilterReaderLineEnding extends
AbstractFilterReaderLine
* @throws IOException If an I/O error occurs
*/
@Override
- public int read(char cbuf[], int off, int len) throws IOException {
+ public int read(char[] cbuf, int off, int len) throws IOException {
for (int i = 0; i < len; i++) {
int ch = read();
if (ch == -1) {
@@ -301,7 +301,7 @@ public class InterpolatorFilterReaderLineEnding extends
AbstractFilterReaderLine
value = interpolator.interpolate(key.toString(),
recursionInterceptor);
}
} catch (InterpolationException e) {
- throw new IllegalArgumentException(e);
+ throw new IllegalArgumentException(e.getMessage(), e);
}
}
diff --git
a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
index 84fa63f..e81edfc 100644
---
a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
+++
b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
@@ -174,7 +174,7 @@ public class
MultiDelimiterInterpolatorFilterReaderLineEnding extends AbstractFi
* @throws IOException If an I/O error occurs
*/
@Override
- public int read(char cbuf[], int off, int len) throws IOException {
+ public int read(char[] cbuf, int off, int len) throws IOException {
for (int i = 0; i < len; i++) {
int ch = read();
if (ch == -1) {
@@ -220,7 +220,7 @@ public class
MultiDelimiterInterpolatorFilterReaderLineEnding extends AbstractFi
for (int i = 0; i < getEscapeString().length(); i++) {
key.append((char) ch);
- if (ch != getEscapeString().charAt(i) || ch == -1 || (ch ==
'\n' && !supportMultiLineFiltering)) {
+ if (ch != getEscapeString().charAt(i) || ch == '\n' &&
!supportMultiLineFiltering) {
// mismatch, EOF or EOL, no escape string here
in.reset();
inEscape = false;
@@ -243,7 +243,7 @@ public class
MultiDelimiterInterpolatorFilterReaderLineEnding extends AbstractFi
}
for (int i = 0; i < begin.length(); i++) {
- if (ch != begin.charAt(i) || ch == -1 || (ch == '\n' &&
!supportMultiLineFiltering)) {
+ if (ch != begin.charAt(i) || ch == '\n' &&
!supportMultiLineFiltering) {
// mismatch, EOF or EOL, no match
break;
}
@@ -326,7 +326,7 @@ public class
MultiDelimiterInterpolatorFilterReaderLineEnding extends AbstractFi
endToken = null;
// found endtoken? interpolate our key resolved above
- String value = null;
+ String value;
if (end == 0) {
try {
if (interpolateWithPrefixPattern) {
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 a494524..9864a88 100644
--- a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
@@ -178,12 +178,12 @@ public final class PropertyUtils {
String v = p.getProperty(k);
String defaultValue = v;
- String ret = "";
+ StringBuilder ret = new StringBuilder();
int idx, idx2;
while ((idx = v.indexOf("${")) >= 0) {
// append prefix to result
- ret += v.substring(0, idx);
+ ret.append(v, 0, idx);
// strip prefix from original
v = v.substring(idx + 2);
@@ -219,7 +219,7 @@ public final class PropertyUtils {
// resolved property ( so it can be parsed further )
// taking recursion into account.
if (nv == null || nv.equals(k) || k.equals(nk)) {
- ret += "${" + nk + "}";
+ ret.append("${").append(nk).append("}");
} else {
v = nv + v;
}
