From a1f4955ddacb987fc8c1c9665f49fe3d51ae2f41 Mon Sep 17 00:00:00 2001 From: Nils Breunese Date: Fri, 10 Jan 2025 09:42:00 +0100 Subject: [PATCH] [MNG-8482] Use instanceof assignments to get rid of casting expressions (#2018) Co-authored-by: Nils Breunese Co-authored-by: Guillaume Nodet --- .../apache/maven/api/feature/Features.java | 4 +- .../maven/di/tool/DiIndexProcessor.java | 8 +-- api/maven-api-model/src/main/mdo/maven.mdo | 10 ++- .../src/main/mdo/toolchains.mdo | 7 +- .../versioning/ComparableVersion.java | 6 +- .../versioning/DefaultArtifactVersion.java | 10 +-- .../artifact/versioning/Restriction.java | 35 +++++----- .../artifact/versioning/VersionRange.java | 9 ++- .../deployer/DefaultArtifactDeployer.java | 4 +- .../installer/DefaultArtifactInstaller.java | 4 +- .../DefaultRepositoryMetadataManager.java | 8 +-- .../repository/metadata/MetadataBridge.java | 4 +- .../resolver/DefaultArtifactResolver.java | 4 +- .../filter/InversionArtifactFilter.java | 8 +-- .../resolver/filter/OrArtifactFilter.java | 8 +-- .../resolver/filter/TypeArtifactFilter.java | 8 +-- .../project/DefaultMavenProjectBuilder.java | 4 +- .../artifact/ActiveProjectArtifact.java | 32 ++++----- .../artifact/DefaultMavenMetadataCache.java | 14 ++-- .../project/artifact/MavenMetadataSource.java | 13 ++-- .../AbstractStringBasedModelInterpolator.java | 6 +- .../legacy/LegacyRepositorySystem.java | 5 +- .../DefaultArtifactRepositoryFactory.java | 5 +- .../DefaultLegacyArtifactCollector.java | 13 ++-- .../metadata/MetadataGraphEdge.java | 4 +- .../metadata/MetadataGraphVertex.java | 6 +- .../artifact/resolver/TestFileWagon.java | 4 +- .../project/AbstractMavenProjectTestCase.java | 4 +- .../repository/TestRepositorySystem.java | 4 +- .../java/org/apache/maven/cli/MavenCli.java | 4 +- .../maven/cli/props/MavenProperties.java | 4 +- .../org/apache/maven/cli/MavenCliTest.java | 4 +- .../model/building/DefaultModelBuilder.java | 12 ++-- .../DefaultModelProblemCollector.java | 3 +- .../StringVisitorModelInterpolator.java | 3 +- .../reflection/ReflectionValueExtractor.java | 12 ++-- .../building/FileToRawModelMergerTest.java | 4 +- .../org/apache/maven/model/InputLocation.java | 8 +-- .../apache/maven/model/merge/ModelMerger.java | 2 +- .../plugin/descriptor/MojoDescriptor.java | 4 +- .../maven/plugin/descriptor/Parameter.java | 2 +- .../plugin/descriptor/PluginDescriptor.java | 2 +- .../DefaultArtifactDescriptorReader.java | 12 ++-- .../internal/DefaultModelVersionParser.java | 12 ++-- .../internal/DefaultVersionResolver.java | 8 +-- .../internal/PluginsMetadataGenerator.java | 5 +- .../RemoteSnapshotMetadataGenerator.java | 11 ++- .../internal/VersionsMetadataGenerator.java | 3 +- .../DefaultSettingsProblemCollector.java | 3 +- .../maven/cling/invoker/mvn/MavenInvoker.java | 4 +- .../maven/cling/props/MavenProperties.java | 4 +- .../java/org/apache/maven/ReactorReader.java | 4 +- .../DefaultArtifactHandlerManager.java | 3 +- .../manager/LegacyArtifactHandlerManager.java | 3 +- .../resolver/filter/AndArtifactFilter.java | 8 +-- .../filter/CumulativeScopeArtifactFilter.java | 8 +-- .../resolver/filter/ExclusionSetFilter.java | 8 +-- .../resolver/filter/ScopeArtifactFilter.java | 8 +-- .../maven/bridge/MavenRepositorySystem.java | 5 +- .../classrealm/DefaultClassRealmManager.java | 4 +- .../internal/DefaultBeanConfigurator.java | 12 ++-- .../EnhancedConfigurationConverter.java | 8 +-- .../exception/DefaultExceptionHandler.java | 12 ++-- .../scope/internal/MojoExecutionScope.java | 4 +- .../aether/ReverseTreeRepositoryListener.java | 20 +++--- .../internal/aether/TypeRegistryAdapter.java | 4 +- .../internal/impl/DefaultArtifactManager.java | 4 +- .../maven/internal/impl/DefaultSession.java | 4 +- .../internal/impl/DefaultTypeRegistry.java | 3 +- .../internal/LifecycleDependencyResolver.java | 4 +- .../internal/LifecycleModuleBuilder.java | 8 +-- .../apache/maven/lifecycle/internal/Task.java | 6 +- .../internal/builder/BuilderCommon.java | 4 +- .../concurrent/BuildPlanExecutor.java | 4 +- .../maven/logging/LoggingOutputStream.java | 4 +- .../plugin/DefaultExtensionRealmCache.java | 14 ++-- .../plugin/DefaultPluginArtifactsCache.java | 16 ++--- .../plugin/DefaultPluginDescriptorCache.java | 18 +++-- .../maven/plugin/DefaultPluginRealmCache.java | 28 ++++---- .../PluginParameterExpressionEvaluator.java | 8 +-- .../PluginParameterExpressionEvaluatorV4.java | 8 +-- .../internal/DefaultMavenPluginManager.java | 10 +-- .../DefaultPluginValidationManager.java | 3 +- .../project/DefaultProjectRealmCache.java | 8 +-- .../apache/maven/project/MavenProject.java | 16 ++--- .../DefaultProjectArtifactsCache.java | 33 +++++---- .../resolver/MavenChainedWorkspaceReader.java | 4 +- .../maven/toolchain/DefaultToolchain.java | 18 +++-- .../maven/graph/DefaultGraphBuilderTest.java | 4 +- ...ultRepositorySystemSessionFactoryTest.java | 18 ++--- ...luginParameterExpressionEvaluatorTest.java | 3 +- ...ginParameterExpressionEvaluatorV4Test.java | 2 +- .../project/AbstractMavenProjectTestCase.java | 4 +- ...jectBuildingResultWithLocationMatcher.java | 17 ++--- ...ildingResultWithProblemMessageMatcher.java | 15 ++-- .../project/harness/Xpp3DomNodeIterator.java | 7 +- .../harness/Xpp3DomPointerFactory.java | 16 ++--- .../main/java/org/apache/maven/di/Key.java | 10 +-- .../apache/maven/di/impl/ReflectionUtils.java | 4 +- .../java/org/apache/maven/di/impl/Types.java | 70 +++++++++---------- .../java/org/apache/maven/di/impl/Utils.java | 5 +- .../maven/internal/impl/AbstractSession.java | 16 ++--- .../maven/internal/impl/DefaultArtifact.java | 2 +- .../internal/impl/DefaultDependency.java | 2 +- .../impl/DefaultDependencyResolverResult.java | 14 ++-- .../impl/DefaultModelVersionParser.java | 12 ++-- .../impl/DefaultVersionRangeResolver.java | 10 ++- .../internal/impl/DefaultVersionResolver.java | 11 ++- .../impl/model/DefaultModelCache.java | 4 +- .../impl/model/profile/ConditionParser.java | 56 +++++++-------- .../reflection/ReflectionValueExtractor.java | 12 ++-- .../DefaultArtifactDescriptorReader.java | 12 ++-- .../RemoteSnapshotMetadataGenerator.java | 11 ++- .../resolver/VersionsMetadataGenerator.java | 3 +- src/mdo/java/WrapperProperties.java | 4 +- src/mdo/merger.vm | 2 +- src/mdo/model-v3.vm | 8 +-- src/mdo/writer-stax.vm | 4 +- 118 files changed, 496 insertions(+), 575 deletions(-) diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java b/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java index 3318a895d7ce..192a4194066c 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java @@ -57,8 +57,8 @@ private static boolean doGet(Map userProperties, String key, boolean } private static boolean doGet(Object val, boolean def) { - if (val instanceof Boolean) { - return (Boolean) val; + if (val instanceof Boolean bool) { + return bool; } else if (val != null) { return Boolean.parseBoolean(val.toString()); } else { diff --git a/api/maven-api-di/src/main/java/org/apache/maven/di/tool/DiIndexProcessor.java b/api/maven-api-di/src/main/java/org/apache/maven/di/tool/DiIndexProcessor.java index b2232348d117..745256105614 100644 --- a/api/maven-api-di/src/main/java/org/apache/maven/di/tool/DiIndexProcessor.java +++ b/api/maven-api-di/src/main/java/org/apache/maven/di/tool/DiIndexProcessor.java @@ -75,13 +75,13 @@ private String getFullClassName(TypeElement typeElement) { StringBuilder className = new StringBuilder(typeElement.getSimpleName()); Element enclosingElement = typeElement.getEnclosingElement(); - while (enclosingElement instanceof TypeElement) { - className.insert(0, "$").insert(0, ((TypeElement) enclosingElement).getSimpleName()); + while (enclosingElement instanceof TypeElement enclosingTypeElement) { + className.insert(0, "$").insert(0, enclosingTypeElement.getSimpleName()); enclosingElement = enclosingElement.getEnclosingElement(); } - if (enclosingElement instanceof PackageElement) { - className.insert(0, ".").insert(0, ((PackageElement) enclosingElement).getQualifiedName()); + if (enclosingElement instanceof PackageElement packageElement) { + className.insert(0, ".").insert(0, packageElement.getQualifiedName()); } return className.toString(); diff --git a/api/maven-api-model/src/main/mdo/maven.mdo b/api/maven-api-model/src/main/mdo/maven.mdo index 32fff5563202..1404c9788ca4 100644 --- a/api/maven-api-model/src/main/mdo/maven.mdo +++ b/api/maven-api-model/src/main/mdo/maven.mdo @@ -2465,8 +2465,7 @@ * @see java.lang.Object#equals(java.lang.Object) */ public boolean equals(Object other) { - if (other instanceof Plugin) { - Plugin otherPlugin = (Plugin) other; + if (other instanceof Plugin otherPlugin) { return getKey().equals(otherPlugin.getKey()); } return false; @@ -3249,13 +3248,12 @@ public boolean equals(Object o) { if (this == o) { return true; - } else if (!(o instanceof Extension)) { - return false; - } else { - Extension e = (Extension) o; + } else if (o instanceof Extension e) { return java.util.Objects.equals(e.getArtifactId(), getArtifactId()) && java.util.Objects.equals(e.getGroupId(), getGroupId()) && java.util.Objects.equals(e.getVersion(), getVersion()); + } else { + return false; } } diff --git a/api/maven-api-toolchain/src/main/mdo/toolchains.mdo b/api/maven-api-toolchain/src/main/mdo/toolchains.mdo index 4b90fd8ac8fc..63bbffd81ffb 100644 --- a/api/maven-api-toolchain/src/main/mdo/toolchains.mdo +++ b/api/maven-api-toolchain/src/main/mdo/toolchains.mdo @@ -196,12 +196,11 @@ public boolean equals(Object other) { if (this == other) { return true; - } else if (!(other instanceof ToolchainModel)) { - return false; - } else { - ToolchainModel that = (ToolchainModel) other; + } else if (other instanceof ToolchainModel that) { return java.util.Objects.equals(this.getType(), that.getType()) && java.util.Objects.equals(this.getProvides(), that.getProvides()); + } else { + return false; } } //-- boolean equals(Object) ]]> diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index 77cc25b500fc..2ed439d37505 100644 --- a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -621,8 +621,8 @@ private String toListString() { if (buffer.length() > 1) { buffer.append(", "); } - if (item instanceof ListItem) { - buffer.append(((ListItem) item).toListString()); + if (item instanceof ListItem listItem) { + buffer.append(listItem.toListString()); } else { buffer.append(item); } @@ -783,7 +783,7 @@ public String getCanonical() { @Override public boolean equals(Object o) { - return (o instanceof ComparableVersion) && items.equals(((ComparableVersion) o).items); + return o instanceof ComparableVersion comparableVersion && items.equals(comparableVersion.items); } @Override diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java index 039b383aab89..12c37c2d7d39 100644 --- a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java +++ b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java @@ -50,16 +50,16 @@ public boolean equals(Object other) { return true; } - if (!(other instanceof ArtifactVersion)) { - return false; + if (other instanceof ArtifactVersion artifactVersion) { + return compareTo(artifactVersion) == 0; } - return compareTo((ArtifactVersion) other) == 0; + return false; } public int compareTo(ArtifactVersion otherVersion) { - if (otherVersion instanceof DefaultArtifactVersion) { - return this.comparable.compareTo(((DefaultArtifactVersion) otherVersion).comparable); + if (otherVersion instanceof DefaultArtifactVersion defaultArtifactVersion) { + return this.comparable.compareTo(defaultArtifactVersion.comparable); } else { return compareTo(new DefaultArtifactVersion(otherVersion.toString())); } diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java index 89c06e762bba..cd65e3984a32 100644 --- a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java +++ b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java @@ -112,32 +112,31 @@ public boolean equals(Object other) { return true; } - if (!(other instanceof Restriction)) { - return false; - } - - Restriction restriction = (Restriction) other; - if (lowerBound != null) { - if (!lowerBound.equals(restriction.lowerBound)) { + if (other instanceof Restriction restriction) { + if (lowerBound != null) { + if (!lowerBound.equals(restriction.lowerBound)) { + return false; + } + } else if (restriction.lowerBound != null) { return false; } - } else if (restriction.lowerBound != null) { - return false; - } - if (lowerBoundInclusive != restriction.lowerBoundInclusive) { - return false; - } + if (lowerBoundInclusive != restriction.lowerBoundInclusive) { + return false; + } - if (upperBound != null) { - if (!upperBound.equals(restriction.upperBound)) { + if (upperBound != null) { + if (!upperBound.equals(restriction.upperBound)) { + return false; + } + } else if (restriction.upperBound != null) { return false; } - } else if (restriction.upperBound != null) { + + return upperBoundInclusive == restriction.upperBoundInclusive; + } else { return false; } - - return upperBoundInclusive == restriction.upperBoundInclusive; } public String toString() { diff --git a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java index 53191dd7fbb7..3f8cd985c5d5 100644 --- a/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java +++ b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java @@ -469,13 +469,12 @@ public boolean equals(Object obj) { if (this == obj) { return true; } - if (!(obj instanceof VersionRange)) { + if (obj instanceof VersionRange other) { + return Objects.equals(recommendedVersion, other.recommendedVersion) + && Objects.equals(restrictions, other.restrictions); + } else { return false; } - VersionRange other = (VersionRange) obj; - - return Objects.equals(recommendedVersion, other.recommendedVersion) - && Objects.equals(restrictions, other.restrictions); } public int hashCode() { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java index 3ecc9ab80e0b..e634a254c90d 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java @@ -102,9 +102,9 @@ public void deploy( request.addMetadata(relatedMetadata.get(versionKey)); for (ArtifactMetadata metadata : artifact.getMetadataList()) { - if (metadata instanceof ProjectArtifactMetadata) { + if (metadata instanceof ProjectArtifactMetadata projectArtifactMetadata) { org.eclipse.aether.artifact.Artifact pomArtifact = new SubArtifact(mainArtifact, "", "pom"); - pomArtifact = pomArtifact.setFile(((ProjectArtifactMetadata) metadata).getFile()); + pomArtifact = pomArtifact.setFile(projectArtifactMetadata.getFile()); request.addArtifact(pomArtifact); } else if (metadata instanceof SnapshotArtifactRepositoryMetadata || metadata instanceof ArtifactRepositoryMetadata) { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java index 4adf578ddf04..eda4d2f57fca 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java @@ -81,9 +81,9 @@ public void install(File source, Artifact artifact, ArtifactRepository localRepo request.addArtifact(mainArtifact); for (ArtifactMetadata metadata : artifact.getMetadataList()) { - if (metadata instanceof ProjectArtifactMetadata) { + if (metadata instanceof ProjectArtifactMetadata projectArtifactMetadata) { org.eclipse.aether.artifact.Artifact pomArtifact = new SubArtifact(mainArtifact, "", "pom"); - pomArtifact = pomArtifact.setFile(((ProjectArtifactMetadata) metadata).getFile()); + pomArtifact = pomArtifact.setFile(projectArtifactMetadata.getFile()); request.addArtifact(pomArtifact); } else if (metadata instanceof SnapshotArtifactRepositoryMetadata || metadata instanceof ArtifactRepositoryMetadata) { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java index 21bee42ff939..d711fc4ece95 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java @@ -371,8 +371,8 @@ private File getArtifactMetadataFromDeploymentRepository( } } } finally { - if (metadata instanceof RepositoryMetadata) { - updateCheckManager.touch((RepositoryMetadata) metadata, remoteRepository, file); + if (metadata instanceof RepositoryMetadata repositoryMetadata) { + updateCheckManager.touch(repositoryMetadata, remoteRepository, file); } } return file; @@ -382,7 +382,7 @@ public void deploy( ArtifactMetadata metadata, ArtifactRepository localRepository, ArtifactRepository deploymentRepository) throws RepositoryMetadataDeploymentException { File file; - if (metadata instanceof RepositoryMetadata) { + if (metadata instanceof RepositoryMetadata repositoryMetadata) { getLogger().info("Retrieving previous metadata from " + deploymentRepository.getId()); try { file = getArtifactMetadataFromDeploymentRepository(metadata, localRepository, deploymentRepository); @@ -395,7 +395,7 @@ public void deploy( if (file.isFile()) { try { - fixTimestamp(file, readMetadata(file), ((RepositoryMetadata) metadata).getMetadata()); + fixTimestamp(file, readMetadata(file), repositoryMetadata.getMetadata()); } catch (RepositoryMetadataReadException e) { // will be reported via storeInlocalRepository } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java index 8c31f3606984..b9f677f3c71b 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java @@ -100,8 +100,8 @@ public Path getPath() { } public Nature getNature() { - if (metadata instanceof RepositoryMetadata) { - return switch (((RepositoryMetadata) metadata).getNature()) { + if (metadata instanceof RepositoryMetadata repositoryMetadata) { + return switch (repositoryMetadata.getNature()) { case RepositoryMetadata.RELEASE_OR_SNAPSHOT -> Nature.RELEASE_OR_SNAPSHOT; case RepositoryMetadata.SNAPSHOT -> Nature.SNAPSHOT; default -> Nature.RELEASE; diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java index 5bb0c7d7edab..d802d46c50b1 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java @@ -605,8 +605,8 @@ public void run() { @Override public void dispose() { - if (executor instanceof ExecutorService) { - ((ExecutorService) executor).shutdownNow(); + if (executor instanceof ExecutorService executorService) { + executorService.shutdownNow(); } } } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java index 30f4e1641856..cadc5a9c7950 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java @@ -48,12 +48,10 @@ public boolean equals(Object obj) { return true; } - if (!(obj instanceof InversionArtifactFilter)) { + if (obj instanceof InversionArtifactFilter other) { + return toInvert.equals(other.toInvert); + } else { return false; } - - InversionArtifactFilter other = (InversionArtifactFilter) obj; - - return toInvert.equals(other.toInvert); } } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java index 274add48ac26..4d66946ac8c9 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java @@ -68,12 +68,10 @@ public boolean equals(Object obj) { return true; } - if (!(obj instanceof OrArtifactFilter)) { + if (obj instanceof OrArtifactFilter other) { + return filters.equals(other.filters); + } else { return false; } - - OrArtifactFilter other = (OrArtifactFilter) obj; - - return filters.equals(other.filters); } } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java index 16ee7bef6b81..b5bbea55c826 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java @@ -46,12 +46,10 @@ public boolean equals(Object obj) { return true; } - if (!(obj instanceof TypeArtifactFilter)) { + if (obj instanceof TypeArtifactFilter other) { + return type.equals(other.type); + } else { return false; } - - TypeArtifactFilter other = (TypeArtifactFilter) obj; - - return type.equals(other.type); } } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index e2d6928edb80..a484104d0559 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -139,9 +139,9 @@ private List normalizeToArtifactRepositories( List repos = new ArrayList<>(repositories.size()); for (Object repository : repositories) { - if (repository instanceof Repository) { + if (repository instanceof Repository repositoryInstance) { try { - ArtifactRepository repo = repositorySystem.buildArtifactRepository((Repository) repository); + ArtifactRepository repo = repositorySystem.buildArtifactRepository(repositoryInstance); repositorySystem.injectMirror(request.getRepositorySession(), Arrays.asList(repo)); repositorySystem.injectProxy(request.getRepositorySession(), Arrays.asList(repo)); repositorySystem.injectAuthentication(request.getRepositorySession(), Arrays.asList(repo)); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java index 8e7bfd16465b..c59595b80d10 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java @@ -311,24 +311,22 @@ public boolean equals(Object o) { return true; } - if (!(o instanceof Artifact)) { - return false; - } - - Artifact a = (Artifact) o; - - if (!a.getGroupId().equals(getGroupId())) { - return false; - } else if (!a.getArtifactId().equals(getArtifactId())) { - return false; - } else if (!a.getVersion().equals(getVersion())) { - return false; - } else if (!a.getType().equals(getType())) { - return false; + if (o instanceof Artifact a) { + if (!a.getGroupId().equals(getGroupId())) { + return false; + } else if (!a.getArtifactId().equals(getArtifactId())) { + return false; + } else if (!a.getVersion().equals(getVersion())) { + return false; + } else if (!a.getType().equals(getType())) { + return false; + } else { + return a.getClassifier() == null + ? getClassifier() == null + : a.getClassifier().equals(getClassifier()); + } } else { - return a.getClassifier() == null - ? getClassifier() == null - : a.getClassifier().equals(getClassifier()); + return false; } } } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java index 48c889cd9899..e19e1ed9409a 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java @@ -92,16 +92,14 @@ public boolean equals(Object o) { return true; } - if (!(o instanceof CacheKey)) { + if (o instanceof CacheKey other) { + return pomHash == other.pomHash + && artifactEquals(artifact, other.artifact) + && resolveManagedVersions == other.resolveManagedVersions + && repositoriesEquals(repositories, other.repositories); + } else { return false; } - - CacheKey other = (CacheKey) o; - - return pomHash == other.pomHash - && artifactEquals(artifact, other.artifact) - && resolveManagedVersions == other.resolveManagedVersions - && repositoriesEquals(repositories, other.repositories); } } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java index 4240cecba57b..8bec5468bca2 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java @@ -187,8 +187,8 @@ public ResolutionGroup retrieve(MetadataResolutionRequest request) throws Artifa RepositorySystemSession repositorySession = legacySupport.getRepositorySession(); final WorkspaceReader workspace = repositorySession.getWorkspaceReader(); Model model; - if (workspace instanceof MavenWorkspaceReader) { - model = ((MavenWorkspaceReader) workspace).findModel(RepositoryUtils.toArtifact(artifact)); + if (workspace instanceof MavenWorkspaceReader mavenWorkspaceReader) { + model = mavenWorkspaceReader.findModel(RepositoryUtils.toArtifact(artifact)); } else { model = null; } @@ -208,12 +208,12 @@ public ResolutionGroup retrieve(MetadataResolutionRequest request) throws Artifa } else { pomRepositories = new ArrayList<>(); } - } else if (artifact instanceof ArtifactWithDependencies) { + } else if (artifact instanceof ArtifactWithDependencies artifactWithDependencies) { pomArtifact = artifact; - dependencies = ((ArtifactWithDependencies) artifact).getDependencies(); + dependencies = artifactWithDependencies.getDependencies(); - managedDependencies = ((ArtifactWithDependencies) artifact).getManagedDependencies(); + managedDependencies = artifactWithDependencies.getManagedDependencies(); } else { ProjectRelocation rel = retrieveRelocatedProject(artifact, request); @@ -665,8 +665,7 @@ private ProjectRelocation retrieveRelocatedProject(Artifact artifact, MetadataRe } private ModelProblem hasMissingParentPom(ProjectBuildingException e) { - if (e.getCause() instanceof ModelBuildingException) { - ModelBuildingException mbe = (ModelBuildingException) e.getCause(); + if (e.getCause() instanceof ModelBuildingException mbe) { for (ModelProblem problem : mbe.getProblems()) { if (problem.getException() instanceof UnresolvableModelException) { return problem; diff --git a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java index 0570d20a0471..b8233d8a39cf 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java @@ -275,11 +275,11 @@ protected String interpolateInternal( Object last = null; for (Object next : feedback) { - if (next instanceof Throwable) { + if (next instanceof Throwable throwable) { if (last == null) { - logger.debug("", ((Throwable) next)); + logger.debug("", throwable); } else { - logger.debug(String.valueOf(last), ((Throwable) next)); + logger.debug(String.valueOf(last), throwable); } } else { if (last != null) { diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java index fac3efb39800..df994b12d394 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java @@ -302,10 +302,7 @@ public ArtifactResolutionResult resolve(ArtifactResolutionRequest request) { LocalArtifactRepository ideWorkspace = plexus.lookup(LocalArtifactRepository.class, LocalArtifactRepository.IDE_WORKSPACE); - if (request.getLocalRepository() instanceof DelegatingLocalArtifactRepository) { - DelegatingLocalArtifactRepository delegatingLocalRepository = - (DelegatingLocalArtifactRepository) request.getLocalRepository(); - + if (request.getLocalRepository() instanceof DelegatingLocalArtifactRepository delegatingLocalRepository) { LocalArtifactRepository orig = delegatingLocalRepository.getIdeWorkspace(); delegatingLocalRepository.setIdeWorkspace(ideWorkspace); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java index 34dd8e860d1b..5e1c5a7c3596 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java @@ -109,9 +109,8 @@ public ArtifactRepository createArtifactRepository( } ArtifactRepository repository; - if (repositoryLayout instanceof ArtifactRepositoryLayout2) { - repository = ((ArtifactRepositoryLayout2) repositoryLayout) - .newMavenArtifactRepository(id, url, snapshots, releases); + if (repositoryLayout instanceof ArtifactRepositoryLayout2 artifactRepositoryLayout2) { + repository = artifactRepositoryLayout2.newMavenArtifactRepository(id, url, snapshots, releases); } else { repository = new MavenArtifactRepository(id, url, repositoryLayout, snapshots, releases); } diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java index 01ace063816e..a9e173c65ddd 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java @@ -203,8 +203,8 @@ public ArtifactResolutionResult collect( private ManagedVersionMap getManagedVersionsMap( Artifact originatingArtifact, Map managedVersions) { ManagedVersionMap versionMap; - if (managedVersions instanceof ManagedVersionMap) { - versionMap = (ManagedVersionMap) managedVersions; + if (managedVersions instanceof ManagedVersionMap managedVersionMap) { + versionMap = managedVersionMap; } else { versionMap = new ManagedVersionMap(managedVersions); } @@ -679,24 +679,21 @@ private void fireEvent( listener.updateScopeCurrentPom(node.getArtifact(), replacement.getScope()); break; case ResolutionListener.MANAGE_ARTIFACT_VERSION: - if (listener instanceof ResolutionListenerForDepMgmt) { - ResolutionListenerForDepMgmt asImpl = (ResolutionListenerForDepMgmt) listener; + if (listener instanceof ResolutionListenerForDepMgmt asImpl) { asImpl.manageArtifactVersion(node.getArtifact(), replacement); } else { listener.manageArtifact(node.getArtifact(), replacement); } break; case ResolutionListener.MANAGE_ARTIFACT_SCOPE: - if (listener instanceof ResolutionListenerForDepMgmt) { - ResolutionListenerForDepMgmt asImpl = (ResolutionListenerForDepMgmt) listener; + if (listener instanceof ResolutionListenerForDepMgmt asImpl) { asImpl.manageArtifactScope(node.getArtifact(), replacement); } else { listener.manageArtifact(node.getArtifact(), replacement); } break; case ResolutionListener.MANAGE_ARTIFACT_SYSTEM_PATH: - if (listener instanceof ResolutionListenerForDepMgmt) { - ResolutionListenerForDepMgmt asImpl = (ResolutionListenerForDepMgmt) listener; + if (listener instanceof ResolutionListenerForDepMgmt asImpl) { asImpl.manageArtifactSystemPath(node.getArtifact(), replacement); } else { listener.manageArtifact(node.getArtifact(), replacement); diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java index 161b9beef91b..a42efd5c678f 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java @@ -77,9 +77,7 @@ private static boolean objectsEqual(Object o1, Object o2) { @Override @SuppressWarnings("checkstyle:equalshashcode") public boolean equals(Object o) { - if (o instanceof MetadataGraphEdge) { - MetadataGraphEdge e = (MetadataGraphEdge) o; - + if (o instanceof MetadataGraphEdge e) { return objectsEqual(version, e.version) && ArtifactScopeEnum.checkScope(scope) .getScope() diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java index ee8a3b575714..edbfae8534c8 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java @@ -142,10 +142,10 @@ public int compareTo(MetadataGraphVertex vertex) { // --------------------------------------------------------------------- @Override public boolean equals(Object vo) { - if (!(vo instanceof MetadataGraphVertex)) { - return false; + if (vo instanceof MetadataGraphVertex metadataGraphVertex) { + return compareTo(metadataGraphVertex) == 0; } - return compareTo((MetadataGraphVertex) vo) == 0; + return false; } // --------------------------------------------------------------------- diff --git a/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java index 9ee3cc27a8c7..d93edab31323 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java @@ -68,8 +68,8 @@ public boolean getIfNewer(String resourceName, File destination, long timestamp) } public void addTransferListener(TransferListener listener) { - if (listener instanceof TestTransferListener) { - testTransferListener = (TestTransferListener) listener; + if (listener instanceof TestTransferListener t) { + testTransferListener = t; } super.addTransferListener(listener); } diff --git a/compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index 4893eb69d974..a7b89c933e9e 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -134,9 +134,9 @@ protected MavenProject getProjectWithDependencies(File pom) throws Exception { return projectBuilder.build(pom, configuration).getProject(); } catch (Exception e) { Throwable cause = e.getCause(); - if (cause instanceof ModelBuildingException) { + if (cause instanceof ModelBuildingException modelBuildingException) { StringBuilder message = new StringBuilder("In: " + pom + "\n\n"); - for (ModelProblem problem : ((ModelBuildingException) cause).getProblems()) { + for (ModelProblem problem : modelBuildingException.getProblems()) { message.append(problem).append("\n"); } System.out.println(message); diff --git a/compat/maven-compat/src/test/java/org/apache/maven/repository/TestRepositorySystem.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/TestRepositorySystem.java index 5b436de54379..c2921c3cac98 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/repository/TestRepositorySystem.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/repository/TestRepositorySystem.java @@ -234,8 +234,8 @@ public ArtifactResolutionResult resolve(ArtifactResolutionRequest request) { } List dependencies = new ArrayList<>(); - if (request.getArtifact() instanceof ArtifactWithDependencies) { - dependencies = ((ArtifactWithDependencies) request.getArtifact()).getDependencies(); + if (request.getArtifact() instanceof ArtifactWithDependencies artifactWithDependencies) { + dependencies = artifactWithDependencies.getDependencies(); } else { Artifact pomArtifact = createProjectArtifact( request.getArtifact().getGroupId(), diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 28beaeb51c98..0b2d95ea2ae1 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -986,8 +986,8 @@ private int execute(CliRequest cliRequest) throws MavenExecutionRequestPopulatio logSummary(summary, references, "", cliRequest.showErrors); - if (exception instanceof LifecycleExecutionException) { - failedProjects.add(((LifecycleExecutionException) exception).getProject()); + if (exception instanceof LifecycleExecutionException lifecycleExecutionException) { + failedProjects.add(lifecycleExecutionException.getProject()); } } diff --git a/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java index 99df049210a6..b2a9479331c7 100644 --- a/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java +++ b/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java @@ -317,8 +317,8 @@ public String put(String key, String comment, String value) { public boolean update(Map props) { MavenProperties properties; - if (props instanceof MavenProperties) { - properties = (MavenProperties) props; + if (props instanceof MavenProperties mavenProperties) { + properties = mavenProperties; } else { properties = new MavenProperties(); properties.putAll(props); diff --git a/compat/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java index 0e57e4b381e0..fa805e0c084c 100644 --- a/compat/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java +++ b/compat/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java @@ -691,8 +691,8 @@ public void calculateTransferListener(boolean ciEnv, String[] cliArgs, Class entry : properties.entrySet()) { Object v = entry.getValue(); - if (v instanceof String) { - String value = (String) v; + if (v instanceof String value) { String inter = interpolate(value); if (value != inter && inter != null) { entry.setValue(inter); diff --git a/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractor.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractor.java index ab9b91d2ae42..ff2dd36398d0 100644 --- a/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractor.java +++ b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractor.java @@ -217,8 +217,8 @@ public static Object evaluate(@Nonnull String expression, @Nullable Object root, } } - if (value instanceof Optional) { - value = ((Optional) value).orElse(null); + if (value instanceof Optional optional) { + value = optional.orElse(null); } return value; } @@ -230,8 +230,8 @@ private static Object getMappedValue( return null; } - if (value instanceof Map) { - return ((Map) value).get(key); + if (value instanceof Map map) { + return map.get(key); } final String message = String.format( @@ -252,8 +252,8 @@ private static Object getIndexedValue( return Array.get(value, index); } - if (value instanceof List) { - return ((List) value).get(index); + if (value instanceof List list) { + return list.get(index); } } catch (NumberFormatException | IndexOutOfBoundsException e) { return null; diff --git a/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java index 427aac072b20..ff82552ff51f 100644 --- a/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java +++ b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java @@ -48,8 +48,8 @@ void testOverriddenMergeMethods() { Type returnType = m.getParameterTypes()[0] .getMethod("get" + entity) .getGenericReturnType(); - if (returnType instanceof ParameterizedType) { - return !((ParameterizedType) returnType).getActualTypeArguments()[0].equals(String.class); + if (returnType instanceof ParameterizedType parameterizedType) { + return !parameterizedType.getActualTypeArguments()[0].equals(String.class); } else { return false; } diff --git a/compat/maven-model/src/main/java/org/apache/maven/model/InputLocation.java b/compat/maven-model/src/main/java/org/apache/maven/model/InputLocation.java index e3fc5fc24c33..82bfc9162b8b 100644 --- a/compat/maven-model/src/main/java/org/apache/maven/model/InputLocation.java +++ b/compat/maven-model/src/main/java/org/apache/maven/model/InputLocation.java @@ -143,8 +143,8 @@ public int getLineNumber() { * @return InputLocation */ public InputLocation getLocation(Object key) { - if (key instanceof String) { - switch ((String) key) { + if (key instanceof String string) { + switch (string) { case "": { return this.location; } @@ -173,8 +173,8 @@ public java.util.Map getLocations() { * @param location */ public void setLocation(Object key, InputLocation location) { - if (key instanceof String) { - switch ((String) key) { + if (key instanceof String string) { + switch (string) { case "": { this.location = location; return; diff --git a/compat/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java b/compat/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java index ac5694f8dcb2..109882a0545b 100644 --- a/compat/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java +++ b/compat/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java @@ -2427,7 +2427,7 @@ void mergeAll(Collection vs, Remapping remapping) { } list = null; } - if (vs instanceof MergingList && ((MergingList) vs).map != null) { + if (vs instanceof MergingList mergingList && mergingList.map != null) { for (Map.Entry e : ((MergingList) vs).map.entrySet()) { Object key = e.getKey(); V oldValue = map.get(key); diff --git a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java index 750ebddd6635..2a43008c1063 100644 --- a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java +++ b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java @@ -506,9 +506,7 @@ public boolean equals(Object object) { return true; } - if (object instanceof MojoDescriptor) { - MojoDescriptor other = (MojoDescriptor) object; - + if (object instanceof MojoDescriptor other) { return Objects.equals(getPluginDescriptor(), other.getPluginDescriptor()) && Objects.equals(getGoal(), other.getGoal()); } diff --git a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java index 0249b1d19c27..a897a05c6300 100644 --- a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java +++ b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java @@ -121,7 +121,7 @@ public int hashCode() { } public boolean equals(Object other) { - return (other instanceof Parameter) && getName().equals(((Parameter) other).getName()); + return (other instanceof Parameter parameter) && getName().equals(parameter.getName()); } public String getAlias() { diff --git a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java index 9a2482eb16c0..a5232989e4d6 100644 --- a/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java +++ b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java @@ -313,7 +313,7 @@ public boolean equals(Object object) { return true; } - return object instanceof PluginDescriptor && getId().equals(((PluginDescriptor) object).getId()); + return object instanceof PluginDescriptor pluginDescriptor && getId().equals(pluginDescriptor.getId()); } public int hashCode() { diff --git a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java index eaf189aa4027..b7cc1d90811b 100644 --- a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java +++ b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java @@ -182,8 +182,8 @@ private Model loadPom( pomArtifact = resolveResult.getArtifact(); result.setRepository(resolveResult.getRepository()); } catch (ArtifactResolutionException e) { - if (e.getCause() instanceof ArtifactNotFoundException) { - missingDescriptor(session, trace, a, (Exception) e.getCause()); + if (e.getCause() instanceof ArtifactNotFoundException artifactNotFoundException) { + missingDescriptor(session, trace, a, artifactNotFoundException); if ((getPolicy(session, a, request) & ArtifactDescriptorPolicy.IGNORE_MISSING) != 0) { return null; } @@ -196,8 +196,8 @@ private Model loadPom( // TODO hack: don't rebuild model if it was already loaded during reactor resolution final WorkspaceReader workspace = session.getWorkspaceReader(); - if (workspace instanceof MavenWorkspaceReader) { - model = ((MavenWorkspaceReader) workspace).findModel(pomArtifact); + if (workspace instanceof MavenWorkspaceReader mavenWorkspaceReader) { + model = mavenWorkspaceReader.findModel(pomArtifact); if (model != null) { return model; } @@ -265,8 +265,8 @@ private Model loadPom( model = modelResult.getEffectiveModel(); } catch (ModelBuildingException e) { for (ModelProblem problem : e.getProblems()) { - if (problem.getException() instanceof UnresolvableModelException) { - result.addException(problem.getException()); + if (problem.getException() instanceof UnresolvableModelException unresolvableModelException) { + result.addException(unresolvableModelException); throw new ArtifactDescriptorException(result); } } diff --git a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java index 0db8131c0049..5323a71bd93f 100644 --- a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java +++ b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java @@ -97,8 +97,8 @@ static class DefaultVersion implements Version { @Override public int compareTo(Version o) { - if (o instanceof DefaultVersion) { - return delegate.compareTo(((DefaultVersion) o).delegate); + if (o instanceof DefaultVersion defaultVersion) { + return delegate.compareTo(defaultVersion.delegate); } else { return compareTo(new DefaultVersion(versionScheme, o.asString())); } @@ -152,8 +152,8 @@ static class DefaultVersionRange implements VersionRange { @Override public boolean contains(Version version) { - if (version instanceof DefaultVersion) { - return delegate.containsVersion(((DefaultVersion) version).delegate); + if (version instanceof DefaultVersion defaultVersion) { + return delegate.containsVersion(defaultVersion.delegate); } else { return contains(new DefaultVersion(versionScheme, version.asString())); } @@ -240,8 +240,8 @@ static class DefaultVersionConstraint implements VersionConstraint { @Override public boolean contains(Version version) { - if (version instanceof DefaultVersion) { - return delegate.containsVersion(((DefaultVersion) version).delegate); + if (version instanceof DefaultVersion defaultVersion) { + return delegate.containsVersion(defaultVersion.delegate); } else { return contains(new DefaultVersion(versionScheme, version.asString())); } diff --git a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java index ac0cab573a48..5b349022f577 100644 --- a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java +++ b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java @@ -111,8 +111,7 @@ public VersionResult resolveVersion(RepositorySystemSession session, VersionRequ cacheKey = new Key(session, request); Object obj = cache.get(session, cacheKey); - if (obj instanceof Record) { - Record record = (Record) obj; + if (obj instanceof Record record) { result.setVersion(record.version); result.setRepository( getRepository(session, request.getRepositories(), record.repoClass, record.repoId)); @@ -191,9 +190,8 @@ public VersionResult resolveVersion(RepositorySystemSession session, VersionRequ if (result.getVersion() != null && result.getVersion().endsWith(SNAPSHOT)) { VersionRequest subRequest = new VersionRequest(); subRequest.setArtifact(artifact.setVersion(result.getVersion())); - if (result.getRepository() instanceof RemoteRepository) { - RemoteRepository r = (RemoteRepository) result.getRepository(); - subRequest.setRepositories(Collections.singletonList(r)); + if (result.getRepository() instanceof RemoteRepository remoteRepository) { + subRequest.setRepositories(Collections.singletonList(remoteRepository)); } else { subRequest.setRepositories(request.getRepositories()); } diff --git a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java index d5bfca2741aa..d570dd7b4e2d 100644 --- a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java +++ b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java @@ -81,10 +81,9 @@ private PluginsMetadataGenerator(RepositorySystemSession session, Collection it = metadatas.iterator(); it.hasNext(); ) { Metadata metadata = it.next(); - if (metadata instanceof PluginsMetadata) { + if (metadata instanceof PluginsMetadata pluginsMetadata) { it.remove(); - PluginsMetadata pluginMetadata = (PluginsMetadata) metadata; - processedPlugins.put(pluginMetadata.getGroupId(), pluginMetadata); + processedPlugins.put(pluginsMetadata.getGroupId(), pluginsMetadata); } } } diff --git a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java index e7854543641f..29193080be9c 100644 --- a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java +++ b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java @@ -50,10 +50,10 @@ class RemoteSnapshotMetadataGenerator implements MetadataGenerator { RemoteSnapshotMetadataGenerator(RepositorySystemSession session, DeployRequest request) { timestamp = (Date) ConfigUtils.getObject(session, new Date(), "maven.startTime"); Object bn = ConfigUtils.getObject(session, null, "maven.buildNumber"); - if (bn instanceof Integer) { - this.buildNumber = (Integer) bn; - } else if (bn instanceof String) { - this.buildNumber = Integer.valueOf((String) bn); + if (bn instanceof Integer integer) { + this.buildNumber = integer; + } else if (bn instanceof String string) { + this.buildNumber = Integer.valueOf(string); } else { this.buildNumber = null; } @@ -67,8 +67,7 @@ class RemoteSnapshotMetadataGenerator implements MetadataGenerator { * deployment allows to re-establish the association between the artifacts of the same project. */ for (Metadata metadata : request.getMetadata()) { - if (metadata instanceof RemoteSnapshotMetadata) { - RemoteSnapshotMetadata snapshotMetadata = (RemoteSnapshotMetadata) metadata; + if (metadata instanceof RemoteSnapshotMetadata snapshotMetadata) { snapshots.put(snapshotMetadata.getKey(), snapshotMetadata); } } diff --git a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java index 9540b4a3380a..e2faf4c7e831 100644 --- a/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java +++ b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java @@ -70,9 +70,8 @@ private VersionsMetadataGenerator(RepositorySystemSession session, Collection it = metadatas.iterator(); it.hasNext(); ) { Metadata metadata = it.next(); - if (metadata instanceof VersionsMetadata) { + if (metadata instanceof VersionsMetadata versionsMetadata) { it.remove(); - VersionsMetadata versionsMetadata = (VersionsMetadata) metadata; processedVersions.put(versionsMetadata.getKey(), versionsMetadata); } } diff --git a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java index 616ed58cac87..f95c1c9fbed6 100644 --- a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java +++ b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java @@ -49,8 +49,7 @@ public void setSource(String source) { @Override public void add(SettingsProblem.Severity severity, String message, int line, int column, Exception cause) { - if (line <= 0 && column <= 0 && (cause instanceof SettingsParseException)) { - SettingsParseException e = (SettingsParseException) cause; + if (line <= 0 && column <= 0 && cause instanceof SettingsParseException e) { line = e.getLineNumber(); column = e.getColumnNumber(); } diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java index f185ad85f66e..9e95b0d65995 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java @@ -467,8 +467,8 @@ protected int doExecute(MavenContext context, MavenExecutionRequest request) thr ExceptionSummary summary = handler.handleException(exception); logSummary(context, summary, references, ""); - if (exception instanceof LifecycleExecutionException) { - failedProjects.add(((LifecycleExecutionException) exception).getProject()); + if (exception instanceof LifecycleExecutionException lifecycleExecutionException) { + failedProjects.add(lifecycleExecutionException.getProject()); } } diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenProperties.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenProperties.java index 5817bab379d6..2249477490eb 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenProperties.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/props/MavenProperties.java @@ -316,8 +316,8 @@ public String put(String key, String comment, String value) { public boolean update(Map props) { MavenProperties properties; - if (props instanceof MavenProperties) { - properties = (MavenProperties) props; + if (props instanceof MavenProperties mavenProperties) { + properties = mavenProperties; } else { properties = new MavenProperties(); properties.putAll(props); diff --git a/impl/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/impl/maven-core/src/main/java/org/apache/maven/ReactorReader.java index 31052b97a8f6..d2f13e21a726 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/ReactorReader.java +++ b/impl/maven-core/src/main/java/org/apache/maven/ReactorReader.java @@ -533,9 +533,9 @@ public void init(Context context) throws Exception {} @Override public void onEvent(Object event) throws Exception { - if (event instanceof ExecutionEvent) { + if (event instanceof ExecutionEvent executionEvent) { ReactorReader reactorReader = lookup.lookup(ReactorReader.class); - reactorReader.processEvent((ExecutionEvent) event); + reactorReader.processEvent(executionEvent); } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java index 2ad0541914dc..1cf20ee7c6ce 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java @@ -53,8 +53,7 @@ public DefaultArtifactHandlerManager(TypeRegistry typeRegistry) { @Override public void onEvent(Object event) { - if (event instanceof ExecutionEvent) { - ExecutionEvent executionEvent = (ExecutionEvent) event; + if (event instanceof ExecutionEvent executionEvent) { if (executionEvent.getType() == ExecutionEvent.Type.SessionEnded) { allHandlers.clear(); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java index 46e480fae5da..8250345e39e3 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java @@ -48,8 +48,7 @@ public LegacyArtifactHandlerManager(Map artifactHandler @Override public void onEvent(Object event) { - if (event instanceof ExecutionEvent) { - ExecutionEvent executionEvent = (ExecutionEvent) event; + if (event instanceof ExecutionEvent executionEvent) { if (executionEvent.getType() == ExecutionEvent.Type.SessionEnded) { allHandlers.clear(); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java index 13928c4b591d..50e9c85736c0 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java +++ b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java @@ -73,12 +73,10 @@ public boolean equals(Object obj) { return true; } - if (!(obj instanceof AndArtifactFilter)) { + if (obj instanceof AndArtifactFilter other) { + return filters.equals(other.filters); + } else { return false; } - - AndArtifactFilter other = (AndArtifactFilter) obj; - - return filters.equals(other.filters); } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java index 5f7235b1b4fb..afe8f16f8f65 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java +++ b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java @@ -92,12 +92,10 @@ public boolean equals(Object obj) { return true; } - if (!(obj instanceof CumulativeScopeArtifactFilter)) { + if (obj instanceof CumulativeScopeArtifactFilter that) { + return scopes.equals(that.scopes); + } else { return false; } - - CumulativeScopeArtifactFilter that = (CumulativeScopeArtifactFilter) obj; - - return scopes.equals(that.scopes); } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java index 7e57e940b95b..913ea3889631 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java +++ b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java @@ -62,12 +62,10 @@ public boolean equals(Object obj) { return true; } - if (!(obj instanceof ExclusionSetFilter)) { + if (obj instanceof ExclusionSetFilter other) { + return excludes.equals(other.excludes); + } else { return false; } - - ExclusionSetFilter other = (ExclusionSetFilter) obj; - - return excludes.equals(other.excludes); } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java index 28ca6e7efe1c..89add4faf3c4 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java +++ b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java @@ -53,12 +53,10 @@ public boolean equals(Object obj) { return true; } - if (!(obj instanceof ScopeArtifactFilter)) { + if (obj instanceof ScopeArtifactFilter other) { + return Objects.equals(scope, other.scope); + } else { return false; } - - ScopeArtifactFilter other = (ScopeArtifactFilter) obj; - - return Objects.equals(scope, other.scope); } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/impl/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java index 1810c50a90f6..42e8e9ad0bcd 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java +++ b/impl/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java @@ -410,9 +410,8 @@ public static ArtifactRepository createArtifactRepository( } ArtifactRepository repository; - if (repositoryLayout instanceof ArtifactRepositoryLayout2) { - repository = ((ArtifactRepositoryLayout2) repositoryLayout) - .newMavenArtifactRepository(id, url, snapshots, releases); + if (repositoryLayout instanceof ArtifactRepositoryLayout2 artifactRepositoryLayout2) { + repository = artifactRepositoryLayout2.newMavenArtifactRepository(id, url, snapshots, releases); } else { repository = new MavenArtifactRepository(id, url, repositoryLayout, snapshots, releases); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index 772769340141..4da7b14c7e5e 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -354,8 +354,8 @@ private void wireRealm(ClassRealm classRealm, List parentImports, Map children = null; - if (exception instanceof ProjectBuildingException) { - List results = ((ProjectBuildingException) exception).getResults(); + if (exception instanceof ProjectBuildingException projectBuildingException) { + List results = projectBuildingException.getResults(); children = new ArrayList<>(); @@ -235,10 +235,10 @@ private String getMessage(String message, Throwable exception) { String exceptionMessage = t.getMessage(); String longMessage = null; - if (t instanceof AbstractMojoExecutionException) { - longMessage = ((AbstractMojoExecutionException) t).getLongMessage(); - } else if (t instanceof MojoException) { - longMessage = ((MojoException) t).getLongMessage(); + if (t instanceof AbstractMojoExecutionException abstractMojoExecutionException) { + longMessage = abstractMojoExecutionException.getLongMessage(); + } else if (t instanceof MojoException mojoException) { + longMessage = mojoException.getLongMessage(); } if (longMessage != null && !longMessage.isEmpty()) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java b/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java index 1233557b3747..a36f48536cbd 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java +++ b/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java @@ -74,8 +74,8 @@ private Collection getProvidedListeners() { // deduplicate instances to avoid redundant beforeXXX/afterXXX callbacks IdentityHashMap listeners = new IdentityHashMap<>(); for (Object provided : getScopeState().provided()) { - if (provided instanceof WeakMojoExecutionListener) { - listeners.put((WeakMojoExecutionListener) provided, null); + if (provided instanceof WeakMojoExecutionListener weakMojoExecutionListener) { + listeners.put(weakMojoExecutionListener, null); } } return listeners.keySet(); diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java index 4bb367ade8b0..f1ae7295dcfd 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java @@ -70,14 +70,14 @@ public void artifactResolved(RepositoryEvent event) { while (trace != null) { Object data = trace.getData(); - if (data instanceof CollectStepData) { - collectStepTrace = (CollectStepData) data; - } else if (data instanceof ArtifactDescriptorRequest) { - artifactDescriptorRequest = (ArtifactDescriptorRequest) data; - } else if (data instanceof ArtifactRequest) { - artifactRequest = (ArtifactRequest) data; - } else if (data instanceof Plugin) { - plugin = (Plugin) data; + if (data instanceof CollectStepData collectStepData) { + collectStepTrace = collectStepData; + } else if (data instanceof ArtifactDescriptorRequest artifactDescriptorRequestData) { + artifactDescriptorRequest = artifactDescriptorRequestData; + } else if (data instanceof ArtifactRequest artifactRequestData) { + artifactRequest = artifactRequestData; + } else if (data instanceof Plugin pluginData) { + plugin = pluginData; } trace = trace.getParent(); } @@ -209,8 +209,8 @@ static boolean isLocalRepositoryArtifactOrMissing(RepositorySystemSession sessio static CollectStepData lookupCollectStepData(RequestTrace trace) { CollectStepData collectStepTrace = null; while (trace != null) { - if (trace.getData() instanceof CollectStepData) { - collectStepTrace = (CollectStepData) trace.getData(); + if (trace.getData() instanceof CollectStepData collectStepData) { + collectStepTrace = collectStepData; break; } trace = trace.getParent(); diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java index 534893885282..405d7d97f690 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java @@ -37,8 +37,8 @@ class TypeRegistryAdapter implements ArtifactTypeRegistry { @Override public ArtifactType get(String typeId) { Type type = typeRegistry.require(typeId); - if (type instanceof ArtifactType) { - return (ArtifactType) type; + if (type instanceof ArtifactType artifactType) { + return artifactType; } if (type != null) { return new DefaultType( diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java index 433f877e7fdc..707334346476 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java @@ -66,8 +66,8 @@ public Optional getPath(@Nonnull Artifact artifact) { } } Path path = paths.get(id); - if (path == null && artifact instanceof DefaultArtifact) { - path = ((DefaultArtifact) artifact).getArtifact().getPath(); + if (path == null && artifact instanceof DefaultArtifact defaultArtifact) { + path = defaultArtifact.getArtifact().getPath(); } return Optional.ofNullable(path); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java index 27c30927f0b0..a3f48734fef8 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java @@ -201,8 +201,8 @@ protected Session newSession(MavenSession mavenSession, List r } public ArtifactRepository toArtifactRepository(RemoteRepository repository) { - if (repository instanceof DefaultRemoteRepository) { - org.eclipse.aether.repository.RemoteRepository rr = ((DefaultRemoteRepository) repository).getRepository(); + if (repository instanceof DefaultRemoteRepository defaultRemoteRepository) { + org.eclipse.aether.repository.RemoteRepository rr = defaultRemoteRepository.getRepository(); try { return mavenRepositorySystem.createRepository( diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java index af8344599cfd..6bc183aa5203 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java @@ -67,8 +67,7 @@ public DefaultTypeRegistry( @Override public void onEvent(Object event) { - if (event instanceof ExecutionEvent) { - ExecutionEvent executionEvent = (ExecutionEvent) event; + if (event instanceof ExecutionEvent executionEvent) { if (executionEvent.getType() == ExecutionEvent.Type.SessionEnded) { usedTypes.clear(); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java index 6b1df8b77536..a0f30a65737b 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java @@ -180,8 +180,8 @@ public DependencyResolutionResult getProjectDependencyResolutionResult( Set resolvedArtifacts = resolveProjectArtifacts( project, scopesToCollect, scopesToResolve, session, aggregating, projectArtifacts); - if (resolvedArtifacts instanceof ProjectArtifactsCache.ArtifactsSetWithResult) { - return ((ProjectArtifactsCache.ArtifactsSetWithResult) resolvedArtifacts).getResult(); + if (resolvedArtifacts instanceof ProjectArtifactsCache.ArtifactsSetWithResult artifactsSetWithResult) { + return artifactsSetWithResult.getResult(); } else { throw new IllegalStateException(); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java index 0994baf00601..2e6efa7d15c0 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java @@ -126,11 +126,11 @@ public void buildProject( new ProjectExecutionEvent(session, currentProject, t)); // rethrow original errors and runtime exceptions - if (t instanceof RuntimeException) { - throw (RuntimeException) t; + if (t instanceof RuntimeException runtimeException) { + throw runtimeException; } - if (t instanceof Error) { - throw (Error) t; + if (t instanceof Error error) { + throw error; } } finally { session.setCurrentProject(null); diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/Task.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/Task.java index 08f9fdc0911b..3b5587c00db9 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/Task.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/Task.java @@ -44,11 +44,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof Task)) { + if (o instanceof Task task) { + return Objects.equals(getClass(), task.getClass()) && Objects.equals(value, task.value); + } else { return false; } - Task task = (Task) o; - return Objects.equals(getClass(), task.getClass()) && Objects.equals(value, task.value); } @Override diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java index b683a06cdb2b..f94271ed1f22 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java @@ -176,8 +176,8 @@ public void handleBuildError( .addBuildSummary(new BuildFailure(mavenProject, Duration.between(buildStartTime, buildEndTime), t)); // notify listeners about "soft" project build failures only - if (t instanceof Exception && !(t instanceof RuntimeException)) { - eventCatapult.fire(ExecutionEvent.Type.ProjectFailed, currentSession, null, (Exception) t); + if (t instanceof Exception exception && !(t instanceof RuntimeException)) { + eventCatapult.fire(ExecutionEvent.Type.ProjectFailed, currentSession, null, exception); } // reactor failure modes diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java index 5dfa27cb9b28..45dabc299b2b 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java +++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java @@ -574,8 +574,8 @@ protected void handleBuildError( .addBuildSummary(new BuildFailure(mavenProject, clock.execTime(), clock.wallTime(), t)); // notify listeners about "soft" project build failures only - if (t instanceof Exception && !(t instanceof RuntimeException)) { - eventCatapult.fire(ExecutionEvent.Type.ProjectFailed, session, null, (Exception) t); + if (t instanceof Exception exception && !(t instanceof RuntimeException)) { + eventCatapult.fire(ExecutionEvent.Type.ProjectFailed, session, null, exception); } // reactor failure modes diff --git a/impl/maven-core/src/main/java/org/apache/maven/logging/LoggingOutputStream.java b/impl/maven-core/src/main/java/org/apache/maven/logging/LoggingOutputStream.java index 037307f8e477..c514ec91a9a9 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/logging/LoggingOutputStream.java +++ b/impl/maven-core/src/main/java/org/apache/maven/logging/LoggingOutputStream.java @@ -95,8 +95,8 @@ public void forceFlush() { } public static void forceFlush(PrintStream ps) { - if (ps instanceof LoggingPrintStream) { - ((LoggingPrintStream) ps).forceFlush(); + if (ps instanceof LoggingPrintStream loggingPrintStream) { + loggingPrintStream.forceFlush(); } } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java index da83a9934926..2fad875c99c6 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java @@ -85,16 +85,14 @@ public boolean equals(Object o) { return true; } - if (!(o instanceof CacheKey)) { + if (o instanceof CacheKey other) { + return ids.equals(other.ids) + && files.equals(other.files) + && timestamps.equals(other.timestamps) + && sizes.equals(other.sizes); + } else { return false; } - - CacheKey other = (CacheKey) o; - - return ids.equals(other.ids) - && files.equals(other.files) - && timestamps.equals(other.timestamps) - && sizes.equals(other.sizes); } @Override diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java index 154fee3e68e6..0991e1d4cc18 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java @@ -102,17 +102,15 @@ public boolean equals(Object o) { return true; } - if (!(o instanceof CacheKey)) { + if (o instanceof CacheKey that) { + return CacheUtils.pluginEquals(plugin, that.plugin) + && Objects.equals(workspace, that.workspace) + && Objects.equals(localRepo, that.localRepo) + && RepositoryUtils.repositoriesEquals(repositories, that.repositories) + && Objects.equals(filter, that.filter); + } else { return false; } - - CacheKey that = (CacheKey) o; - - return CacheUtils.pluginEquals(plugin, that.plugin) - && Objects.equals(workspace, that.workspace) - && Objects.equals(localRepo, that.localRepo) - && RepositoryUtils.repositoriesEquals(repositories, that.repositories) - && Objects.equals(filter, that.filter); } } diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java index b47e258f0845..df5550517bdb 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java @@ -145,18 +145,16 @@ public boolean equals(Object obj) { return true; } - if (!(obj instanceof CacheKey)) { + if (obj instanceof CacheKey that) { + return Objects.equals(this.artifactId, that.artifactId) + && Objects.equals(this.groupId, that.groupId) + && Objects.equals(this.version, that.version) + && Objects.equals(this.localRepo, that.localRepo) + && Objects.equals(this.workspace, that.workspace) + && RepositoryUtils.repositoriesEquals(this.repositories, that.repositories); + } else { return false; } - - CacheKey that = (CacheKey) obj; - - return Objects.equals(this.artifactId, that.artifactId) - && Objects.equals(this.groupId, that.groupId) - && Objects.equals(this.version, that.version) - && Objects.equals(this.localRepo, that.localRepo) - && Objects.equals(this.workspace, that.workspace) - && RepositoryUtils.repositoriesEquals(this.repositories, that.repositories); } @Override diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java index dfbee3900f47..62fd05332413 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java @@ -117,19 +117,17 @@ public boolean equals(Object o) { return true; } - if (!(o instanceof CacheKey)) { + if (o instanceof CacheKey that) { + return parentRealm == that.parentRealm + && CacheUtils.pluginEquals(plugin, that.plugin) + && Objects.equals(workspace, that.workspace) + && Objects.equals(localRepo, that.localRepo) + && RepositoryUtils.repositoriesEquals(this.repositories, that.repositories) + && Objects.equals(filter, that.filter) + && Objects.equals(foreignImports, that.foreignImports); + } else { return false; } - - CacheKey that = (CacheKey) o; - - return parentRealm == that.parentRealm - && CacheUtils.pluginEquals(plugin, that.plugin) - && Objects.equals(workspace, that.workspace) - && Objects.equals(localRepo, that.localRepo) - && RepositoryUtils.repositoriesEquals(this.repositories, that.repositories) - && Objects.equals(filter, that.filter) - && Objects.equals(foreignImports, that.foreignImports); } } @@ -161,11 +159,11 @@ public CacheRecord get(Key key, PluginRealmSupplier supplier) } }); } catch (RuntimeException e) { - if (e.getCause() instanceof PluginResolutionException) { - throw (PluginResolutionException) e.getCause(); + if (e.getCause() instanceof PluginResolutionException pluginResolutionException) { + throw pluginResolutionException; } - if (e.getCause() instanceof PluginContainerException) { - throw (PluginContainerException) e.getCause(); + if (e.getCause() instanceof PluginContainerException pluginContainerException) { + throw pluginContainerException; } throw e; } diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java index ca70cf5a4545..c522428a98d5 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java @@ -177,8 +177,8 @@ public Object evaluate(String expr, Class type) throws ExpressionEvaluationEx String pathExpression = expression.substring(0, pathSeparator); value = ReflectionValueExtractor.evaluate(pathExpression, session); if (pathSeparator < expression.length() - 1) { - if (value instanceof Path) { - value = ((Path) value).resolve(expression.substring(pathSeparator + 1)); + if (value instanceof Path path) { + value = path.resolve(expression.substring(pathSeparator + 1)); } else { value = value + expression.substring(pathSeparator); } @@ -309,11 +309,9 @@ public Object evaluate(String expr, Class type) throws ExpressionEvaluationEx } } - if (value instanceof String) { + if (value instanceof String val) { // TODO without #, this could just be an evaluate call... - String val = (String) value; - int exprStartDelimiter = val.indexOf("${"); if (exprStartDelimiter >= 0) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java index 7fc45d4fadbc..f4244b4960d4 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java @@ -146,8 +146,8 @@ public Object evaluate(String expr, Class type) throws ExpressionEvaluationEx String pathExpression = expression.substring(0, pathSeparator); value = ReflectionValueExtractor.evaluate(pathExpression, ctx.getValue()); if (pathSeparator < expression.length() - 1) { - if (value instanceof Path) { - value = ((Path) value).resolve(expression.substring(pathSeparator + 1)); + if (value instanceof Path path) { + value = path.resolve(expression.substring(pathSeparator + 1)); } else { value = value + expression.substring(pathSeparator); } @@ -189,11 +189,9 @@ public Object evaluate(String expr, Class type) throws ExpressionEvaluationEx } } - if (value instanceof String) { + if (value instanceof String val) { // TODO without #, this could just be an evaluate call... - String val = (String) value; - int exprStartDelimiter = val.indexOf("${"); if (exprStartDelimiter >= 0) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java index dea8a94feadb..530bca711657 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java @@ -713,7 +713,7 @@ private T loadV3Mojo( e); } - if (mojo instanceof ContextEnabled) { + if (mojo instanceof ContextEnabled contextEnabledMojo) { MavenProject project = session.getCurrentProject(); Map pluginContext = session.getPluginContext(pluginDescriptor, project); @@ -723,13 +723,13 @@ private T loadV3Mojo( pluginContext.put("pluginDescriptor", pluginDescriptor); - ((ContextEnabled) mojo).setPluginContext(pluginContext); + contextEnabledMojo.setPluginContext(pluginContext); } } - if (mojo instanceof Mojo) { + if (mojo instanceof Mojo mojoInstance) { Logger mojoLogger = LoggerFactory.getLogger(mojoDescriptor.getImplementation()); - ((Mojo) mojo).setLog(new MojoLogWrapper(mojoLogger)); + mojoInstance.setLog(new MojoLogWrapper(mojoLogger)); } if (mojo instanceof Contextualizable) { @@ -1041,7 +1041,7 @@ public int hashCode() { } public boolean equals(Object o) { - return o instanceof Named && this.value.equals(((Named) o).value()); + return o instanceof Named named && this.value.equals(named.value()); } public Class annotationType() { diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java index 35cae50a4c94..dc1e161c09c5 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java @@ -85,8 +85,7 @@ private enum ValidationReportLevel { @Override public void onEvent(Object event) { - if (event instanceof ExecutionEvent) { - ExecutionEvent executionEvent = (ExecutionEvent) event; + if (event instanceof ExecutionEvent executionEvent) { if (executionEvent.getType() == ExecutionEvent.Type.SessionStarted) { RepositorySystemSession repositorySystemSession = executionEvent.getSession().getRepositorySession(); diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java index eff2288bcd7c..613367bc26b7 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java @@ -65,13 +65,11 @@ public boolean equals(Object o) { return true; } - if (!(o instanceof CacheKey)) { + if (o instanceof CacheKey other) { + return extensionRealms.equals(other.extensionRealms); + } else { return false; } - - CacheKey other = (CacheKey) o; - - return extensionRealms.equals(other.extensionRealms); } @Override diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index f278f04afb2f..260945360512 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -940,15 +940,15 @@ public Map getManagedVersionMap() { public boolean equals(Object other) { if (other == this) { return true; - } else if (!(other instanceof MavenProject)) { - return false; + } else { + if (other instanceof MavenProject that) { + return Objects.equals(getArtifactId(), that.getArtifactId()) + && Objects.equals(getGroupId(), that.getGroupId()) + && Objects.equals(getVersion(), that.getVersion()); + } else { + return false; + } } - - MavenProject that = (MavenProject) other; - - return Objects.equals(getArtifactId(), that.getArtifactId()) - && Objects.equals(getGroupId(), that.getGroupId()) - && Objects.equals(getVersion(), that.getVersion()); } @Override diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java b/impl/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java index f5005c5fc6c6..5b0665b5e350 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java +++ b/impl/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java @@ -141,20 +141,20 @@ public boolean equals(Object o) { if (o == this) { return true; } - if (!(o instanceof CacheKey)) { + if (o instanceof CacheKey that) { + return Objects.equals(groupId, that.groupId) + && Objects.equals(artifactId, that.artifactId) + && Objects.equals(version, that.version) + && Objects.equals(dependencyArtifacts, that.dependencyArtifacts) + && Objects.equals(workspace, that.workspace) + && Objects.equals(localRepo, that.localRepo) + && RepositoryUtils.repositoriesEquals(repositories, that.repositories) + && Objects.equals(collect, that.collect) + && Objects.equals(resolve, that.resolve) + && aggregating == that.aggregating; + } else { return false; } - CacheKey that = (CacheKey) o; - return Objects.equals(groupId, that.groupId) - && Objects.equals(artifactId, that.artifactId) - && Objects.equals(version, that.version) - && Objects.equals(dependencyArtifacts, that.dependencyArtifacts) - && Objects.equals(workspace, that.workspace) - && Objects.equals(localRepo, that.localRepo) - && RepositoryUtils.repositoriesEquals(repositories, that.repositories) - && Objects.equals(collect, that.collect) - && Objects.equals(resolve, that.resolve) - && aggregating == that.aggregating; } } @@ -193,11 +193,10 @@ public CacheRecord put(Key key, Set projectArtifacts) { assertUniqueKey(key); SetWithResolutionResult artifacts; - if (projectArtifacts instanceof SetWithResolutionResult) { - artifacts = (SetWithResolutionResult) projectArtifacts; - } else if (projectArtifacts instanceof ArtifactsSetWithResult) { - artifacts = new SetWithResolutionResult( - ((ArtifactsSetWithResult) projectArtifacts).getResult(), projectArtifacts); + if (projectArtifacts instanceof SetWithResolutionResult setWithResolutionResult) { + artifacts = setWithResolutionResult; + } else if (projectArtifacts instanceof ArtifactsSetWithResult artifactsSetWithResult) { + artifacts = new SetWithResolutionResult(artifactsSetWithResult.getResult(), projectArtifacts); } else { throw new IllegalArgumentException("projectArtifacts must implement ArtifactsSetWithResult"); } diff --git a/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java b/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java index 73c1dc272652..f6263fc3cb00 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java +++ b/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java @@ -67,8 +67,8 @@ public Model findModel(Artifact artifact) { Model model = null; for (WorkspaceReader workspaceReader : readers) { - if (workspaceReader instanceof MavenWorkspaceReader) { - model = ((MavenWorkspaceReader) workspaceReader).findModel(artifact); + if (workspaceReader instanceof MavenWorkspaceReader mavenWorkspaceReader) { + model = mavenWorkspaceReader.findModel(artifact); if (model != null) { break; } diff --git a/impl/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java index 96789c43c54a..5bb7e5a48e60 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java +++ b/impl/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java @@ -113,20 +113,18 @@ public boolean equals(Object obj) { return true; } - if (!(obj instanceof DefaultToolchain)) { - return false; - } + if (obj instanceof DefaultToolchain other) { + if (!Objects.equals(type, other.type)) { + return false; + } - DefaultToolchain other = (DefaultToolchain) obj; + Properties thisProvides = this.getModel().getProvides(); + Properties otherProvides = other.getModel().getProvides(); - if (!Objects.equals(type, other.type)) { + return Objects.equals(thisProvides, otherProvides); + } else { return false; } - - Properties thisProvides = this.getModel().getProvides(); - Properties otherProvides = other.getModel().getProvides(); - - return Objects.equals(thisProvides, otherProvides); } @Override diff --git a/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java index a553b7ff4cc6..1b09f72af8cd 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java @@ -312,11 +312,11 @@ void testGetReactorProjects( Result result = graphBuilder.build(session); // Then - if (parameterExpectedResult instanceof SelectedProjectsResult) { + if (parameterExpectedResult instanceof SelectedProjectsResult selectedProjectsResult) { assertThat(result.hasErrors()) .withFailMessage("Expected result not to have errors") .isFalse(); - List expectedProjectNames = ((SelectedProjectsResult) parameterExpectedResult).projectNames; + List expectedProjectNames = selectedProjectsResult.projectNames; List actualReactorProjects = result.get().getSortedProjects(); List expectedReactorProjects = expectedProjectNames.stream().map(artifactIdProjectMap::get).collect(toList()); diff --git a/impl/maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java index 875a5642cea2..8b80dc0efd60 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java @@ -52,10 +52,10 @@ import static org.codehaus.plexus.testing.PlexusExtension.getBasedir; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrowsExactly; -import static org.junit.jupiter.api.Assertions.assertTrue; /** * UT for {@link DefaultRepositorySystemSessionFactory}. @@ -409,43 +409,43 @@ void versionFilteringTest() throws InvalidRepositoryException { request.getUserProperties().put("maven.session.versionFilter", "s"); versionFilter = systemSessionFactory.newRepositorySession(request).getVersionFilter(); assertNotNull(versionFilter); - assertTrue(versionFilter instanceof ContextualSnapshotVersionFilter); + assertInstanceOf(ContextualSnapshotVersionFilter.class, versionFilter); request.getUserProperties().put("maven.session.versionFilter", "h"); versionFilter = systemSessionFactory.newRepositorySession(request).getVersionFilter(); assertNotNull(versionFilter); - assertTrue(versionFilter instanceof HighestVersionFilter); + assertInstanceOf(HighestVersionFilter.class, versionFilter); request.getUserProperties().put("maven.session.versionFilter", "h(5)"); versionFilter = systemSessionFactory.newRepositorySession(request).getVersionFilter(); assertNotNull(versionFilter); - assertTrue(versionFilter instanceof HighestVersionFilter); + assertInstanceOf(HighestVersionFilter.class, versionFilter); request.getUserProperties().put("maven.session.versionFilter", "l"); versionFilter = systemSessionFactory.newRepositorySession(request).getVersionFilter(); assertNotNull(versionFilter); - assertTrue(versionFilter instanceof LowestVersionFilter); + assertInstanceOf(LowestVersionFilter.class, versionFilter); request.getUserProperties().put("maven.session.versionFilter", "l(5)"); versionFilter = systemSessionFactory.newRepositorySession(request).getVersionFilter(); assertNotNull(versionFilter); - assertTrue(versionFilter instanceof LowestVersionFilter); + assertInstanceOf(LowestVersionFilter.class, versionFilter); request.getUserProperties().put("maven.session.versionFilter", "e(g:a:v)"); versionFilter = systemSessionFactory.newRepositorySession(request).getVersionFilter(); assertNotNull(versionFilter); - assertTrue(versionFilter instanceof PredicateVersionFilter); + assertInstanceOf(PredicateVersionFilter.class, versionFilter); request.getUserProperties().put("maven.session.versionFilter", "e(g:a:[1,2])"); versionFilter = systemSessionFactory.newRepositorySession(request).getVersionFilter(); assertNotNull(versionFilter); - assertTrue(versionFilter instanceof PredicateVersionFilter); + assertInstanceOf(PredicateVersionFilter.class, versionFilter); // chained request.getUserProperties().put("maven.session.versionFilter", "h(5);s;e(org.foo:bar:1)"); versionFilter = systemSessionFactory.newRepositorySession(request).getVersionFilter(); assertNotNull(versionFilter); - assertTrue(versionFilter instanceof ChainedVersionFilter); + assertInstanceOf(ChainedVersionFilter.class, versionFilter); } protected ArtifactRepository getLocalRepository() throws InvalidRepositoryException { diff --git a/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java index 4785c93e89c4..a0121c6ff999 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java @@ -68,7 +68,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; /** */ @@ -389,7 +388,7 @@ void testShouldExtractPluginArtifacts() throws Exception { Object value = ee.evaluate("${plugin.artifacts}"); - assertTrue(value instanceof List); + assertInstanceOf(List.class, value); @SuppressWarnings("unchecked") List artifacts = (List) value; diff --git a/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java index 27ad838a0ba5..35601b9c2bc5 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java +++ b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java @@ -331,7 +331,7 @@ public void testShouldExtractPluginArtifacts() throws Exception { Object value = ee.evaluate("${mojo.plugin.dependencies}"); - assertTrue(value instanceof Collection); + assertInstanceOf(Collection.class, value); @SuppressWarnings("unchecked") Collection artifacts = (Collection) value; diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/impl/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index 652479a879ab..3def05aa3b8d 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -121,9 +121,9 @@ protected MavenProject getProjectWithDependencies(File pom) throws Exception { return projectBuilder.build(pom, configuration).getProject(); } catch (Exception e) { Throwable cause = e.getCause(); - if (cause instanceof ModelBuildingException) { + if (cause instanceof ModelBuildingException modelBuildingException) { String message = "In: " + pom + "\n\n"; - for (ModelProblem problem : ((ModelBuildingException) cause).getProblems()) { + for (ModelProblem problem : modelBuildingException.getProblems()) { message += problem + "\n"; } System.out.println(message); diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithLocationMatcher.java b/impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithLocationMatcher.java index 235561f29f63..ac46ca37e57e 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithLocationMatcher.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithLocationMatcher.java @@ -38,14 +38,12 @@ class ProjectBuildingResultWithLocationMatcher extends BaseMatcher p.getLineNumber() == lineNumber && p.getColumnNumber() == columnNumber); + } else { return false; } - - final ProjectBuildingResult r = (ProjectBuildingResult) o; - - return r.getProblems().stream() - .anyMatch(p -> p.getLineNumber() == lineNumber && p.getColumnNumber() == columnNumber); } @Override @@ -61,15 +59,14 @@ private String formatLocation(int columnNumber, int lineNumber) { @Override public void describeMismatch(final Object o, final Description description) { - if (!(o instanceof ProjectBuildingResult)) { - super.describeMismatch(o, description); - } else { - final ProjectBuildingResult r = (ProjectBuildingResult) o; + if (o instanceof ProjectBuildingResult r) { description.appendText("was a ProjectBuildingResult with locations "); String messages = r.getProblems().stream() .map(p -> formatLocation(p.getColumnNumber(), p.getLineNumber())) .collect(joining(", ")); description.appendText(messages); + } else { + super.describeMismatch(o, description); } } diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithProblemMessageMatcher.java b/impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithProblemMessageMatcher.java index efbde86406aa..a180175c2a3c 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithProblemMessageMatcher.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithProblemMessageMatcher.java @@ -37,13 +37,11 @@ class ProjectBuildingResultWithProblemMessageMatcher extends BaseMatcher p.getMessage().contains(problemMessage)); + } else { return false; } - - final ProjectBuildingResult r = (ProjectBuildingResult) o; - - return r.getProblems().stream().anyMatch(p -> p.getMessage().contains(problemMessage)); } @Override @@ -53,16 +51,15 @@ public void describeTo(Description description) { @Override public void describeMismatch(final Object o, final Description description) { - if (!(o instanceof ProjectBuildingResult)) { - super.describeMismatch(o, description); - } else { - final ProjectBuildingResult r = (ProjectBuildingResult) o; + if (o instanceof ProjectBuildingResult r) { description.appendText("was a ProjectBuildingResult with messages "); String messages = r.getProblems().stream() .map(ModelProblem::getMessage) .map(m -> "\"" + m + "\"" + System.lineSeparator()) .collect(joining(", ")); description.appendText(messages); + } else { + super.describeMismatch(o, description); } } diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java index 0651d70ad2eb..ff15d3fa4f54 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java @@ -102,13 +102,12 @@ private boolean testNode(XmlNode node) { if (test == null) { return true; } - if (test instanceof NodeNameTest) { + if (test instanceof NodeNameTest nodeNameTest) { String nodeName = node.getName(); if (nodeName == null || nodeName.isEmpty()) { return false; } - NodeNameTest nodeNameTest = (NodeNameTest) test; String namespaceURI = nodeNameTest.getNamespaceURI(); boolean wildcard = nodeNameTest.isWildcard(); String testName = nodeNameTest.getNodeName().getName(); @@ -121,8 +120,8 @@ private boolean testNode(XmlNode node) { } return false; } - if (test instanceof NodeTypeTest) { - return switch (((NodeTypeTest) test).getNodeType()) { + if (test instanceof NodeTypeTest nodeTypeTest) { + return switch (nodeTypeTest.getNodeType()) { case Compiler.NODE_TYPE_NODE -> true; case Compiler.NODE_TYPE_TEXT -> node.getValue() != null; default -> false; diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java index 536fd0bb21e0..20ef83c50441 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java @@ -36,21 +36,21 @@ public int getOrder() { } public NodePointer createNodePointer(QName name, Object object, Locale locale) { - if (object instanceof org.codehaus.plexus.util.xml.Xpp3Dom) { - object = ((org.codehaus.plexus.util.xml.Xpp3Dom) object).getDom(); + if (object instanceof org.codehaus.plexus.util.xml.Xpp3Dom xpp3Dom) { + object = xpp3Dom.getDom(); } - if (object instanceof XmlNode) { - return new Xpp3DomNodePointer((XmlNode) object); + if (object instanceof XmlNode xmlNode) { + return new Xpp3DomNodePointer(xmlNode); } return null; } public NodePointer createNodePointer(NodePointer parent, QName name, Object object) { - if (object instanceof org.codehaus.plexus.util.xml.Xpp3Dom) { - object = ((org.codehaus.plexus.util.xml.Xpp3Dom) object).getDom(); + if (object instanceof org.codehaus.plexus.util.xml.Xpp3Dom xpp3Dom) { + object = xpp3Dom.getDom(); } - if (object instanceof XmlNode) { - return new Xpp3DomNodePointer(parent, (XmlNode) object); + if (object instanceof XmlNode xmlNode) { + return new Xpp3DomNodePointer(parent, xmlNode); } return null; } diff --git a/impl/maven-di/src/main/java/org/apache/maven/di/Key.java b/impl/maven-di/src/main/java/org/apache/maven/di/Key.java index 6f13be353107..4326d95de86c 100644 --- a/impl/maven-di/src/main/java/org/apache/maven/di/Key.java +++ b/impl/maven-di/src/main/java/org/apache/maven/di/Key.java @@ -113,8 +113,8 @@ public Class getRawType() { * @throws IllegalStateException when underlying type is not a parameterized one. */ public Key getTypeParameter(int index) { - if (type instanceof ParameterizedType) { - return new KeyImpl<>(((ParameterizedType) type).getActualTypeArguments()[index], null); + if (type instanceof ParameterizedType parameterizedType) { + return new KeyImpl<>(parameterizedType.getActualTypeArguments()[index], null); } throw new IllegalStateException("Expected type from key " + getDisplayString() + " to be parameterized"); } @@ -144,11 +144,11 @@ public boolean equals(Object o) { if (this == o) { return true; } - if (!(o instanceof Key)) { + if (o instanceof Key that) { + return type.equals(that.type) && Objects.equals(qualifier, that.qualifier); + } else { return false; } - Key that = (Key) o; - return type.equals(that.type) && Objects.equals(qualifier, that.qualifier); } @Override diff --git a/impl/maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java index 3d49a28ed625..08337041a7be 100644 --- a/impl/maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java +++ b/impl/maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java @@ -101,8 +101,8 @@ public static String getDisplayName(Type type) { if (qualifier != null) { throw new DIException("More than one qualifier annotation on " + annotatedElement); } - if (annotation instanceof Named) { - qualifier = ((Named) annotation).value(); + if (annotation instanceof Named named) { + qualifier = named.value(); } else { Class annotationType = annotation.annotationType(); qualifier = Utils.isMarker(annotationType) ? annotationType : annotation; diff --git a/impl/maven-di/src/main/java/org/apache/maven/di/impl/Types.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/Types.java index b4830bd9f8fc..abf37b07332a 100644 --- a/impl/maven-di/src/main/java/org/apache/maven/di/impl/Types.java +++ b/impl/maven-di/src/main/java/org/apache/maven/di/impl/Types.java @@ -54,22 +54,22 @@ public class Types { * {@link GenericArrayType} or {@link TypeVariable} */ public static Class getRawType(Type type) { - if (type instanceof Class) { - return (Class) type; - } else if (type instanceof ParameterizedType) { - return (Class) ((ParameterizedType) type).getRawType(); - } else if (type instanceof WildcardType) { - Type[] upperBounds = ((WildcardType) type).getUpperBounds(); + if (type instanceof Class clazz) { + return clazz; + } else if (type instanceof ParameterizedType parameterizedType) { + return (Class) parameterizedType.getRawType(); + } else if (type instanceof WildcardType wildcardType) { + Type[] upperBounds = wildcardType.getUpperBounds(); return getRawType(getUppermostType(upperBounds)); - } else if (type instanceof GenericArrayType) { - Class rawComponentType = getRawType(((GenericArrayType) type).getGenericComponentType()); + } else if (type instanceof GenericArrayType genericArrayType) { + Class rawComponentType = getRawType(genericArrayType.getGenericComponentType()); try { return Class.forName("[L" + rawComponentType.getName() + ";"); } catch (ClassNotFoundException e) { throw new RuntimeException(e); } - } else if (type instanceof TypeVariable) { - return getRawType(getUppermostType(((TypeVariable) type).getBounds())); + } else if (type instanceof TypeVariable typeVariable) { + return getRawType(getUppermostType(typeVariable.getBounds())); } else { throw new IllegalArgumentException("Unsupported type: " + type); } @@ -100,12 +100,12 @@ public static Type getUppermostType(Type[] types) { * @return an array of actual type arguments for a given {@link Type} */ public static Type[] getActualTypeArguments(Type type) { - if (type instanceof Class) { - return ((Class) type).isArray() ? new Type[] {((Class) type).getComponentType()} : NO_TYPES; - } else if (type instanceof ParameterizedType) { - return ((ParameterizedType) type).getActualTypeArguments(); - } else if (type instanceof GenericArrayType) { - return new Type[] {((GenericArrayType) type).getGenericComponentType()}; + if (type instanceof Class clazz) { + return clazz.isArray() ? new Type[] {clazz.getComponentType()} : NO_TYPES; + } else if (type instanceof ParameterizedType parameterizedType) { + return parameterizedType.getActualTypeArguments(); + } else if (type instanceof GenericArrayType genericArrayType) { + return new Type[] {genericArrayType.getGenericComponentType()}; } throw new IllegalArgumentException("Unsupported type: " + type); } @@ -141,8 +141,8 @@ public static Map, Type> getAllTypeBindings(Type type) { private static void getAllTypeBindingsImpl(Type type, Map, Type> mapping) { Class cls = getRawType(type); - if (type instanceof ParameterizedType) { - Type[] typeArguments = ((ParameterizedType) type).getActualTypeArguments(); + if (type instanceof ParameterizedType parameterizedType) { + Type[] typeArguments = parameterizedType.getActualTypeArguments(); if (typeArguments.length != 0) { TypeVariable>[] typeVariables = cls.getTypeParameters(); for (int i = 0; i < typeArguments.length; i++) { @@ -203,8 +203,8 @@ public static Type bind(Type type, Function, Type> bindings) { return new ParameterizedTypeImpl( parameterizedType.getOwnerType(), parameterizedType.getRawType(), typeArguments2); } - if (type instanceof GenericArrayType) { - Type componentType = ((GenericArrayType) type).getGenericComponentType(); + if (type instanceof GenericArrayType genericArrayType) { + Type componentType = genericArrayType.getGenericComponentType(); return new GenericArrayTypeImpl(bind(componentType, bindings)); } if (type instanceof WildcardType wildcardType) { @@ -256,8 +256,8 @@ public static Set getAllSuperTypes(Type original) { if (done.add(type)) { Class cls = getRawType(type); Function, Type> bindings; - if (type instanceof ParameterizedType) { - Type[] typeArguments = ((ParameterizedType) type).getActualTypeArguments(); + if (type instanceof ParameterizedType parameterizedType) { + Type[] typeArguments = parameterizedType.getActualTypeArguments(); TypeVariable>[] typeVariables = cls.getTypeParameters(); bindings = v -> { for (int i = 0; i < typeArguments.length; i++) { @@ -297,8 +297,8 @@ public static Type simplifyType(Type original) { return original; } - if (original instanceof GenericArrayType) { - Type componentType = ((GenericArrayType) original).getGenericComponentType(); + if (original instanceof GenericArrayType genericArrayType) { + Type componentType = genericArrayType.getGenericComponentType(); Type repackedComponentType = simplifyType(componentType); if (componentType != repackedComponentType) { return genericArrayType(repackedComponentType); @@ -384,8 +384,8 @@ private static boolean isAllObjects(Type[] types) { */ public static boolean isAssignable(Type to, Type from) { // shortcut - if (to instanceof Class && from instanceof Class) { - return ((Class) to).isAssignableFrom((Class) from); + if (to instanceof Class toClazz && from instanceof Class fromClazz) { + return toClazz.isAssignableFrom(fromClazz); } return isAssignable(to, from, false); } @@ -438,8 +438,8 @@ private static boolean isAssignable(Type to, Type from, boolean strict) { if (from instanceof GenericArrayType) { from = getRawType(from); } - if (!strict && to instanceof Class) { - return ((Class) to).isAssignableFrom(getRawType(from)); + if (!strict && to instanceof Class toClazz) { + return toClazz.isAssignableFrom(getRawType(from)); } Class toRawClazz = getRawType(to); Type[] toTypeArguments = getActualTypeArguments(to); @@ -675,7 +675,7 @@ public String toString() { } private static String toString(Type type) { - return type instanceof Class ? ((Class) type).getName() : type.toString(); + return type instanceof Class clazz ? clazz.getName() : type.toString(); } /** @@ -684,10 +684,10 @@ private static String toString(Type type) { * @see Class#getSimpleName() */ public static String getSimpleName(Type type) { - if (type instanceof Class) { - return ((Class) type).getSimpleName(); - } else if (type instanceof ParameterizedType) { - return Arrays.stream(((ParameterizedType) type).getActualTypeArguments()) + if (type instanceof Class clazz) { + return clazz.getSimpleName(); + } else if (type instanceof ParameterizedType parameterizedType) { + return Arrays.stream(parameterizedType.getActualTypeArguments()) .map(Types::getSimpleName) .collect(joining(",", "<", ">")); } else if (type instanceof WildcardType wildcardType) { @@ -706,8 +706,8 @@ public static String getSimpleName(Type type) { + Arrays.stream(lowerBounds) .map(Types::getSimpleName) .collect(joining(" & "))); - } else if (type instanceof GenericArrayType) { - return Types.getSimpleName(((GenericArrayType) type).getGenericComponentType()) + "[]"; + } else if (type instanceof GenericArrayType genericArrayType) { + return Types.getSimpleName(genericArrayType.getGenericComponentType()) + "[]"; } return type.getTypeName(); diff --git a/impl/maven-di/src/main/java/org/apache/maven/di/impl/Utils.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/Utils.java index 195be016e7e7..cc1dd3bb120c 100644 --- a/impl/maven-di/src/main/java/org/apache/maven/di/impl/Utils.java +++ b/impl/maven-di/src/main/java/org/apache/maven/di/impl/Utils.java @@ -36,12 +36,11 @@ public static String getDisplayString(Class annotationType } public static String getDisplayString(Object object) { - if (object instanceof Class && ((Class) object).isAnnotation()) { + if (object instanceof Class clazz && clazz.isAnnotation()) { //noinspection unchecked return getDisplayString((Class) object, null); } - if (object instanceof Annotation) { - Annotation annotation = (Annotation) object; + if (object instanceof Annotation annotation) { return getDisplayString(annotation.annotationType(), annotation); } return object.toString(); diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java index a2245631312a..d5cefa8327a2 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java @@ -185,8 +185,8 @@ public List toRepositories(List< @Override public org.eclipse.aether.repository.RemoteRepository toRepository(RemoteRepository repository) { - if (repository instanceof DefaultRemoteRepository) { - return ((DefaultRemoteRepository) repository).getRepository(); + if (repository instanceof DefaultRemoteRepository defaultRemoteRepository) { + return defaultRemoteRepository.getRepository(); } else { // TODO throw new UnsupportedOperationException("Not implemented yet"); @@ -195,8 +195,8 @@ public org.eclipse.aether.repository.RemoteRepository toRepository(RemoteReposit @Override public org.eclipse.aether.repository.LocalRepository toRepository(LocalRepository repository) { - if (repository instanceof DefaultLocalRepository) { - return ((DefaultLocalRepository) repository).getRepository(); + if (repository instanceof DefaultLocalRepository defaultLocalRepository) { + return defaultLocalRepository.getRepository(); } else { // TODO throw new UnsupportedOperationException("Not implemented yet"); @@ -358,8 +358,8 @@ public List toArtifacts(Collection filter, Path p */ private boolean containsPatches(Set types) { for (PathType type : types) { - if (type instanceof JavaPathType.Modular) { - type = ((JavaPathType.Modular) type).rawType(); + if (type instanceof JavaPathType.Modular modular) { + type = modular.rawType(); } if (JavaPathType.PATCH_MODULE.equals(type)) { return true; @@ -365,7 +365,7 @@ public Map getDependencies() { @Override public Optional getModuleDescriptor(Path dependency) throws IOException { Object value = cache.getModuleInfo(dependency).descriptors.get(dependency); - return (value instanceof ModuleDescriptor) ? Optional.of((ModuleDescriptor) value) : Optional.empty(); + return (value instanceof ModuleDescriptor moduleDescriptor) ? Optional.of(moduleDescriptor) : Optional.empty(); } @Override @@ -378,10 +378,10 @@ public Optional getModuleName(Path dependency) throws IOException { * Returns the module name for the given value of the {@link PathModularization#descriptors} map. */ private static String name(final Object value) { - if (value instanceof String) { - return (String) value; - } else if (value instanceof ModuleDescriptor) { - return ((ModuleDescriptor) value).name(); + if (value instanceof String string) { + return string; + } else if (value instanceof ModuleDescriptor moduleDescriptor) { + return moduleDescriptor.name(); } else { return null; } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java index 4d674d183878..8627245ca89e 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java @@ -92,8 +92,8 @@ static class DefaultVersion implements Version { @Override public int compareTo(Version o) { - if (o instanceof DefaultVersion) { - return delegate.compareTo(((DefaultVersion) o).delegate); + if (o instanceof DefaultVersion defaultVersion) { + return delegate.compareTo(defaultVersion.delegate); } else { return compareTo(new DefaultVersion(versionScheme, o.asString())); } @@ -147,8 +147,8 @@ static class DefaultVersionRange implements VersionRange { @Override public boolean contains(Version version) { - if (version instanceof DefaultVersion) { - return delegate.containsVersion(((DefaultVersion) version).delegate); + if (version instanceof DefaultVersion defaultVersion) { + return delegate.containsVersion(defaultVersion.delegate); } else { return contains(new DefaultVersion(versionScheme, version.asString())); } @@ -235,8 +235,8 @@ static class DefaultVersionConstraint implements VersionConstraint { @Override public boolean contains(Version version) { - if (version instanceof DefaultVersion) { - return delegate.containsVersion(((DefaultVersion) version).delegate); + if (version instanceof DefaultVersion defaultVersion) { + return delegate.containsVersion(defaultVersion.delegate); } else { return contains(new DefaultVersion(versionScheme, version.asString())); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java index 2de529f6fc17..dbea333e3cf6 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java @@ -87,12 +87,10 @@ public List getVersions() { @Override public Optional getRepository(Version version) { ArtifactRepository repo = repos.get(version.toString()); - if (repo instanceof org.eclipse.aether.repository.LocalRepository) { - return Optional.of( - new DefaultLocalRepository((org.eclipse.aether.repository.LocalRepository) repo)); - } else if (repo instanceof org.eclipse.aether.repository.RemoteRepository) { - return Optional.of( - new DefaultRemoteRepository((org.eclipse.aether.repository.RemoteRepository) repo)); + if (repo instanceof org.eclipse.aether.repository.LocalRepository localRepository) { + return Optional.of(new DefaultLocalRepository(localRepository)); + } else if (repo instanceof org.eclipse.aether.repository.RemoteRepository remoteRepository) { + return Optional.of(new DefaultRemoteRepository(remoteRepository)); } else { return Optional.empty(); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java index 6c9f0ec9165a..45b0f089122b 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java @@ -77,12 +77,11 @@ public Version getVersion() { @Override public Optional getRepository() { - if (res.getRepository() instanceof org.eclipse.aether.repository.LocalRepository) { - return Optional.of(new DefaultLocalRepository( - (org.eclipse.aether.repository.LocalRepository) res.getRepository())); - } else if (res.getRepository() instanceof org.eclipse.aether.repository.RemoteRepository) { - return Optional.of(new DefaultRemoteRepository( - (org.eclipse.aether.repository.RemoteRepository) res.getRepository())); + if (res.getRepository() instanceof org.eclipse.aether.repository.LocalRepository localRepository) { + return Optional.of(new DefaultLocalRepository(localRepository)); + } else if (res.getRepository() + instanceof org.eclipse.aether.repository.RemoteRepository remoteRepository) { + return Optional.of(new DefaultRemoteRepository(remoteRepository)); } else { return Optional.empty(); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java index 9438c7415d43..47a0469fef14 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java @@ -182,8 +182,8 @@ public T get() { } } } - if (v instanceof AltRes) { - uncheckedThrow(((AltRes) v).t); + if (v instanceof AltRes altRes) { + uncheckedThrow(altRes.t); } return (T) v; } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionParser.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionParser.java index a4ee2b628920..6e649f00128d 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionParser.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/ConditionParser.java @@ -409,8 +409,8 @@ private Object parseParentheses() { private static Object add(Object left, Object right) { if (left instanceof String || right instanceof String) { return toString(left) + toString(right); - } else if (left instanceof Number && right instanceof Number) { - return ((Number) left).doubleValue() + ((Number) right).doubleValue(); + } else if (left instanceof Number leftNumber && right instanceof Number rightNumber) { + return leftNumber.doubleValue() + rightNumber.doubleValue(); } else { throw new RuntimeException("Cannot add " + left + " and " + right); } @@ -424,8 +424,8 @@ private static Object add(Object left, Object right) { * @throws RuntimeException if the value cannot be negated */ private Object negate(Object value) { - if (value instanceof Number) { - return -((Number) value).doubleValue(); + if (value instanceof Number number) { + return -number.doubleValue(); } throw new RuntimeException("Cannot negate non-numeric value: " + value); } @@ -439,8 +439,8 @@ private Object negate(Object value) { * @throws RuntimeException if the operands cannot be subtracted */ private static Object subtract(Object left, Object right) { - if (left instanceof Number && right instanceof Number) { - return ((Number) left).doubleValue() - ((Number) right).doubleValue(); + if (left instanceof Number leftNumber && right instanceof Number rightNumber) { + return leftNumber.doubleValue() - rightNumber.doubleValue(); } else { throw new RuntimeException("Cannot subtract " + right + " from " + left); } @@ -455,8 +455,8 @@ private static Object subtract(Object left, Object right) { * @throws RuntimeException if the operands cannot be multiplied */ private static Object multiply(Object left, Object right) { - if (left instanceof Number && right instanceof Number) { - return ((Number) left).doubleValue() * ((Number) right).doubleValue(); + if (left instanceof Number leftNumber && right instanceof Number rightNumber) { + return leftNumber.doubleValue() * rightNumber.doubleValue(); } else { throw new RuntimeException("Cannot multiply " + left + " and " + right); } @@ -472,12 +472,12 @@ private static Object multiply(Object left, Object right) { * @throws ArithmeticException if attempting to divide by zero */ private static Object divide(Object left, Object right) { - if (left instanceof Number && right instanceof Number) { - double divisor = ((Number) right).doubleValue(); + if (left instanceof Number leftNumber && right instanceof Number rightNumber) { + double divisor = rightNumber.doubleValue(); if (divisor == 0) { throw new ArithmeticException("Division by zero"); } - return ((Number) left).doubleValue() / divisor; + return leftNumber.doubleValue() / divisor; } else { throw new RuntimeException("Cannot divide " + left + " by " + right); } @@ -505,9 +505,9 @@ private static Object compare(Object left, String operator, Object right) { return true; } } - if (left instanceof Number && right instanceof Number) { - double leftVal = ((Number) left).doubleValue(); - double rightVal = ((Number) right).doubleValue(); + if (left instanceof Number leftNumber && right instanceof Number rightNumber) { + double leftVal = leftNumber.doubleValue(); + double rightVal = rightNumber.doubleValue(); return switch (operator) { case ">" -> leftVal > rightVal; case "<" -> leftVal < rightVal; @@ -517,8 +517,8 @@ private static Object compare(Object left, String operator, Object right) { case "!=" -> Math.abs(leftVal - rightVal) >= 1e-9; default -> throw new IllegalStateException("Unknown operator: " + operator); }; - } else if (left instanceof String && right instanceof String) { - int comparison = ((String) left).compareTo((String) right); + } else if (left instanceof String leftString && right instanceof String rightString) { + int comparison = leftString.compareTo(rightString); return switch (operator) { case ">" -> comparison > 0; case "<" -> comparison < 0; @@ -586,16 +586,16 @@ public static Boolean toBoolean(Object value) { * @throws RuntimeException if the object cannot be converted to a double */ public static double toDouble(Object value) { - if (value instanceof Number) { - return ((Number) value).doubleValue(); // Converts number to double - } else if (value instanceof String) { + if (value instanceof Number number) { + return number.doubleValue(); // Converts number to double + } else if (value instanceof String string) { try { - return Double.parseDouble((String) value); // Tries to parse string as double + return Double.parseDouble(string); // Tries to parse string as double } catch (NumberFormatException e) { throw new RuntimeException("Cannot convert string to number: " + value); } - } else if (value instanceof Boolean) { - return ((Boolean) value) ? 1.0 : 0.0; // True = 1.0, False = 0.0 + } else if (value instanceof Boolean bool) { + return bool ? 1.0 : 0.0; // True = 1.0, False = 0.0 } else { throw new RuntimeException("Cannot convert to number: " + value); } @@ -614,11 +614,11 @@ public static double toDouble(Object value) { * @throws RuntimeException if the object cannot be converted to an integer */ public static int toInt(Object value) { - if (value instanceof Number) { - return ((Number) value).intValue(); // Converts number to int - } else if (value instanceof String) { + if (value instanceof Number number) { + return number.intValue(); // Converts number to int + } else if (value instanceof String string) { try { - return Integer.parseInt((String) value); // Tries to parse string as int + return Integer.parseInt(string); // Tries to parse string as int } catch (NumberFormatException e) { // If string is not an int, tries parsing as double and converting to int try { @@ -627,8 +627,8 @@ public static int toInt(Object value) { throw new RuntimeException("Cannot convert string to integer: " + value); } } - } else if (value instanceof Boolean) { - return ((Boolean) value) ? 1 : 0; // True = 1, False = 0 + } else if (value instanceof Boolean bool) { + return bool ? 1 : 0; // True = 1, False = 0 } else { throw new RuntimeException("Cannot convert to integer: " + value); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java index 567298a6539b..66d036e89a49 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java @@ -213,8 +213,8 @@ public static Object evaluate(@Nonnull String expression, @Nullable Object root, } } - if (value instanceof Optional) { - value = ((Optional) value).orElse(null); + if (value instanceof Optional optional) { + value = optional.orElse(null); } return value; } @@ -226,8 +226,8 @@ private static Object getMappedValue( return null; } - if (value instanceof Map) { - return ((Map) value).get(key); + if (value instanceof Map map) { + return map.get(key); } final String message = String.format( @@ -248,8 +248,8 @@ private static Object getIndexedValue( return Array.get(value, index); } - if (value instanceof List) { - return ((List) value).get(index); + if (value instanceof List list) { + return list.get(index); } } catch (NumberFormatException | IndexOutOfBoundsException e) { return null; diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java index 60b3880c061b..e046d1b14f39 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java @@ -165,8 +165,8 @@ private Model loadPom( pomArtifact = resolveResult.getArtifact(); result.setRepository(resolveResult.getRepository()); } catch (ArtifactResolutionException e) { - if (e.getCause() instanceof ArtifactNotFoundException) { - missingDescriptor(session, trace, a, (Exception) e.getCause()); + if (e.getCause() instanceof ArtifactNotFoundException artifactNotFoundException) { + missingDescriptor(session, trace, a, artifactNotFoundException); if ((getPolicy(session, a, request) & ArtifactDescriptorPolicy.IGNORE_MISSING) != 0) { return null; } @@ -179,8 +179,8 @@ private Model loadPom( // TODO hack: don't rebuild model if it was already loaded during reactor resolution final WorkspaceReader workspace = session.getWorkspaceReader(); - if (workspace instanceof MavenWorkspaceReader) { - model = ((MavenWorkspaceReader) workspace).findModel(pomArtifact); + if (workspace instanceof MavenWorkspaceReader mavenWorkspaceReader) { + model = mavenWorkspaceReader.findModel(pomArtifact); if (model != null) { return model; } @@ -243,8 +243,8 @@ private Model loadPom( } catch (ModelBuilderException e) { for (ModelProblem problem : e.getResult().getProblemCollector().problems().toList()) { - if (problem.getException() instanceof ModelResolverException) { - result.addException(problem.getException()); + if (problem.getException() instanceof ModelResolverException modelResolverException) { + result.addException(modelResolverException); throw new ArtifactDescriptorException(result); } } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java index c2e81b941bde..3caa15e1dd22 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java @@ -49,10 +49,10 @@ class RemoteSnapshotMetadataGenerator implements MetadataGenerator { RemoteSnapshotMetadataGenerator(RepositorySystemSession session, DeployRequest request) { timestamp = (Instant) ConfigUtils.getObject(session, MonotonicClock.now(), Constants.MAVEN_START_INSTANT); Object bn = ConfigUtils.getObject(session, null, Constants.MAVEN_DEPLOY_SNAPSHOT_BUILD_NUMBER); - if (bn instanceof Integer) { - this.buildNumber = (Integer) bn; - } else if (bn instanceof String) { - this.buildNumber = Integer.valueOf((String) bn); + if (bn instanceof Integer integer) { + this.buildNumber = integer; + } else if (bn instanceof String string) { + this.buildNumber = Integer.valueOf(string); } else { this.buildNumber = null; } @@ -66,8 +66,7 @@ class RemoteSnapshotMetadataGenerator implements MetadataGenerator { * deployment allows to re-establish the association between the artifacts of the same project. */ for (Metadata metadata : request.getMetadata()) { - if (metadata instanceof RemoteSnapshotMetadata) { - RemoteSnapshotMetadata snapshotMetadata = (RemoteSnapshotMetadata) metadata; + if (metadata instanceof RemoteSnapshotMetadata snapshotMetadata) { snapshots.put(snapshotMetadata.getKey(), snapshotMetadata); } } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java index c684311fce6e..5f546ea29f05 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java @@ -69,9 +69,8 @@ private VersionsMetadataGenerator(RepositorySystemSession session, Collection it = metadatas.iterator(); it.hasNext(); ) { Metadata metadata = it.next(); - if (metadata instanceof VersionsMetadata) { + if (metadata instanceof VersionsMetadata versionsMetadata) { it.remove(); - VersionsMetadata versionsMetadata = (VersionsMetadata) metadata; processedVersions.put(versionsMetadata.getKey(), versionsMetadata); } } diff --git a/src/mdo/java/WrapperProperties.java b/src/mdo/java/WrapperProperties.java index d6e431de70fa..4a8641a8b992 100644 --- a/src/mdo/java/WrapperProperties.java +++ b/src/mdo/java/WrapperProperties.java @@ -181,8 +181,8 @@ public int size() { @Override public synchronized boolean equals(Object o) { - if (o instanceof WrapperProperties) { - o = ((WrapperProperties) o).getter.get(); + if (o instanceof WrapperProperties wrapperProperties) { + o = wrapperProperties.getter.get(); } return getter.get().equals(o); } diff --git a/src/mdo/merger.vm b/src/mdo/merger.vm index ad71bf0b3ac5..1ac8ad0315a7 100644 --- a/src/mdo/merger.vm +++ b/src/mdo/merger.vm @@ -281,7 +281,7 @@ public class ${className} { list = null; } - if (vs instanceof MergingList && ((MergingList) vs).map != null) { + if (vs instanceof MergingList mergingList && ((MergingList) vs).map != null) { for (Map.Entry e : ((MergingList) vs).map.entrySet()) { Object key = e.getKey(); V v = e.getValue(); diff --git a/src/mdo/model-v3.vm b/src/mdo/model-v3.vm index 3619fff02767..b2a21f7473df 100644 --- a/src/mdo/model-v3.vm +++ b/src/mdo/model-v3.vm @@ -189,10 +189,10 @@ public class ${class.name} public void set${cap}(${type} ${field.name}) { #if ($field.type == "DOM") - if (${field.name} instanceof Xpp3Dom) { - if (!Objects.equals(((Xpp3Dom) ${field.name}).getDom(), getDelegate().${pfx}${cap}())) { - update(getDelegate().with${cap}(((Xpp3Dom) ${field.name}).getDom())); - ((Xpp3Dom) ${field.name}).setChildrenTracking(this::replace); + if (${field.name} instanceof Xpp3Dom xpp3Dom) { + if (!Objects.equals(xpp3Dom.getDom(), getDelegate().${pfx}${cap}())) { + update(getDelegate().with${cap}(xpp3Dom.getDom())); + xpp3Dom.setChildrenTracking(this::replace); } } else if (${field.name} == null) { if (getDelegate().${pfx}${cap}() != null) { diff --git a/src/mdo/writer-stax.vm b/src/mdo/writer-stax.vm index c479e91cc688..f7f55aeacb42 100644 --- a/src/mdo/writer-stax.vm +++ b/src/mdo/writer-stax.vm @@ -384,8 +384,8 @@ public class ${className} { } serializer.writeEndElement(); #if ( $locationTracking ) - if (addLocationInformation && dom.getInputLocation() instanceof InputLocation && dom.getChildren().isEmpty()) { - serializer.writeComment(toString((InputLocation) dom.getInputLocation())); + if (addLocationInformation && dom.getInputLocation() instanceof InputLocation inputLocation && dom.getChildren().isEmpty()) { + serializer.writeComment(toString(inputLocation)); } #end }