Skip to content

Commit d68c070

Browse files
elharoelharo
authored
Simplify code (#1429)
* Simplify code * simplify
1 parent cbdc4a7 commit d68c070

File tree

16 files changed

+49
-96
lines changed

16 files changed

+49
-96
lines changed

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ private void transformDocument(
424424

425425
private void rewriteBuildOutputTimestampProperty(Properties properties, ReleaseResult result) {
426426
String buildOutputTimestamp = properties.getProperty("project.build.outputTimestamp");
427-
if (buildOutputTimestamp == null || (buildOutputTimestamp == null || buildOutputTimestamp.isEmpty())) {
427+
if (buildOutputTimestamp == null || buildOutputTimestamp.isEmpty()) {
428428
// no Reproducible Builds output timestamp defined
429429
return;
430430
}

‎maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModelETL.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ public void extract(File pomFile) throws ReleaseExecutionException {
125125
*/
126126
// CHECKSTYLE_OFF: LocalFinalVariableName
127127
final String SPACE = "\\s++";
128-
final String XML = "<\\?(?:(?:[^\"'>]++)|(?:\"[^\"]*+\")|(?:'[^\']*+'))*+>";
129-
final String INTSUB = "\\[(?:(?:[^\"'\\]]++)|(?:\"[^\"]*+\")|(?:'[^\']*+'))*+\\]";
128+
final String XML = "<\\?(?:(?:[^\"'>]++)|(?:\"[^\"]*+\")|(?:'[^']*+'))*+>";
129+
final String INTSUB = "\\[(?:(?:[^\"'\\]]++)|(?:\"[^\"]*+\")|(?:'[^']*+'))*+\\]";
130130
final String DOCTYPE =
131-
"<!DOCTYPE(?:(?:[^\"'\\[>]++)|(?:\"[^\"]*+\")|(?:'[^\']*+')|(?:" + INTSUB + "))*+>";
131+
"<!DOCTYPE(?:(?:[^\"'\\[>]++)|(?:\"[^\"]*+\")|(?:'[^']*+')|(?:" + INTSUB + "))*+>";
132132
final String PI = XML;
133133
final String COMMENT = "<!--(?:[^-]|(?:-[^-]))*+-->";
134134

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.junit.jupiter.api.Test;
3131

3232
import static org.junit.jupiter.api.Assertions.assertEquals;
33-
import static org.junit.jupiter.api.Assertions.assertFalse;
33+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
3434
import static org.junit.jupiter.api.Assertions.assertTrue;
3535

3636
/**
@@ -57,7 +57,7 @@ void testEquals() throws IOException {
5757

5858
assertEquals(builder, builder, "test ==");
5959
Object obj = this;
60-
assertFalse(builder.equals(obj), "test class instance");
60+
assertNotEquals(builder, obj, "test class instance");
6161
}
6262

6363
private static void doEqualsAssertions(
@@ -71,67 +71,67 @@ private static void doEqualsAssertions(
7171
assertEquals(configBuilder.build(), origConfig, "Check original comparison");
7272

7373
configBuilder.setScmSourceUrl(other);
74-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
74+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
7575
configBuilder.setScmSourceUrl(origConfig.getScmSourceUrl());
7676

7777
configBuilder.setAdditionalArguments(other);
78-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
78+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
7979
configBuilder.setAdditionalArguments(origConfig.getAdditionalArguments());
8080

8181
configBuilder.setAddSchema(!origConfig.isAddSchema());
82-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
82+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
8383
configBuilder.setAddSchema(origConfig.isAddSchema());
8484

8585
configBuilder.setGenerateReleasePoms(!origConfig.isAddSchema());
86-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
86+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
8787
configBuilder.setGenerateReleasePoms(origConfig.isGenerateReleasePoms());
8888

8989
configBuilder.setScmUseEditMode(!origConfig.isScmUseEditMode());
90-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
90+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
9191
configBuilder.setScmUseEditMode(origConfig.isScmUseEditMode());
9292

9393
configBuilder.setInteractive(!origConfig.isInteractive());
94-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
94+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
9595
configBuilder.setInteractive(origConfig.isInteractive());
9696

9797
configBuilder.setCommitByProject(!origConfig.isCommitByProject());
98-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
98+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
9999
configBuilder.setCommitByProject(origConfig.isCommitByProject());
100100

101101
configBuilder.setCompletedPhase(other);
102-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
102+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
103103
configBuilder.setCompletedPhase(origConfig.getCompletedPhase());
104104

105105
configBuilder.setScmPrivateKeyPassPhrase(other);
106-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
106+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
107107
configBuilder.setScmPrivateKeyPassPhrase(origConfig.getScmPrivateKeyPassPhrase());
108108

109109
configBuilder.setScmPassword(other);
110-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
110+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
111111
configBuilder.setScmPassword(origConfig.getScmPassword());
112112

113113
configBuilder.setScmUsername(other);
114-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
114+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
115115
configBuilder.setScmUsername(origConfig.getScmUsername());
116116

117117
configBuilder.setScmPrivateKey(other);
118-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
118+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
119119
configBuilder.setScmPrivateKey(origConfig.getScmPrivateKey());
120120

121121
configBuilder.setPomFileName(other);
122-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
122+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
123123
configBuilder.setPomFileName(origConfig.getPomFileName());
124124

125125
configBuilder.setPreparationGoals(other);
126-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
126+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
127127
configBuilder.setPreparationGoals(origConfig.getPreparationGoals());
128128

129129
configBuilder.setScmReleaseLabel(other);
130-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
130+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
131131
configBuilder.setScmReleaseLabel(origConfig.getScmReleaseLabel());
132132

133133
configBuilder.setScmTagBase(other);
134-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
134+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
135135
configBuilder.setScmTagBase(origConfig.getScmTagBase());
136136

137137
if (otherFile != null) {
@@ -141,7 +141,7 @@ private static void doEqualsAssertions(
141141
"Failed to create the directory, along with all necessary parent directories");
142142
}
143143
configBuilder.setWorkingDirectory(AbstractReleaseTestCase.getPath(otherFile));
144-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
144+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
145145
}
146146

147147
configBuilder.setWorkingDirectory(origConfig.getWorkingDirectory());
@@ -150,20 +150,20 @@ private static void doEqualsAssertions(
150150
assertEquals(configBuilder.build(), origConfig, "Check original comparison");
151151

152152
configBuilder.addDevelopmentVersion("groupId:artifactId", "1.0-SNAPSHOT");
153-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
153+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
154154
configBuilder = copyReleaseDescriptor(origConfig);
155155

156156
configBuilder.addReleaseVersion("groupId:artifactId", "1.0");
157-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
157+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
158158
configBuilder = copyReleaseDescriptor(origConfig);
159159

160160
configBuilder.addOriginalScmInfo("groupId:artifactId", new Scm());
161-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
161+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
162162
configBuilder = copyReleaseDescriptor(origConfig);
163163

164164
configBuilder.addOriginalScmInfo("groupId:artifactId", new Scm());
165165
origConfig.addOriginalScmInfo("foo", new Scm());
166-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
166+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
167167
origConfig = createReleaseDescriptor().build();
168168
configBuilder = copyReleaseDescriptor(origConfig);
169169

@@ -181,25 +181,25 @@ private static void doEqualsAssertions(
181181

182182
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("-", "dev", "url", "tag"));
183183
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn", "dev", "url", "tag"));
184-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
184+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
185185
origConfig = createReleaseDescriptor().build();
186186
configBuilder = copyReleaseDescriptor(origConfig);
187187

188188
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("conn", "-", "url", "tag"));
189189
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn", "dev", "url", "tag"));
190-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
190+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
191191
origConfig = createReleaseDescriptor().build();
192192
configBuilder = copyReleaseDescriptor(origConfig);
193193

194194
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("conn", "dev", "-", "tag"));
195195
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn", "dev", "url", "tag"));
196-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
196+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
197197
origConfig = createReleaseDescriptor().build();
198198
configBuilder = copyReleaseDescriptor(origConfig);
199199

200200
configBuilder.addOriginalScmInfo("groupId:artifactId", getScm("conn", "dev", "url", "-"));
201201
origConfig.addOriginalScmInfo("groupId:artifactId", getScm("conn", "dev", "url", "tag"));
202-
assertFalse(configBuilder.build().equals(origConfig), "Check original comparison");
202+
assertNotEquals(configBuilder.build(), origConfig, "Check original comparison");
203203
}
204204

205205
@Test

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.codehaus.plexus.util.cli.Commandline;
2525
import org.junit.jupiter.api.Test;
2626

27-
import static org.junit.jupiter.api.Assertions.assertFalse;
27+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
2828
import static org.junit.jupiter.api.Assertions.assertNotNull;
2929
import static org.junit.jupiter.api.Assertions.assertTrue;
3030

@@ -46,6 +46,6 @@ void testCreation() throws Exception {
4646
String executable = cl.getExecutable();
4747
assertTrue(executable.contains("exec"), "Check executable " + executable);
4848
assertNotNull(cl.getEnvironmentVariables(), "Check environment");
49-
assertFalse(cl.getEnvironmentVariables().length == 0, "Check environment");
49+
assertNotEquals(0, cl.getEnvironmentVariables().length, "Check environment");
5050
}
5151
}

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ public void testRewriteCDataAroundValues() throws Exception {
618618
@Test
619619
public void testCleanNoProjects() {
620620
// This occurs when it is release:perform run standalone. Just check there are no errors.
621-
((ResourceGenerator) getTestedPhase()).clean(Collections.<MavenProject>emptyList());
621+
((ResourceGenerator) getTestedPhase()).clean(Collections.emptyList());
622622
}
623623

624624
protected ReleaseDescriptorBuilder createUnmappedConfiguration(

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.junit.jupiter.api.Test;
3333

3434
import static org.codehaus.plexus.testing.PlexusExtension.getTestPath;
35+
import static org.junit.jupiter.api.Assertions.assertEquals;
3536
import static org.junit.jupiter.api.Assertions.assertFalse;
3637
import static org.junit.jupiter.api.Assertions.assertTrue;
3738

@@ -112,7 +113,7 @@ protected void testProjectBackups(List<MavenProject> reactorProjects, boolean cr
112113

113114
String backupContents = ReleaseUtil.readXmlFile(backupFile);
114115

115-
assertTrue(pomContents.equals(backupContents), "Check if pom and backup files are identical");
116+
assertEquals(pomContents, backupContents, "Check if pom and backup files are identical");
116117
} else {
117118
assertFalse(backupFile.exists(), "Check if backup file is not present");
118119
}

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/HasCommandParameter.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ public HasCommandParameter(CommandParameter commandParameter, Object expected) {
3939
}
4040

4141
@Override
42-
public boolean matches(CommandParameters argument) {
43-
CommandParameters commandParameters = (CommandParameters) argument;
44-
42+
public boolean matches(CommandParameters commandParameters) {
4543
try {
4644
return commandParameters.getString(this.commandParameter).equals(String.valueOf(expected));
4745
} catch (ScmException e) {

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ public IsScmBranchParametersEquals(ScmBranchParameters scmBranchParameters) {
3434
}
3535

3636
@Override
37-
public boolean matches(ScmBranchParameters argument) {
38-
ScmBranchParameters sbp = (ScmBranchParameters) argument;
37+
public boolean matches(ScmBranchParameters sbp) {
3938
return sbp.getMessage().equals(this.scmBranchParameters.getMessage())
4039
&& sbp.isRemoteBranching() == this.scmBranchParameters.isRemoteBranching()
4140
&& sbp.isPinExternals() == this.scmBranchParameters.isPinExternals();

‎maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,14 @@ public IsScmFileSetEquals(ScmFileSet fileSet) {
3636
}
3737

3838
@Override
39-
public boolean matches(ScmFileSet argument) {
40-
ScmFileSet fs = (ScmFileSet) argument;
41-
39+
public boolean matches(ScmFileSet fs) {
4240
try {
4341
return fs.getBasedir()
4442
.getCanonicalPath()
4543
.equals(fileSet.getBasedir().getCanonicalPath())
4644
&& fs.getFileList().equals(fileSet.getFileList());
4745
} catch (IOException e) {
48-
// should not happened so RuntimeException
46+
// should not have happened so RuntimeException
4947
throw new RuntimeException(e.getMessage(), e);
5048
}
5149
}

0 commit comments

Comments
 (0)
⚡