-
Notifications
You must be signed in to change notification settings - Fork 104
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(rest): Add license information linking for project releases. #2871
Open
nikkuma7
wants to merge
1
commit into
eclipse-sw360:main
Choose a base branch
from
siemens:feat/Add_License_Info_to_Release
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1543,4 +1543,101 @@ public List<ReleaseLink> serveLinkedReleasesInDependencyNetworkByIndexPath(Strin | |
ProjectService.Iface sw360ProjectClient = getThriftProjectClient(); | ||
return sw360ProjectClient.getReleaseLinksOfProjectNetWorkByIndexPath(projectId, indexPath, sw360User); | ||
} | ||
|
||
public RequestStatus addLicenseToLinkedReleases(String projectId, User sw360User) | ||
throws TTransportException, TException { | ||
ThriftClients thriftClients = new ThriftClients(); | ||
ProjectService.Iface projectClient = getThriftProjectClient(); | ||
LicenseInfoService.Iface licenseInfoClient = thriftClients.makeLicenseInfoClient(); | ||
ComponentService.Iface componentClient = thriftClients.makeComponentClient(); | ||
JSONObject jsonResult = new JSONObject(); | ||
|
||
try { | ||
Project project = projectClient.getProjectById(projectId, sw360User); | ||
if (project == null) { | ||
throw new IllegalArgumentException("Project with ID " + projectId + " not found."); | ||
} | ||
|
||
Set<String> releaseIds = CommonUtils.getNullToEmptyKeyset(project.getReleaseIdToUsage()); | ||
List<Release> releasesWithSingleCLI = new ArrayList<>(); | ||
List<Release> releasesWithMultipleCLI = new ArrayList<>(); | ||
boolean isModerationRequired = false; | ||
|
||
for (String releaseId : releaseIds) { | ||
Release release = componentClient.getReleaseById(releaseId, sw360User); | ||
if (release == null) { | ||
throw new IllegalArgumentException("Release with ID " + releaseId + " not found."); | ||
} | ||
|
||
List<Attachment> approvedCliAttachments = SW360Utils.getApprovedClxAttachmentForRelease(release); | ||
if (approvedCliAttachments.isEmpty()) { | ||
approvedCliAttachments = SW360Utils.getClxAttachmentForRelease(release); | ||
} | ||
|
||
if (approvedCliAttachments.size() == 1) { | ||
processSingleAttachment(approvedCliAttachments.get(0), release, licenseInfoClient, sw360User); | ||
releasesWithSingleCLI.add(release); | ||
} else { | ||
if (approvedCliAttachments.size() > 1) { | ||
releasesWithMultipleCLI.add(release); | ||
} | ||
jsonResult.put(SW360Constants.STATUS, SW360Constants.FAILURE); | ||
isModerationRequired = true; | ||
} | ||
|
||
componentClient.updateRelease(release, sw360User); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This call can result in creation of Moderation Request. Please add comment field for the same in the controller as done in #2405 |
||
} | ||
|
||
jsonResult.put("releasesWithSingleCLI", releasesWithSingleCLI); | ||
jsonResult.put("releasesWithMultipleCLI", releasesWithMultipleCLI); | ||
|
||
if (isModerationRequired) { | ||
return RequestStatus.SENT_TO_MODERATOR; | ||
} | ||
|
||
return RequestStatus.SUCCESS; | ||
|
||
} catch (Exception e) { | ||
throw new RuntimeException("Error processing linked releases for project: " + projectId, e); | ||
} | ||
} | ||
|
||
|
||
private void processSingleAttachment(Attachment attachment, Release release, | ||
LicenseInfoService.Iface licenseInfoClient, User sw360User) throws TTransportException, TException { | ||
String attachmentName = attachment.getFilename(); | ||
|
||
Set<String> mainLicenses = new HashSet<>(); | ||
Set<String> otherLicenses = new HashSet<>(); | ||
|
||
List<LicenseInfoParsingResult> licenseInfoResults = licenseInfoClient.getLicenseInfoForAttachment(release, | ||
attachment.getAttachmentContentId(), true, sw360User); | ||
|
||
if (attachmentName.endsWith(SW360Constants.RDF_FILE_EXTENSION)) { | ||
licenseInfoResults.forEach(result -> { | ||
if (result.getLicenseInfo() != null) { | ||
mainLicenses.addAll(result.getLicenseInfo().getConcludedLicenseIds()); | ||
otherLicenses.addAll(result.getLicenseInfo().getLicenseNamesWithTexts().stream() | ||
.map(LicenseNameWithText::getLicenseName).collect(Collectors.toSet())); | ||
} | ||
}); | ||
otherLicenses.removeAll(mainLicenses); | ||
} else if (attachmentName.endsWith(SW360Constants.XML_FILE_EXTENSION)) { | ||
licenseInfoResults.forEach(result -> { | ||
if (result.getLicenseInfo() != null) { | ||
result.getLicenseInfo().getLicenseNamesWithTexts().forEach(license -> { | ||
if (SW360Constants.LICENSE_TYPE_GLOBAL.equals(license.getType())) { | ||
mainLicenses.add(license.getLicenseName()); | ||
} else { | ||
otherLicenses.add(license.getLicenseName()); | ||
} | ||
}); | ||
} | ||
}); | ||
} | ||
|
||
release.setMainLicenseIds(mainLicenses); | ||
release.setOtherLicenseIds(otherLicenses); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The actual response seems more like following.