feat: resolve conflicts after rebase.

https://gravitee.atlassian.net/browse/APIM-11696

Author: kovaren

gravitee-apim-rest-api/gravitee-apim-rest-api-management-v2/gravitee-apim-rest-api-management-v2-rest/src/main/java/io/gravitee/rest/api/management/v2/rest/mapper/PortalNavigationItemsMapper.java

@@ -17,10 +17,10 @@
 
 import io.gravitee.apim.core.portal_page.model.PortalArea;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationFolder;
+import io.gravitee.apim.core.portal_page.model.PortalNavigationItemId;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationLink;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationPage;
 import io.gravitee.apim.core.portal_page.model.PortalPageContentId;
-import io.gravitee.apim.core.portal_page.model.PortalPageNavigationId;
 import io.gravitee.rest.api.management.v2.rest.model.CreatePortalNavigationItem;
 import io.gravitee.rest.api.management.v2.rest.model.PortalNavigationItem;
 import org.mapstruct.Mapper;
@@ -40,12 +40,12 @@ public interface PortalNavigationItemsMapper {
     PortalNavigationItem map(io.gravitee.apim.core.portal_page.model.PortalNavigationItem portalNavigationItem);
 
     @Named("mapId")
-    default String mapId(PortalPageNavigationId id) {
+    default String mapId(PortalNavigationItemId id) {
         return id == null ? null : id.toString();
     }
 
     @Named("mapParentId")
-    default String mapParentId(PortalPageNavigationId id) {
+    default String mapParentId(PortalNavigationItemId id) {
         return id == null ? null : id.toString();
     }
 
@@ -76,11 +76,11 @@ default io.gravitee.apim.core.portal_page.model.PortalNavigationItem map(
         String environmentId,
         CreatePortalNavigationItem createPortalNavigationItem
     ) {
-        final var id = PortalPageNavigationId.random();
+        final var id = PortalNavigationItemId.random();
         final var title = createPortalNavigationItem.getTitle();
         final var area = createPortalNavigationItem.getArea();
         final var parentIdStr = createPortalNavigationItem.getParentId();
-        final var parentId = parentIdStr == null ? null : PortalPageNavigationId.of(parentIdStr);
+        final var parentId = parentIdStr == null ? null : PortalNavigationItemId.of(parentIdStr);
         final var contentIdStr = createPortalNavigationItem.getContentId();
         final var contentId = contentIdStr == null ? null : PortalPageContentId.of(contentIdStr);
         final var uri = createPortalNavigationItem.getUri();

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/portal_page/crud_service/PortalNavigationItemCrudService.java

@@ -16,12 +16,12 @@
 package io.gravitee.apim.core.portal_page.crud_service;
 
 import io.gravitee.apim.core.portal_page.model.PortalNavigationItem;
-import io.gravitee.apim.core.portal_page.model.PortalPageNavigationId;
+import io.gravitee.apim.core.portal_page.model.PortalNavigationItemId;
 
 public interface PortalNavigationItemCrudService {
     PortalNavigationItem create(PortalNavigationItem portalNavigationItem);
 
     PortalNavigationItem update(PortalNavigationItem portalNavigationItem);
 
-    void delete(PortalPageNavigationId portalNavigationItemId);
+    void delete(PortalNavigationItemId portalNavigationItemId);
 }

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/portal_page/model/PortalNavigationLink.java

@@ -33,7 +33,7 @@ public PortalNavigationLink(
         @Nonnull String environmentId,
         @Nonnull String title,
         @Nonnull PortalArea area,
-        @Nullable PortalPageNavigationId parentId,
+        @Nullable PortalNavigationItemId parentId,
         @Nonnull String href
     ) {
         super(id, organizationId, environmentId, title, area, parentId);

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/portal_page/use_case/CreatePortalNavigationItemUseCase.java

@@ -20,7 +20,6 @@
 import io.gravitee.apim.core.portal_page.exception.PortalPageSpecificationException;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationFolder;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationItem;
-import io.gravitee.apim.core.portal_page.model.PortalPageNavigationId;
 import io.gravitee.apim.core.portal_page.query_service.PortalNavigationItemsQueryService;
 import lombok.Builder;
 import lombok.RequiredArgsConstructor;

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/infra/query_service/portal_page/PortalNavigationItemsCrudServiceImpl.java

@@ -18,7 +18,7 @@
 import io.gravitee.apim.core.exception.TechnicalDomainException;
 import io.gravitee.apim.core.portal_page.crud_service.PortalNavigationItemCrudService;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationItem;
-import io.gravitee.apim.core.portal_page.model.PortalPageNavigationId;
+import io.gravitee.apim.core.portal_page.model.PortalNavigationItemId;
 import io.gravitee.apim.infra.adapter.PortalNavigationItemAdapter;
 import io.gravitee.repository.exceptions.TechnicalException;
 import io.gravitee.repository.management.api.PortalNavigationItemRepository;
@@ -73,7 +73,7 @@ public PortalNavigationItem update(PortalNavigationItem portalNavigationItem) {
     }
 
     @Override
-    public void delete(PortalPageNavigationId portalNavigationItemId) {
+    public void delete(PortalNavigationItemId portalNavigationItemId) {
         try {
             portalNavigationItemRepository.delete(portalNavigationItemId.toString());
         } catch (TechnicalException e) {

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/inmemory/PortalNavigationItemsCrudServiceInMemory.java

@@ -17,7 +17,7 @@
 
 import io.gravitee.apim.core.portal_page.crud_service.PortalNavigationItemCrudService;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationItem;
-import io.gravitee.apim.core.portal_page.model.PortalPageNavigationId;
+import io.gravitee.apim.core.portal_page.model.PortalNavigationItemId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.OptionalInt;
@@ -52,7 +52,7 @@ public PortalNavigationItem update(PortalNavigationItem portalNavigationItem) {
     }
 
     @Override
-    public void delete(PortalPageNavigationId portalNavigationItemId) {
+    public void delete(PortalNavigationItemId portalNavigationItemId) {
         storage.removeIf(page -> page.getId().equals(portalNavigationItemId));
     }
 

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/portal_page/use_case/CreatePortalNavigationItemUseCaseTest.java

@@ -25,8 +25,8 @@
 import io.gravitee.apim.core.portal_page.model.PortalArea;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationFolder;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationItem;
-import io.gravitee.apim.core.portal_page.model.PortalPageNavigationId;
 import java.util.ArrayList;
+import io.gravitee.apim.core.portal_page.model.PortalNavigationItemId;
 import org.junit.function.ThrowingRunnable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -58,7 +58,7 @@ void setUp() {
     void should_create_top_level_navigation_item_when_parent_id_is_null() {
         // Given
         final var portalNavigationItem = new PortalNavigationFolder(
-            PortalPageNavigationId.random(),
+            PortalNavigationItemId.random(),
             ORG_ID,
             ENV_ID,
             "title",
@@ -78,12 +78,12 @@ void should_create_top_level_navigation_item_when_parent_id_is_null() {
     void should_create_nested_navigation_item_when_parent_id_is_not_null() {
         // Given
         final var portalNavigationItem = new PortalNavigationFolder(
-            PortalPageNavigationId.random(),
+            PortalNavigationItemId.random(),
             ORG_ID,
             ENV_ID,
             "title",
             PortalArea.TOP_NAVBAR,
-            PortalPageNavigationId.of(APIS_ID)
+            PortalNavigationItemId.of(APIS_ID)
         );
 
         // When
@@ -92,7 +92,7 @@ void should_create_nested_navigation_item_when_parent_id_is_not_null() {
         // Then
         final var result = queryService.findByParentIdAndEnvironmentId(
             portalNavigationItem.getEnvironmentId(),
-            PortalPageNavigationId.of(APIS_ID)
+            PortalNavigationItemId.of(APIS_ID)
         );
         assertThat(result).extracting(PortalNavigationItem::getId).contains(portalNavigationItem.getId());
     }
@@ -101,12 +101,12 @@ void should_create_nested_navigation_item_when_parent_id_is_not_null() {
     void should_fail_when_parent_is_not_folder() {
         // Given
         final var portalNavigationItem = new PortalNavigationFolder(
-            PortalPageNavigationId.random(),
+            PortalNavigationItemId.random(),
             ORG_ID,
             ENV_ID,
             "title",
             PortalArea.TOP_NAVBAR,
-            PortalPageNavigationId.of(PAGE11_ID)
+            PortalNavigationItemId.of(PAGE11_ID)
         );
 
         // When

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/infra/adapter/PortalNavigationItemAdapterTest.java

@@ -213,9 +213,9 @@ void should_map_folder_to_repository() {
                 "org-id",
                 "env-id",
                 "My Folder",
-                PortalArea.TOP_NAVBAR
+                PortalArea.TOP_NAVBAR,
+                    PortalNavigationItemId.of("550e8400-e29b-41d4-a716-446655440011")
             );
-            entity.setParentId(PortalNavigationItemId.of("550e8400-e29b-41d4-a716-446655440011"));
             entity.setOrder(1);
 
             // When
@@ -242,6 +242,7 @@ void should_map_page_to_repository() {
                 "env-id",
                 "My Page",
                 PortalArea.HOMEPAGE,
+                    null,
                 PortalPageContentId.of("550e8400-e29b-41d4-a716-446655440013")
             );
             entity.setOrder(2);
@@ -269,6 +270,7 @@ void should_map_link_to_repository() {
                 "env-id",
                 "My Link",
                 PortalArea.TOP_NAVBAR,
+                null,
                 "https://example.com"
             );
             entity.setOrder(3);
@@ -296,6 +298,7 @@ void should_handle_null_parent_id() {
                 "env-id",
                 "My Folder",
                 PortalArea.TOP_NAVBAR
+                    , null
             );
 
             // When

gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/infra/query_service/portal_page/PortalNavigationItemsCrudServiceImplTest.java

@@ -20,10 +20,10 @@
 
 import io.gravitee.apim.core.portal_page.model.PortalArea;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationFolder;
+import io.gravitee.apim.core.portal_page.model.PortalNavigationItemId;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationLink;
 import io.gravitee.apim.core.portal_page.model.PortalNavigationPage;
 import io.gravitee.apim.core.portal_page.model.PortalPageContentId;
-import io.gravitee.apim.core.portal_page.model.PortalPageNavigationId;
 import io.gravitee.repository.exceptions.TechnicalException;
 import io.gravitee.repository.management.api.PortalNavigationItemRepository;
 import io.gravitee.repository.management.model.PortalNavigationItem;
@@ -60,7 +60,7 @@ class CreatePortalNavigationItem {
 
         @Test
         void should_create_a_folder() throws TechnicalException {
-            final var itemId = PortalPageNavigationId.random();
+            final var itemId = PortalNavigationItemId.random();
             final var item = new PortalNavigationFolder(itemId, "organizationId", "environmentId", "title", PortalArea.TOP_NAVBAR, null);
 
             service.create(item);
@@ -82,7 +82,7 @@ void should_create_a_folder() throws TechnicalException {
 
         @Test
         void should_create_a_page() throws TechnicalException {
-            final var itemId = PortalPageNavigationId.random();
+            final var itemId = PortalNavigationItemId.random();
             final var contentId = PortalPageContentId.random();
             final var item = new PortalNavigationPage(
                 itemId,
@@ -113,7 +113,7 @@ void should_create_a_page() throws TechnicalException {
 
         @Test
         void should_create_a_link() throws TechnicalException {
-            final var itemId = PortalPageNavigationId.random();
+            final var itemId = PortalNavigationItemId.random();
             final var contentId = PortalPageContentId.random();
             final var href = "http://example.com";
             final var item = new PortalNavigationLink(