This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch red in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 86ef7a84899bacfb2c76cacfc7d26a75546cd480 Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Wed Nov 26 18:27:29 2025 -0600 Simplify code --- .../release/phase/AbstractRewritePomsPhase.java | 2 +- .../release/transform/jdom2/JDomModelETL.java | 6 ++-- .../AbstractRewritingReleasePhaseTestCase.java | 2 +- .../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 +- .../transform/jdom2/JDomPropertiesTest.java | 2 +- .../policy/oddeven/OddEvenVersionPolicy.java | 2 +- 11 files changed, 13 insertions(+), 63 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/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/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/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); }
