[MNG-8404] ModelValidator: add unit tests and simplify a bit

impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelValidator.java

@@ -19,7 +19,6 @@
 package org.apache.maven.api.services.model;
 
 import org.apache.maven.api.model.Model;
-import org.apache.maven.api.services.ModelBuilderRequest;
 import org.apache.maven.api.services.ModelProblemCollector;
 
 /**
@@ -60,35 +59,27 @@ public interface ModelValidator {
      *
      * @param model The model to validate, must not be {@code null}.
      * @param validationLevel The validation level.
-     * @param request The model building request that holds further settings, must not be {@code null}.
      * @param problems The container used to collect problems that were encountered, must not be {@code null}.
      */
-    default void validateFileModel(
-            Model model, int validationLevel, ModelBuilderRequest request, ModelProblemCollector problems) {
-        // do nothing
-    }
+    void validateFileModel(Model model, int validationLevel, ModelProblemCollector problems);
 
     /**
      * Checks the specified (raw) model for missing or invalid values. The raw model is the file model + buildpom filter
      * transformation and has not been subjected to inheritance, interpolation or profile/default injection.
      *
      * @param model The model to validate, must not be {@code null}.
      * @param validationLevel The validation level.
-     * @param request The model building request that holds further settings, must not be {@code null}.
      * @param problems The container used to collect problems that were encountered, must not be {@code null}.
      */
-    void validateRawModel(
-            Model model, int validationLevel, ModelBuilderRequest request, ModelProblemCollector problems);
+    void validateRawModel(Model model, int validationLevel, ModelProblemCollector problems);
 
     /**
      * Checks the specified (effective) model for missing or invalid values. The effective model is fully assembled and
      * has undergone inheritance, interpolation and other model operations.
      *
      * @param model The model to validate, must not be {@code null}.
      * @param validationLevel The validation level.
-     * @param request The model building request that holds further settings, must not be {@code null}.
      * @param problems The container used to collect problems that were encountered, must not be {@code null}.
      */
-    void validateEffectiveModel(
-            Model model, int validationLevel, ModelBuilderRequest request, ModelProblemCollector problems);
+    void validateEffectiveModel(Model model, int validationLevel, ModelProblemCollector problems);
 }

impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java

@@ -858,7 +858,6 @@ void buildEffectiveModel(Collection<String> importIds) throws ModelBuilderExcept
             modelValidator.validateEffectiveModel(
                     resultModel,
                     isBuildRequest() ? ModelValidator.VALIDATION_LEVEL_STRICT : ModelValidator.VALIDATION_LEVEL_MINIMAL,
-                    request,
                     this);
 
             if (hasErrors()) {
@@ -1453,7 +1452,6 @@ Model doReadFileModel() throws ModelBuilderException {
             modelValidator.validateFileModel(
                     model,
                     isBuildRequest() ? ModelValidator.VALIDATION_LEVEL_STRICT : ModelValidator.VALIDATION_LEVEL_MINIMAL,
-                    request,
                     this);
             if (hasFatalErrors()) {
                 throw newModelBuilderException();
@@ -1485,7 +1483,6 @@ private Model doReadRawModel() throws ModelBuilderException {
             modelValidator.validateRawModel(
                     rawModel,
                     isBuildRequest() ? ModelValidator.VALIDATION_LEVEL_STRICT : ModelValidator.VALIDATION_LEVEL_MINIMAL,
-                    request,
                     this);
 
             if (hasFatalErrors()) {