fix(console): remove deprecated class

Author: aditya-goyal01

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/flow/domain_service/FlowValidationDomainService.java

@@ -17,6 +17,7 @@
 
 import io.gravitee.apim.core.DomainService;
 import io.gravitee.apim.core.api.exception.NativeApiWithMultipleFlowsException;
+import io.gravitee.apim.core.exception.ValidationDomainException;
 import io.gravitee.apim.core.flow.exception.InvalidFlowException;
 import io.gravitee.apim.core.plugin.model.PlatformPlugin;
 import io.gravitee.apim.core.plugin.query_service.EntrypointPluginQueryService;
@@ -29,7 +30,6 @@
 import io.gravitee.definition.model.v4.flow.selector.SelectorType;
 import io.gravitee.definition.model.v4.flow.step.Step;
 import io.gravitee.definition.model.v4.nativeapi.NativeFlow;
-import io.gravitee.rest.api.service.v4.exception.PathParameterOverlapValidationException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -279,7 +279,7 @@ private void validatePathParamOverlapping(ApiType apiType, Stream<Flow> flows) {
                 .peek(e -> e.getValue().sort(String::compareTo))
                 .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().toString()));
 
-            throw new PathParameterOverlapValidationException(payload);
+            throw new ValidationDomainException("Invalid path parameters", payload);
         }
     }
 

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/v4/exception/PathParameterOverlapValidationException.java

@@ -26,6 +26,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.gravitee.apim.core.audit.model.AuditInfo;
 import io.gravitee.apim.core.flow.crud_service.FlowCrudService;
+import io.gravitee.apim.core.flow.domain_service.FlowValidationDomainService;
 import io.gravitee.apim.core.subscription.domain_service.CloseSubscriptionDomainService;
 import io.gravitee.definition.model.v4.ApiType;
 import io.gravitee.definition.model.v4.flow.Flow;
@@ -83,7 +84,6 @@
 import io.gravitee.rest.api.service.v4.mapper.GenericPlanMapper;
 import io.gravitee.rest.api.service.v4.mapper.PlanMapper;
 import io.gravitee.rest.api.service.v4.validation.FlowValidationService;
-import io.gravitee.rest.api.service.v4.validation.PathParametersValidationService;
 import io.gravitee.rest.api.service.v4.validation.TagsValidationService;
 import java.util.Arrays;
 import java.util.Collection;
@@ -176,7 +176,7 @@ public class PlanServiceImpl extends AbstractService implements PlanService {
     private FlowValidationService flowValidationService;
 
     @Autowired
-    private PathParametersValidationService pathParametersValidationService;
+    private FlowValidationDomainService flowValidationDomainService;
 
     @Autowired
     private GroupService groupService;
@@ -265,7 +265,7 @@ private void validatePathParameters(Api api, List<Flow> newPlanFlows) throws Tec
             .flatMap(Collection::stream);
         planFlows = Stream.concat(planFlows, newPlanFlows.stream());
 
-        pathParametersValidationService.validate(api.getType(), apiFlows, planFlows);
+        flowValidationDomainService.validatePathParameters(api.getType(), apiFlows, planFlows);
     }
 
     private void validateTags(Set<String> tags, Api api) {
@@ -435,7 +435,7 @@ private void validatePathParameters(Api api, UpdatePlanEntity updatePlan) throws
             })
             .flatMap(Collection::stream);
 
-        pathParametersValidationService.validate(api.getType(), apiFlows, planFlows);
+        flowValidationDomainService.validatePathParameters(api.getType(), apiFlows, planFlows);
     }
 
     private void checkStatusOfGeneralConditions(Plan plan) {

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/v4/impl/PlanServiceImpl.java

@@ -21,6 +21,7 @@
 import static io.gravitee.rest.api.model.api.ApiLifecycleState.UNPUBLISHED;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
+import io.gravitee.apim.core.flow.domain_service.FlowValidationDomainService;
 import io.gravitee.definition.model.DefinitionVersion;
 import io.gravitee.definition.model.v4.ApiType;
 import io.gravitee.definition.model.v4.flow.Flow;
@@ -51,7 +52,6 @@
 import io.gravitee.rest.api.service.v4.validation.FlowValidationService;
 import io.gravitee.rest.api.service.v4.validation.GroupValidationService;
 import io.gravitee.rest.api.service.v4.validation.ListenerValidationService;
-import io.gravitee.rest.api.service.v4.validation.PathParametersValidationService;
 import io.gravitee.rest.api.service.v4.validation.PlanValidationService;
 import io.gravitee.rest.api.service.v4.validation.ResourcesValidationService;
 import io.gravitee.rest.api.service.v4.validation.TagsValidationService;
@@ -78,8 +78,8 @@ public class ApiValidationServiceImpl extends TransactionalService implements Ap
     private final AnalyticsValidationService analyticsValidationService;
     private final PlanSearchService planSearchService;
     private final PlanValidationService planValidationService;
-    private final PathParametersValidationService pathParametersValidationService;
     private final ApiServicePluginService apiServicePluginService;
+    private final FlowValidationDomainService flowValidationDomainService;
 
     public ApiValidationServiceImpl(
         final TagsValidationService tagsValidationService,
@@ -91,8 +91,8 @@ public ApiValidationServiceImpl(
         final AnalyticsValidationService loggingValidationService,
         final PlanSearchService planSearchService,
         final PlanValidationService planValidationService,
-        final PathParametersValidationService pathParametersValidationService,
-        ApiServicePluginService apiServicePluginService
+        ApiServicePluginService apiServicePluginService,
+        FlowValidationDomainService flowValidationDomainService
     ) {
         this.tagsValidationService = tagsValidationService;
         this.groupValidationService = groupValidationService;
@@ -103,8 +103,8 @@ public ApiValidationServiceImpl(
         this.analyticsValidationService = loggingValidationService;
         this.planSearchService = planSearchService;
         this.planValidationService = planValidationService;
-        this.pathParametersValidationService = pathParametersValidationService;
         this.apiServicePluginService = apiServicePluginService;
+        this.flowValidationDomainService = flowValidationDomainService;
     }
 
     @Override
@@ -143,7 +143,7 @@ public void validateAndSanitizeNewApi(
         // Validate and clean flow
         newApiEntity.setFlows(flowValidationService.validateAndSanitize(newApiEntity.getType(), newApiEntity.getFlows()));
 
-        pathParametersValidationService.validate(
+        flowValidationDomainService.validatePathParameters(
             newApiEntity.getType(),
             (newApiEntity.getFlows() != null ? newApiEntity.getFlows().stream() : Stream.empty()),
             Stream.empty()
@@ -204,7 +204,7 @@ public void validateAndSanitizeUpdateApi(
         updateApiEntity.setPlans(planValidationService.validateAndSanitize(updateApiEntity.getType(), updateApiEntity.getPlans()));
 
         // Validate path parameters
-        pathParametersValidationService.validate(
+        flowValidationDomainService.validatePathParameters(
             updateApiEntity.getType(),
             (updateApiEntity.getFlows() != null ? updateApiEntity.getFlows().stream() : Stream.empty()),
             getPlansFlows(updateApiEntity.getPlans())
@@ -258,7 +258,7 @@ public void validateAndSanitizeImportApiForCreation(
         apiEntity.setPlans(planValidationService.validateAndSanitize(apiEntity.getType(), apiEntity.getPlans()));
 
         // Validate path parameters
-        pathParametersValidationService.validate(
+        flowValidationDomainService.validatePathParameters(
             apiEntity.getType(),
             (apiEntity.getFlows() != null ? apiEntity.getFlows().stream() : Stream.empty()),
             getPlansFlows(apiEntity.getPlans())