fix: resolve cherry-pick merge conflicts in test files

ValidateApiCRDDomainServiceTest: remove conflict markers, keep java.util.List import needed by null-pathOperator test, drop unused IdBuilder import.

FlowMapperTest: resolve conflict between existing toRepositoryShouldThrowValidationExceptionWhenHttpSelectorPathOperatorIsNull (HEAD) and cherry-pick's renamed toRepositoryShouldRejectNullPathOperator plus new toDefinitionShouldDefaultNullPathOperatorToStartsWith; take cherry-pick version entirely, remove now-unused assertThatThrownBy import.

Author: carlos-andres-osorio

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/api/domain_service/ValidateApiCRDDomainServiceTest.java

@@ -39,11 +39,7 @@
 import io.gravitee.definition.model.v4.flow.selector.HttpSelector;
 import io.gravitee.rest.api.model.notification.NotificationConfigType;
 import io.gravitee.rest.api.model.notification.PortalNotificationConfigEntity;
-<<<<<<< HEAD
-=======
-import io.gravitee.rest.api.service.common.IdBuilder;
 import java.util.List;
->>>>>>> 611dfe1fe7 (fix: reject null pathOperator in v4 flow HTTP selectors and coerce on read)
 import java.util.Set;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/v4/mapper/FlowMapperTest.java

@@ -15,7 +15,6 @@
  */
 package io.gravitee.rest.api.service.v4.mapper;
 
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -140,21 +139,6 @@ public void should_map_entrypoint_connect_steps() {
     }
 
     @Test
-<<<<<<< HEAD
-    public void toRepositoryShouldThrowValidationExceptionWhenHttpSelectorPathOperatorIsNull() {
-        HttpSelector httpSelector = new HttpSelector();
-        httpSelector.setPath("/");
-        httpSelector.setPathOperator(null);
-
-        Flow flowDefinition = new Flow();
-        flowDefinition.setName("bad_flow");
-        flowDefinition.setSelectors(List.of(httpSelector));
-        flowDefinition.setEnabled(true);
-
-        assertThatThrownBy(() -> flowMapper.toRepository(flowDefinition, FlowReferenceType.ORGANIZATION, "DEFAULT", 0)).isInstanceOf(
-            io.gravitee.rest.api.service.exceptions.InvalidDataException.class
-        );
-=======
     public void toRepositoryShouldRejectNullPathOperator() {
         HttpSelector httpSelector = new HttpSelector();
         httpSelector.setPath("/calls");
@@ -182,7 +166,6 @@ public void toDefinitionShouldDefaultNullPathOperatorToStartsWith() {
         assertEquals(1, flowDefinition.getSelectors().size());
         HttpSelector mappedSelector = (HttpSelector) flowDefinition.getSelectors().get(0);
         assertEquals(Operator.STARTS_WITH, mappedSelector.getPathOperator());
->>>>>>> 611dfe1fe7 (fix: reject null pathOperator in v4 flow HTTP selectors and coerce on read)
     }
 
     @Test