You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2021/03/11 13:50:48 UTC
[maven-enforcer] 01/01: fix assorted warnings
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch simple2
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 1d28e5dac4c3fc82812cc3e003b68e8b0f3332b4
Author: Elliotte Rusty Harold <el...@google.com>
AuthorDate: Thu Mar 11 08:50:30 2021 -0500
fix assorted warnings
---
.../plugins/enforcer/AbstractVersionEnforcer.java | 1 -
.../plugins/enforcer/ReactorModuleConvergence.java | 3 +-
.../plugins/enforcer/RequireFileChecksum.java | 2 +-
.../plugins/enforcer/RequireUpperBoundDeps.java | 1 -
.../enforcer/BannedDependenciesTestSetup.java | 1 -
.../enforcer/ReactorModuleConvergenceTest.java | 15 ----------
.../plugins/enforcer/RequireActiveProfileTest.java | 5 ----
.../maven/plugins/enforcer/TestAlwaysFail.java | 2 +-
.../maven/plugins/enforcer/TestAlwaysPass.java | 15 ++--------
.../maven/plugins/enforcer/TestMavenVersion.java | 1 -
.../plugins/enforcer/TestRequireFileChecksum.java | 2 --
.../enforcer/TestRequireFilesDontExist.java | 8 ++---
.../plugins/enforcer/TestRequireFilesExist.java | 26 ++++------------
.../plugins/enforcer/TestRequireFilesSize.java | 35 ++++++----------------
14 files changed, 25 insertions(+), 92 deletions(-)
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
index f10215e..2dbfc3f 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
@@ -130,7 +130,6 @@ public abstract class AbstractVersionEnforcer
else
{
// only singular versions ever have a recommendedVersion
- @SuppressWarnings( "unchecked" )
int compareTo = recommendedVersion.compareTo( theVersion );
return ( compareTo <= 0 );
}
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java
index e5dd9af..71d8e5b 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.commons.lang3.SystemUtils;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.execution.MavenSession;
@@ -88,7 +87,7 @@ public class ReactorModuleConvergence
existParentsWhichAreNotPartOfTheReactor( sortedProjects );
if ( !parentsWhichAreNotPartOfTheReactor.isEmpty() )
{
- StringBuilder sb = new StringBuilder().append( SystemUtils.LINE_SEPARATOR );
+ StringBuilder sb = new StringBuilder().append( System.lineSeparator() );
addMessageIfExist( sb );
for ( MavenProject mavenProject : parentsWhichAreNotPartOfTheReactor )
{
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
index 774a493..1ca890d 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
@@ -164,7 +164,7 @@ public class RequireFileChecksum
}
else if ( "sha1".equals( this.type ) )
{
- checksum = DigestUtils.shaHex( inputStream );
+ checksum = DigestUtils.sha1Hex( inputStream );
}
else if ( "sha256".equals( this.type ) )
{
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
index 7eee9ae..9dffb3b 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
@@ -332,7 +332,6 @@ public class RequireUpperBoundDeps
return output;
}
- @SuppressWarnings( "unchecked" )
private boolean containsConflicts( List<DependencyNodeHopCountPair> pairs )
{
DependencyNodeHopCountPair resolvedPair = pairs.get( 0 );
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java
index 1d36ef7..6d13ce3 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java
@@ -92,7 +92,6 @@ public class BannedDependenciesTestSetup
{
BannedDependencies rule = new BannedDependencies()
{
- @SuppressWarnings( "unchecked" )
@Override
protected Set<Artifact> getDependenciesToCheck( MavenProject project )
{
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java
index 4eab0cb..06e3539 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java
@@ -77,9 +77,6 @@ public class ReactorModuleConvergenceTest
setupSortedProjects( Collections.<MavenProject>emptyList() );
rule.execute( helper );
-
- // intentionally only assertTrue cause we don't expect an exception.
- assertTrue( true );
}
@Test
@@ -94,9 +91,6 @@ public class ReactorModuleConvergenceTest
setupSortedProjects( theList );
rule.execute( helper );
-
- // intentionally only assertTrue cause we don't expect an exception.
- assertTrue( true );
}
@Test( expected = EnforcerRuleException.class )
@@ -153,9 +147,6 @@ public class ReactorModuleConvergenceTest
setupSortedProjects( theList );
rule.execute( helper );
-
- // intentionally only assertTrue cause we don't expect an exception.
- assertTrue( true );
}
@Test( expected = EnforcerRuleException.class )
@@ -170,9 +161,6 @@ public class ReactorModuleConvergenceTest
setupSortedProjects( theList );
rule.execute( helper );
-
- // intentionally only assertTrue cause we don't expect an exception.
- assertTrue( true );
}
@Test( expected = EnforcerRuleException.class )
@@ -219,9 +207,6 @@ public class ReactorModuleConvergenceTest
setupSortedProjects( theList );
rule.execute( helper );
-
- // intentionally no assertTrue() cause we do not expect to get an exception.
- assertTrue( true );
}
@Test( expected = EnforcerRuleException.class )
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java
index f6713c8..f312119 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java
@@ -65,8 +65,6 @@ public class RequireActiveProfileTest
when( project.getActiveProfiles() ).thenReturn( Collections.<Profile> emptyList() );
rule.execute( helper );
-
- assertTrue( true );
}
@Test
@@ -80,7 +78,6 @@ public class RequireActiveProfileTest
rule.setProfiles( "profile-2" );
rule.execute( helper );
- assertTrue( true );
}
@Test( expected = EnforcerRuleException.class )
@@ -119,7 +116,6 @@ public class RequireActiveProfileTest
rule.setProfiles( "profile-2" );
rule.execute( helper );
- assertTrue( true );
}
@Test
@@ -134,7 +130,6 @@ public class RequireActiveProfileTest
rule.setAll( true );
rule.execute( helper );
- assertTrue( true );
}
@Test( expected = EnforcerRuleException.class )
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysFail.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysFail.java
index cf34d33..f024432 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysFail.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysFail.java
@@ -42,7 +42,7 @@ public class TestAlwaysFail extends TestCase
}
catch ( EnforcerRuleException e )
{
- assertTrue( true );
+ assertNotNull( e.getMessage() );
}
}
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysPass.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysPass.java
index 60b1cc5..a983873 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysPass.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysPass.java
@@ -31,19 +31,10 @@ import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
public class TestAlwaysPass extends TestCase
{
- public void testExecute()
+ public void testExecute() throws EnforcerRuleException
{
- final AlwaysPass rule = new AlwaysPass();
- try
- {
- // execute rule -- should NOT throw EnforcerRuleException
- rule.execute( EnforcerTestUtils.getHelper() );
- assertTrue( true );
- }
- catch ( EnforcerRuleException e )
- {
- fail( "Should NOT throw EnforcerRuleException" );
- }
+ AlwaysPass rule = new AlwaysPass();
+ rule.execute( EnforcerTestUtils.getHelper() );
}
}
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java
index 06c9060..e54c5df 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java
@@ -24,7 +24,6 @@ import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.apache.maven.execution.MavenSession;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
-import org.junit.Assert;
import org.junit.Test;
import java.util.Properties;
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFileChecksum.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFileChecksum.java
index 201c5aa..c7075ce 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFileChecksum.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFileChecksum.java
@@ -21,10 +21,8 @@ package org.apache.maven.plugins.enforcer;
import java.io.File;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-import org.apache.maven.plugins.enforcer.utils.NormalizeLineSeparatorReader.LineSeparator;
import org.codehaus.plexus.util.FileUtils;
import org.junit.Rule;
import org.junit.Test;
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
index 22287a4..684a6ad 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java
@@ -51,7 +51,7 @@ public class TestRequireFilesDontExist
}
catch ( EnforcerRuleException e )
{
- assertTrue( true );
+ assertNotNull( e.getMessage() );
}
f.delete();
}
@@ -67,7 +67,7 @@ public class TestRequireFilesDontExist
}
catch ( EnforcerRuleException e )
{
- assertTrue( true );
+ assertNotNull( e.getMessage() );
}
}
@@ -98,7 +98,7 @@ public class TestRequireFilesDontExist
}
catch ( EnforcerRuleException e )
{
- assertTrue( true );
+ assertNotNull( e.getMessage() );
}
}
@@ -124,7 +124,7 @@ public class TestRequireFilesDontExist
File f = File.createTempFile( "enforcer", "tmp" );
f.delete();
- assertTrue( !f.exists() );
+ assertFalse( f.exists() );
rule.setFiles( new File[] { f } );
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
index b05a4fb..efb7195 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java
@@ -60,7 +60,7 @@ public class TestRequireFilesExist
}
catch ( EnforcerRuleException e )
{
- assertTrue( true );
+ assertNotNull( e.getMessage() );
}
}
@@ -69,14 +69,7 @@ public class TestRequireFilesExist
{
rule.setFiles( new File[] { null } );
rule.setAllowNulls( true );
- try
- {
- rule.execute( EnforcerTestUtils.getHelper() );
- }
- catch ( EnforcerRuleException e )
- {
- fail( "Unexpected Exception:" + e.getLocalizedMessage() );
- }
+ rule.execute( EnforcerTestUtils.getHelper() );
}
public void testEmptyFileList()
@@ -91,7 +84,7 @@ public class TestRequireFilesExist
}
catch ( EnforcerRuleException e )
{
- assertTrue( true );
+ assertNotNull( e.getMessage() );
}
}
@@ -101,14 +94,7 @@ public class TestRequireFilesExist
rule.setFiles( new File[] {} );
assertEquals( 0, rule.getFiles().length );
rule.setAllowNulls( true );
- try
- {
- rule.execute( EnforcerTestUtils.getHelper() );
- }
- catch ( EnforcerRuleException e )
- {
- fail( "Unexpected Exception:" + e.getLocalizedMessage() );
- }
+ rule.execute( EnforcerTestUtils.getHelper() );
}
public void testFileDoesNotExist()
@@ -116,7 +102,7 @@ public class TestRequireFilesExist
{
File f = File.createTempFile( "enforcer", "tmp" );
f.delete();
- assertTrue( !f.exists() );
+ assertFalse( f.exists() );
rule.setFiles( new File[] { f } );
try
@@ -126,7 +112,7 @@ public class TestRequireFilesExist
}
catch ( EnforcerRuleException e )
{
- assertTrue( true );
+ assertNotNull( e.getMessage() );
}
}
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java
index 93996cf..23e1b95 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java
@@ -64,7 +64,7 @@ public class TestRequireFilesSize
}
catch ( EnforcerRuleException e )
{
- assertTrue( true );
+ assertNotNull( e.getMessage() );
}
}
@@ -73,14 +73,7 @@ public class TestRequireFilesSize
{
rule.setFiles( new File[] { null } );
rule.setAllowNulls( true );
- try
- {
- rule.execute( EnforcerTestUtils.getHelper() );
- }
- catch ( EnforcerRuleException e )
- {
- fail( "Unexpected Exception:" + e.getLocalizedMessage() );
- }
+ rule.execute( EnforcerTestUtils.getHelper() );
}
public void testEmptyFileList()
@@ -111,7 +104,7 @@ public class TestRequireFilesSize
{
File f = File.createTempFile( "enforcer", "tmp" );
f.delete();
- assertTrue( !f.exists() );
+ assertFalse( f.exists() );
rule.setFiles( new File[] { f } );
try
@@ -121,7 +114,7 @@ public class TestRequireFilesSize
}
catch ( EnforcerRuleException e )
{
- assertTrue( true );
+ assertNotNull( e.getMessage() );
}
}
@@ -139,28 +132,18 @@ public class TestRequireFilesSize
}
catch ( EnforcerRuleException e )
{
- assertTrue( true );
+ assertNotNull( e.getMessage() );
}
}
public void testFileTooBig()
- throws EnforcerRuleException, IOException
+ throws IOException
{
File f = File.createTempFile( "enforcer", "tmp" );
f.deleteOnExit();
- try
- {
- // Create file
- FileWriter fstream = new FileWriter( f );
- BufferedWriter out = new BufferedWriter( fstream );
+ try ( BufferedWriter out = new BufferedWriter( new FileWriter( f ) ) )
+ {
out.write( "123456789101112131415" );
- // Close the output stream
- out.close();
- fstream.close();
- }
- catch ( Exception e )
- {// Catch exception if any
- System.err.println( "Error: " + e.getMessage() );
}
rule.setFiles( new File[] { f } );
@@ -173,7 +156,7 @@ public class TestRequireFilesSize
}
catch ( EnforcerRuleException e )
{
- assertTrue( true );
+ assertNotNull( e.getMessage() );
}
}