You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/08/15 20:14:45 UTC
[maven-scm] branch master updated: Code cleanups
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/master by this push:
new 971ad07 Code cleanups
971ad07 is described below
commit 971ad07bc661da1562f71b75dcd805c5f3e3bb83
Author: Davide Angelocola <da...@gmail.com>
AuthorDate: Sun Aug 12 23:21:14 2018 +0200
Code cleanups
This closes #83 and closes #84
---
.../org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java | 7 ++++++-
.../main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java | 7 ++++++-
.../provider/integrity/command/blame/IntegrityBlameCommand.java | 7 ++++---
.../scm/provider/integrity/command/diff/IntegrityDiffCommand.java | 8 ++++----
.../integrity/command/fileinfo/IntegrityFileInfoCommand.java | 7 ++++---
.../apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java | 7 ++++++-
.../maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java | 5 +----
7 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java b/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
index a4fe1e4..e24ceb6 100644
--- a/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
+++ b/maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/BazaarScmProvider.java
@@ -81,7 +81,12 @@ public class BazaarScmProvider
public ScmProviderRepository makeProviderScmRepository( File path )
throws ScmRepositoryException, UnknownRepositoryStructure
{
- if ( path == null || !path.isDirectory() )
+ if ( path == null )
+ {
+ throw new NullPointerException( "Path argument is null" );
+ }
+
+ if ( !path.isDirectory() )
{
throw new ScmRepositoryException( path.getAbsolutePath() + " isn't a valid directory." );
}
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
index 02a36aa..e38d3b4 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgScmProvider.java
@@ -159,7 +159,12 @@ public class HgScmProvider
public ScmProviderRepository makeProviderScmRepository( File path )
throws ScmRepositoryException, UnknownRepositoryStructure
{
- if ( path == null || !path.isDirectory() )
+ if ( path == null )
+ {
+ throw new NullPointerException( "Path argument is null" );
+ }
+
+ if ( !path.isDirectory() )
{
throw new ScmRepositoryException( path.getAbsolutePath() + " isn't a valid directory." );
}
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/blame/IntegrityBlameCommand.java b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/blame/IntegrityBlameCommand.java
index 21a7255..b5da866 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/blame/IntegrityBlameCommand.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/blame/IntegrityBlameCommand.java
@@ -123,21 +123,22 @@ public class IntegrityBlameCommand
shell.createArg().setValue( "--fields=date,revision,author" );
shell.createArg().setValue( '"' + filename + '"' );
IntegrityBlameConsumer shellConsumer = new IntegrityBlameConsumer( getLogger() );
+ String commandLine = CommandLineUtils.toString( shell.getCommandline() );
try
{
- getLogger().debug( "Executing: " + CommandLineUtils.toString( shell.getCommandline() ) );
+ getLogger().debug( "Executing: " + commandLine );
int exitCode = CommandLineUtils.executeCommandLine( shell, shellConsumer,
new CommandLineUtils.StringStreamConsumer() );
boolean success = ( exitCode == 0 ? true : false );
ScmResult scmResult =
- new ScmResult( shell.getCommandline().toString(), "", "Exit Code: " + exitCode, success );
+ new ScmResult( commandLine, "", "Exit Code: " + exitCode, success );
return new BlameScmResult( shellConsumer.getBlameList(), scmResult );
}
catch ( CommandLineException cle )
{
getLogger().error( "Command Line Exception: " + cle.getMessage() );
- result = new BlameScmResult( shell.getCommandline().toString(), cle.getMessage(), "", false );
+ result = new BlameScmResult( commandLine, cle.getMessage(), "", false );
}
return result;
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/diff/IntegrityDiffCommand.java b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/diff/IntegrityDiffCommand.java
index c13e004..75be500 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/diff/IntegrityDiffCommand.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/diff/IntegrityDiffCommand.java
@@ -75,15 +75,15 @@ public class IntegrityDiffCommand
shell.createArg().setValue( "--filter=changed:all" );
shell.createArg().setValue( "--filter=format:text" );
IntegrityDiffConsumer shellConsumer = new IntegrityDiffConsumer( getLogger() );
+ String commandLine = CommandLineUtils.toString( shell.getCommandline() );
try
{
- getLogger().debug( "Executing: " + shell.getCommandline() );
+ getLogger().debug( "Executing: " + commandLine );
int exitCode = CommandLineUtils.executeCommandLine( shell, shellConsumer,
new CommandLineUtils.StringStreamConsumer() );
boolean success = ( exitCode == 128 ? false : true );
- ScmResult scmResult =
- new ScmResult( shell.getCommandline().toString(), "", "Exit Code: " + exitCode, success );
+ ScmResult scmResult = new ScmResult( commandLine, "", "Exit Code: " + exitCode, success );
// Since we can't really parse the differences output, we'll just have to go by the command output
// Returning a DiffScmResult(List changedFiles, Map differences, String patch, ScmResult result) to avoid
// a NPE in org.codehaus.plexus.util.FileUtils.fileWrite(FileUtils.java:426)
@@ -93,7 +93,7 @@ public class IntegrityDiffCommand
catch ( CommandLineException cle )
{
getLogger().error( "Command Line Exception: " + cle.getMessage() );
- result = new DiffScmResult( shell.getCommandline().toString(), cle.getMessage(), "", false );
+ result = new DiffScmResult( commandLine, cle.getMessage(), "", false );
}
return result;
diff --git a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/fileinfo/IntegrityFileInfoCommand.java b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/fileinfo/IntegrityFileInfoCommand.java
index 9c31a20..a819536 100644
--- a/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/fileinfo/IntegrityFileInfoCommand.java
+++ b/maven-scm-providers/maven-scm-provider-integrity/src/main/java/org/apache/maven/scm/provider/integrity/command/fileinfo/IntegrityFileInfoCommand.java
@@ -74,20 +74,21 @@ public class IntegrityFileInfoCommand
shell.createArg().setValue( "--user=" + api.getUserName() );
shell.createArg().setValue( '"' + filename + '"' );
IntegrityFileInfoConsumer shellConsumer = new IntegrityFileInfoConsumer( getLogger() );
+ String commandLine = CommandLineUtils.toString( shell.getCommandline() );
try
{
- getLogger().debug( "Executing: " + shell.getCommandline() );
+ getLogger().debug( "Executing: " + commandLine );
int exitCode = CommandLineUtils.executeCommandLine( shell, shellConsumer,
new CommandLineUtils.StringStreamConsumer() );
boolean success = ( exitCode == 128 ? false : true );
- result = new ScmResult( shell.getCommandline().toString(), "", "Exit Code: " + exitCode, success );
+ result = new ScmResult( commandLine, "", "Exit Code: " + exitCode, success );
}
catch ( CommandLineException cle )
{
getLogger().error( "Command Line Exception: " + cle.getMessage() );
- result = new ScmResult( shell.getCommandline().toString(), cle.getMessage(), "", false );
+ result = new ScmResult( commandLine, cle.getMessage(), "", false );
}
return result;
diff --git a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
index 05db3c8..9dc1950 100644
--- a/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
+++ b/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java
@@ -199,7 +199,12 @@ public abstract class AbstractCvsScmProvider
public ScmProviderRepository makeProviderScmRepository( File path )
throws ScmRepositoryException, UnknownRepositoryStructure
{
- if ( path == null || !path.isDirectory() )
+ if ( path == null )
+ {
+ throw new NullPointerException( "Path argument is null" );
+ }
+
+ if ( !path.isDirectory() )
{
throw new ScmRepositoryException( path.getAbsolutePath() + " isn't a valid directory." );
}
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
index e2f2626..b3f6005 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
@@ -103,8 +103,7 @@ public class SvnTagCommand
try
{
- FileUtils.fileWrite( messageFile.getAbsolutePath(), scmTagParameters == null ? "" : scmTagParameters
- .getMessage() );
+ FileUtils.fileWrite( messageFile.getAbsolutePath(), scmTagParameters.getMessage() );
}
catch ( IOException ex )
{
@@ -164,7 +163,6 @@ public class SvnTagCommand
{
if ( StringUtils.isNotEmpty( fileSet.getExcludes() ) )
{
- @SuppressWarnings( "unchecked" )
List<File> list =
FileUtils.getFiles( fileSet.getBasedir(),
( StringUtils.isEmpty( fileSet.getIncludes() ) ? "**"
@@ -174,7 +172,6 @@ public class SvnTagCommand
}
else
{
- @SuppressWarnings( "unchecked" )
List<File> list =
FileUtils.getFiles( fileSet.getBasedir(),
( StringUtils.isEmpty( fileSet.getIncludes() ) ? "**"