[maven] 12/18: Reuse existing methods to avoid code duplication

[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 cefd2d27dd63a823cdde2ec5316ba101cfaaa065
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Nov 30 11:49:16 2020 +0100

    Reuse existing methods to avoid code duplication
---
 .../org/apache/maven/model/building/DefaultModelBuilder.java | 12 ++----------
 1 file changed, 2 insertions(+), 10 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 b987f3b..7935dfa 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
@@ -1107,11 +1107,7 @@ public class DefaultModelBuilder
         // before because with parents as ranges it will never work in this 
scenario.
         //
 
-        String groupId = candidateModel.getGroupId();
-        if ( groupId == null && candidateModel.getParent() != null )
-        {
-            groupId = candidateModel.getParent().getGroupId();
-        }
+        String groupId = getGroupId( candidateModel );
         String artifactId = candidateModel.getArtifactId();
 
         if ( groupId == null || !groupId.equals( parent.getGroupId() ) || 
artifactId == null
@@ -1133,11 +1129,7 @@ public class DefaultModelBuilder
             return null;
         }
 
-        String version = candidateModel.getVersion();
-        if ( version == null && candidateModel.getParent() != null )
-        {
-            version = candidateModel.getParent().getVersion();
-        }
+        String version = getVersion( candidateModel );
         if ( version != null && parent.getVersion() != null && 
!version.equals( parent.getVersion() ) )
         {
             try