Skip to content

Commit a1f4955

Browse files
breunNils Breunesegnodet
authored
[MNG-8482] Use instanceof assignments to get rid of casting expressions (#2018)
Co-authored-by: Nils Breunese <[email protected]> Co-authored-by: Guillaume Nodet <[email protected]>
1 parent 5cef91e commit a1f4955

File tree

118 files changed

+496
-575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+496
-575
lines changed

api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ private static boolean doGet(Map<String, ?> userProperties, String key, boolean
5757
}
5858

5959
private static boolean doGet(Object val, boolean def) {
60-
if (val instanceof Boolean) {
61-
return (Boolean) val;
60+
if (val instanceof Boolean bool) {
61+
return bool;
6262
} else if (val != null) {
6363
return Boolean.parseBoolean(val.toString());
6464
} else {

api/maven-api-di/src/main/java/org/apache/maven/di/tool/DiIndexProcessor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ private String getFullClassName(TypeElement typeElement) {
7575
StringBuilder className = new StringBuilder(typeElement.getSimpleName());
7676
Element enclosingElement = typeElement.getEnclosingElement();
7777

78-
while (enclosingElement instanceof TypeElement) {
79-
className.insert(0, "$").insert(0, ((TypeElement) enclosingElement).getSimpleName());
78+
while (enclosingElement instanceof TypeElement enclosingTypeElement) {
79+
className.insert(0, "$").insert(0, enclosingTypeElement.getSimpleName());
8080
enclosingElement = enclosingElement.getEnclosingElement();
8181
}
8282

83-
if (enclosingElement instanceof PackageElement) {
84-
className.insert(0, ".").insert(0, ((PackageElement) enclosingElement).getQualifiedName());
83+
if (enclosingElement instanceof PackageElement packageElement) {
84+
className.insert(0, ".").insert(0, packageElement.getQualifiedName());
8585
}
8686

8787
return className.toString();

api/maven-api-model/src/main/mdo/maven.mdo

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2465,8 +2465,7 @@
24652465
* @see java.lang.Object#equals(java.lang.Object)
24662466
*/
24672467
public boolean equals(Object other) {
2468-
if (other instanceof Plugin) {
2469-
Plugin otherPlugin = (Plugin) other;
2468+
if (other instanceof Plugin otherPlugin) {
24702469
return getKey().equals(otherPlugin.getKey());
24712470
}
24722471
return false;
@@ -3249,13 +3248,12 @@
32493248
public boolean equals(Object o) {
32503249
if (this == o) {
32513250
return true;
3252-
} else if (!(o instanceof Extension)) {
3253-
return false;
3254-
} else {
3255-
Extension e = (Extension) o;
3251+
} else if (o instanceof Extension e) {
32563252
return java.util.Objects.equals(e.getArtifactId(), getArtifactId())
32573253
&& java.util.Objects.equals(e.getGroupId(), getGroupId())
32583254
&& java.util.Objects.equals(e.getVersion(), getVersion());
3255+
} else {
3256+
return false;
32593257
}
32603258
}
32613259

api/maven-api-toolchain/src/main/mdo/toolchains.mdo

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,11 @@
196196
public boolean equals(Object other) {
197197
if (this == other) {
198198
return true;
199-
} else if (!(other instanceof ToolchainModel)) {
200-
return false;
201-
} else {
202-
ToolchainModel that = (ToolchainModel) other;
199+
} else if (other instanceof ToolchainModel that) {
203200
return java.util.Objects.equals(this.getType(), that.getType())
204201
&& java.util.Objects.equals(this.getProvides(), that.getProvides());
202+
} else {
203+
return false;
205204
}
206205
} //-- boolean equals(Object)
207206
]]>

compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,8 @@ private String toListString() {
621621
if (buffer.length() > 1) {
622622
buffer.append(", ");
623623
}
624-
if (item instanceof ListItem) {
625-
buffer.append(((ListItem) item).toListString());
624+
if (item instanceof ListItem listItem) {
625+
buffer.append(listItem.toListString());
626626
} else {
627627
buffer.append(item);
628628
}
@@ -783,7 +783,7 @@ public String getCanonical() {
783783

784784
@Override
785785
public boolean equals(Object o) {
786-
return (o instanceof ComparableVersion) && items.equals(((ComparableVersion) o).items);
786+
return o instanceof ComparableVersion comparableVersion && items.equals(comparableVersion.items);
787787
}
788788

789789
@Override

compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ public boolean equals(Object other) {
5050
return true;
5151
}
5252

53-
if (!(other instanceof ArtifactVersion)) {
54-
return false;
53+
if (other instanceof ArtifactVersion artifactVersion) {
54+
return compareTo(artifactVersion) == 0;
5555
}
5656

57-
return compareTo((ArtifactVersion) other) == 0;
57+
return false;
5858
}
5959

6060
public int compareTo(ArtifactVersion otherVersion) {
61-
if (otherVersion instanceof DefaultArtifactVersion) {
62-
return this.comparable.compareTo(((DefaultArtifactVersion) otherVersion).comparable);
61+
if (otherVersion instanceof DefaultArtifactVersion defaultArtifactVersion) {
62+
return this.comparable.compareTo(defaultArtifactVersion.comparable);
6363
} else {
6464
return compareTo(new DefaultArtifactVersion(otherVersion.toString()));
6565
}

compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -112,32 +112,31 @@ public boolean equals(Object other) {
112112
return true;
113113
}
114114

115-
if (!(other instanceof Restriction)) {
116-
return false;
117-
}
118-
119-
Restriction restriction = (Restriction) other;
120-
if (lowerBound != null) {
121-
if (!lowerBound.equals(restriction.lowerBound)) {
115+
if (other instanceof Restriction restriction) {
116+
if (lowerBound != null) {
117+
if (!lowerBound.equals(restriction.lowerBound)) {
118+
return false;
119+
}
120+
} else if (restriction.lowerBound != null) {
122121
return false;
123122
}
124-
} else if (restriction.lowerBound != null) {
125-
return false;
126-
}
127123

128-
if (lowerBoundInclusive != restriction.lowerBoundInclusive) {
129-
return false;
130-
}
124+
if (lowerBoundInclusive != restriction.lowerBoundInclusive) {
125+
return false;
126+
}
131127

132-
if (upperBound != null) {
133-
if (!upperBound.equals(restriction.upperBound)) {
128+
if (upperBound != null) {
129+
if (!upperBound.equals(restriction.upperBound)) {
130+
return false;
131+
}
132+
} else if (restriction.upperBound != null) {
134133
return false;
135134
}
136-
} else if (restriction.upperBound != null) {
135+
136+
return upperBoundInclusive == restriction.upperBoundInclusive;
137+
} else {
137138
return false;
138139
}
139-
140-
return upperBoundInclusive == restriction.upperBoundInclusive;
141140
}
142141

143142
public String toString() {

compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,13 +469,12 @@ public boolean equals(Object obj) {
469469
if (this == obj) {
470470
return true;
471471
}
472-
if (!(obj instanceof VersionRange)) {
472+
if (obj instanceof VersionRange other) {
473+
return Objects.equals(recommendedVersion, other.recommendedVersion)
474+
&& Objects.equals(restrictions, other.restrictions);
475+
} else {
473476
return false;
474477
}
475-
VersionRange other = (VersionRange) obj;
476-
477-
return Objects.equals(recommendedVersion, other.recommendedVersion)
478-
&& Objects.equals(restrictions, other.restrictions);
479478
}
480479

481480
public int hashCode() {

compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ public void deploy(
102102
request.addMetadata(relatedMetadata.get(versionKey));
103103

104104
for (ArtifactMetadata metadata : artifact.getMetadataList()) {
105-
if (metadata instanceof ProjectArtifactMetadata) {
105+
if (metadata instanceof ProjectArtifactMetadata projectArtifactMetadata) {
106106
org.eclipse.aether.artifact.Artifact pomArtifact = new SubArtifact(mainArtifact, "", "pom");
107-
pomArtifact = pomArtifact.setFile(((ProjectArtifactMetadata) metadata).getFile());
107+
pomArtifact = pomArtifact.setFile(projectArtifactMetadata.getFile());
108108
request.addArtifact(pomArtifact);
109109
} else if (metadata instanceof SnapshotArtifactRepositoryMetadata
110110
|| metadata instanceof ArtifactRepositoryMetadata) {

compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ public void install(File source, Artifact artifact, ArtifactRepository localRepo
8181
request.addArtifact(mainArtifact);
8282

8383
for (ArtifactMetadata metadata : artifact.getMetadataList()) {
84-
if (metadata instanceof ProjectArtifactMetadata) {
84+
if (metadata instanceof ProjectArtifactMetadata projectArtifactMetadata) {
8585
org.eclipse.aether.artifact.Artifact pomArtifact = new SubArtifact(mainArtifact, "", "pom");
86-
pomArtifact = pomArtifact.setFile(((ProjectArtifactMetadata) metadata).getFile());
86+
pomArtifact = pomArtifact.setFile(projectArtifactMetadata.getFile());
8787
request.addArtifact(pomArtifact);
8888
} else if (metadata instanceof SnapshotArtifactRepositoryMetadata
8989
|| metadata instanceof ArtifactRepositoryMetadata) {

0 commit comments

Comments
 (0)