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/02/12 12:32:59 UTC
[maven] 13/22: Avoid useless anonymous classes
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-7063
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 335c08e5b232b3206131a580690e9d20709fc8bd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Nov 30 10:54:35 2020 +0100
Avoid useless anonymous classes
# Conflicts:
# maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
---
.../maven/model/building/DefaultModelBuilder.java | 44 ++++------------------
.../building/DefaultModelBuildingRequest.java | 1 +
2 files changed, 9 insertions(+), 36 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 83e69b0..bdf2d93 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
@@ -1076,14 +1076,8 @@ public class DefaultModelBuilder
return null;
}
- ModelBuildingRequest candidateBuildRequest = new FilterModelBuildingRequest( request )
- {
- @Override
- public ModelSource getModelSource()
- {
- return candidateSource;
- }
- };
+ ModelBuildingRequest candidateBuildRequest = new DefaultModelBuildingRequest( request )
+ .setModelSource( candidateSource );
candidateModel = readRawModel( candidateBuildRequest, problems );
}
@@ -1273,25 +1267,10 @@ public class DefaultModelBuilder
}
int validationLevel = Math.min( request.getValidationLevel(), ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 );
- ModelBuildingRequest lenientRequest = new FilterModelBuildingRequest( request )
- {
- @Override
- public int getValidationLevel()
- {
- return validationLevel;
- }
-
- @Override
- public ModelSource getModelSource()
- {
- return modelSource;
- }
- @Override
- public Model getFileModel()
- {
- return null;
- }
- };
+ ModelBuildingRequest lenientRequest = new DefaultModelBuildingRequest( request )
+ .setValidationLevel( validationLevel )
+ .setFileModel( null )
+ .setModelSource( modelSource );
Model parentModel = readRawModel( lenientRequest, problems );
@@ -1824,15 +1803,8 @@ public class DefaultModelBuilder
{
try
{
- ModelBuildingRequest gaBuildingRequest = new FilterModelBuildingRequest( request )
- {
- @Override
- public ModelSource getModelSource()
- {
- return (ModelSource) source;
- }
-
- };
+ ModelBuildingRequest gaBuildingRequest = new DefaultModelBuildingRequest( request )
+ .setModelSource( (ModelSource) source );
return readRawModel( gaBuildingRequest, problems );
}
catch ( ModelBuildingException e )
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 a012786..379b5e7 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
@@ -102,6 +102,7 @@ public class DefaultModelBuildingRequest
setModelResolver( request.getModelResolver() );
setModelBuildingListener( request.getModelBuildingListener() );
setModelCache( request.getModelCache() );
+ setWorkspaceModelResolver( request.getWorkspaceModelResolver() );
setTransformerContextBuilder( request.getTransformerContextBuilder() );
}