You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/06/06 17:23:23 UTC
[maven-dependency-tree] branch fix-tests updated: premanaged is
verbose info
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch fix-tests
in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git
The following commit(s) were added to refs/heads/fix-tests by this push:
new a2924c4 premanaged is verbose info
a2924c4 is described below
commit a2924c49a08fc16363e2c7ad7d2647914bba365c
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Jun 6 19:23:09 2021 +0200
premanaged is verbose info
---
.../graph/internal/DefaultDependencyNode.java | 85 ----------------------
.../graph/internal/VerboseDependencyNode.java | 83 +++++++++++++++------
2 files changed, 61 insertions(+), 107 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java b/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
index 3b4cc5a..a171484 100644
--- a/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
+++ b/src/main/java/org/apache/maven/shared/dependency/graph/internal/DefaultDependencyNode.java
@@ -189,91 +189,6 @@ public class DefaultDependencyNode implements DependencyNode
buffer.append( artifact );
-// ItemAppender appender = new ItemAppender( buffer, " (", "; ", ")" );
-//
-// if ( getPremanagedVersion() != null )
-// {
-// appender.append( "version managed from ", getPremanagedVersion() );
-// }
-//
-// if ( getPremanagedScope() != null )
-// {
-// appender.append( "scope managed from ", getPremanagedScope() );
-// }
-//
-// if ( getVersionConstraint() != null )
-// {
-// appender.append( "version selected from constraint ", getVersionConstraint() );
-// }
-//
-//
-// appender.flush();
-// if ( optional != null && optional )
-// {
-// buffer.append( " (optional) " );
-// }
-
return buffer.toString();
}
-
- /**
- * Utility class to concatenate a number of parameters with separator tokens.
- */
- static class ItemAppender
- {
- private StringBuilder buffer;
-
- private String startToken;
-
- private String separatorToken;
-
- private String endToken;
-
- private boolean appended;
-
- ItemAppender( StringBuilder buffer, String startToken, String separatorToken, String endToken )
- {
- this.buffer = buffer;
- this.startToken = startToken;
- this.separatorToken = separatorToken;
- this.endToken = endToken;
-
- appended = false;
- }
-
- public ItemAppender append( String item1 )
- {
- appendToken();
-
- buffer.append( item1 );
-
- return this;
- }
-
- public ItemAppender append( String item1, String item2 )
- {
- appendToken();
-
- buffer.append( item1 ).append( item2 );
-
- return this;
- }
-
- public void flush()
- {
- if ( appended )
- {
- buffer.append( endToken );
-
- appended = false;
- }
- }
-
- private void appendToken()
- {
- buffer.append( appended ? separatorToken : startToken );
-
- appended = true;
- }
- }
}
diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/internal/VerboseDependencyNode.java b/src/main/java/org/apache/maven/shared/dependency/graph/internal/VerboseDependencyNode.java
index 79b7723..d13b623 100644
--- a/src/main/java/org/apache/maven/shared/dependency/graph/internal/VerboseDependencyNode.java
+++ b/src/main/java/org/apache/maven/shared/dependency/graph/internal/VerboseDependencyNode.java
@@ -82,7 +82,7 @@ class VerboseDependencyNode
// appender.append( "available versions ", getAvailableVersions().toString() );
// }
- if ( data.getWinnerVersion() != null )
+ if ( !included )
{
String winnerVersion = data.getWinnerVersion();
if ( winnerVersion.equals( getArtifact().getVersion() ) )
@@ -94,27 +94,6 @@ class VerboseDependencyNode
appender.append( "omitted for conflict with ", winnerVersion );
}
}
-
-// switch ( data.getState() )
-// {
-// case ConflictData.INCLUDED:
-// break;
-//
-// case ConflictData.OMITTED_FOR_DUPLICATE:
-// appender.append( "omitted for duplicate" );
-// break;
-//
-//// case ConflictData.OMITTED_FOR_CONFLICT:
-//// appender.append( "omitted for conflict with ", relatedArtifact.getVersion() );
-//// break;
-//
-// case ConflictData.OMITTED_FOR_CYCLE:
-// appender.append( "omitted for cycle" );
-// break;
-//
-// default:
-// break;
-// }
appender.flush();
@@ -126,4 +105,64 @@ class VerboseDependencyNode
return buffer.toString();
}
+ /**
+ * Utility class to concatenate a number of parameters with separator tokens.
+ */
+ private static class ItemAppender
+ {
+ private StringBuilder buffer;
+
+ private String startToken;
+
+ private String separatorToken;
+
+ private String endToken;
+
+ private boolean appended;
+
+ ItemAppender( StringBuilder buffer, String startToken, String separatorToken, String endToken )
+ {
+ this.buffer = buffer;
+ this.startToken = startToken;
+ this.separatorToken = separatorToken;
+ this.endToken = endToken;
+
+ appended = false;
+ }
+
+ public ItemAppender append( String item1 )
+ {
+ appendToken();
+
+ buffer.append( item1 );
+
+ return this;
+ }
+
+ public ItemAppender append( String item1, String item2 )
+ {
+ appendToken();
+
+ buffer.append( item1 ).append( item2 );
+
+ return this;
+ }
+
+ public void flush()
+ {
+ if ( appended )
+ {
+ buffer.append( endToken );
+
+ appended = false;
+ }
+ }
+
+ private void appendToken()
+ {
+ buffer.append( appended ? separatorToken : startToken );
+
+ appended = true;
+ }
+ }
}