Language level fixes
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1639381 13f79535-47bb-0310-9956-ffa450edef68
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 7696b6a..fc26e25 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
@@ -154,7 +154,7 @@
{
String contains = pattern.substring( 1, pattern.length() - 1 );
- matches = ( token.indexOf( contains ) != -1 );
+ matches = ( token.contains( contains ) );
}
// support leading wildcard
else if ( pattern.startsWith( "*" ) )
diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
index 87c64a2..4307f1d 100644
--- a/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
+++ b/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
@@ -110,7 +110,7 @@
}
else
{
- return Boolean.valueOf( match( artifact, negativePatterns ) );
+ return match( artifact, negativePatterns );
}
}
@@ -122,7 +122,7 @@
}
else
{
- return Boolean.valueOf( match( artifact, positivePatterns ) );
+ return match( artifact, positivePatterns );
}
}
@@ -199,7 +199,7 @@
return true;
}
- if ( regionMatch && value.indexOf( pattern ) > -1 )
+ if ( regionMatch && value.contains( pattern ) )
{
patternsTriggered.add( pattern );
return true;
@@ -231,7 +231,7 @@
{
final String contains = pattern.substring( 1, pattern.length() - 1 );
- matches = ( token.indexOf( contains ) != -1 );
+ matches = ( token.contains( contains ) );
}
// support leading wildcard
else if ( pattern.startsWith( "*" ) )
@@ -307,7 +307,7 @@
if ( !missed.isEmpty() && logger.isWarnEnabled() )
{
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
buffer.append( "The following patterns were never triggered in this " );
buffer.append( getFilterDescription() );
@@ -333,7 +333,7 @@
protected String getPatternsAsString()
{
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
for ( String pattern : positivePatterns )
{
buffer.append( "\no \'" ).append( pattern ).append( "\'" );
@@ -351,8 +351,8 @@
{
if ( !filteredArtifactIds.isEmpty() && logger.isDebugEnabled() )
{
- final StringBuffer buffer =
- new StringBuffer( "The following artifacts were removed by this " + getFilterDescription() + ": " );
+ final StringBuilder buffer =
+ new StringBuilder( "The following artifacts were removed by this " + getFilterDescription() + ": " );
for ( String artifactId : filteredArtifactIds )
{
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 f6d567a..b1fc2c2 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
@@ -171,7 +171,7 @@
{
if ( !filteredArtifactIds.isEmpty() && logger.isDebugEnabled() )
{
- StringBuffer buffer = new StringBuffer( "The following artifacts were removed by this filter: " );
+ StringBuilder buffer = new StringBuilder( "The following artifacts were removed by this filter: " );
for ( String artifactId : filteredArtifactIds )
{
@@ -186,7 +186,7 @@
{
if ( logger.isDebugEnabled() )
{
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
boolean report = false;
if ( !nullScopeHit )
