You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2023/09/26 12:10:33 UTC
[maven-resolver] branch master updated: [MNG-7416] Simplify Boolean expressions and returns (#333)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new 20d54244 [MNG-7416] Simplify Boolean expressions and returns (#333)
20d54244 is described below
commit 20d5424408fbdf4b49953b3df53cbc52e526ad0a
Author: Tim te Beek <ti...@gmail.com>
AuthorDate: Tue Sep 26 14:10:28 2023 +0200
[MNG-7416] Simplify Boolean expressions and returns (#333)
Use this link to re-run the recipe: https://app.moderne.io/recipes/builder/SEvWu02zw?organizationId=QXBhY2hlIE1hdmVu
Co-authored-by: Moderne <te...@moderne.io>
---
.../aether/internal/impl/DefaultMetadataResolver.java | 7 ++-----
.../org/eclipse/aether/util/artifact/ArtifactIdUtils.java | 15 +++------------
.../aether/util/filter/ExclusionsDependencyFilter.java | 6 +-----
.../util/graph/selector/ExclusionDependencySelector.java | 5 +----
4 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
index e28dd75b..b0620cd7 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
@@ -435,11 +435,8 @@ public class DefaultMetadataResolver implements MetadataResolver, Service {
&& repository.getPolicy(false).isEnabled()) {
return true;
}
- if (!Metadata.Nature.RELEASE.equals(nature)
- && repository.getPolicy(true).isEnabled()) {
- return true;
- }
- return false;
+ return !Metadata.Nature.RELEASE.equals(nature)
+ && repository.getPolicy(true).isEnabled();
}
private RepositoryPolicy getPolicy(
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java
index 49901a73..0d2a4018 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java
@@ -165,10 +165,7 @@ public final class ArtifactIdUtils {
if (!Objects.equals(artifact1.getClassifier(), artifact2.getClassifier())) {
return false;
}
- if (!Objects.equals(artifact1.getVersion(), artifact2.getVersion())) {
- return false;
- }
- return true;
+ return Objects.equals(artifact1.getVersion(), artifact2.getVersion());
}
/**
@@ -196,10 +193,7 @@ public final class ArtifactIdUtils {
if (!Objects.equals(artifact1.getClassifier(), artifact2.getClassifier())) {
return false;
}
- if (!Objects.equals(artifact1.getBaseVersion(), artifact2.getBaseVersion())) {
- return false;
- }
- return true;
+ return Objects.equals(artifact1.getBaseVersion(), artifact2.getBaseVersion());
}
/**
@@ -225,9 +219,6 @@ public final class ArtifactIdUtils {
if (!Objects.equals(artifact1.getExtension(), artifact2.getExtension())) {
return false;
}
- if (!Objects.equals(artifact1.getClassifier(), artifact2.getClassifier())) {
- return false;
- }
- return true;
+ return Objects.equals(artifact1.getClassifier(), artifact2.getClassifier());
}
}
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/ExclusionsDependencyFilter.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/ExclusionsDependencyFilter.java
index 12d745af..8c6b1858 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/ExclusionsDependencyFilter.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/ExclusionsDependencyFilter.java
@@ -65,11 +65,7 @@ public final class ExclusionsDependencyFilter implements DependencyFilter {
id = dependency.getArtifact().getGroupId() + ':' + id;
- if (excludes.contains(id)) {
- return false;
- }
-
- return true;
+ return !(excludes.contains(id));
}
@Override
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelector.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelector.java
index a9d5a7ef..a44e8c81 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelector.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelector.java
@@ -90,10 +90,7 @@ public final class ExclusionDependencySelector implements DependencySelector {
if (!matches(exclusion.getExtension(), artifact.getExtension())) {
return false;
}
- if (!matches(exclusion.getClassifier(), artifact.getClassifier())) {
- return false;
- }
- return true;
+ return matches(exclusion.getClassifier(), artifact.getClassifier());
}
private boolean matches(String pattern, String value) {