From 9714940c1d03e9069d00ff1f4eb1f5df9bc1b8f3 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 6 Aug 2025 22:15:48 +0100 Subject: [PATCH 1/2] Remove redundant code --- .../src/main/java/org/apache/maven/scm/ChangeSet.java | 2 +- .../java/org/apache/maven/scm/repository/ScmRepository.java | 2 +- .../src/test/java/org/apache/maven/scm/ScmFileSetTest.java | 2 +- .../java/org/apache/maven/scm/client/cli/MavenScmCli.java | 2 -- .../src/main/java/org/apache/maven/scm/plugin/AddMojo.java | 2 +- .../main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java | 4 ++-- .../main/java/org/apache/maven/scm/plugin/ValidateMojo.java | 2 +- .../maven/scm/provider/hg/command/add/HgAddConsumer.java | 2 +- .../scm/provider/hg/command/remove/HgRemoveConsumer.java | 2 +- .../local/command/update/LocalUpdateCommandTckTest.java | 2 +- .../maven/scm/provider/git/command/diff/GitDiffConsumer.java | 1 - .../git/gitexe/command/checkout/GitCheckOutCommand.java | 2 +- .../provider/git/gitexe/command/remove/GitRemoveConsumer.java | 2 -- .../provider/git/gitexe/command/update/GitUpdateCommand.java | 3 +-- .../git/gitexe/command/remove/GitRemoveConsumerTest.java | 4 ++-- .../scm/provider/svn/svnexe/command/info/SvnInfoCommand.java | 2 +- .../provider/svn/svnexe/command/mkdir/SvnMkdirConsumer.java | 4 ---- .../java/org/apache/maven/scm/provider/ScmProviderStub.java | 4 ++-- .../scm/tck/command/checkout/CheckOutCommandTckTest.java | 2 +- 19 files changed, 18 insertions(+), 28 deletions(-) diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java b/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java index 750d2963d..af7a0721c 100644 --- a/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java +++ b/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java @@ -431,7 +431,7 @@ public void addMergedRevision(String mergedRevision) { } public Set getMergedRevisions() { - return mergedRevisions == null ? Collections.emptySet() : mergedRevisions; + return mergedRevisions == null ? Collections.emptySet() : mergedRevisions; } public void setMergedRevisions(Set mergedRevisions) { diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java b/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java index 2b4efcec6..48e427f48 100644 --- a/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java +++ b/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java @@ -54,6 +54,6 @@ public ScmProviderRepository getProviderRepository() { /** {@inheritDoc} */ public String toString() { - return provider.toString() + ":" + providerRepository.toString(); + return provider + ":" + providerRepository; } } diff --git a/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java b/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java index b42a5bf42..585499ac5 100644 --- a/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java +++ b/maven-scm-api/src/test/java/org/apache/maven/scm/ScmFileSetTest.java @@ -79,7 +79,7 @@ public void testFilesListExcludes() throws IOException { Iterator it = files.iterator(); while (it.hasNext()) { - File file = (File) it.next(); + File file = it.next(); if (removeBasedir(file.getAbsolutePath()).indexOf("exclude") != -1) { fail("Found excludes in file set: " + file); } diff --git a/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java b/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java index e5a4f5ecf..37897d6a6 100644 --- a/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java +++ b/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java @@ -192,8 +192,6 @@ public void execute(String scmUrl, String command, File workingDirectory, ScmVer System.err.println("Error while executing the SCM command."); ex.printStackTrace(System.err); - - return; } } diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java index a4145e001..0980401dd 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java @@ -54,7 +54,7 @@ public void execute() throws MojoExecutionException { checkResult(result); - getLog().info("" + result.getAddedFiles().size() + " files successfully added."); + getLog().info(result.getAddedFiles().size() + " files successfully added."); } catch (IOException | ScmException e) { throw new MojoExecutionException("Cannot run add command : ", e); diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java index a91158e20..2fc9078c5 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java @@ -220,11 +220,11 @@ private Date parseDate(SimpleDateFormat format, String date) throws MojoExecutio } try { - return format.parse(date.toString()); + return format.parse(date); } catch (ParseException e) { throw new MojoExecutionException( "Please use this date pattern: " - + format.toLocalizedPattern().toString(), + + format.toLocalizedPattern(), e); } } diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java index aea7ce862..2ce62bfe0 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java @@ -108,7 +108,7 @@ private void validateConnection(String connectionString, String type) throws Moj Iterator iter = messages.iterator(); while (iter.hasNext()) { - getLog().error(iter.next().toString()); + getLog().error(iter.next()); } getLog().error("The invalid scm url connection: '" + connectionString + "'."); diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java index 938e58273..af1acd65c 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/add/HgAddConsumer.java @@ -41,7 +41,7 @@ public HgAddConsumer(File workingDir) { /** {@inheritDoc} */ public void doConsume(ScmFileStatus status, String trimmedLine) { - if (status != null && status == ScmFileStatus.ADDED) { + if (status == ScmFileStatus.ADDED) { // Only include real files (not directories) File tmpFile = new File(workingDir, trimmedLine); if (!tmpFile.exists()) { diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveConsumer.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveConsumer.java index 5cff2fcbb..4bc3f2298 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveConsumer.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/remove/HgRemoveConsumer.java @@ -42,7 +42,7 @@ public HgRemoveConsumer(File workingDir) { /** {@inheritDoc} */ public void doConsume(ScmFileStatus status, String trimmedLine) { - if (status != null && status == ScmFileStatus.DELETED) { + if (status == ScmFileStatus.DELETED) { // Only include real files (not directories) File tmpFile = new File(workingDir, trimmedLine); if (!tmpFile.exists()) { diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java index 2dcd7bf48..1964f3c83 100644 --- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java +++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java @@ -110,7 +110,7 @@ public void testDeletion() throws Exception { Iterator files = new TreeSet(updatedFiles).iterator(); // readme.txt - ScmFile file = (ScmFile) files.next(); + ScmFile file = files.next(); assertPath("/readme.txt", file.getPath()); assertTrue(file.getStatus().isUpdate()); diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java index adb920fa8..595fe395e 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java @@ -124,7 +124,6 @@ public void consumeLine(String line) { logger.warn("Unparseable line: '" + line + "'"); } patch.append(line).append("\n"); - return; } else if (line.startsWith(INDEX_LINE_TOKEN)) { // skip, though could parse to verify start revision and end revision patch.append(line).append("\n"); 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/checkout/GitCheckOutCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java index 9ff18288e..35ad6d7b4 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java @@ -183,7 +183,7 @@ private Commandline createCloneCommand( gitClone.createArg().setValue("1"); } - if (version != null && (version instanceof ScmBranch)) { + if (version instanceof ScmBranch) { gitClone.createArg().setValue("--branch"); 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/remove/GitRemoveConsumer.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java index 0ff9d55cb..401ce0f1e 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java @@ -72,8 +72,6 @@ public void consumeLine(String line) { if (logger.isInfoEnabled()) { logger.info("could not parse line: " + line); } - - return; } } 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/update/GitUpdateCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java index 1682b5d26..9f9c9d954 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java @@ -136,8 +136,7 @@ public static Commandline createLatestRevisionCommandLine( // same as --topo-order, but ensure ordering of merges cl.createArg().setValue("--date-order"); - if (scmVersion != null - && scmVersion instanceof ScmBranch + if (scmVersion instanceof ScmBranch && scmVersion.getName() != null && scmVersion.getName().length() > 0) { // if any branch is given, lets take em diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java index cd51e0886..9913e430f 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumerTest.java @@ -74,8 +74,8 @@ public void testLog1Consumer() throws Exception { assertEquals(2, changedFiles.size()); - testScmFile((ScmFile) changedFiles.get(0), "src/main/java/Application.java", ScmFileStatus.DELETED); - testScmFile((ScmFile) changedFiles.get(1), "src/test/java/Test.java", ScmFileStatus.DELETED); + testScmFile(changedFiles.get(0), "src/main/java/Application.java", ScmFileStatus.DELETED); + testScmFile(changedFiles.get(1), "src/test/java/Test.java", ScmFileStatus.DELETED); } @Test 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/info/SvnInfoCommand.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java index 699baa2c4..3c165dd6c 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/info/SvnInfoCommand.java @@ -109,7 +109,7 @@ protected Commandline createCommandLine( Iterator it = fileSet.getFileList().iterator(); while (it.hasNext()) { - File file = (File) it.next(); + File file = it.next(); if (repository == null) { cl.createArg().setValue(file.getPath()); 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/mkdir/SvnMkdirConsumer.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirConsumer.java index 9e8b119f9..027fccd77 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirConsumer.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/mkdir/SvnMkdirConsumer.java @@ -50,8 +50,6 @@ public void consumeLine(String line) { String revisionString = line.substring(COMMITTED_REVISION_TOKEN.length() + 1, line.length() - 1); revision = Integer.parseInt(revisionString); - - return; } else if (statusString.equals("A")) { String file = line.substring(3); @@ -62,8 +60,6 @@ public void consumeLine(String line) { if (logger.isInfoEnabled()) { logger.info("Unknown line: '" + line + "'"); } - - return; } } diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java b/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java index 894b09b83..c1d58c8f4 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java @@ -115,8 +115,8 @@ public class ScmProviderStub implements ScmProvider { */ public ScmProviderStub() { setScmSpecificFilename(""); - setAddScmResult(new AddScmResult("", Collections.emptyList())); - setBranchScmResult(new BranchScmResult("", Collections.emptyList())); + setAddScmResult(new AddScmResult("", Collections.emptyList())); + setBranchScmResult(new BranchScmResult("", Collections.emptyList())); setChangeLogScmResult(new ChangeLogScmResult("", "", "", true)); setCheckInScmResult(new CheckInScmResult("", "", "", true)); setCheckOutScmResult(new CheckOutScmResult("", "", "", true)); diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java index 77d126c77..6eee767a8 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java @@ -55,7 +55,7 @@ public void testCheckOutCommandTest() throws Exception { for (Iterator it = files.iterator(); it.hasNext(); i++) { ScmFile scmFile = it.next(); - System.out.println("" + i + ": " + scmFile); + System.out.println(i + ": " + scmFile); } fail("Expected 4 files in the updated files list, was " + checkedOutFiles.size()); From 68b5edc0076404f8d8580a28e67707b729430150 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 7 Aug 2025 06:52:15 +0100 Subject: [PATCH 2/2] spotless --- .../main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java | 5 +---- .../java/org/apache/maven/scm/provider/ScmProviderStub.java | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java index 2fc9078c5..cf84e1cce 100644 --- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java +++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java @@ -222,10 +222,7 @@ private Date parseDate(SimpleDateFormat format, String date) throws MojoExecutio try { return format.parse(date); } catch (ParseException e) { - throw new MojoExecutionException( - "Please use this date pattern: " - + format.toLocalizedPattern(), - e); + throw new MojoExecutionException("Please use this date pattern: " + format.toLocalizedPattern(), e); } } } diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java b/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java index c1d58c8f4..03e58c7a3 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java @@ -28,7 +28,6 @@ import org.apache.maven.scm.ScmBranch; import org.apache.maven.scm.ScmBranchParameters; import org.apache.maven.scm.ScmException; -import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; import org.apache.maven.scm.ScmTagParameters; import org.apache.maven.scm.ScmVersion;