Skip to content

Commit 5c01801

Browse files
Kareem74xGMishx
authored andcommitted
refactor(wsimport): improve duplicate releaseId logging in ThriftUploader
Signed-off-by: Kareem74x <kareemmostafa74x@gmail.com>
1 parent 98c9115 commit 5c01801

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

backend/wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftUploader.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,13 @@ protected ProjectImportResult createProject(WsProject wsProject, User sw360User,
104104
.collect(Collectors.toMap(
105105
ReleaseRelation::getReleaseId,
106106
ReleaseRelation::getProjectReleaseRelationship,
107-
(projectReleaseRelationship1, projectReleaseRelationship2) -> {
108-
LOGGER.info("--- Duplicate key found!");
109-
LOGGER.info("--- 1: " + projectReleaseRelationship1.getReleaseRelation());
110-
LOGGER.info("--- 2: " + projectReleaseRelationship2.getReleaseRelation());
111-
return projectReleaseRelationship1;
107+
(existing, duplicate) -> {
108+
LOGGER.warn(
109+
"Duplicate releaseId detected. Keeping existing relation {} and ignoring {}",
110+
existing.getReleaseRelation(),
111+
duplicate.getReleaseRelation()
112+
);
113+
return existing;
112114
}
113115
));
114116
sw360Project.setReleaseIdToUsage(releaseIdToUsage);

0 commit comments

Comments
 (0)