[GitHub] [maven-resolver] michael-o commented on a diff in pull request #161: [MRESOLVER-248] Make BF and DF collectors coexists

[GitBox <gi...@apache.org>]

michael-o commented on code in PR #161:
URL: https://github.com/apache/maven-resolver/pull/161#discussion_r842058117


##########
maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java:
##########
@@ -212,6 +221,19 @@ protected void configure()
 
     }
 
+    @Provides
+    @Singleton
+    Map<String, DependencyCollectorDelegate> dependencyCollectorDelegates(
+            @Named( BfDependencyCollector.NAME ) DependencyCollectorDelegate bf,
+            @Named( DfDependencyCollector.NAME ) DependencyCollectorDelegate df
+    )
+    {
+        Map<String, DependencyCollectorDelegate> providedChecksumsSource = new HashMap<>();

Review Comment:
   `providedChecksumsSource` copy and paste?



##########
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/CachingArtifactTypeRegistry.java:
##########
@@ -29,7 +29,7 @@
 /**
  * A short-lived artifact type registry that caches results from a presumedly slower type registry.
  */
-class CachingArtifactTypeRegistry
+public class CachingArtifactTypeRegistry

Review Comment:
   If this is logically internal, you should document it as such.



##########
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollectionContext.java:
##########
@@ -29,7 +29,7 @@
 /**
  * @see DefaultDependencyCollector
  */
-final class DefaultDependencyCollectionContext
+public final class DefaultDependencyCollectionContext

Review Comment:
   If this is logically internal, you should document it as such.



##########
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DataPool.java:
##########
@@ -49,7 +49,7 @@
 
 /**
  */
-final class DataPool
+public final class DataPool

Review Comment:
   If this is logically internal, you should document it as such.



##########
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCycle.java:
##########
@@ -30,17 +30,16 @@
 import org.eclipse.aether.util.artifact.ArtifactIdUtils;
 
 /**
- * @see DefaultDependencyCollector
+ * Default implementation of {@link DependencyCycle}.
  */
-final class DefaultDependencyCycle
+public final class DefaultDependencyCycle

Review Comment:
   If this is logically internal, you should document it as such.



##########
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/bf/BfProcessingContext.java:
##########
@@ -29,7 +29,7 @@
 import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.repository.RemoteRepository;
 
-final class DependencyProcessingContext
+final class BfProcessingContext

Review Comment:
   `BfDependencyProcessingContext`?



##########
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java:
##########
@@ -0,0 +1,96 @@
+package org.eclipse.aether.internal.impl.collect;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.eclipse.aether.impl.ArtifactDescriptorReader;
+import org.eclipse.aether.impl.DependencyCollector;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.impl.VersionRangeResolver;
+import org.eclipse.aether.spi.locator.ServiceLocator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * The delegate to the actual implementation.
+ *
+ * @since 1.8.0
+ */
+public abstract class DependencyCollectorDelegate implements DependencyCollector
+{
+    protected static final String CONFIG_PROP_MAX_EXCEPTIONS = "aether.dependencyCollector.maxExceptions";
+
+    protected static final int CONFIG_PROP_MAX_EXCEPTIONS_DEFAULT = 50;
+
+    protected static final String CONFIG_PROP_MAX_CYCLES = "aether.dependencyCollector.maxCycles";
+
+    protected static final int CONFIG_PROP_MAX_CYCLES_DEFAULT = 10;
+
+    protected final Logger logger = LoggerFactory.getLogger( getClass() );
+
+    protected RemoteRepositoryManager remoteRepositoryManager;
+
+    protected ArtifactDescriptorReader descriptorReader;
+
+    protected VersionRangeResolver versionRangeResolver;
+
+    public DependencyCollectorDelegate()
+    {
+        // enables default constructor
+    }
+
+    protected DependencyCollectorDelegate( RemoteRepositoryManager remoteRepositoryManager,
+                           ArtifactDescriptorReader artifactDescriptorReader,
+                           VersionRangeResolver versionRangeResolver )
+    {
+        setRemoteRepositoryManager( remoteRepositoryManager );
+        setArtifactDescriptorReader( artifactDescriptorReader );
+        setVersionRangeResolver( versionRangeResolver );
+    }
+
+    public void initService( ServiceLocator locator )
+    {
+        setRemoteRepositoryManager( locator.getService( RemoteRepositoryManager.class ) );
+        setArtifactDescriptorReader( locator.getService( ArtifactDescriptorReader.class ) );
+        setVersionRangeResolver( locator.getService( VersionRangeResolver.class ) );
+    }
+
+    public DependencyCollector setRemoteRepositoryManager( RemoteRepositoryManager remoteRepositoryManager )
+    {
+        this.remoteRepositoryManager =
+                requireNonNull( remoteRepositoryManager, "remote repository provider cannot be null" );

Review Comment:
   Not provider, manager



##########
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultVersionFilterContext.java:
##########
@@ -36,7 +36,7 @@
 /**
  * @see DefaultDependencyCollector
  */
-final class DefaultVersionFilterContext
+public final class DefaultVersionFilterContext

Review Comment:
   If this is logically internal, you should document it as such.



##########
maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyGraphTransformationContext.java:
##########
@@ -28,15 +28,15 @@
 
 /**
  */
-class DefaultDependencyGraphTransformationContext
+public class DefaultDependencyGraphTransformationContext

Review Comment:
   If this is logically internal, you should document it as such.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@maven.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org