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-common-artifact-filters.git
The following commit(s) were added to refs/heads/master by this push:
new a11a231 Use System.lineSeparator(), @Override and try-with-resources
a11a231 is described below
commit a11a231759800e38a5c46822f1cc04b867bc5670
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Mon Nov 16 21:56:41 2026 +0000
Use System.lineSeparator(), @Override and try-with-resources
---
.../shared/artifact/filter/AbstractStrictPatternArtifactFilter.java | 1 +
.../org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java | 5 +++++
.../artifact/filter/collection/AbstractArtifactFeatureFilter.java | 1 +
.../shared/artifact/filter/collection/AbstractArtifactsFilter.java | 1 +
.../artifact/filter/collection/ArtifactTransitivityFilter.java | 1 +
.../maven/shared/artifact/filter/collection/ClassifierFilter.java | 1 +
.../shared/artifact/filter/collection/ProjectTransitivityFilter.java | 1 +
.../apache/maven/shared/artifact/filter/collection/ScopeFilter.java | 1 +
.../apache/maven/shared/artifact/filter/collection/TypeFilter.java | 1 +
.../org/apache/maven/shared/artifact/filter/resolve/ScopeFilter.java | 1 +
.../shared/artifact/filter/GNPatternIncludesArtifactFilter.java | 5 +++++
.../shared/artifact/filter/OldPatternIncludesArtifactFilter.java | 4 ++++
.../artifact/filter/StrictPatternExcludesArtifactFilterTest.java | 2 ++
.../artifact/filter/StrictPatternIncludesArtifactFilterTest.java | 1 +
.../maven/shared/artifact/filter/collection/TestArtifactFilter.java | 4 ++++
.../shared/artifact/filter/collection/TestClassifierFilter.java | 4 ++++
.../maven/shared/artifact/filter/collection/TestGroupIdFilter.java | 4 ++++
17 files changed, 38 insertions(+)
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
index 4f5c061..5c3b197 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
@@ -76,6 +76,7 @@ public abstract class AbstractStrictPatternArtifactFilter
implements ArtifactFil
// ArtifactFilter methods -------------------------------------------------
/** {@inheritDoc} */
+ @Override
public boolean include(Artifact artifact) {
boolean matched = false;
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
index 1bd34d2..41aaa22 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
@@ -93,6 +93,7 @@ public class ScopeArtifactFilter implements ArtifactFilter,
StatisticsReportingA
}
/** {@inheritDoc} */
+ @Override
public boolean include(Artifact artifact) {
boolean result = true;
@@ -138,6 +139,7 @@ public class ScopeArtifactFilter implements ArtifactFilter,
StatisticsReportingA
*
* @return Information converted to a string.
*/
+ @Override
public String toString() {
return "Scope filter [null-scope=" + includeNullScope + ", compile=" +
includeCompileScope + ", runtime="
+ includeRuntimeScope + ", test=" + includeTestScope + ",
provided=" + includeProvidedScope
@@ -146,6 +148,7 @@ public class ScopeArtifactFilter implements ArtifactFilter,
StatisticsReportingA
}
/** {@inheritDoc} */
+ @Override
public void reportFilteredArtifacts(Logger logger) {
if (!filteredArtifactIds.isEmpty() && logger.isDebugEnabled()) {
StringBuilder buffer = new StringBuilder("The following artifacts
were removed by this filter: ");
@@ -159,6 +162,7 @@ public class ScopeArtifactFilter implements ArtifactFilter,
StatisticsReportingA
}
/** {@inheritDoc} */
+ @Override
public void reportMissedCriteria(Logger logger) {
if (logger.isDebugEnabled()) {
StringBuilder buffer = new StringBuilder();
@@ -200,6 +204,7 @@ public class ScopeArtifactFilter implements ArtifactFilter,
StatisticsReportingA
*
* @return a boolean.
*/
+ @Override
public boolean hasMissedCriteria() {
return !nullScopeHit
|| !compileScopeHit
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
index d5abfad..5003b0e 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
@@ -58,6 +58,7 @@ public abstract class AbstractArtifactFeatureFilter extends
AbstractArtifactsFil
*
* This function determines if filtering needs to be performed. Includes
are processed before Excludes.
*/
+ @Override
public Set<Artifact> filter(Set<Artifact> artifacts) {
Set<Artifact> results = artifacts;
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java
index 30cb1fb..b053905 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java
@@ -30,6 +30,7 @@ import org.apache.maven.artifact.Artifact;
*/
public abstract class AbstractArtifactsFilter implements ArtifactsFilter {
/** {@inheritDoc} */
+ @Override
public boolean isArtifactIncluded(Artifact artifact) throws
ArtifactFilterException {
Set<Artifact> set = new LinkedHashSet<>();
set.add(artifact);
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
index 422eae0..f2e87e7 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
@@ -82,6 +82,7 @@ public class ArtifactTransitivityFilter extends
AbstractArtifactsFilter {
}
/** {@inheritDoc} */
+ @Override
public Set<Artifact> filter(Set<Artifact> artifacts) {
Set<Artifact> result = new LinkedHashSet<>();
for (Artifact artifact : artifacts) {
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java
index 1034050..6865741 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java
@@ -37,6 +37,7 @@ public class ClassifierFilter extends
AbstractArtifactFeatureFilter {
}
/** {@inheritDoc} */
+ @Override
protected String getArtifactFeature(Artifact artifact) {
return artifact.getClassifier();
}
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ProjectTransitivityFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ProjectTransitivityFilter.java
index 24f8251..b9fefbb 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ProjectTransitivityFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ProjectTransitivityFilter.java
@@ -46,6 +46,7 @@ public class ProjectTransitivityFilter extends
AbstractArtifactsFilter {
}
/** {@inheritDoc} */
+ @Override
public Set<Artifact> filter(Set<Artifact> artifacts) {
// why not just take the directDependencies here?
// because if this filter is run after some other process, the
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java
index b60d5bd..e44639b 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java
@@ -55,6 +55,7 @@ public class ScopeFilter extends AbstractArtifactsFilter {
* This function determines if filtering needs to be performed. Excludes
are
* ignored if Includes are used.
*/
+ @Override
public Set<Artifact> filter(Set<Artifact> artifacts) throws
ArtifactFilterException {
Set<Artifact> results = artifacts;
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java
index 62a071f..5904352 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java
@@ -37,6 +37,7 @@ public class TypeFilter extends AbstractArtifactFeatureFilter
{
}
/** {@inheritDoc} */
+ @Override
protected String getArtifactFeature(Artifact artifact) {
return artifact.getType();
}
diff --git
a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ScopeFilter.java
b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ScopeFilter.java
index 102f10b..f4e0358 100644
---
a/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ScopeFilter.java
+++
b/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ScopeFilter.java
@@ -108,6 +108,7 @@ public class ScopeFilter implements TransformableFilter {
*
* Transform this filter to a tool specific implementation
*/
+ @Override
public <T> T transform(FilterTransformer<T> transformer) {
return transformer.transform(this);
}
diff --git
a/src/test/java/org/apache/maven/shared/artifact/filter/GNPatternIncludesArtifactFilter.java
b/src/test/java/org/apache/maven/shared/artifact/filter/GNPatternIncludesArtifactFilter.java
index c3014ce..0b8518a 100644
---
a/src/test/java/org/apache/maven/shared/artifact/filter/GNPatternIncludesArtifactFilter.java
+++
b/src/test/java/org/apache/maven/shared/artifact/filter/GNPatternIncludesArtifactFilter.java
@@ -82,6 +82,7 @@ public class GNPatternIncludesArtifactFilter implements
ArtifactFilter, Statisti
}
/** {@inheritDoc} */
+ @Override
public boolean include(final Artifact artifact) {
final boolean shouldInclude = patternMatches(artifact);
@@ -150,6 +151,7 @@ public class GNPatternIncludesArtifactFilter implements
ArtifactFilter, Statisti
}
/** {@inheritDoc} */
+ @Override
public void reportMissedCriteria(final Logger logger) {
// if there are no patterns, there is nothing to report.
if (!patterns.isEmpty()) {
@@ -204,6 +206,7 @@ public class GNPatternIncludesArtifactFilter implements
ArtifactFilter, Statisti
}
/** {@inheritDoc} */
+ @Override
public void reportFilteredArtifacts(final Logger logger) {
if (!filteredArtifact.isEmpty() && logger.isDebugEnabled()) {
final StringBuilder buffer =
@@ -222,6 +225,7 @@ public class GNPatternIncludesArtifactFilter implements
ArtifactFilter, Statisti
*
* @return a boolean.
*/
+ @Override
public boolean hasMissedCriteria() {
// if there are no patterns, there is nothing to report.
if (!patterns.isEmpty()) {
@@ -710,6 +714,7 @@ public class GNPatternIncludesArtifactFilter implements
ArtifactFilter, Statisti
return translateEquals(0);
}
+ @Override
public String translateEquals(int pos) {
return posMin == pos && posMax == pos && (pos < 3 || (token[0] !=
'[' && token[0] != '('))
? String.valueOf(token)
diff --git
a/src/test/java/org/apache/maven/shared/artifact/filter/OldPatternIncludesArtifactFilter.java
b/src/test/java/org/apache/maven/shared/artifact/filter/OldPatternIncludesArtifactFilter.java
index 3258dfb..0248ee5 100644
---
a/src/test/java/org/apache/maven/shared/artifact/filter/OldPatternIncludesArtifactFilter.java
+++
b/src/test/java/org/apache/maven/shared/artifact/filter/OldPatternIncludesArtifactFilter.java
@@ -79,6 +79,7 @@ public class OldPatternIncludesArtifactFilter implements
ArtifactFilter, Statist
}
/** {@inheritDoc} */
+ @Override
public boolean include(final Artifact artifact) {
final boolean shouldInclude = patternMatches(artifact);
@@ -275,6 +276,7 @@ public class OldPatternIncludesArtifactFilter implements
ArtifactFilter, Statist
}
/** {@inheritDoc} */
+ @Override
public void reportMissedCriteria(final Logger logger) {
// if there are no patterns, there is nothing to report.
if (!positivePatterns.isEmpty() || !negativePatterns.isEmpty()) {
@@ -327,6 +329,7 @@ public class OldPatternIncludesArtifactFilter implements
ArtifactFilter, Statist
}
/** {@inheritDoc} */
+ @Override
public void reportFilteredArtifacts(final Logger logger) {
if (!filteredArtifactIds.isEmpty() && logger.isDebugEnabled()) {
final StringBuilder buffer =
@@ -341,6 +344,7 @@ public class OldPatternIncludesArtifactFilter implements
ArtifactFilter, Statist
}
/** {@inheritDoc} */
+ @Override
public boolean hasMissedCriteria() {
// if there are no patterns, there is nothing to report.
if (!positivePatterns.isEmpty() || !negativePatterns.isEmpty()) {
diff --git
a/src/test/java/org/apache/maven/shared/artifact/filter/StrictPatternExcludesArtifactFilterTest.java
b/src/test/java/org/apache/maven/shared/artifact/filter/StrictPatternExcludesArtifactFilterTest.java
index 49421f1..e719e97 100644
---
a/src/test/java/org/apache/maven/shared/artifact/filter/StrictPatternExcludesArtifactFilterTest.java
+++
b/src/test/java/org/apache/maven/shared/artifact/filter/StrictPatternExcludesArtifactFilterTest.java
@@ -30,6 +30,7 @@ public class StrictPatternExcludesArtifactFilterTest extends
AbstractStrictPatte
/*
* @see
org.apache.maven.shared.artifact.filter.AbstractStrictPatternArtifactFilterTest#createFilter(java.util.List)
*/
+ @Override
protected AbstractStrictPatternArtifactFilter createFilter(List<String>
patterns) {
return new StrictPatternExcludesArtifactFilter(patterns);
}
@@ -38,6 +39,7 @@ public class StrictPatternExcludesArtifactFilterTest extends
AbstractStrictPatte
* @see
org.apache.maven.shared.artifact.filter.AbstractStrictPatternArtifactFilterTest#assertFilter(boolean,
* java.lang.String)
*/
+ @Override
protected void assertFilter(boolean expected, String pattern) {
super.assertFilter(!expected, pattern);
}
diff --git
a/src/test/java/org/apache/maven/shared/artifact/filter/StrictPatternIncludesArtifactFilterTest.java
b/src/test/java/org/apache/maven/shared/artifact/filter/StrictPatternIncludesArtifactFilterTest.java
index 2cb69d6..a953a78 100644
---
a/src/test/java/org/apache/maven/shared/artifact/filter/StrictPatternIncludesArtifactFilterTest.java
+++
b/src/test/java/org/apache/maven/shared/artifact/filter/StrictPatternIncludesArtifactFilterTest.java
@@ -30,6 +30,7 @@ public class StrictPatternIncludesArtifactFilterTest extends
AbstractStrictPatte
/*
* @see
org.apache.maven.shared.artifact.filter.AbstractStrictPatternArtifactFilterTest#createFilter(java.util.List)
*/
+ @Override
protected AbstractStrictPatternArtifactFilter createFilter(List<String>
patterns) {
return new StrictPatternIncludesArtifactFilter(patterns);
}
diff --git
a/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestArtifactFilter.java
b/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestArtifactFilter.java
index 91e656f..14045d7 100644
---
a/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestArtifactFilter.java
+++
b/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestArtifactFilter.java
@@ -40,11 +40,13 @@ class TestArtifactFilter extends
AbstractArtifactFeatureFilterTest {
artifacts = factory.getArtifactArtifacts();
}
+ @Override
@Test
public void checkParsing() throws Exception {
parsing();
}
+ @Override
@Test
public void checkFiltering() throws Exception {
Set<Artifact> result = filtering();
@@ -53,6 +55,7 @@ class TestArtifactFilter extends
AbstractArtifactFeatureFilterTest {
}
}
+ @Override
@Test
public void checkFiltering2() throws Exception {
Set<Artifact> result = filtering2();
@@ -62,6 +65,7 @@ class TestArtifactFilter extends
AbstractArtifactFeatureFilterTest {
}
}
+ @Override
@Test
public void checkFiltering3() throws Exception {
filtering3();
diff --git
a/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestClassifierFilter.java
b/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestClassifierFilter.java
index 8935a9c..b591622 100644
---
a/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestClassifierFilter.java
+++
b/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestClassifierFilter.java
@@ -39,11 +39,13 @@ class TestClassifierFilter extends
AbstractArtifactFeatureFilterTest {
artifacts = factory.getClassifiedArtifacts();
}
+ @Override
@Test
public void checkParsing() throws Exception {
parsing();
}
+ @Override
@Test
public void checkFiltering() throws Exception {
Set<Artifact> result = filtering();
@@ -53,6 +55,7 @@ class TestClassifierFilter extends
AbstractArtifactFeatureFilterTest {
}
}
+ @Override
@Test
public void checkFiltering2() throws Exception {
Set<Artifact> result = filtering2();
@@ -62,6 +65,7 @@ class TestClassifierFilter extends
AbstractArtifactFeatureFilterTest {
}
}
+ @Override
@Test
public void checkFiltering3() throws Exception {
filtering3();
diff --git
a/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestGroupIdFilter.java
b/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestGroupIdFilter.java
index cfbaf49..313b58f 100644
---
a/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestGroupIdFilter.java
+++
b/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestGroupIdFilter.java
@@ -41,11 +41,13 @@ class TestGroupIdFilter extends
AbstractArtifactFeatureFilterTest {
artifacts = factory.getGroupIdArtifacts();
}
+ @Override
@Test
public void checkParsing() throws Exception {
parsing();
}
+ @Override
@Test
public void checkFiltering() throws Exception {
Set<Artifact> result = filtering();
@@ -55,6 +57,7 @@ class TestGroupIdFilter extends
AbstractArtifactFeatureFilterTest {
}
}
+ @Override
@Test
public void checkFiltering2() throws Exception {
Set<Artifact> result = filtering2();
@@ -64,6 +67,7 @@ class TestGroupIdFilter extends
AbstractArtifactFeatureFilterTest {
}
}
+ @Override
@Test
public void checkFiltering3() throws Exception {
filtering3();