[maven] 03/03: toolchain.xml file should support environment variables Submitted by: Mike Mol and Martin Kanters

[rf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MNG-6665
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 66544a8459395d3bc00389db0dcdc78f003b755f
Author: Martin Kanters <Ma...@ing.com>
AuthorDate: Thu Jun 6 09:26:50 2019 +0200

    toolchain.xml file should support environment variables Submitted by: Mike Mol and Martin Kanters
    
    Added field injection again, instead of constructor injection, to be consistent with the codebase and because it will probably not work with the way maven generates a injection descriptor on compile time.
---
 .../toolchain/building/DefaultToolchainsBuilder.java     | 12 +++---------
 .../toolchain/building/DefaultToolchainsBuilderTest.java | 16 ++++++++++------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
index 25fc10c..beeee19 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
@@ -54,19 +54,13 @@ import java.util.Map;
 public class DefaultToolchainsBuilder
     implements ToolchainsBuilder
 {
-    private MavenToolchainMerger toolchainsMerger;
+    private MavenToolchainMerger toolchainsMerger = new MavenToolchainMerger();
 
+    @Inject
     private ToolchainsWriter toolchainsWriter;
 
-    private ToolchainsReader toolchainsReader;
-
     @Inject
-    public DefaultToolchainsBuilder( ToolchainsWriter toolchainsWriter, ToolchainsReader toolchainsReader )
-    {
-        this.toolchainsMerger = new MavenToolchainMerger();
-        this.toolchainsWriter = toolchainsWriter;
-        this.toolchainsReader = toolchainsReader;
-    }
+    private ToolchainsReader toolchainsReader;
 
     @Override
     public ToolchainsBuildingResult build( ToolchainsBuildingRequest request )
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
index 5eed404..2c20d3c 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
@@ -23,7 +23,6 @@ import org.apache.maven.building.StringSource;
 import org.apache.maven.toolchain.io.DefaultToolchainsReader;
 import org.apache.maven.toolchain.io.DefaultToolchainsWriter;
 import org.apache.maven.toolchain.io.ToolchainsParseException;
-import org.apache.maven.toolchain.io.ToolchainsWriter;
 import org.apache.maven.toolchain.model.PersistedToolchains;
 import org.apache.maven.toolchain.model.ToolchainModel;
 import org.codehaus.plexus.interpolation.os.OperatingSystemUtils;
@@ -31,7 +30,9 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
+import org.mockito.InjectMocks;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,16 +49,19 @@ public class DefaultToolchainsBuilderTest
 {
     private static final String LS = System.getProperty( "line.separator" );
 
+    @Spy
     private DefaultToolchainsReader toolchainsReader;
 
+    @Spy
+    private DefaultToolchainsWriter toolchainsWriter;
+
+    @InjectMocks
     private DefaultToolchainsBuilder toolchainBuilder;
 
     @Before
     public void onSetup()
     {
-        toolchainsReader = Mockito.spy( DefaultToolchainsReader.class );
-        ToolchainsWriter toolchainsWriter = new DefaultToolchainsWriter();
-        toolchainBuilder = new DefaultToolchainsBuilder( toolchainsWriter, toolchainsReader );
+        MockitoAnnotations.initMocks( this );
 
         Map<String, String> envVarMap = new HashMap<>();
         envVarMap.put("testKey", "testValue");
@@ -88,7 +92,7 @@ public class DefaultToolchainsBuilderTest
         toolchain.setType( "TYPE" );
         toolchain.addProvide( "key", "user_value" );
         userResult.addToolchain(  toolchain );
-        doReturn(userResult).doReturn(userResult).when( toolchainsReader ).read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap());
+        doReturn(userResult).when( toolchainsReader ).read( any( InputStream.class ), ArgumentMatchers.<String, Object>anyMap());
 
         ToolchainsBuildingResult result = toolchainBuilder.build( request );
         assertNotNull( result.getEffectiveToolchains() );