You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2023/10/24 19:38:01 UTC
[maven-resolver] branch master updated: Automatic code change (#349)
This is an automated email from the ASF dual-hosted git repository.
cstamas 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 12b1c2cb Automatic code change (#349)
12b1c2cb is described below
commit 12b1c2cb27106c647c6bd8a1254e40d4b0530682
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Oct 24 21:37:56 2023 +0200
Automatic code change (#349)
Some archaic constructs were replaced with more appropriate methods around string handling.
This PR does not introduce any semantic change.
---
.../java/org/eclipse/aether/artifact/AbstractArtifact.java | 2 +-
.../java/org/eclipse/aether/artifact/DefaultArtifactType.java | 6 +++---
.../aether/collection/UnsolvableVersionConflictException.java | 2 +-
.../src/main/java/org/eclipse/aether/graph/Exclusion.java | 2 +-
.../java/org/eclipse/aether/metadata/AbstractMetadata.java | 6 +++---
.../org/eclipse/aether/repository/AuthenticationContext.java | 4 ++--
.../eclipse/aether/internal/impl/DefaultLocalPathComposer.java | 10 +++++-----
.../org/eclipse/aether/spi/connector/transport/GetTask.java | 2 +-
.../aether/internal/test/util/DependencyGraphParser.java | 2 +-
.../aether/internal/test/util/IniArtifactDataReader.java | 2 +-
.../org/eclipse/aether/internal/test/util/NodeBuilder.java | 4 ++--
.../eclipse/aether/internal/test/util/TestVersionRange.java | 4 ++--
.../eclipse/aether/internal/test/util/TestVersionScheme.java | 4 ++--
.../aether/transport/classpath/ClasspathTransporter.java | 2 +-
.../main/java/org/eclipse/aether/transport/file/PathUtils.java | 2 +-
.../main/java/org/eclipse/aether/transport/http/UriUtils.java | 2 +-
.../src/main/java/org/eclipse/aether/util/ChecksumUtils.java | 2 +-
.../java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java | 2 +-
.../eclipse/aether/util/concurrency/WorkerThreadFactory.java | 2 +-
.../aether/util/filter/AbstractPatternDependencyFilter.java | 2 +-
.../org/eclipse/aether/util/filter/DependencyFilterUtils.java | 2 +-
.../aether/util/graph/manager/ClassicDependencyManager.java | 4 ++--
.../aether/util/graph/manager/DefaultDependencyManager.java | 4 ++--
.../aether/util/graph/manager/TransitiveDependencyManager.java | 4 ++--
.../aether/util/repository/ComponentAuthentication.java | 2 +-
.../eclipse/aether/util/repository/DefaultMirrorSelector.java | 2 +-
.../eclipse/aether/util/repository/SecretAuthentication.java | 2 +-
.../eclipse/aether/util/repository/StringAuthentication.java | 2 +-
.../java/org/eclipse/aether/util/version/GenericVersion.java | 2 +-
.../org/eclipse/aether/util/version/GenericVersionRange.java | 4 ++--
.../org/eclipse/aether/util/version/GenericVersionScheme.java | 2 +-
31 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/AbstractArtifact.java b/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/AbstractArtifact.java
index 777a81e2..92e59f23 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/AbstractArtifact.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/AbstractArtifact.java
@@ -134,7 +134,7 @@ public abstract class AbstractArtifact implements Artifact {
buffer.append(getGroupId());
buffer.append(':').append(getArtifactId());
buffer.append(':').append(getExtension());
- if (getClassifier().length() > 0) {
+ if (!getClassifier().isEmpty()) {
buffer.append(':').append(getClassifier());
}
buffer.append(':').append(getVersion());
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifactType.java b/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifactType.java
index 68d8963d..4fc45f12 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifactType.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifactType.java
@@ -85,14 +85,14 @@ public final class DefaultArtifactType implements ArtifactType {
boolean constitutesBuildPath,
boolean includesDependencies) {
this.id = requireNonNull(id, "type id cannot be null");
- if (id.length() == 0) {
+ if (id.isEmpty()) {
throw new IllegalArgumentException("type id cannot be empty");
}
this.extension = emptify(extension);
this.classifier = emptify(classifier);
Map<String, String> props = new HashMap<>();
props.put(ArtifactProperties.TYPE, id);
- props.put(ArtifactProperties.LANGUAGE, (language != null && language.length() > 0) ? language : "none");
+ props.put(ArtifactProperties.LANGUAGE, (language != null && !language.isEmpty()) ? language : "none");
props.put(ArtifactProperties.INCLUDES_DEPENDENCIES, Boolean.toString(includesDependencies));
props.put(ArtifactProperties.CONSTITUTES_BUILD_PATH, Boolean.toString(constitutesBuildPath));
properties = Collections.unmodifiableMap(props);
@@ -108,7 +108,7 @@ public final class DefaultArtifactType implements ArtifactType {
*/
public DefaultArtifactType(String id, String extension, String classifier, Map<String, String> properties) {
this.id = requireNonNull(id, "type id cannot be null");
- if (id.length() == 0) {
+ if (id.isEmpty()) {
throw new IllegalArgumentException("type id cannot be empty");
}
this.extension = emptify(extension);
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/UnsolvableVersionConflictException.java b/maven-resolver-api/src/main/java/org/eclipse/aether/collection/UnsolvableVersionConflictException.java
index d2832e08..445f9339 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/UnsolvableVersionConflictException.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/collection/UnsolvableVersionConflictException.java
@@ -89,7 +89,7 @@ public class UnsolvableVersionConflictException extends RepositoryException {
buffer.append(artifact.getGroupId());
buffer.append(':').append(artifact.getArtifactId());
buffer.append(':').append(artifact.getExtension());
- if (artifact.getClassifier().length() > 0) {
+ if (!artifact.getClassifier().isEmpty()) {
buffer.append(':').append(artifact.getClassifier());
}
buffer.append(':').append(node.getVersionConstraint());
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Exclusion.java b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Exclusion.java
index ddf5d252..100eabc4 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Exclusion.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/Exclusion.java
@@ -91,7 +91,7 @@ public final class Exclusion {
+ getArtifactId()
+ ':'
+ getExtension()
- + (getClassifier().length() > 0 ? ':' + getClassifier() : "");
+ + (!getClassifier().isEmpty() ? ':' + getClassifier() : "");
}
@Override
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/AbstractMetadata.java b/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/AbstractMetadata.java
index bbb07f9e..486f0cfd 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/AbstractMetadata.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/metadata/AbstractMetadata.java
@@ -73,13 +73,13 @@ public abstract class AbstractMetadata implements Metadata {
@Override
public String toString() {
StringBuilder buffer = new StringBuilder(128);
- if (getGroupId().length() > 0) {
+ if (!getGroupId().isEmpty()) {
buffer.append(getGroupId());
}
- if (getArtifactId().length() > 0) {
+ if (!getArtifactId().isEmpty()) {
buffer.append(':').append(getArtifactId());
}
- if (getVersion().length() > 0) {
+ if (!getVersion().isEmpty()) {
buffer.append(':').append(getVersion());
}
buffer.append('/').append(getType());
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java b/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java
index 9d266a61..feaf052f 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java
@@ -242,7 +242,7 @@ public final class AuthenticationContext implements Closeable {
*/
public <T> T get(String key, Map<String, String> data, Class<T> type) {
requireNonNull(key, "authentication key cannot be null");
- if (key.length() == 0) {
+ if (key.isEmpty()) {
throw new IllegalArgumentException("authentication key cannot be empty");
}
@@ -304,7 +304,7 @@ public final class AuthenticationContext implements Closeable {
*/
public void put(String key, Object value) {
requireNonNull(key, "authentication key cannot be null");
- if (key.length() == 0) {
+ if (key.isEmpty()) {
throw new IllegalArgumentException("authentication key cannot be empty");
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalPathComposer.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalPathComposer.java
index dc55e148..a2a1d31e 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalPathComposer.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalPathComposer.java
@@ -53,11 +53,11 @@ public final class DefaultLocalPathComposer implements LocalPathComposer {
path.append(artifact.getVersion());
}
- if (artifact.getClassifier().length() > 0) {
+ if (!artifact.getClassifier().isEmpty()) {
path.append('-').append(artifact.getClassifier());
}
- if (artifact.getExtension().length() > 0) {
+ if (!artifact.getExtension().isEmpty()) {
path.append('.').append(artifact.getExtension());
}
@@ -71,13 +71,13 @@ public final class DefaultLocalPathComposer implements LocalPathComposer {
StringBuilder path = new StringBuilder(128);
- if (metadata.getGroupId().length() > 0) {
+ if (!metadata.getGroupId().isEmpty()) {
path.append(metadata.getGroupId().replace('.', '/')).append('/');
- if (metadata.getArtifactId().length() > 0) {
+ if (!metadata.getArtifactId().isEmpty()) {
path.append(metadata.getArtifactId()).append('/');
- if (metadata.getVersion().length() > 0) {
+ if (!metadata.getVersion().isEmpty()) {
path.append(metadata.getVersion()).append('/');
}
}
diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java
index 60d4d159..bfc873a2 100644
--- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java
+++ b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java
@@ -223,7 +223,7 @@ public final class GetTask extends TransportTask {
if (checksums.isEmpty()) {
checksums = new HashMap<>();
}
- if (value != null && value.length() > 0) {
+ if (value != null && !value.isEmpty()) {
checksums.put(algorithm, value);
} else {
checksums.remove(algorithm);
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 237d75da..f9fa121e 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
@@ -265,7 +265,7 @@ public class DependencyGraphParser {
}
private static boolean isEmpty(String line) {
- return line == null || line.length() == 0;
+ return line == null || line.isEmpty();
}
private static String cutComment(String line) {
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 c524acfb..e2b47c21 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
@@ -222,7 +222,7 @@ class IniArtifactDataReader {
}
private static boolean isEmpty(String line) {
- return line == null || line.length() == 0;
+ return line == null || line.isEmpty();
}
private static String cutComment(String line) {
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 1632712d..4644dea8 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
@@ -122,13 +122,13 @@ public class NodeBuilder {
public DependencyNode build() {
Dependency dependency = null;
- if (artifactId != null && artifactId.length() > 0) {
+ if (artifactId != null && !artifactId.isEmpty()) {
Artifact artifact =
new DefaultArtifact(groupId, artifactId, classifier, ext, version, properties, (File) null);
dependency = new Dependency(artifact, scope, optional);
}
DefaultDependencyNode node = new DefaultDependencyNode(dependency);
- if (artifactId != null && artifactId.length() > 0) {
+ if (artifactId != null && !artifactId.isEmpty()) {
try {
node.setVersion(versionScheme.parseVersion(version));
node.setVersionConstraint(versionScheme.parseVersionConstraint(range != null ? range : version));
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java
index e326c601..2b9e4a3c 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java
@@ -86,8 +86,8 @@ final class TestVersionRange implements VersionRange {
range, "Invalid version range " + range + ", bounds may not contain additional ','");
}
- lowerBound = parsedLowerBound.length() > 0 ? new TestVersion(parsedLowerBound) : null;
- upperBound = parsedUpperBound.length() > 0 ? new TestVersion(parsedUpperBound) : null;
+ lowerBound = !parsedLowerBound.isEmpty() ? new TestVersion(parsedLowerBound) : null;
+ upperBound = !parsedUpperBound.isEmpty() ? new TestVersion(parsedUpperBound) : null;
if (upperBound != null && lowerBound != null) {
if (upperBound.compareTo(lowerBound) < 0) {
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java
index 7fd59749..5cbf0318 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java
@@ -69,12 +69,12 @@ final class TestVersionScheme implements VersionScheme {
process = process.substring(index + 1).trim();
- if (process.length() > 0 && process.startsWith(",")) {
+ if (process.startsWith(",")) {
process = process.substring(1).trim();
}
}
- if (process.length() > 0 && !ranges.isEmpty()) {
+ if (!process.isEmpty() && !ranges.isEmpty()) {
throw new InvalidVersionSpecificationException(
constraint, "Invalid version range " + constraint + ", expected [ or ( but got " + process);
}
diff --git a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporter.java b/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporter.java
index ee8148e4..86a8209f 100644
--- a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporter.java
+++ b/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporter.java
@@ -61,7 +61,7 @@ final class ClasspathTransporter extends AbstractTransporter {
} else {
base = ssp;
}
- if (base.length() > 0 && !base.endsWith("/")) {
+ if (!base.isEmpty() && !base.endsWith("/")) {
base += '/';
}
} catch (URISyntaxException e) {
diff --git a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/PathUtils.java b/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/PathUtils.java
index 7795421e..5b0813b6 100644
--- a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/PathUtils.java
+++ b/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/PathUtils.java
@@ -52,7 +52,7 @@ final class PathUtils {
String retValue = null;
- if (protocol.length() > 0) {
+ if (!protocol.isEmpty()) {
retValue = url.substring(protocol.length() + 1);
} else {
retValue = url;
diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/UriUtils.java b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/UriUtils.java
index 80c9542e..7139b454 100644
--- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/UriUtils.java
+++ b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/UriUtils.java
@@ -32,7 +32,7 @@ final class UriUtils {
public static URI resolve(URI base, URI ref) {
String path = ref.getRawPath();
- if (path != null && path.length() > 0) {
+ if (path != null && !path.isEmpty()) {
path = base.getRawPath();
if (path == null || !path.endsWith("/")) {
try {
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/ChecksumUtils.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/ChecksumUtils.java
index 90c007e7..d3acf225 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/ChecksumUtils.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/ChecksumUtils.java
@@ -60,7 +60,7 @@ public final class ChecksumUtils {
break;
}
line = line.trim();
- if (line.length() > 0) {
+ if (!line.isEmpty()) {
checksum = line;
break;
}
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 0d2a4018..e8e867e8 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
@@ -133,7 +133,7 @@ public final class ArtifactIdUtils {
if (extension != null) {
buffer.append(extension);
}
- if (classifier != null && classifier.length() > 0) {
+ if (classifier != null && !classifier.isEmpty()) {
buffer.append(SEP).append(classifier);
}
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/WorkerThreadFactory.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/WorkerThreadFactory.java
index 0662ec65..7752f086 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/WorkerThreadFactory.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/concurrency/WorkerThreadFactory.java
@@ -44,7 +44,7 @@ public final class WorkerThreadFactory implements ThreadFactory {
public WorkerThreadFactory(String namePrefix) {
this.factory = Executors.defaultThreadFactory();
this.namePrefix =
- ((namePrefix != null && namePrefix.length() > 0) ? namePrefix : getCallerSimpleClassName() + '-')
+ ((namePrefix != null && !namePrefix.isEmpty()) ? namePrefix : getCallerSimpleClassName() + '-')
+ POOL_INDEX.getAndIncrement()
+ '-';
threadIndex = new AtomicInteger();
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java
index 04e7d208..9cd71dd6 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java
@@ -128,7 +128,7 @@ class AbstractPatternDependencyFilter implements DependencyFilter {
boolean matches;
// support full wildcard and implied wildcard
- if ("*".equals(pattern) || pattern.length() == 0) {
+ if ("*".equals(pattern) || pattern.isEmpty()) {
matches = true;
}
// support contains wildcard
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/DependencyFilterUtils.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/DependencyFilterUtils.java
index 596d6efa..438187ef 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/DependencyFilterUtils.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/filter/DependencyFilterUtils.java
@@ -133,7 +133,7 @@ public final class DependencyFilterUtils {
String[] tokens = classpathType.split("[+,]");
for (String token : tokens) {
token = token.trim();
- if (token.length() > 0) {
+ if (!token.isEmpty()) {
types.add(token);
}
}
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java
index 56518c0f..19917376 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java
@@ -102,7 +102,7 @@ public final class ClassicDependencyManager implements DependencyManager {
Object key = getKey(artifact);
String version = artifact.getVersion();
- if (version.length() > 0 && !managedVersions.containsKey(key)) {
+ if (!version.isEmpty() && !managedVersions.containsKey(key)) {
if (managedVersions == this.managedVersions) {
managedVersions = new HashMap<>(this.managedVersions);
}
@@ -110,7 +110,7 @@ public final class ClassicDependencyManager implements DependencyManager {
}
String scope = managedDependency.getScope();
- if (scope.length() > 0 && !managedScopes.containsKey(key)) {
+ if (!scope.isEmpty() && !managedScopes.containsKey(key)) {
if (managedScopes == this.managedScopes) {
managedScopes = new HashMap<>(this.managedScopes);
}
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/DefaultDependencyManager.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/DefaultDependencyManager.java
index af131038..332a3622 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/DefaultDependencyManager.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/DefaultDependencyManager.java
@@ -100,7 +100,7 @@ public final class DefaultDependencyManager implements DependencyManager {
Object key = getKey(artifact);
String version = artifact.getVersion();
- if (version.length() > 0 && !versions.containsKey(key)) {
+ if (!version.isEmpty() && !versions.containsKey(key)) {
if (versions == this.managedVersions) {
versions = new HashMap<>(this.managedVersions);
}
@@ -108,7 +108,7 @@ public final class DefaultDependencyManager implements DependencyManager {
}
String scope = managedDependency.getScope();
- if (scope.length() > 0 && !scopes.containsKey(key)) {
+ if (!scope.isEmpty() && !scopes.containsKey(key)) {
if (scopes == this.managedScopes) {
scopes = new HashMap<>(this.managedScopes);
}
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
index 09e01c92..9e691239 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/manager/TransitiveDependencyManager.java
@@ -100,7 +100,7 @@ public final class TransitiveDependencyManager implements DependencyManager {
Object key = getKey(artifact);
String version = artifact.getVersion();
- if (version.length() > 0 && !versions.containsKey(key)) {
+ if (!version.isEmpty() && !versions.containsKey(key)) {
if (versions == managedVersions) {
versions = new HashMap<>(managedVersions);
}
@@ -108,7 +108,7 @@ public final class TransitiveDependencyManager implements DependencyManager {
}
String scope = managedDependency.getScope();
- if (scope.length() > 0 && !scopes.containsKey(key)) {
+ if (!scope.isEmpty() && !scopes.containsKey(key)) {
if (scopes == this.managedScopes) {
scopes = new HashMap<>(this.managedScopes);
}
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ComponentAuthentication.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ComponentAuthentication.java
index 8e30cf1c..2fba8f9b 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ComponentAuthentication.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ComponentAuthentication.java
@@ -38,7 +38,7 @@ final class ComponentAuthentication implements Authentication {
ComponentAuthentication(String key, Object value) {
this.key = requireNonNull(key, "authentication key cannot be null");
- if (key.length() == 0) {
+ if (key.isEmpty()) {
throw new IllegalArgumentException("authentication key cannot be empty");
}
this.value = value;
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultMirrorSelector.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultMirrorSelector.java
index ea399c12..c3fab864 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultMirrorSelector.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultMirrorSelector.java
@@ -85,7 +85,7 @@ public final class DefaultMirrorSelector implements MirrorSelector {
builder.setBlocked(mirror.blocked);
- if (mirror.type != null && mirror.type.length() > 0) {
+ if (mirror.type != null && !mirror.type.isEmpty()) {
builder.setContentType(mirror.type);
}
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SecretAuthentication.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SecretAuthentication.java
index 2510fdaf..373d5273 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SecretAuthentication.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/SecretAuthentication.java
@@ -60,7 +60,7 @@ final class SecretAuthentication implements Authentication {
private SecretAuthentication(char[] value, String key) {
this.key = requireNonNull(key, "authentication key cannot be null");
- if (key.length() == 0) {
+ if (key.isEmpty()) {
throw new IllegalArgumentException("authentication key cannot be empty");
}
this.secretHash = Arrays.hashCode(value) ^ KEYS[0].hashCode();
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/StringAuthentication.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/StringAuthentication.java
index 69d0f455..2dbc0cfe 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/StringAuthentication.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/StringAuthentication.java
@@ -38,7 +38,7 @@ final class StringAuthentication implements Authentication {
StringAuthentication(String key, String value) {
this.key = requireNonNull(key, "authentication key cannot be null");
- if (key.length() == 0) {
+ if (key.isEmpty()) {
throw new IllegalArgumentException("authentication key cannot be empty");
}
this.value = value;
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersion.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersion.java
index fc90ae27..e4e244be 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersion.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersion.java
@@ -206,7 +206,7 @@ final class GenericVersion implements Version {
private boolean terminatedByNumber;
Tokenizer(String version) {
- this.version = (version.length() > 0) ? version : "0";
+ this.version = (!version.isEmpty()) ? version : "0";
this.versionLength = this.version.length();
}
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
index fe8bf6e1..ecdecee5 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
@@ -94,8 +94,8 @@ final class GenericVersionRange implements VersionRange {
range, "Invalid version range " + range + ", bounds may not contain additional ','");
}
- lowerBound = parsedLowerBound.length() > 0 ? parse(parsedLowerBound) : null;
- upperBound = parsedUpperBound.length() > 0 ? parse(parsedUpperBound) : null;
+ lowerBound = !parsedLowerBound.isEmpty() ? parse(parsedLowerBound) : null;
+ upperBound = !parsedUpperBound.isEmpty() ? parse(parsedUpperBound) : null;
if (upperBound != null && lowerBound != null) {
if (upperBound.compareTo(lowerBound) < 0) {
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionScheme.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionScheme.java
index 3c9f6d93..2636d834 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionScheme.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/version/GenericVersionScheme.java
@@ -98,7 +98,7 @@ public final class GenericVersionScheme implements VersionScheme {
}
}
- if (process.length() > 0 && !ranges.isEmpty()) {
+ if (!process.isEmpty() && !ranges.isEmpty()) {
throw new InvalidVersionSpecificationException(
constraint, "Invalid version range " + constraint + ", expected [ or ( but got " + process);
}