Skip to content

[MSHARED-1454] Expose ConflictData on DependencyNode #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

[MSHARED-1454] Expose ConflictData on DependencyNode #50

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bbbef2e
Expose ConflictData on DependencyNode
LogFlames Nov 27, 2024
4e67f0a
Add tests
LogFlames Dec 10, 2024
575cd1a
Use assertNull and put expected value first
LogFlames Jan 8, 2025
d38f26d
add javadoc strings
LogFlames Jan 8, 2025
65534ff
rename test, remove dots, add docs for ignoredScope in constructor
LogFlames Jan 8, 2025
1d0fe10
Remove .
LogFlames Jan 8, 2025
3c54d66
Remove originalScope and originalOptionality
LogFlames Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...pendency/graph/internal/ConflictData.java → ...shared/dependency/graph/ConflictData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.maven.shared.dependency.graph.internal;
package org.apache.maven.shared.dependency.graph;

/**
* Explicit subset of Aether's DependencyNode.getData().
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/apache/maven/shared/dependency/graph/DependencyNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,11 @@ public interface DependencyNode {
* @return the exclusions of the dependency
*/
List<Exclusion> getExclusions();

/**
* If this is a verbose dependency node, this returns the conflict data. Otherwise, it returns null.
*
* @return the conflict data of verbose dependency node or null
*/
ConflictData getConflictData();
}
1 change: 1 addition & 0 deletions .../org/apache/maven/shared/dependency/graph/internal/DefaultDependencyCollectorBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.dependency.graph.ConflictData;
import org.apache.maven.shared.dependency.graph.DependencyCollectorBuilder;
import org.apache.maven.shared.dependency.graph.DependencyCollectorBuilderException;
import org.apache.maven.shared.dependency.graph.DependencyCollectorRequest;
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Exclusion;
import org.apache.maven.shared.dependency.graph.ConflictData;
import org.apache.maven.shared.dependency.graph.DependencyNode;
import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor;

Expand Down Expand Up @@ -177,4 +178,9 @@ public List<Exclusion> getExclusions() {
public String toNodeString() {
return artifact + (Boolean.TRUE.equals(optional) ? " (optional)" : "");
}

@Override
public ConflictData getConflictData() {
return null;
}
}
6 changes: 6 additions & 0 deletions src/main/java/org/apache/maven/shared/dependency/graph/internal/VerboseDependencyNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Exclusion;
import org.apache.maven.shared.dependency.graph.ConflictData;
import org.apache.maven.shared.dependency.graph.DependencyNode;

class VerboseDependencyNode extends DefaultDependencyNode {
Expand Down Expand Up @@ -96,6 +97,11 @@ public String toNodeString() {
return buffer.toString();
}

@Override
public ConflictData getConflictData() {
return data;
}

/**
* Utility class to concatenate a number of parameters with separator tokens.
*/
Expand Down