This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch memory in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit dccb4691113a42ffc42de264f5c94e5317887231 Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Sun Jul 13 09:16:43 2025 -0400 Remove unneeded code --- .../main/java/org/eclipse/aether/artifact/DefaultArtifact.java | 4 +--- .../eclipse/aether/connector/basic/ChecksumValidatorTest.java | 4 ++-- .../aether/generator/gnupg/loaders/GpgAgentPasswordLoader.java | 2 +- .../aether/internal/impl/DefaultArtifactPredicateFactory.java | 2 +- .../impl/filter/PrefixesRemoteRepositoryFilterSource.java | 2 +- .../aether/internal/impl/DefaultMetadataResolverTest.java | 5 +---- .../eclipse/aether/internal/test/util/DependencyGraphParser.java | 2 +- .../java/org/eclipse/aether/internal/test/util/TestVersion.java | 9 ++------- .../src/main/java/org/eclipse/aether/util/ConfigUtils.java | 2 +- 9 files changed, 11 insertions(+), 21 deletions(-) diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java b/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java index 080993ec..6f52a274 100644 --- a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java +++ b/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java @@ -226,9 +226,7 @@ public final class DefaultArtifact extends AbstractArtifact { if (typeDefaultProperties != null) { properties.putAll(typeDefaultProperties); } - if (artifactProperties != null) { - properties.putAll(artifactProperties); - } + properties.putAll(artifactProperties); properties = Collections.unmodifiableMap(properties); } diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java index 6a896086..01c3f9ae 100644 --- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java +++ b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java @@ -87,7 +87,7 @@ public class ChecksumValidatorTest { @Override public void onNoMoreChecksums() throws ChecksumFailureException { - callbacks.add(String.format("noMore()")); + callbacks.add("noMore()"); if (conclusion instanceof ChecksumFailureException) { throw (ChecksumFailureException) conclusion; } else if (!Boolean.TRUE.equals(conclusion)) { @@ -97,7 +97,7 @@ public class ChecksumValidatorTest { @Override public void onTransferRetry() { - callbacks.add(String.format("retry()")); + callbacks.add("retry()"); } @Override diff --git a/maven-resolver-generator-gnupg/src/main/java/org/eclipse/aether/generator/gnupg/loaders/GpgAgentPasswordLoader.java b/maven-resolver-generator-gnupg/src/main/java/org/eclipse/aether/generator/gnupg/loaders/GpgAgentPasswordLoader.java index 7ee336cc..1d26155a 100644 --- a/maven-resolver-generator-gnupg/src/main/java/org/eclipse/aether/generator/gnupg/loaders/GpgAgentPasswordLoader.java +++ b/maven-resolver-generator-gnupg/src/main/java/org/eclipse/aether/generator/gnupg/loaders/GpgAgentPasswordLoader.java @@ -71,7 +71,7 @@ public final class GpgAgentPasswordLoader implements GnupgSignatureArtifactGener boolean interactive = ConfigUtils.getBoolean( session, ConfigurationProperties.DEFAULT_INTERACTIVE, ConfigurationProperties.INTERACTIVE); List<String> socketLocations = Arrays.stream(socketLocationsStr.split(",")) - .filter(s -> s != null && !s.isEmpty()) + .filter(s -> !s.isEmpty()) .collect(Collectors.toList()); for (String socketLocation : socketLocations) { try { diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactPredicateFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactPredicateFactory.java index 8fdf22fe..59961b46 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactPredicateFactory.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactPredicateFactory.java @@ -68,7 +68,7 @@ public final class DefaultArtifactPredicateFactory implements ArtifactPredicateF DEFAULT_OMIT_CHECKSUMS_FOR_EXTENSIONS, CONFIG_PROP_OMIT_CHECKSUMS_FOR_EXTENSIONS) .split(",")) - .filter(s -> s != null && !s.trim().isEmpty()) + .filter(s -> !s.trim().isEmpty()) .collect(Collectors.toSet()); // validation: enforce that all strings in this set are having leading dot diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/PrefixesRemoteRepositoryFilterSource.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/PrefixesRemoteRepositoryFilterSource.java index 50afd4c0..5b6011d2 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/PrefixesRemoteRepositoryFilterSource.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/PrefixesRemoteRepositoryFilterSource.java @@ -284,7 +284,7 @@ public final class PrefixesRemoteRepositoryFilterSource extends RemoteRepository private static List<String> elementsOf(final String path) { return Arrays.stream(path.split("/")) - .filter(e -> e != null && !e.isEmpty()) + .filter(e -> !e.isEmpty()) .collect(toList()); } } diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java index ed711476..93502638 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java @@ -120,11 +120,8 @@ public class DefaultMetadataResolverTest { MetadataResult result = results.get(0); assertSame(request, result.getRequest()); - assertNotNull( - result.getException(), - "" + (result.getMetadata() != null ? result.getMetadata().getFile() : result.getMetadata())); + assertNotNull(result.getException()); assertEquals(MetadataNotFoundException.class, result.getException().getClass()); - assertNull(result.getMetadata()); } diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java index f9fa121e..32833b73 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java +++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java @@ -390,7 +390,7 @@ public class DependencyGraphParser { } } - class NodeEntry { + private static class NodeEntry { int level; String definition; diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java index a8769306..e4ccddb3 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java +++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java @@ -38,8 +38,7 @@ public final class TestVersion implements Version { @Override public int hashCode() { final int prime = 31; - int result = 1; - result = prime * result + ((version == null) ? 0 : version.hashCode()); + int result = prime + version.hashCode(); return result; } @@ -55,11 +54,7 @@ public final class TestVersion implements Version { return false; } TestVersion other = (TestVersion) obj; - if (version == null) { - if (other.version != null) { - return false; - } - } else if (!version.equals(other.version)) { + if (!version.equals(other.version)) { return false; } return true; diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/ConfigUtils.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/ConfigUtils.java index 006cc8d1..bd7a4e79 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/ConfigUtils.java +++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/ConfigUtils.java @@ -355,7 +355,7 @@ public final class ConfigUtils { return Collections.emptyList(); } return Arrays.stream(commaSeparatedNames.split(",")) - .filter(s -> s != null && !s.trim().isEmpty()) + .filter(s -> !s.trim().isEmpty()) .collect(toList()); }
