From 2ea819ed26ae79c6a5c2bbdfb6fce2eea1e03d9d Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 6 Aug 2025 21:59:23 +0100 Subject: [PATCH] Remove redundant null checks --- .../gitexe/command/update/GitLatestRevisionCommandConsumer.java | 2 +- .../scm/provider/svn/svnexe/command/mkdir/SvnMkdirCommand.java | 2 +- .../svn/svnexe/command/checkout/SvnCheckOutCommandTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/GitLatestRevisionCommandConsumer.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/GitLatestRevisionCommandConsumer.java index 60307d7f1..e9f4c6c29 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/GitLatestRevisionCommandConsumer.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/GitLatestRevisionCommandConsumer.java @@ -41,7 +41,7 @@ public void consumeLine(String line) { if (logger.isDebugEnabled()) { logger.debug("GitLatestRevisionCommandConsumer consumeLine : " + line); } - if (line == null || (line == null || line.isEmpty())) { + if (line == null || line.isEmpty()) { return; } 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/SvnMkdirCommand.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/SvnMkdirCommand.java index 382d189b9..2ff5299fb 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/SvnMkdirCommand.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/SvnMkdirCommand.java @@ -118,7 +118,7 @@ protected Commandline createCommandLine( Iterator it = fileSet.getFileList().iterator(); String dirPath = it.next().getPath(); // replacing \ with / for windauze - if (dirPath != null && Os.isFamily(Os.FAMILY_WINDOWS)) { + if (Os.isFamily(Os.FAMILY_WINDOWS)) { dirPath = StringUtils.replace(dirPath, "\\", "/"); } diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java index 51b4635ef..eb08205eb 100644 --- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java +++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommandTest.java @@ -50,7 +50,7 @@ public void setUp() throws Exception { recursive = true; workingDirectory = getTestFile("target/svn-checkout-command-test"); - if (workingDirectory != null && workingDirectory.isDirectory()) { + if (workingDirectory.isDirectory()) { FileUtils.deleteDirectory(workingDirectory); } }