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 2022/09/14 06:59:04 UTC
[maven-resolver] 01/02: Tidy
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch remote-repository-filter
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 3fef5454ada0f5802fe16e20ea3b49db15991479
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Sep 14 08:35:48 2022 +0200
Tidy
---
.../org/eclipse/aether/internal/impl/DefaultArtifactResolver.java | 4 ++--
.../org/eclipse/aether/internal/impl/DefaultMetadataResolver.java | 7 +++++--
.../internal/impl/filter/DefaultRemoteRepositoryFilterSource.java | 2 +-
.../aether/internal/impl/filter/FilteringRepositoryConnector.java | 2 +-
.../aether/spi/connector/filter/RemoteRepositoryFilter.java | 4 ++--
.../aether/spi/connector/filter/RemoteRepositoryFilterSource.java | 2 +-
6 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
index 7c22fd13..e494567e 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
@@ -259,6 +259,7 @@ public class DefaultArtifactResolver
List<ArtifactResult> results = new ArrayList<>( requests.size() );
boolean failures = false;
+ RemoteRepositoryFilter filter = remoteRepositoryFilterSource.getRemoteRepositoryFilter( session );
LocalRepositoryManager lrm = session.getLocalRepositoryManager();
WorkspaceReader workspace = session.getWorkspaceReader();
@@ -273,7 +274,6 @@ public class DefaultArtifactResolver
Artifact artifact = request.getArtifact();
- RemoteRepositoryFilter filter = remoteRepositoryFilterSource.getRemoteRepositoryFilter( session );
List<RemoteRepository> filteredRepos = new ArrayList<>( request.getRepositories().size() );
for ( RemoteRepository repository : request.getRepositories() )
{
@@ -430,7 +430,7 @@ public class DefaultArtifactResolver
{
group = new ResolutionGroup( repo );
groups.add( group );
- groupIt = Collections.<ResolutionGroup>emptyList().iterator();
+ groupIt = Collections.emptyIterator();
}
group.items.add( new ResolutionItem( trace, artifact, resolved, result, local, repo ) );
}
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 9fc81320..ad2d1224 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
@@ -47,6 +47,7 @@ import org.eclipse.aether.impl.OfflineController;
import org.eclipse.aether.impl.RemoteRepositoryManager;
import org.eclipse.aether.impl.RepositoryConnectorProvider;
import org.eclipse.aether.impl.RepositoryEventDispatcher;
+import org.eclipse.aether.spi.connector.filter.RemoteRepositoryFilter;
import org.eclipse.aether.spi.connector.filter.RemoteRepositoryFilterSource;
import org.eclipse.aether.spi.synccontext.SyncContextFactory;
import org.eclipse.aether.impl.UpdateCheck;
@@ -208,6 +209,9 @@ public class DefaultMetadataResolver
Map<File, Long> localLastUpdates = new HashMap<>();
+ RemoteRepositoryFilter remoteRepositoryFilter = remoteRepositoryFilterSource
+ .getRemoteRepositoryFilter( session );
+
for ( MetadataRequest request : requests )
{
RequestTrace trace = RequestTrace.newChild( request.getTrace(), request );
@@ -240,8 +244,7 @@ public class DefaultMetadataResolver
continue;
}
- if ( !remoteRepositoryFilterSource.getRemoteRepositoryFilter( session )
- .acceptMetadata( repository, metadata ) )
+ if ( !remoteRepositoryFilter.acceptMetadata( repository, metadata ) )
{
result.setException( new MetadataNotFoundException( metadata, repository,
"Metadata " + metadata + " not allowed from " + repository ) );
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/DefaultRemoteRepositoryFilterSource.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/DefaultRemoteRepositoryFilterSource.java
index aefd4c5d..2773c9cb 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/DefaultRemoteRepositoryFilterSource.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/DefaultRemoteRepositoryFilterSource.java
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A filtering connector that filters transfers and delegates to another connector.
+ * Default implementation of remote repository filter source.
*
* @since TBD
*/
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/FilteringRepositoryConnector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/FilteringRepositoryConnector.java
index 03c8879e..07bb95d8 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/FilteringRepositoryConnector.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/filter/FilteringRepositoryConnector.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
/**
- * A filtering connector that filters transfers and delegates to another connector.
+ * A filtering connector that filter transfers using remote repository filter and delegates to another connector.
*
* @since TBD
*/
diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/filter/RemoteRepositoryFilter.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/filter/RemoteRepositoryFilter.java
index e04bd13a..6a5dbd68 100644
--- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/filter/RemoteRepositoryFilter.java
+++ b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/filter/RemoteRepositoryFilter.java
@@ -24,8 +24,8 @@ import org.eclipse.aether.metadata.Metadata;
import org.eclipse.aether.repository.RemoteRepository;
/**
- * Remote repository filter that decides should have given artifact or metadata be accepted (for further processing)
- * from given remote repository.
+ * Remote repository filter that decides should the given artifact or metadata be accepted (for further processing)
+ * from remote repository or not.
*
* @since TBD
*/
diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/filter/RemoteRepositoryFilterSource.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/filter/RemoteRepositoryFilterSource.java
index 377a8000..86bfb3d8 100644
--- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/filter/RemoteRepositoryFilterSource.java
+++ b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/filter/RemoteRepositoryFilterSource.java
@@ -29,7 +29,7 @@ import org.eclipse.aether.RepositorySystemSession;
public interface RemoteRepositoryFilterSource
{
/**
- * Provides the filter, never {@code null}.
+ * Provides the filter instance, never {@code null}.
*/
RemoteRepositoryFilter getRemoteRepositoryFilter( RepositorySystemSession session );
}