[MSHARED-1018] Allow for using the -ntp ,--no-transfer-progress flag in Maven invocations

slawekjaranowski · slawekjaranowski · commit 1424ed800d26 · 2022-02-26T15:52:47.000+01:00
diff --git a/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java b/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
@@ -111,6 +111,8 @@ public class DefaultInvocationRequest
 
     private File mavenExecutable;
 
+    private boolean noTransferProgress;
+
     /**
      * <p>getBaseDirectory.</p>
      *
@@ -729,6 +731,19 @@ public InvocationRequest setQuiet( boolean quiet )
         return this;
     }
 
+    @Override
+    public boolean isNoTransferProgress()
+    {
+        return noTransferProgress;
+    }
+
+    @Override
+    public InvocationRequest setNoTransferProgress( boolean noTransferProgress )
+    {
+        this.noTransferProgress = noTransferProgress;
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java b/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
@@ -319,6 +319,14 @@ public interface InvocationRequest
      */
     boolean isQuiet();
 
+    /**
+     * Get the value of the {@code no-transfer-progress} argument.
+     *
+     * @return {@code true} if the argument {@code no-transfer-progress} was specified, otherwise {@code false}
+     * @since 3.2.0
+     */
+    boolean isNoTransferProgress();
+
     // ----------------------------------------------------------------------
     // Reactor Failure Mode
     // ----------------------------------------------------------------------
@@ -736,6 +744,14 @@ enum CheckSumPolicy
      */
     InvocationRequest setQuiet( boolean quiet );
 
+    /**
+     * Enable no transfer progress mode. Equivalent of {@code -ntp} or {@code --no-transfer-progress}
+     * @param noTransferProgress enable no transfer progress mode
+     * @return This invocation request.
+     * @since 3.2.0
+     */
+    InvocationRequest setNoTransferProgress( boolean noTransferProgress );
+
     /**
      * Get the current set builder strategy id equivalent of {@code --builder id}. <b>Note. This is available since
      * Maven 3.2.1</b>
diff --git a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
@@ -528,6 +528,11 @@ else if ( CheckSumPolicy.Warn.equals( checksumPolicy ) )
         {
             cli.createArg().setValue( "-q" );
         }
+
+        if ( request.isNoTransferProgress() )
+        {
+            cli.createArg().setValue( "-ntp" );
+        }
     }
 
     /**
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
@@ -78,8 +78,12 @@ ${project.name}
     * Update-Snapshots Flag
     
     * Debug Flag (show debug-level output)
+
+    * Quiet Flag (only show errors)
     
     * Show-Errors Flag (show exception stacktraces, but not full debug output)
+
+    * No-Transfer-Progress Flag (Do not display transfer progress when downloading or uploading)
     
     * Inherit-Shell-Environment Flag (inherit envars from the shell used to
       start the current JVM)
diff --git a/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java b/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
@@ -485,6 +485,13 @@ public void testShouldUseDefaultOfFailFastWhenSpecifiedInRequest()
         assertArgumentsNotPresent( cli, banned );
     }
 
+    @Test
+    public void testShouldSetNoTransferProgressFlagFromRequest()
+    {
+        mclb.setFlags( newRequest().setNoTransferProgress( true ), cli );
+        assertArgumentsPresent( cli, Collections.singleton( "-ntp" ));
+    }
+
     @Test
     public void testShouldSpecifyFileOptionUsingNonStandardPomFileLocation()
         throws Exception

Original file line number	Diff line number	Diff line change
`@@ -528,6 +528,11 @@ else if ( CheckSumPolicy.Warn.equals( checksumPolicy ) )`
`528`	`528`	`{`
`529`	`529`	`cli.createArg().setValue( "-q" );`
`530`	`530`	`}`
	`531`	`+`
	`532`	`+ if ( request.isNoTransferProgress() )`
	`533`	`+ {`
	`534`	`+ cli.createArg().setValue( "-ntp" );`
	`535`	`+ }`
`531`	`536`	`}`
`532`	`537`
`533`	`538`	`/**`