This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new d68c0702 Simplify code (#1429)
d68c0702 is described below
commit d68c0702ecf4f9a93caf0c642107b7cd81f28305
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Fri Nov 28 08:18:47 2025 -0600
Simplify code (#1429)
* Simplify code
* simplify
---
.../release/phase/AbstractRewritePomsPhase.java | 2 +-
.../release/transform/jdom2/JDomModelETL.java | 6 +--
.../shared/release/config/ReleaseUtilsTest.java | 54 +++++++++++-----------
.../release/exec/CommandLineFactoryTest.java | 4 +-
.../AbstractRewritingReleasePhaseTestCase.java | 2 +-
.../release/phase/CreateBackupPomsPhaseTest.java | 3 +-
.../shared/release/phase/HasCommandParameter.java | 4 +-
.../shared/release/phase/IsScmBranchEquals.java | 42 -----------------
.../release/phase/IsScmBranchParametersEquals.java | 3 +-
.../shared/release/phase/IsScmFileSetEquals.java | 6 +--
.../maven/shared/release/phase/IsScmTagEquals.java | 4 +-
.../release/phase/IsScmTagParametersEquals.java | 3 +-
.../release/phase/RemoveReleasePomsPhaseTest.java | 5 +-
.../release/phase/RestoreBackupPomsPhaseTest.java | 3 +-
.../transform/jdom2/JDomPropertiesTest.java | 2 +-
.../policy/oddeven/OddEvenVersionPolicy.java | 2 +-
16 files changed, 49 insertions(+), 96 deletions(-)
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
index a34df0d8..8311a136 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -424,7 +424,7 @@ public abstract class AbstractRewritePomsPhase extends
AbstractReleasePhase impl
private void rewriteBuildOutputTimestampProperty(Properties properties,
ReleaseResult result) {
String buildOutputTimestamp =
properties.getProperty("project.build.outputTimestamp");
- if (buildOutputTimestamp == null || (buildOutputTimestamp == null ||
buildOutputTimestamp.isEmpty())) {
+ if (buildOutputTimestamp == null || buildOutputTimestamp.isEmpty()) {
// no Reproducible Builds output timestamp defined
return;
}
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModelETL.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModelETL.java
index 640f574e..e10d3622 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModelETL.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModelETL.java
@@ -125,10 +125,10 @@ public class JDomModelETL implements ModelETL {
*/
// CHECKSTYLE_OFF: LocalFinalVariableName
final String SPACE = "\\s++";
- final String XML =
"<\\?(?:(?:[^\"'>]++)|(?:\"[^\"]*+\")|(?:'[^\']*+'))*+>";
- final String INTSUB =
"\\[(?:(?:[^\"'\\]]++)|(?:\"[^\"]*+\")|(?:'[^\']*+'))*+\\]";
+ final String XML =
"<\\?(?:(?:[^\"'>]++)|(?:\"[^\"]*+\")|(?:'[^']*+'))*+>";
+ final String INTSUB =
"\\[(?:(?:[^\"'\\]]++)|(?:\"[^\"]*+\")|(?:'[^']*+'))*+\\]";
final String DOCTYPE =
-
"<!DOCTYPE(?:(?:[^\"'\\[>]++)|(?:\"[^\"]*+\")|(?:'[^\']*+')|(?:" + INTSUB +
"))*+>";
+
"<!DOCTYPE(?:(?:[^\"'\\[>]++)|(?:\"[^\"]*+\")|(?:'[^']*+')|(?:" + INTSUB +
"))*+>";
final String PI = XML;
final String COMMENT = "<!--(?:[^-]|(?:-[^-]))*+-->";
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
index 59d2d92b..98e72381 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
@@ -30,7 +30,7 @@ import
org.apache.maven.shared.release.phase.AbstractReleaseTestCase;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -57,7 +57,7 @@ class ReleaseUtilsTest {
assertEquals(builder, builder, "test ==");
Object obj = this;
- assertFalse(builder.equals(obj), "test class instance");
+ assertNotEquals(builder, obj, "test class instance");
}
private static void doEqualsAssertions(
@@ -71,67 +71,67 @@ class ReleaseUtilsTest {
assertEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmSourceUrl(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmSourceUrl(origConfig.getScmSourceUrl());
configBuilder.setAdditionalArguments(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setAdditionalArguments(origConfig.getAdditionalArguments());
configBuilder.setAddSchema(!origConfig.isAddSchema());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setAddSchema(origConfig.isAddSchema());
configBuilder.setGenerateReleasePoms(!origConfig.isAddSchema());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setGenerateReleasePoms(origConfig.isGenerateReleasePoms());
configBuilder.setScmUseEditMode(!origConfig.isScmUseEditMode());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmUseEditMode(origConfig.isScmUseEditMode());
configBuilder.setInteractive(!origConfig.isInteractive());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setInteractive(origConfig.isInteractive());
configBuilder.setCommitByProject(!origConfig.isCommitByProject());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setCommitByProject(origConfig.isCommitByProject());
configBuilder.setCompletedPhase(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setCompletedPhase(origConfig.getCompletedPhase());
configBuilder.setScmPrivateKeyPassPhrase(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmPrivateKeyPassPhrase(origConfig.getScmPrivateKeyPassPhrase());
configBuilder.setScmPassword(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmPassword(origConfig.getScmPassword());
configBuilder.setScmUsername(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmUsername(origConfig.getScmUsername());
configBuilder.setScmPrivateKey(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmPrivateKey(origConfig.getScmPrivateKey());
configBuilder.setPomFileName(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setPomFileName(origConfig.getPomFileName());
configBuilder.setPreparationGoals(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setPreparationGoals(origConfig.getPreparationGoals());
configBuilder.setScmReleaseLabel(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmReleaseLabel(origConfig.getScmReleaseLabel());
configBuilder.setScmTagBase(other);
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.setScmTagBase(origConfig.getScmTagBase());
if (otherFile != null) {
@@ -141,7 +141,7 @@ class ReleaseUtilsTest {
"Failed to create the directory, along with all
necessary parent directories");
}
configBuilder.setWorkingDirectory(AbstractReleaseTestCase.getPath(otherFile));
- assertFalse(configBuilder.build().equals(origConfig), "Check
original comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
}
configBuilder.setWorkingDirectory(origConfig.getWorkingDirectory());
@@ -150,20 +150,20 @@ class ReleaseUtilsTest {
assertEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder.addDevelopmentVersion("groupId:artifactId",
"1.0-SNAPSHOT");
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addReleaseVersion("groupId:artifactId", "1.0");
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addOriginalScmInfo("groupId:artifactId", new Scm());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addOriginalScmInfo("groupId:artifactId", new Scm());
origConfig.addOriginalScmInfo("foo", new Scm());
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
origConfig = createReleaseDescriptor().build();
configBuilder = copyReleaseDescriptor(origConfig);
@@ -181,25 +181,25 @@ class ReleaseUtilsTest {
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("-",
"dev", "url", "tag"));
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "url", "tag"));
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
origConfig = createReleaseDescriptor().build();
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"-", "url", "tag"));
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "url", "tag"));
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
origConfig = createReleaseDescriptor().build();
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "-", "tag"));
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "url", "tag"));
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
origConfig = createReleaseDescriptor().build();
configBuilder = copyReleaseDescriptor(origConfig);
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "url", "-"));
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn",
"dev", "url", "tag"));
- assertFalse(configBuilder.build().equals(origConfig), "Check original
comparison");
+ assertNotEquals(configBuilder.build(), origConfig, "Check original
comparison");
}
@Test
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
index 4b4f95e9..960fffd2 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
@@ -24,7 +24,7 @@ import org.codehaus.plexus.testing.PlexusTest;
import org.codehaus.plexus.util.cli.Commandline;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -46,6 +46,6 @@ class CommandLineFactoryTest {
String executable = cl.getExecutable();
assertTrue(executable.contains("exec"), "Check executable " +
executable);
assertNotNull(cl.getEnvironmentVariables(), "Check environment");
- assertFalse(cl.getEnvironmentVariables().length == 0, "Check
environment");
+ assertNotEquals(0, cl.getEnvironmentVariables().length, "Check
environment");
}
}
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
index 0f973a90..10a48903 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
@@ -618,7 +618,7 @@ abstract class AbstractRewritingReleasePhaseTestCase
extends AbstractReleaseTest
@Test
public void testCleanNoProjects() {
// This occurs when it is release:perform run standalone. Just check
there are no errors.
- ((ResourceGenerator)
getTestedPhase()).clean(Collections.<MavenProject>emptyList());
+ ((ResourceGenerator) getTestedPhase()).clean(Collections.emptyList());
}
protected ReleaseDescriptorBuilder createUnmappedConfiguration(
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
index 4b7e5ec9..0651baf3 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
@@ -32,6 +32,7 @@ import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Test;
import static org.codehaus.plexus.testing.PlexusExtension.getTestPath;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -112,7 +113,7 @@ class CreateBackupPomsPhaseTest extends
AbstractBackupPomsPhaseTest {
String backupContents = ReleaseUtil.readXmlFile(backupFile);
- assertTrue(pomContents.equals(backupContents), "Check if pom
and backup files are identical");
+ assertEquals(pomContents, backupContents, "Check if pom and
backup files are identical");
} else {
assertFalse(backupFile.exists(), "Check if backup file is not
present");
}
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/HasCommandParameter.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/HasCommandParameter.java
index a9fe3661..3dacdc1c 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/HasCommandParameter.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/HasCommandParameter.java
@@ -39,9 +39,7 @@ public class HasCommandParameter implements
ArgumentMatcher<CommandParameters> {
}
@Override
- public boolean matches(CommandParameters argument) {
- CommandParameters commandParameters = (CommandParameters) argument;
-
+ public boolean matches(CommandParameters commandParameters) {
try {
return
commandParameters.getString(this.commandParameter).equals(String.valueOf(expected));
} catch (ScmException e) {
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java
deleted file mode 100644
index c7e2b839..00000000
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.maven.shared.release.phase;
-
-import org.apache.maven.scm.ScmBranch;
-import org.mockito.ArgumentMatcher;
-
-/**
- * Mockito constraint to compare tags since it has no equals method.
- *
- * @author <a href="mailto:[email protected]";>Brett Porter</a>
- */
-public class IsScmBranchEquals implements ArgumentMatcher<ScmBranch> {
- private final ScmBranch branch;
-
- public IsScmBranchEquals(ScmBranch branch) {
- this.branch = branch;
- }
-
- @Override
- public boolean matches(ScmBranch argument) {
- ScmBranch sb = (ScmBranch) argument;
-
- return sb.getName().equals(this.branch.getName());
- }
-}
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java
index 104bf356..0911def0 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java
@@ -34,8 +34,7 @@ public class IsScmBranchParametersEquals implements
ArgumentMatcher<ScmBranchPar
}
@Override
- public boolean matches(ScmBranchParameters argument) {
- ScmBranchParameters sbp = (ScmBranchParameters) argument;
+ public boolean matches(ScmBranchParameters sbp) {
return sbp.getMessage().equals(this.scmBranchParameters.getMessage())
&& sbp.isRemoteBranching() ==
this.scmBranchParameters.isRemoteBranching()
&& sbp.isPinExternals() ==
this.scmBranchParameters.isPinExternals();
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
index d966c98f..deb5e7dd 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
@@ -36,16 +36,14 @@ public class IsScmFileSetEquals implements
ArgumentMatcher<ScmFileSet> {
}
@Override
- public boolean matches(ScmFileSet argument) {
- ScmFileSet fs = (ScmFileSet) argument;
-
+ public boolean matches(ScmFileSet fs) {
try {
return fs.getBasedir()
.getCanonicalPath()
.equals(fileSet.getBasedir().getCanonicalPath())
&& fs.getFileList().equals(fileSet.getFileList());
} catch (IOException e) {
- // should not happened so RuntimeException
+ // should not have happened so RuntimeException
throw new RuntimeException(e.getMessage(), e);
}
}
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
index 4e214c51..87f5117f 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
@@ -34,9 +34,7 @@ public class IsScmTagEquals implements
ArgumentMatcher<ScmTag> {
}
@Override
- public boolean matches(ScmTag argument) {
- ScmTag tag = (ScmTag) argument;
-
+ public boolean matches(ScmTag tag) {
return tag.getName().equals(this.tag.getName());
}
}
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java
index 267e7493..241743d6 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java
@@ -34,8 +34,7 @@ public class IsScmTagParametersEquals implements
ArgumentMatcher<ScmTagParameter
}
@Override
- public boolean matches(ScmTagParameters argument) {
- ScmTagParameters stp = (ScmTagParameters) argument;
+ public boolean matches(ScmTagParameters stp) {
return stp.getMessage().equals(this.scmTagParameters.getMessage())
&& stp.isRemoteTagging() ==
this.scmTagParameters.isRemoteTagging()
&& stp.isPinExternals() ==
this.scmTagParameters.isPinExternals()
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
index 8818fd70..7fbc3739 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
@@ -46,6 +46,7 @@ import org.junit.jupiter.api.Test;
import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
@@ -161,7 +162,7 @@ class RemoveReleasePomsPhaseTest extends
AbstractReleaseTestCase {
try (BufferedReader reader = new BufferedReader(new
StringReader(result.getOutput()))) {
assertEquals("[INFO] Removing release POM for 'artifactId'...",
reader.readLine());
- assertEquals(null, reader.readLine(), "Expected EOF");
+ assertNull(reader.readLine(), "Expected EOF");
}
// never invoke scmProviderMock
@@ -190,7 +191,7 @@ class RemoveReleasePomsPhaseTest extends
AbstractReleaseTestCase {
"[INFO] Full run would be removing ["
+ reactorProjects.get(0).getFile().getParent() +
File.separator + "release-pom.xml]",
reader.readLine());
- assertEquals(null, reader.readLine(), "Expected EOF");
+ assertNull(reader.readLine(), "Expected EOF");
}
// never invoke scmProviderMock
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
index 396c3336..9d9958dc 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
@@ -35,6 +35,7 @@ import org.junit.jupiter.api.Test;
import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
import static org.codehaus.plexus.testing.PlexusExtension.getTestPath;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -98,7 +99,7 @@ class RestoreBackupPomsPhaseTest extends
AbstractBackupPomsPhaseTest {
String expectedContents = ReleaseUtil.readXmlFile(expectedFile);
- assertTrue(pomContents.equals(expectedContents), "Check if pom and
backup files are identical");
+ assertEquals(pomContents, expectedContents, "Check if pom and
backup files are identical");
}
}
}
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom2/JDomPropertiesTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom2/JDomPropertiesTest.java
index c3334050..6e379210 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom2/JDomPropertiesTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom2/JDomPropertiesTest.java
@@ -90,7 +90,7 @@ class JDomPropertiesTest {
@Test
void testStoreToXMLEncoded() {
assertThrows(UnsupportedOperationException.class, () -> new
JDomProperties(null)
- .storeToXML((OutputStream) null, null, (String) null));
+ .storeToXML(null, null, (String) null));
}
@Test
diff --git
a/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
b/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
index 239ca6cf..a6793d21 100644
---
a/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
+++
b/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
@@ -91,7 +91,7 @@ public final class OddEvenVersionPolicy implements
VersionPolicy {
int skip = getVersionIncrements(development,
mostSignificantSegment % 2 == 0);
- digits.set(digits.size() - 1,
String.valueOf(String.valueOf(mostSignificantSegment + skip)));
+ digits.set(digits.size() - 1,
String.valueOf(mostSignificantSegment + skip));
newVersion = defaultVersionInfo.setDigits(digits);
}
