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 2021/09/05 18:48:21 UTC
[maven-scm] branch master updated: Replace unnecessary local
variables with inline variables
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 35da024 Replace unnecessary local variables with inline variables
35da024 is described below
commit 35da024a179f5186d1109de9146f86c9eae97789
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Wed Sep 1 21:05:50 2021 +0200
Replace unnecessary local variables with inline variables
This closes #123
---
.../main/java/org/apache/maven/scm/ScmFileSet.java | 3 +--
.../provider/accurev/cli/StatBackingConsumer.java | 3 +--
.../maven/scm/provider/hg/HgScmProvider.java | 18 +++++++-------
.../local/command/update/LocalUpdateCommand.java | 3 +--
.../starteam/command/StarteamCommandLineUtils.java | 4 +---
.../command/diff/StarteamDiffConsumer.java | 3 +--
.../command/status/StarteamStatusConsumer.java | 4 +---
.../synergy/command/edit/SynergyEditCommand.java | 11 ++++-----
.../git/gitexe/command/list/GitListCommand.java | 3 +--
.../git/gitexe/command/list/GitListConsumer.java | 3 +--
.../scm/provider/svn/AbstractSvnScmProvider.java | 28 ++++++++++------------
.../svnexe/command/branch/SvnBranchCommand.java | 3 +--
.../svn/svnexe/command/tag/SvnTagCommand.java | 18 ++++++--------
13 files changed, 42 insertions(+), 62 deletions(-)
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
index 0559f35..28d0022 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
@@ -102,8 +102,7 @@ public class ScmFileSet
{
excludes = DEFAULT_EXCLUDES;
}
- List<File> fileList = FileUtils.getFiles( basedir, includes, excludes, false );
- this.files = fileList;
+ this.files = FileUtils.getFiles( basedir, includes, excludes, false );
this.includes = includes;
this.excludes = excludes;
}
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumer.java
index 5c1d30a..03a2e49 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumer.java
@@ -51,8 +51,7 @@ public class StatBackingConsumer
{
// first group is the fileName
// second group is the indicator expected "backed","stale","overlap","underlap","no such elem";
- Pattern pattern = STAT_PATTERN;
- Matcher matcher = pattern.matcher( line );
+ Matcher matcher = STAT_PATTERN.matcher( line );
if ( matcher.matches() )
{
File file = new File( matcher.group( 1 ) );
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 e38d3b4..2e233db 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
@@ -101,33 +101,31 @@ public class HgScmProvider
{
HgUrlParserResult result = new HgUrlParserResult();
- String url = scmSpecificUrl;
-
// ----------------------------------------------------------------------
// Do some sanity checking of the SVN url
// ----------------------------------------------------------------------
- if ( url.startsWith( "file" ) )
+ if ( scmSpecificUrl.startsWith( "file" ) )
{
- if ( !url.startsWith( "file:///" ) && !url.startsWith( "file://localhost/" ) )
+ if ( !scmSpecificUrl.startsWith( "file:///" ) && !scmSpecificUrl.startsWith( "file://localhost/" ) )
{
result.messages.add( "An hg 'file' url must be on the form 'file:///' or 'file://localhost/'." );
return result;
}
}
- else if ( url.startsWith( "https" ) )
+ else if ( scmSpecificUrl.startsWith( "https" ) )
{
- if ( !url.startsWith( "https://" ) )
+ if ( !scmSpecificUrl.startsWith( "https://" ) )
{
result.messages.add( "An hg 'http' url must be on the form 'https://'." );
return result;
}
}
- else if ( url.startsWith( "http" ) )
+ else if ( scmSpecificUrl.startsWith( "http" ) )
{
- if ( !url.startsWith( "http://" ) )
+ if ( !scmSpecificUrl.startsWith( "http://" ) )
{
result.messages.add( "An hg 'http' url must be on the form 'http://'." );
@@ -139,7 +137,7 @@ public class HgScmProvider
try
{
@SuppressWarnings( "unused" )
- File file = new File( url );
+ File file = new File( scmSpecificUrl );
}
catch ( Throwable e )
{
@@ -150,7 +148,7 @@ public class HgScmProvider
}
- result.repository = new HgScmProviderRepository( url );
+ result.repository = new HgScmProviderRepository( scmSpecificUrl );
return result;
}
diff --git a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
index f927bd5..408e326 100644
--- a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
+++ b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommand.java
@@ -104,8 +104,7 @@ public class LocalUpdateCommand
@SuppressWarnings( "unchecked" )
List<File> fileList = FileUtils.getFiles( source.getAbsoluteFile(), "**", null );
- List<File> list = fileList;
- updatedFiles = update( source, baseDestination, list );
+ updatedFiles = update( source, baseDestination, fileList );
// process deletions in repository
LocalScmMetadataUtils metadataUtils = new LocalScmMetadataUtils( getLogger() );
diff --git a/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java b/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
index a63f61c..14de344 100644
--- a/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
+++ b/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/StarteamCommandLineUtils.java
@@ -264,9 +264,7 @@ public final class StarteamCommandLineUtils
throw new IllegalStateException();
}
- String retDir = "." + childPath.substring( parentPath.length() );
-
- return retDir;
+ return "." + childPath.substring( parentPath.length() );
}
catch ( IOException e )
diff --git a/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java b/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
index dd8da15..04d0557 100644
--- a/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
@@ -184,9 +184,8 @@ public class StarteamDiffConsumer
*/
private void processGetDir( String line, int pos )
{
- String dirPath = line.substring( pos + WORKING_DIR_TOKEN.length(), line.length() - 1 ).replace( '\\', '/' );
- this.currentDir = dirPath;
+ this.currentDir = line.substring( pos + WORKING_DIR_TOKEN.length(), line.length() - 1 ).replace( '\\', '/' );
}
private void extractCurrentFile( String line, int pos )
diff --git a/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumer.java b/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumer.java
index bd3d681..b93c937 100644
--- a/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/status/StarteamStatusConsumer.java
@@ -119,9 +119,7 @@ public class StarteamStatusConsumer
{
String fileName = line.substring( pos + FILE_MARKER.length(), line.length() );
- String checkedOutFilePath = this.currentDir + "/" + fileName;
-
- this.currentFile = checkedOutFilePath;
+ this.currentFile = this.currentDir + "/" + fileName;
}
private void processStatus( String line, int pos )
diff --git a/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java b/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java
index d742b09..ab6dd1c 100644
--- a/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java
+++ b/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/edit/SynergyEditCommand.java
@@ -80,10 +80,9 @@ public class SynergyEditCommand
{
getLogger().info( "Task " + taskNum + " was created to perform checkout." );
}
- for ( File f : fileSet.getFileList() )
+ for ( File dest : fileSet.getFileList() )
{
- File dest = f;
- File source = new File( sourcePath, SynergyUtil.removePrefix( fileSet.getBasedir(), f ) );
+ File source = new File( sourcePath, SynergyUtil.removePrefix( fileSet.getBasedir(), dest ) );
List<File> list = new LinkedList<File>();
list.add( source );
SynergyUtil.checkoutFiles( getLogger(), list, ccmAddr );
@@ -91,7 +90,7 @@ public class SynergyEditCommand
{
if ( getLogger().isDebugEnabled() )
{
- getLogger().debug( "Copy file [" + source + "] to expected folder [" + dest + "]." );
+ getLogger().debug( "Copy file [" + source + "] to expected directory [" + dest + "]." );
}
try
{
@@ -109,9 +108,9 @@ public class SynergyEditCommand
SynergyUtil.stop( getLogger(), ccmAddr );
}
List<ScmFile> scmFiles = new ArrayList<ScmFile>( fileSet.getFileList().size() );
- for ( File f : fileSet.getFileList() )
+ for ( File dest : fileSet.getFileList() )
{
- scmFiles.add( new ScmFile( f.getPath(), ScmFileStatus.EDITED ) );
+ scmFiles.add( new ScmFile( dest.getPath(), ScmFileStatus.EDITED ) );
}
return new EditScmResult( "", scmFiles );
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java
index ffe5733..4b940e6 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java
@@ -33,9 +33,8 @@ public class GitListCommand
{
public static Commandline createCommandLine( GitScmProviderRepository repository, File workingDirectory )
{
- Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "ls-files" );
- return cl;
+ return GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "ls-files" );
}
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListConsumer.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListConsumer.java
index 459f6d8..5e77a77 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListConsumer.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListConsumer.java
@@ -52,9 +52,8 @@ public class GitListConsumer
/** {@inheritDoc} */
protected void parseLine( String line )
{
- String file = line;
- addFile( new ScmFile( file, fileStatus ) );
+ addFile( new ScmFile( line, fileStatus ) );
}
// ----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
index de6e929..921fc09 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
@@ -214,33 +214,31 @@ public abstract class AbstractSvnScmProvider
{
ScmUrlParserResult result = new ScmUrlParserResult();
- String url = scmSpecificUrl;
-
// ----------------------------------------------------------------------
// Do some sanity checking of the SVN url
// ----------------------------------------------------------------------
- if ( url.startsWith( "file" ) )
+ if ( scmSpecificUrl.startsWith( "file" ) )
{
- if ( !url.startsWith( "file://" ) )
+ if ( !scmSpecificUrl.startsWith( "file://" ) )
{
result.messages.add( "A svn 'file' url must be on the form 'file://[hostname]/'." );
return result;
}
}
- else if ( url.startsWith( "https" ) )
+ else if ( scmSpecificUrl.startsWith( "https" ) )
{
- if ( !url.startsWith( "https://" ) )
+ if ( !scmSpecificUrl.startsWith( "https://" ) )
{
result.messages.add( "A svn 'http' url must be on the form 'https://'." );
return result;
}
}
- else if ( url.startsWith( "http" ) )
+ else if ( scmSpecificUrl.startsWith( "http" ) )
{
- if ( !url.startsWith( "http://" ) )
+ if ( !scmSpecificUrl.startsWith( "http://" ) )
{
result.messages.add( "A svn 'http' url must be on the form 'http://'." );
@@ -248,9 +246,9 @@ public abstract class AbstractSvnScmProvider
}
}
// Support of tunnels: svn+xxx with xxx defined in subversion conf file
- else if ( url.startsWith( "svn+" ) )
+ else if ( scmSpecificUrl.startsWith( "svn+" ) )
{
- if ( url.indexOf( "://" ) < 0 )
+ if ( scmSpecificUrl.indexOf( "://" ) < 0 )
{
result.messages.add( "A svn 'svn+xxx' url must be on the form 'svn+xxx://'." );
@@ -258,7 +256,7 @@ public abstract class AbstractSvnScmProvider
}
else
{
- String tunnel = url.substring( "svn+".length(), url.indexOf( "://" ) );
+ String tunnel = scmSpecificUrl.substring( "svn+".length(), scmSpecificUrl.indexOf( "://" ) );
//ssh is always an allowed tunnel
if ( !"ssh".equals( tunnel ) )
@@ -279,9 +277,9 @@ public abstract class AbstractSvnScmProvider
}
}
}
- else if ( url.startsWith( "svn" ) )
+ else if ( scmSpecificUrl.startsWith( "svn" ) )
{
- if ( !url.startsWith( "svn://" ) )
+ if ( !scmSpecificUrl.startsWith( "svn://" ) )
{
result.messages.add( "A svn 'svn' url must be on the form 'svn://'." );
@@ -290,12 +288,12 @@ public abstract class AbstractSvnScmProvider
}
else
{
- result.messages.add( url + " url isn't a valid svn URL." );
+ result.messages.add( scmSpecificUrl + " url isn't a valid svn URL." );
return result;
}
- result.repository = new SvnScmProviderRepository( url );
+ result.repository = new SvnScmProviderRepository( scmSpecificUrl );
return result;
}
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/branch/SvnBranchCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
index 46e8f80..cd78617 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
@@ -135,8 +135,7 @@ public class SvnBranchCommand
try
{
- List<File> listFiles = FileUtils.getFiles( fileSet.getBasedir(), "**", "**/.svn/**", false );
- files = listFiles;
+ files = FileUtils.getFiles( fileSet.getBasedir(), "**", "**/.svn/**", false );
}
catch ( IOException e )
{
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 108a03e..f5f7a17 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
@@ -163,20 +163,16 @@ public class SvnTagCommand
{
if ( StringUtils.isNotEmpty( fileSet.getExcludes() ) )
{
- List<File> list =
- FileUtils.getFiles( fileSet.getBasedir(),
- ( StringUtils.isEmpty( fileSet.getIncludes() ) ? "**"
- : fileSet.getIncludes() ), fileSet.getExcludes()
- + ",**/.svn/**", false );
- files = list;
+ files = FileUtils.getFiles( fileSet.getBasedir(),
+ ( StringUtils.isEmpty( fileSet.getIncludes() ) ? "**"
+ : fileSet.getIncludes() ), fileSet.getExcludes()
+ + ",**/.svn/**", false );
}
else
{
- List<File> list =
- FileUtils.getFiles( fileSet.getBasedir(),
- ( StringUtils.isEmpty( fileSet.getIncludes() ) ? "**"
- : fileSet.getIncludes() ), "**/.svn/**", false );
- files = list;
+ files = FileUtils.getFiles( fileSet.getBasedir(),
+ ( StringUtils.isEmpty( fileSet.getIncludes() ) ? "**"
+ : fileSet.getIncludes() ), "**/.svn/**", false );
}
}
catch ( IOException e )