fix(moderation): fix moderation creation

Signed-off-by: Gaurav Mishra <[email protected]>
eclipse-sw360 · Dec 16, 2024 · ce1ae55 · ce1ae55
1 parent c8b2756
commit ce1ae55
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...d/moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationDatabaseHandler.java b/...d/moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationDatabaseHandler.java
@@ -177,7 +177,10 @@ public ModerationRequest getRequest(String requestId) {
     public List<ModerationRequest> getRequestByDocumentId(String documentId) {
         List<ModerationRequest> requests = CommonUtils.nullToEmptyList(repository.getRequestsByDocumentId(documentId));
 
-        Collections.sort(requests, CommonUtils.compareByTimeStampDescending());
+        if (!requests.isEmpty()) {
+            // nullToEmptyList returns ImmutableList which is not sortable.
+            requests.sort(CommonUtils.compareByTimeStampDescending());
+        }
 
         return requests;
     }

diff --git a/...server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java b/...server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
@@ -905,8 +905,13 @@ public Component convertToEmbeddedComponent(Component component) {
         embeddedComponent.setMainLicenseIds(component.getMainLicenseIds());
         embeddedComponent.setVcs(component.getVcs());
         if (CommonUtils.isNotNullEmptyOrWhitespace(component.getDefaultVendorId())) {
-            Vendor defaultVendor = vendorService.getVendorById(component.getDefaultVendorId());
-            embeddedComponent.setDefaultVendor(defaultVendor);
+            try {
+                Vendor defaultVendor = vendorService.getVendorById(component.getDefaultVendorId());
+                embeddedComponent.setDefaultVendor(defaultVendor);
+            } catch (RuntimeException e) {
+                LOGGER.error("Failed to retrieve default vendor '{}' from SW360 database.",
+                        component.getDefaultVendorId(), e);
+            }
         }
         embeddedComponent.setType(null);
         return embeddedComponent;