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 2022/06/06 17:50:35 UTC
[maven-resolver] 05/10: Rename
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch tmp-collect-listener-2
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit bf96c997c8d88669de23de03b68276d0e13e0fc8
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Fri May 27 15:12:09 2022 +0200
Rename
---
.../collection/{CollectStepTrace.java => CollectStepData.java} | 6 +++---
.../resolver/examples/util/ReverseTreeRepositoryListener.java | 10 +++++-----
.../{CollectStepTraceImpl.java => CollectStepDataImpl.java} | 6 +++---
.../internal/impl/collect/DependencyCollectorDelegate.java | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectStepTrace.java b/maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectStepData.java
similarity index 89%
rename from maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectStepTrace.java
rename to maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectStepData.java
index 0d736b1c..28036e9d 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectStepTrace.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/collection/CollectStepData.java
@@ -30,10 +30,10 @@ import org.eclipse.aether.graph.DependencyNode;
* @see org.eclipse.aether.RequestTrace
* @since 1.8.1
*/
-public interface CollectStepTrace
+public interface CollectStepData
{
/**
- * Returns the context this step happened in. Never {@code null}.
+ * Returns the context of collection. Never {@code null}.
*/
String getContext();
@@ -44,7 +44,7 @@ public interface CollectStepTrace
List<DependencyNode> getPath();
/**
- * Returns the current node being processed. Never {@code null}.
+ * Returns the current node being collected. Never {@code null}.
*/
Dependency getNode();
}
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ReverseTreeRepositoryListener.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ReverseTreeRepositoryListener.java
index 66b996f2..2f911e04 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ReverseTreeRepositoryListener.java
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ReverseTreeRepositoryListener.java
@@ -31,14 +31,14 @@ import org.eclipse.aether.AbstractRepositoryListener;
import org.eclipse.aether.RepositoryEvent;
import org.eclipse.aether.RequestTrace;
import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.collection.CollectStepTrace;
+import org.eclipse.aether.collection.CollectStepData;
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.DependencyNode;
import static java.util.Objects.requireNonNull;
/**
- * A demo using {@link org.eclipse.aether.collection.CollectStepTrace}.
+ * A demo using {@link CollectStepData}.
*/
public class ReverseTreeRepositoryListener
extends AbstractRepositoryListener
@@ -48,12 +48,12 @@ public class ReverseTreeRepositoryListener
requireNonNull( event, "event cannot be null" );
RequestTrace trace = event.getTrace();
- CollectStepTrace collectStepTrace = null;
+ CollectStepData collectStepTrace = null;
while ( trace != null )
{
- if ( trace.getData() instanceof CollectStepTrace )
+ if ( trace.getData() instanceof CollectStepData )
{
- collectStepTrace = (CollectStepTrace) trace.getData();
+ collectStepTrace = (CollectStepData) trace.getData();
break;
}
trace = trace.getParent();
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/CollectStepTraceImpl.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/CollectStepDataImpl.java
similarity index 87%
rename from maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/CollectStepTraceImpl.java
rename to maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/CollectStepDataImpl.java
index 670b239d..6223dace 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/CollectStepTraceImpl.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/CollectStepDataImpl.java
@@ -21,7 +21,7 @@ package org.eclipse.aether.internal.impl.collect;
import java.util.List;
-import org.eclipse.aether.collection.CollectStepTrace;
+import org.eclipse.aether.collection.CollectStepData;
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.DependencyNode;
@@ -32,7 +32,7 @@ import static java.util.Objects.requireNonNull;
*
* @since 1.8.1
*/
-public final class CollectStepTraceImpl implements CollectStepTrace
+public final class CollectStepDataImpl implements CollectStepData
{
private final String context;
@@ -40,7 +40,7 @@ public final class CollectStepTraceImpl implements CollectStepTrace
private final Dependency node;
- public CollectStepTraceImpl( final String context, final List<DependencyNode> path, final Dependency node )
+ public CollectStepDataImpl( final String context, final List<DependencyNode> path, final Dependency node )
{
this.context = context;
this.path = requireNonNull( path );
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java
index 252854ed..1b5bf5ba 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegate.java
@@ -295,7 +295,7 @@ public abstract class DependencyCollectorDelegate implements DependencyCollector
{
return RequestTrace.newChild(
trace,
- new CollectStepTraceImpl(
+ new CollectStepDataImpl(
context,
path,
node