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
commit 8b64075b41174b581be3606aea08a88f9f06f73c Author: Michael Osipov <[email protected]> AuthorDate: Sat Jan 8 20:42:33 2022 +0100 Fix issues reported by Checkstyle --- .../scm/command/changelog/ChangeLogScmRequest.java | 14 +++++------ .../apache/maven/scm/manager/BasicScmManager.java | 2 +- .../maven/scm/provider/git/util/GitUtil.java | 7 +++--- .../scm/provider/git/jgit/command/JGitUtils.java | 29 ++++++++++++---------- .../maven/scm/provider/svn/util/SvnUtil.java | 7 +++--- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmRequest.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmRequest.java index a2cb04e..3591ed0 100644 --- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmRequest.java +++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmRequest.java @@ -63,7 +63,7 @@ public class ChangeLogScmRequest /** * @param startDate the start date of the period - * @throws ScmException if any + * @throws ScmException if any */ public void setStartDate( Date startDate ) throws ScmException @@ -79,7 +79,7 @@ public class ChangeLogScmRequest /** * @param endDate the end date of the period - * @throws ScmException if any + * @throws ScmException if any */ public void setEndDate( Date endDate ) throws ScmException @@ -95,7 +95,7 @@ public class ChangeLogScmRequest /** * @param numDays the number days before the current time if startdate and enddate are null - * @throws ScmException if any + * @throws ScmException if any */ public void setNumDays( int numDays ) throws ScmException @@ -111,7 +111,7 @@ public class ChangeLogScmRequest /** * @param startRevision the start branch/tag/revision - * @throws ScmException if any + * @throws ScmException if any */ public void setStartRevision( ScmVersion startRevision ) throws ScmException @@ -127,7 +127,7 @@ public class ChangeLogScmRequest /** * @param endRevision the end branch/tag/revision - * @throws ScmException if any + * @throws ScmException if any */ public void setEndRevision( ScmVersion endRevision ) throws ScmException @@ -143,7 +143,7 @@ public class ChangeLogScmRequest /** * @param datePattern the date pattern used in changelog output returned by scm tool - * @throws ScmException if any + * @throws ScmException if any */ public void setDatePattern( String datePattern ) throws ScmException @@ -160,7 +160,7 @@ public class ChangeLogScmRequest /** * @param limit the maximal count of returned changesets - * @throws ScmException if any + * @throws ScmException if any */ public void setLimit( Integer limit ) throws ScmException diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/manager/BasicScmManager.java b/maven-scm-api/src/main/java/org/apache/maven/scm/manager/BasicScmManager.java index 68a22e2..2af5204 100644 --- a/maven-scm-api/src/main/java/org/apache/maven/scm/manager/BasicScmManager.java +++ b/maven-scm-api/src/main/java/org/apache/maven/scm/manager/BasicScmManager.java @@ -31,7 +31,7 @@ public class BasicScmManager { /** {@inheritDoc} */ @Deprecated - protected ScmLogger getScmLogger() + protected ScmLogger getScmLogger() { return new DefaultLog(); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java index 3da92d6..0845ad0 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java @@ -25,7 +25,6 @@ import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; /** @@ -41,7 +40,7 @@ public class GitUtil private static File settingsDirectory = DEFAULT_SETTINGS_DIRECTORY; private static Settings settings; - + private GitUtil() { // no op @@ -55,7 +54,7 @@ public class GitUtil } return settings; } - + public static Settings readSettings() { File settingsFile = getSettingsFile(); @@ -87,7 +86,7 @@ public class GitUtil settingsDirectory = directory; settings = readSettings(); } - + public static File getSettingsFile() { return new File( settingsDirectory, GIT_SETTINGS_FILENAME ); diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java index cc18268..db8fc52 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java @@ -102,7 +102,7 @@ public class JGitUtils /** * Closes the repository wrapped by the passed git object - * @param git + * @param git */ public static void closeRepo( Git git ) { @@ -236,9 +236,10 @@ public class JGitUtils List<ScmFile> list = new ArrayList<ScmFile>(); if ( JGitUtils.hasCommits( repository ) ) { - + try ( RevWalk rw = new RevWalk( repository ); - DiffFormatter df = new DiffFormatter( DisabledOutputStream.INSTANCE ) ) { + DiffFormatter df = new DiffFormatter( DisabledOutputStream.INSTANCE ) ) + { RevCommit realParent = commit.getParentCount() > 0 ? commit.getParent( 0 ) : commit; RevCommit parent = rw.parseCommit( realParent.getId() ); df.setRepository( repository ); @@ -309,7 +310,7 @@ public class JGitUtils } } add.call(); - + Status status = git.status().call(); Set<String> allInIndex = new HashSet<String>(); @@ -379,12 +380,13 @@ public class JGitUtils sortings = new RevSort[]{ RevSort.TOPO, RevSort.COMMIT_TIME_DESC }; } - try ( RevWalk walk = new RevWalk( repo ) ) { + try ( RevWalk walk = new RevWalk( repo ) ) + { for ( final RevSort s : sortings ) { walk.sort( s, true ); } - + if ( fromDate != null && toDate != null ) { //walk.setRevFilter( CommitTimeRevFilter.between( fromDate, toDate ) ); @@ -395,10 +397,11 @@ public class JGitUtils throws StopWalkException, MissingObjectException, IncorrectObjectTypeException, IOException { int cmtTime = cmit.getCommitTime(); - - return ( cmtTime >= ( fromDate.getTime() / 1000 ) ) && ( cmtTime <= ( toDate.getTime() / 1000 ) ); + + return ( cmtTime >= ( fromDate.getTime() / 1000 ) ) + && ( cmtTime <= ( toDate.getTime() / 1000 ) ); } - + @Override public RevFilter clone() { @@ -417,7 +420,7 @@ public class JGitUtils walk.setRevFilter( CommitTimeRevFilter.before( toDate ) ); } } - + if ( fromRevId != null ) { RevCommit c = walk.parseCommit( fromRevId ); @@ -425,7 +428,7 @@ public class JGitUtils RevCommit real = walk.parseCommit( c ); walk.markUninteresting( real ); } - + if ( toRevId != null ) { RevCommit c = walk.parseCommit( toRevId ); @@ -443,7 +446,7 @@ public class JGitUtils RevCommit real = walk.parseCommit( head ); walk.markStart( real ); } - + int n = 0; for ( final RevCommit c : walk ) { @@ -452,7 +455,7 @@ public class JGitUtils { break; } - + revs.add( c ); } return revs; diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.java index 75935bf..d4d87f5 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/util/SvnUtil.java @@ -25,7 +25,6 @@ import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; /** @@ -39,13 +38,13 @@ public class SvnUtil public static final File DEFAULT_SETTINGS_DIRECTORY = new File( System.getProperty( "user.home" ), ".scm" ); private static File settingsDirectory = DEFAULT_SETTINGS_DIRECTORY; - + private static Settings settings; private SvnUtil() { } - + public static Settings getSettings() { if ( settings == null ) @@ -86,7 +85,7 @@ public class SvnUtil settingsDirectory = directory; settings = readSettings(); } - + public static File getSettingsFile() { return new File( settingsDirectory, SVN_SETTINGS_FILENAME );
