[maven] 07/22: Break the readModel method into smaller methods

[rfscholte]

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 6247800eff9c8bbd00063dae42cd101720714ff2
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Sat Nov 28 22:01:50 2020 +0100

    Break the readModel method into smaller methods
    
    # Conflicts:
    #   
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
---
 .../maven/model/building/DefaultModelBuilder.java  | 37 ++++++++++++++--------
 1 file changed, 23 insertions(+), 14 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 9417619..f66ae86 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
@@ -586,18 +586,38 @@ public class DefaultModelBuilder
         }
     }
 
-    @SuppressWarnings( "checkstyle:methodlength" )
     private Model readFileModel( ModelBuildingRequest request,
                                  DefaultModelProblemCollector problems )
         throws ModelBuildingException
     {
         ModelSource modelSource = request.getModelSource();
         Model model = fromCache( request.getModelCache(), modelSource, 
ModelCacheTag.FILE );
-        if ( model != null )
+        if ( model == null )
         {
-            return model;
+            model = doReadFileModel( modelSource, request, problems );
+
+            intoCache( request.getModelCache(), modelSource, 
ModelCacheTag.FILE, model );
+        }
+
+        if ( modelSource instanceof FileModelSource )
+        {
+            if ( request.getTransformerContextBuilder() instanceof 
DefaultTransformerContextBuilder )
+            {
+                DefaultTransformerContextBuilder contextBuilder =
+                        (DefaultTransformerContextBuilder) 
request.getTransformerContextBuilder();
+                contextBuilder.putSource( getGroupId( model ), 
model.getArtifactId(), modelSource );
+            }
         }
 
+        return model;
+    }
+
+    @SuppressWarnings( "checkstyle:methodlength" )
+    private Model doReadFileModel( ModelSource modelSource, 
ModelBuildingRequest request,
+                                 DefaultModelProblemCollector problems )
+            throws ModelBuildingException
+    {
+        Model model;
         problems.setSource( modelSource.getLocation() );
         try
         {
@@ -700,17 +720,6 @@ public class DefaultModelBuilder
             throw problems.newModelBuildingException();
         }
 
-        intoCache( request.getModelCache(), modelSource, ModelCacheTag.FILE, 
model );
-        if ( modelSource instanceof FileModelSource )
-        {
-            if ( request.getTransformerContextBuilder() instanceof 
DefaultTransformerContextBuilder )
-            {
-                DefaultTransformerContextBuilder contextBuilder =
-                        (DefaultTransformerContextBuilder) 
request.getTransformerContextBuilder();
-                contextBuilder.putSource( getGroupId( model ), 
model.getArtifactId(), modelSource );
-            }
-        }
-
         return model;
     }