You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/09/08 11:00:24 UTC
[maven-resolver] branch master updated: Simplify conditions with
the same result and avoid extra validations
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 d87fda7 Simplify conditions with the same result and avoid extra validations
d87fda7 is described below
commit d87fda700544abffa75655fa9af8738e92c3cea2
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Sep 2 20:39:32 2021 +0200
Simplify conditions with the same result and avoid extra validations
This closes #119
---
.../main/java/org/eclipse/aether/artifact/AbstractArtifact.java | 2 +-
.../java/org/eclipse/aether/repository/AuthenticationContext.java | 2 +-
.../org/eclipse/aether/connector/basic/ChecksumCalculator.java | 8 ++------
.../aether/internal/impl/collect/DefaultDependencyCollector.java | 3 +--
.../java/org/eclipse/aether/transport/wagon/WagonTransporter.java | 2 +-
.../aether/util/graph/manager/ClassicDependencyManager.java | 5 +----
.../aether/util/graph/manager/DefaultDependencyManager.java | 7 ++-----
.../aether/util/graph/manager/TransitiveDependencyManager.java | 2 +-
8 files changed, 10 insertions(+), 21 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 2ef1b7c..f18b398 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
@@ -59,7 +59,7 @@ public abstract class AbstractArtifact
if ( version == null )
{
- baseVersion = version;
+ baseVersion = null;
}
else if ( version.startsWith( "[" ) || version.startsWith( "(" ) )
{
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 98a1f9a..88e13bd 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
@@ -281,7 +281,7 @@ public final class AuthenticationContext
}
if ( value == null )
{
- authData.put( key, value );
+ authData.put( key, null );
}
}
}
diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
index 0b1d4b3..0173fbb 100644
--- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
+++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
@@ -153,12 +153,8 @@ final class ChecksumCalculator
int read = in.read( array );
if ( read < 0 )
{
- if ( total < dataOffset )
- {
- throw new IOException( targetFile + " contains only " + total
- + " bytes, cannot resume download from offset " + dataOffset );
- }
- break;
+ throw new IOException( targetFile + " contains only " + total
+ + " bytes, cannot resume download from offset " + dataOffset );
}
total += read;
if ( total > dataOffset )
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
index 05aca9c..a46499d 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
@@ -362,9 +362,8 @@ public class DefaultDependencyCollector
{
List<Artifact> relocations = Collections.emptyList();
- boolean disableVersionManagement = false;
processDependency( args, results, repositories, depSelector, depManager, depTraverser, verFilter, dependency,
- relocations, disableVersionManagement );
+ relocations, false );
}
@SuppressWarnings( "checkstyle:parameternumber" )
diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
index e0a4c48..9a1a3f7 100644
--- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
+++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
@@ -117,7 +117,7 @@ final class WagonTransporter
wagonRepo.setPermissions( getPermissions( repository.getId(), session ) );
wagonHint = wagonRepo.getProtocol().toLowerCase( Locale.ENGLISH );
- if ( wagonHint == null || wagonHint.isEmpty() )
+ if ( wagonHint.isEmpty() )
{
throw new NoTransporterException( repository );
}
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 72b7eac..aec9536 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
@@ -172,10 +172,7 @@ public final class ClassicDependencyManager
String version = managedVersions.get( key );
if ( version != null )
{
- if ( management == null )
- {
- management = new DependencyManagement();
- }
+ management = new DependencyManagement();
management.setVersion( version );
}
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 2aa7800..2c97604 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
@@ -166,10 +166,7 @@ public final class DefaultDependencyManager
String version = managedVersions.get( key );
if ( version != null )
{
- if ( management == null )
- {
- management = new DependencyManagement();
- }
+ management = new DependencyManagement();
management.setVersion( version );
}
@@ -298,7 +295,7 @@ public final class DefaultDependencyManager
}
- return equal;
+ return false;
}
@Override
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 29e3191..56e0017 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
@@ -292,7 +292,7 @@ public final class TransitiveDependencyManager
&& Objects.equals( artifact.getClassifier(), that.artifact.getClassifier() );
}
- return equal;
+ return false;
}
@Override