From 3bd0414c78d6a013c398597901dd1f163a52f496 Mon Sep 17 00:00:00 2001 From: Kareem74x Date: Thu, 12 Mar 2026 07:32:44 +0200 Subject: [PATCH] refactor(wsimport): improve duplicate releaseId logging in ThriftUploader Signed-off-by: Kareem74x --- .../sw360/wsimport/thrift/ThriftUploader.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/backend/wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftUploader.java b/backend/wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftUploader.java index f639d6313a..2040ac4e35 100644 --- a/backend/wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftUploader.java +++ b/backend/wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftUploader.java @@ -104,11 +104,13 @@ protected ProjectImportResult createProject(WsProject wsProject, User sw360User, .collect(Collectors.toMap( ReleaseRelation::getReleaseId, ReleaseRelation::getProjectReleaseRelationship, - (projectReleaseRelationship1, projectReleaseRelationship2) -> { - LOGGER.info("--- Duplicate key found!"); - LOGGER.info("--- 1: " + projectReleaseRelationship1.getReleaseRelation()); - LOGGER.info("--- 2: " + projectReleaseRelationship2.getReleaseRelation()); - return projectReleaseRelationship1; + (existing, duplicate) -> { + LOGGER.warn( + "Duplicate releaseId detected. Keeping existing relation {} and ignoring {}", + existing.getReleaseRelation(), + duplicate.getReleaseRelation() + ); + return existing; } )); sw360Project.setReleaseIdToUsage(releaseIdToUsage);