This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MNG-6957 in repository https://gitbox.apache.org/repos/asf/maven.git
commit a715b1b5a5844563e07e48804b8e44d598b6cd0a Author: rfscholte <[email protected]> AuthorDate: Sun Oct 11 12:58:06 2020 +0200 remove redundant parameter from readRawModel --- .../maven/model/building/DefaultModelBuilder.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index b0a7b9d..139ed70 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -302,7 +302,7 @@ public class DefaultModelBuilder // @todo use originals DefaultModelBuildingResult res = new DefaultModelBuildingResult(); - return readRawModel( source, gaBuildingRequest, new DefaultModelProblemCollector( res ), null ); + return readRawModel( gaBuildingRequest, new DefaultModelProblemCollector( res ), null ); } catch ( ModelBuildingException e ) { @@ -333,8 +333,8 @@ public class DefaultModelBuilder DefaultModelBuildingResult res = new DefaultModelBuildingResult(); try { - return readRawModel( new FileModelSource( pomFile ), req, - new DefaultModelProblemCollector( res ), null ); + return readRawModel( req, new DefaultModelProblemCollector( res ), + null ); } catch ( ModelBuildingException e ) { @@ -431,7 +431,7 @@ public class DefaultModelBuilder throws ModelBuildingException { Model inputModel = - readRawModel( request.getModelSource(), request, problems, result.getFileModel() ); + readRawModel( request, problems, result.getFileModel() ); problems.setRootModel( inputModel ); @@ -781,10 +781,12 @@ public class DefaultModelBuilder return model; } - private Model readRawModel( Source modelSource, ModelBuildingRequest request, DefaultModelProblemCollector problems, - Model fileModel ) + private Model readRawModel( ModelBuildingRequest request, DefaultModelProblemCollector problems, + Model fileModel ) throws ModelBuildingException { + ModelSource modelSource = request.getModelSource(); + ModelData cachedData = fromCache( request.getModelCache(), modelSource, ModelCacheTag.RAW ); if ( cachedData != null ) { @@ -1181,7 +1183,7 @@ public class DefaultModelBuilder } }; - candidateModel = readRawModel( candidateSource, candidateBuildRequest, problems, null ); + candidateModel = readRawModel( candidateBuildRequest, problems, null ); } else { @@ -1384,7 +1386,7 @@ public class DefaultModelBuilder } }; - Model parentModel = readRawModel( modelSource, lenientRequest, problems, null ); + Model parentModel = readRawModel( lenientRequest, problems, null ); if ( !parent.getVersion().equals( version ) ) {
