From 31329c038e2028d37e9a8749ce44aac7d482d398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Maisse?= Date: Fri, 13 Oct 2023 17:15:32 +0200 Subject: [PATCH] fix: do not remove attached media when renaming an API Doc Page https://gravitee.atlassian.net/browse/APIM-2855 https://github.com/gravitee-io/issues/issues/9285 (cherry picked from commit a8e32c928b580cbc0f51d7455038eb8f2ab4753f) --- .../io/gravitee/rest/api/service/impl/PageServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/PageServiceImpl.java b/gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/PageServiceImpl.java index 69f9cb934b2..8b056af8d6c 100644 --- a/gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/PageServiceImpl.java +++ b/gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/PageServiceImpl.java @@ -318,8 +318,11 @@ private static Page merge(UpdatePageEntity updatePageEntity, Page withUpdatePage : withUpdatePage.getAccessControls() ); - List pageMediaList = convertMediaEntity(updatePageEntity.getAttachedMedia()); - page.setAttachedMedia(pageMediaList != null ? pageMediaList : withUpdatePage.getAttachedMedia()); + page.setAttachedMedia( + updatePageEntity.getAttachedMedia() != null + ? convertMediaEntity(updatePageEntity.getAttachedMedia()) + : withUpdatePage.getAttachedMedia() + ); page.setParentId( updatePageEntity.getParentId() != null ? updatePageEntity.getParentId().isEmpty() ? null : updatePageEntity.getParentId()