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 d626493d2b5a4bf041719d2c2ac8b87c031f0fd5 Author: rfscholte <[email protected]> AuthorDate: Wed Oct 14 22:30:03 2020 +0200 Refactor code --- .../maven/model/building/DefaultModelBuilder.java | 38 +++++++++++----------- .../building/DefaultModelBuildingRequest.java | 18 ++++++++-- .../model/building/FilterModelBuildingRequest.java | 13 ++++++++ .../maven/model/building/ModelBuildingRequest.java | 16 +++++++-- 4 files changed, 61 insertions(+), 24 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 8de4510..fed1d6f 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 @@ -279,9 +279,10 @@ public class DefaultModelBuilder DefaultModelProblemCollector problems = new DefaultModelProblemCollector( result ); // read and validate raw model - Model inputModel = readFileModel( request, problems ); + Model fileModel = readFileModel( request, problems ); - result.setFileModel( inputModel ); + request.setFileModel( fileModel ); + result.setFileModel( fileModel ); activateFileModel( request, result, problems ); @@ -301,7 +302,7 @@ public class DefaultModelBuilder DefaultModelProblemCollector problems ) throws ModelBuildingException { - Model inputModel = result.getFileModel(); + Model inputModel = request.getFileModel(); problems.setRootModel( inputModel ); // profile activation @@ -354,7 +355,7 @@ public class DefaultModelBuilder throws ModelBuildingException { Model inputModel = - readRawModel( request, result, problems, result.getFileModel() ); + readRawModel( request, problems ); problems.setRootModel( inputModel ); @@ -705,8 +706,7 @@ public class DefaultModelBuilder return model; } - private Model readRawModel( ModelBuildingRequest request, ModelBuildingResult result, - DefaultModelProblemCollector problems, Model fileModel ) + private Model readRawModel( ModelBuildingRequest request, DefaultModelProblemCollector problems ) throws ModelBuildingException { ModelSource modelSource = request.getModelSource(); @@ -726,7 +726,7 @@ public class DefaultModelBuilder TransformerContext context = null; if ( request.getTransformerContextBuilder() != null ) { - context = request.getTransformerContextBuilder().initialize( request, result, problems ); + context = request.getTransformerContextBuilder().initialize( request, problems ); } try @@ -745,14 +745,13 @@ public class DefaultModelBuilder problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.V37 ).setException( e ) ); } } - else if ( fileModel == null ) + else if ( request.getFileModel() == null ) { rawModel = readFileModel( request, problems ); } else { -// throw new UnsupportedOperationException(); - rawModel = fileModel.clone(); + rawModel = request.getFileModel().clone(); } modelValidator.validateRawModel( rawModel, request, problems ); @@ -1114,7 +1113,7 @@ public class DefaultModelBuilder } }; - candidateModel = readRawModel( candidateBuildRequest, result, problems, null ); + candidateModel = readRawModel( candidateBuildRequest, problems ); } else { @@ -1315,9 +1314,14 @@ public class DefaultModelBuilder { return modelSource; } + @Override + public Model getFileModel() + { + return null; + } }; - Model parentModel = readRawModel( lenientRequest, result, problems, null ); + Model parentModel = readRawModel( lenientRequest, problems ); if ( !parent.getVersion().equals( version ) ) { @@ -1816,8 +1820,7 @@ public class DefaultModelBuilder return this; } - TransformerContext initialize( ModelBuildingRequest request, ModelBuildingResult result, - ModelProblemCollector problems ) + TransformerContext initialize( ModelBuildingRequest request, DefaultModelProblemCollector problems ) { return new TransformerContext() { @@ -1857,8 +1860,7 @@ public class DefaultModelBuilder } }; - return readRawModel( gaBuildingRequest, result, new DefaultModelProblemCollector( result ), - null ); + return readRawModel( gaBuildingRequest, problems ); } catch ( ModelBuildingException e ) { @@ -1886,13 +1888,11 @@ public class DefaultModelBuilder try { - return readRawModel( req, result, - new DefaultModelProblemCollector( result ), null ); + return readRawModel( req, problems ); } catch ( ModelBuildingException e ) { // gathered with problem collector - } return null; } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java index 8e58ff8..c42b552 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java @@ -39,7 +39,7 @@ import org.apache.maven.model.resolution.WorkspaceModelResolver; public class DefaultModelBuildingRequest implements ModelBuildingRequest { - private Model rawModel; + private Model fileModel; private File pomFile; @@ -388,13 +388,25 @@ public class DefaultModelBuildingRequest @Override public Model getRawModel() { - return rawModel; + return null; } @Override public ModelBuildingRequest setRawModel( Model rawModel ) { - this.rawModel = rawModel; + return this; + } + + @Override + public Model getFileModel() + { + return fileModel; + } + + @Override + public ModelBuildingRequest setFileModel( Model fileModel ) + { + this.fileModel = fileModel; return this; } diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java index 668f997..dfabf46 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java @@ -269,6 +269,19 @@ class FilterModelBuildingRequest request.setRawModel( rawModel ); return this; } + + @Override + public Model getFileModel() + { + return request.getFileModel(); + } + + @Override + public ModelBuildingRequest setFileModel( Model fileModel ) + { + request.setFileModel( fileModel ); + return this; + } @Override public WorkspaceModelResolver getWorkspaceModelResolver() diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java index 37ea102..cf8501f 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java @@ -64,19 +64,31 @@ public interface ModelBuildingRequest * Denotes strict validation as recommended by the current Maven version. */ int VALIDATION_LEVEL_STRICT = VALIDATION_LEVEL_MAVEN_3_0; - + /** * Gets the raw model to build. If not set, model source will be used to load raw model. * * @return The raw model to build or {@code null} if not set. */ - Model getRawModel(); + Model getFileModel(); /** * Set raw model. * * @param rawModel */ + ModelBuildingRequest setFileModel( Model fileModel ); + + /** + * @deprecated rawModel is never set, instead the fileModel is set + */ + @Deprecated + Model getRawModel(); + + /** + * @deprecated setting the rawModel has no effect, instead the fileModel of phase one will be set + */ + @Deprecated ModelBuildingRequest setRawModel( Model rawModel ); /**
