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 2025/07/09 12:42:41 UTC
(maven-resolver) 01/01: Remove unused and unneeded code
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch unused
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit a35319f4dc490f7e97d3ef41fe83181c508de7ff
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Wed Jul 9 08:42:29 2025 -0400
Remove unused and unneeded code
---
.../org/eclipse/aether/graph/DependencyTest.java | 4 +-
.../impl/DefaultRemoteRepositoryManagerTest.java | 6 +-
.../impl/DefaultUpdateCheckManagerTest.java | 4 +-
.../aether/named/ipc/IpcNamedLockFactoryIT.java | 1 -
.../internal/test/util/DependencyGraphParser.java | 2 +-
.../internal/test/util/IniArtifactDataReader.java | 107 +--------------------
.../aether/internal/test/util/NodeBuilder.java | 2 +-
.../graph/transformer/JavaScopeSelectorTest.java | 6 +-
.../aether/util/version/AbstractVersionTest.java | 3 +-
.../aether/util/version/UnionVersionRangeTest.java | 4 +-
10 files changed, 17 insertions(+), 122 deletions(-)
diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java
index 4298fd1c..2e4c427f 100644
--- a/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java
+++ b/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java
@@ -56,8 +56,8 @@ public class DependencyTest {
assertEquals(0, d2.getExclusions().size());
assertSame(d2, d2.setExclusions(null));
- assertSame(d2, d2.setExclusions(Collections.<Exclusion>emptyList()));
- assertSame(d2, d2.setExclusions(Collections.<Exclusion>emptySet()));
+ assertSame(d2, d2.setExclusions(Collections.emptyList()));
+ assertSame(d2, d2.setExclusions(Collections.emptySet()));
assertSame(d1, d1.setExclusions(Arrays.asList(new Exclusion("g", "a", "c", "e"))));
Dependency d3 =
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
index 0bb2ad06..8b5a659d 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
@@ -194,7 +194,7 @@ public class DefaultRemoteRepositoryManagerTest {
});
List<RemoteRepository> result = manager.aggregateRepositories(
- session, Collections.<RemoteRepository>emptyList(), Arrays.asList(repo), true);
+ session, Collections.emptyList(), Arrays.asList(repo), true);
assertEquals(1, result.size());
assertSame(mirror.getAuthentication(), result.get(0).getAuthentication());
@@ -213,7 +213,7 @@ public class DefaultRemoteRepositoryManagerTest {
});
List<RemoteRepository> result = manager.aggregateRepositories(
- session, Collections.<RemoteRepository>emptyList(), Arrays.asList(repo), true);
+ session, Collections.emptyList(), Arrays.asList(repo), true);
assertEquals(1, result.size());
assertEquals("http", result.get(0).getProxy().getType());
@@ -237,7 +237,7 @@ public class DefaultRemoteRepositoryManagerTest {
});
List<RemoteRepository> result = manager.aggregateRepositories(
- session, Collections.<RemoteRepository>emptyList(), Arrays.asList(repo), true);
+ session, Collections.emptyList(), Arrays.asList(repo), true);
assertEquals(1, result.size());
assertEquals("http", result.get(0).getProxy().getType());
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
index 678ab634..9aa09ac9 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
@@ -505,8 +505,8 @@ public class DefaultUpdateCheckManagerTest {
UpdateCheck<Artifact, ArtifactTransferException> check = newArtifactCheck();
long fifteenMinutes = new Date().getTime() - (15L * 60L * 1000L);
check.getFile().setLastModified(fifteenMinutes);
- // time is truncated on setLastModfied
- fifteenMinutes = check.getFile().lastModified();
+ // time is truncated on setLastModified
+ check.getFile().lastModified();
// never checked before
manager.checkArtifact(session, check);
diff --git a/maven-resolver-named-locks-ipc/src/test/java/org/eclipse/aether/named/ipc/IpcNamedLockFactoryIT.java b/maven-resolver-named-locks-ipc/src/test/java/org/eclipse/aether/named/ipc/IpcNamedLockFactoryIT.java
index 158d8a56..62404f8c 100644
--- a/maven-resolver-named-locks-ipc/src/test/java/org/eclipse/aether/named/ipc/IpcNamedLockFactoryIT.java
+++ b/maven-resolver-named-locks-ipc/src/test/java/org/eclipse/aether/named/ipc/IpcNamedLockFactoryIT.java
@@ -31,6 +31,5 @@ public class IpcNamedLockFactoryIT extends NamedLockFactoryTestSupport {
super.doShutdown();
}
};
- ;
}
}
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..c351600f 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
@@ -117,7 +117,7 @@ public class DependencyGraphParser {
* @see DependencyGraphParser#parseResource(String)
*/
public DependencyGraphParser(String prefix) {
- this(prefix, Collections.<String>emptyList());
+ this(prefix, Collections.emptyList());
}
/**
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java
index e2b47c21..d5655e6a 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java
@@ -45,13 +45,6 @@ class IniArtifactDataReader {
private String prefix = "";
- /**
- * Constructs a data reader with the prefix {@code ""}.
- */
- IniArtifactDataReader() {
- this("");
- }
-
/**
* Constructs a data reader with the given prefix.
*
@@ -64,7 +57,7 @@ class IniArtifactDataReader {
/**
* Load an artifact description from the classpath and parse it.
*/
- public ArtifactDescription parse(String resource) throws IOException {
+ ArtifactDescription parse(String resource) throws IOException {
URL res = this.getClass().getClassLoader().getResource(prefix + resource);
if (res == null) {
@@ -76,14 +69,14 @@ class IniArtifactDataReader {
/**
* Open the given URL and parse ist.
*/
- public ArtifactDescription parse(URL res) throws IOException {
+ ArtifactDescription parse(URL res) throws IOException {
return parse(new InputStreamReader(res.openStream(), StandardCharsets.UTF_8));
}
/**
* Parse the given String.
*/
- public ArtifactDescription parseLiteral(String description) throws IOException {
+ ArtifactDescription parseLiteral(String description) throws IOException {
StringReader reader = new StringReader(description);
return parse(reader);
}
@@ -234,98 +227,4 @@ class IniArtifactDataReader {
return line;
}
-
- static class Definition {
- private String groupId;
-
- private String artifactId;
-
- private String extension;
-
- private String version;
-
- private String scope = "";
-
- private String definition;
-
- private String id = null;
-
- private String reference = null;
-
- private boolean optional = false;
-
- Definition(String def) {
- this.definition = def.trim();
-
- if (definition.startsWith("(")) {
- int idx = definition.indexOf(')');
- this.id = definition.substring(1, idx);
- this.definition = definition.substring(idx + 1);
- } else if (definition.startsWith("^")) {
- this.reference = definition.substring(1);
- return;
- }
-
- String[] split = definition.split(":");
- if (split.length < 4) {
- throw new IllegalArgumentException(
- "Need definition like 'gid:aid:ext:ver[:scope]', but was: " + definition);
- }
- groupId = split[0];
- artifactId = split[1];
- extension = split[2];
- version = split[3];
- if (split.length > 4) {
- scope = split[4];
- }
- if (split.length > 5 && "true".equalsIgnoreCase(split[5])) {
- optional = true;
- }
- }
-
- public String getGroupId() {
- return groupId;
- }
-
- public String getArtifactId() {
- return artifactId;
- }
-
- public String getType() {
- return extension;
- }
-
- public String getVersion() {
- return version;
- }
-
- public String getScope() {
- return scope;
- }
-
- @Override
- public String toString() {
- return definition;
- }
-
- public String getId() {
- return id;
- }
-
- public String getReference() {
- return reference;
- }
-
- public boolean isReference() {
- return reference != null;
- }
-
- public boolean hasId() {
- return id != null;
- }
-
- public boolean isOptional() {
- return optional;
- }
- }
}
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
index 4644dea8..3921e249 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
@@ -116,7 +116,7 @@ public class NodeBuilder {
}
public NodeBuilder properties(Map<String, String> properties) {
- this.properties = properties != null ? properties : Collections.<String, String>emptyMap();
+ this.properties = properties != null ? properties : Collections.emptyMap();
return this;
}
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java
index fd557fe7..2ad09b22 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java
@@ -62,10 +62,8 @@ public class JavaScopeSelectorTest extends AbstractDependencyGraphTransformerTes
msg = "";
}
try {
- DependencyNode node = root;
- node = path(node, coords);
-
- assertEquals(expected, node.getDependency().getScope(), msg + "\nculprit: " + node.toString() + "\n");
+ DependencyNode node = path(root, coords);
+ assertEquals(expected, node.getDependency().getScope(), msg + "\nculprit: " + node + "\n");
} catch (IndexOutOfBoundsException | NullPointerException e) {
throw new IllegalArgumentException("illegal coordinates for child", e);
}
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java
index 84248b4b..de6d049a 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java
@@ -22,8 +22,7 @@ import org.eclipse.aether.version.Version;
import static org.junit.jupiter.api.Assertions.*;
-/**
- */
+
abstract class AbstractVersionTest {
protected static final int X_LT_Y = -1;
diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java
index a9b8a1bb..3aa059e8 100644
--- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java
+++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java
@@ -55,7 +55,7 @@ public class UnionVersionRangeTest {
@Test
void testGetLowerBound() {
- VersionRange range = UnionVersionRange.from(Collections.<VersionRange>emptySet());
+ VersionRange range = UnionVersionRange.from(Collections.emptySet());
assertBound(null, false, range.getLowerBound());
range = UnionVersionRange.from(newRange("[1,2]"), newRange("[3,4]"));
@@ -73,7 +73,7 @@ public class UnionVersionRangeTest {
@Test
void testGetUpperBound() {
- VersionRange range = UnionVersionRange.from(Collections.<VersionRange>emptySet());
+ VersionRange range = UnionVersionRange.from(Collections.emptySet());
assertBound(null, false, range.getUpperBound());
range = UnionVersionRange.from(newRange("[1,2]"), newRange("[3,4]"));