lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix retrieve Rollout with details (#2435)

Browse Source 
* Fix retrieve Rollout with details

* Rename RolloutManagement method for retrieve Rollout slice with details. Slight refactoring in MgmtRolloutMapper

---------

Co-authored-by: vasilchev <vasil.ilchev@bosch.com>
This commit is contained in:
Vasil Ilchev
2025-06-09 15:38:20 +03:00
committed by GitHub
parent 5a304af165
commit 09a3d3e0c6
5 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutMapper.java
View File

@@ -62,7 +62,11 @@ final class MgmtRolloutMapper {
return toResponseRollout(rollouts, false);
}
static List<MgmtRolloutResponseBody> toResponseRollout(final List<Rollout> rollouts, final boolean withDetails) {
static List<MgmtRolloutResponseBody> toResponseRolloutWithDetails(final List<Rollout> rollouts) {
return toResponseRollout(rollouts, true);
}
private static List<MgmtRolloutResponseBody> toResponseRollout(final List<Rollout> rollouts, final boolean withDetails) {
if (rollouts == null) {
return Collections.emptyList();
}

11
hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java
View File

@@ -94,19 +94,20 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi {
final Pageable pageable = new OffsetBasedPageRequest(sanitizedOffsetParam, sanitizedLimitParam, sorting);
final Page<Rollout> rollouts;
if (rsqlParam != null) {
rollouts = this.rolloutManagement.findByRsql(pageable, rsqlParam, false);
rollouts = rolloutManagement.findByRsql(pageable, rsqlParam, false);
} else {
rollouts = this.rolloutManagement.findAll(pageable, false);
rollouts = rolloutManagement.findAll(pageable, false);
}
final long totalElements = rollouts.getTotalElements();
final List<MgmtRolloutResponseBody> rest;
if (isFullMode) {
this.rolloutManagement.setRolloutStatusDetails(rollouts);
rest = MgmtRolloutMapper.toResponseRolloutWithDetails(rolloutManagement.getRolloutWithStatusDetails(rollouts).getContent());
} else {
rest = MgmtRolloutMapper.toResponseRollout(rollouts.getContent());
}
final List<MgmtRolloutResponseBody> rest = MgmtRolloutMapper.toResponseRollout(rollouts.getContent(), isFullMode);
return ResponseEntity.ok(new PagedList<>(rest, totalElements));
}