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

Changed the structure of the response body for Distribution statistics (#1397)

Browse Source 
* changed the structure of the response body

Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com>

* Fixed tests

Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com>

* refactoring

Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com>

---------

Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com>
This commit is contained in:
Denislav Prinov
2023-07-17 13:46:52 +03:00
committed by GitHub
parent 56ea5b15c9
commit 71740ccdda
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetStatistics.java
View File

@@ -16,20 +16,19 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public class MgmtDistributionSetStatistics { public class MgmtDistributionSetStatistics {
private static final String TOTAL = "total"; private static final String TOTAL = "total";
@JsonProperty @JsonProperty("actions")
private Map<String, Long> totalActionsPerStatus; private Map<String, Long> totalActionsPerStatus;
@JsonProperty @JsonProperty("rollouts")
private Map<String, Long> totalRolloutsPerStatus; private Map<String, Long> totalRolloutsPerStatus;
@JsonProperty @JsonProperty
private Long totalAutoAssignments; private Long totalAutoAssignments;
private MgmtDistributionSetStatistics() { private MgmtDistributionSetStatistics() {
// Private constructor to enforce the use of the builder pattern // Private constructor to enforce the use of the builder pattern
} }
@@ -47,14 +46,15 @@ public class MgmtDistributionSetStatistics {
} }
public static class Builder { public static class Builder {
private Map<String, Long> totalActionsPerStatus; private final Map<String, Long> totalActionsPerStatus;
private Map<String, Long> totalRolloutsPerStatus; private final Map<String, Long> totalRolloutsPerStatus;
private Long totalAutoAssignments; private Long totalAutoAssignments;
private final boolean fullRepresentation;
public Builder() { public Builder(boolean fullRepresentation) {
totalActionsPerStatus = new HashMap<>(); totalActionsPerStatus = new HashMap<>();
totalRolloutsPerStatus = new HashMap<>(); totalRolloutsPerStatus = new HashMap<>();
this.fullRepresentation = fullRepresentation;
} }
public Builder addTotalActionPerStatus(String status, Long count) { public Builder addTotalActionPerStatus(String status, Long count) {
@@ -76,13 +76,13 @@ public class MgmtDistributionSetStatistics {
MgmtDistributionSetStatistics statistics = new MgmtDistributionSetStatistics(); MgmtDistributionSetStatistics statistics = new MgmtDistributionSetStatistics();
statistics.totalActionsPerStatus = calculateTotalWithStatus(totalActionsPerStatus); statistics.totalActionsPerStatus = calculateTotalWithStatus(totalActionsPerStatus);
statistics.totalRolloutsPerStatus = calculateTotalWithStatus(totalRolloutsPerStatus); statistics.totalRolloutsPerStatus = calculateTotalWithStatus(totalRolloutsPerStatus);
statistics.totalAutoAssignments = totalAutoAssignments; statistics.totalAutoAssignments = fullRepresentation ? (totalAutoAssignments == null ? Long.valueOf(0) : totalAutoAssignments) : totalAutoAssignments;
return statistics; return statistics;
} }
private Map<String, Long> calculateTotalWithStatus(Map<String, Long> statusMap) { private Map<String, Long> calculateTotalWithStatus(Map<String, Long> statusMap) {
if (statusMap.isEmpty()) { if (!fullRepresentation && statusMap.isEmpty()) {
return null; return statusMap;
} }
long total = statusMap.values().stream().mapToLong(Long::longValue).sum(); long total = statusMap.values().stream().mapToLong(Long::longValue).sum();

8
hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java
View File

@@ -417,7 +417,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
@Override @Override
public ResponseEntity<MgmtDistributionSetStatistics> getRolloutsCountByStatusForDistributionSet(Long distributionSetId) { public ResponseEntity<MgmtDistributionSetStatistics> getRolloutsCountByStatusForDistributionSet(Long distributionSetId) {
MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(); MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(false);
distributionSetManagement.countRolloutsByStatusForDistributionSet(distributionSetId).forEach(statistic -> distributionSetManagement.countRolloutsByStatusForDistributionSet(distributionSetId).forEach(statistic ->
statistics.addTotalRolloutPerStatus(String.valueOf(statistic.getName()), Long.parseLong(statistic.getData().toString()))); statistics.addTotalRolloutPerStatus(String.valueOf(statistic.getName()), Long.parseLong(statistic.getData().toString())));
return ResponseEntity.ok(statistics.build()); return ResponseEntity.ok(statistics.build());
@@ -425,7 +425,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
@Override @Override
public ResponseEntity<MgmtDistributionSetStatistics> getActionsCountByStatusForDistributionSet(Long distributionSetId) { public ResponseEntity<MgmtDistributionSetStatistics> getActionsCountByStatusForDistributionSet(Long distributionSetId) {
MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(); MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(false);
distributionSetManagement.countActionsByStatusForDistributionSet(distributionSetId).forEach(statistic -> distributionSetManagement.countActionsByStatusForDistributionSet(distributionSetId).forEach(statistic ->
statistics.addTotalActionPerStatus(String.valueOf(statistic.getName()), Long.parseLong(statistic.getData().toString()))); statistics.addTotalActionPerStatus(String.valueOf(statistic.getName()), Long.parseLong(statistic.getData().toString())));
return ResponseEntity.ok(statistics.build()); return ResponseEntity.ok(statistics.build());
@@ -433,14 +433,14 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
@Override @Override
public ResponseEntity<MgmtDistributionSetStatistics> getAutoAssignmentsCountForDistributionSet(Long distributionSetId) { public ResponseEntity<MgmtDistributionSetStatistics> getAutoAssignmentsCountForDistributionSet(Long distributionSetId) {
MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(); MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(false);
statistics.addTotalAutoAssignments(distributionSetManagement.countAutoAssignmentsForDistributionSet(distributionSetId)); statistics.addTotalAutoAssignments(distributionSetManagement.countAutoAssignmentsForDistributionSet(distributionSetId));
return ResponseEntity.ok(statistics.build()); return ResponseEntity.ok(statistics.build());
} }
@Override @Override
public ResponseEntity<MgmtDistributionSetStatistics> getStatisticsForDistributionSet(Long distributionSetId) { public ResponseEntity<MgmtDistributionSetStatistics> getStatisticsForDistributionSet(Long distributionSetId) {
MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(); MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(true);
distributionSetManagement.countRolloutsByStatusForDistributionSet(distributionSetId).forEach(statistic -> distributionSetManagement.countRolloutsByStatusForDistributionSet(distributionSetId).forEach(statistic ->
statistics.addTotalRolloutPerStatus(String.valueOf(statistic.getName()), Long.parseLong(statistic.getData().toString()))); statistics.addTotalRolloutPerStatus(String.valueOf(statistic.getName()), Long.parseLong(statistic.getData().toString())));
distributionSetManagement.countActionsByStatusForDistributionSet(distributionSetId).forEach(statistic -> distributionSetManagement.countActionsByStatusForDistributionSet(distributionSetId).forEach(statistic ->

42
hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java
View File

@@ -1458,17 +1458,17 @@ public class MgmtDistributionSetResourceTest extends AbstractManagementApiIntegr
mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/rollouts", ds1.getId()).contentType(MediaType.APPLICATION_JSON)) mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/rollouts", ds1.getId()).contentType(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("totalRolloutsPerStatus.READY", equalTo(1))) .andExpect(jsonPath("rollouts.READY", equalTo(1)))
.andExpect(jsonPath("totalRolloutsPerStatus.RUNNING", equalTo(1))) .andExpect(jsonPath("rollouts.RUNNING", equalTo(1)))
.andExpect(jsonPath("totalRolloutsPerStatus.total", equalTo(2))) .andExpect(jsonPath("rollouts.total", equalTo(2)))
.andExpect(jsonPath("totalActionsPerStatus").doesNotExist()) .andExpect(jsonPath("actions").doesNotExist())
.andExpect(jsonPath("totalAutoAssignments").doesNotExist()); .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/rollouts", ds2.getId()).contentType(MediaType.APPLICATION_JSON)) mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/rollouts", ds2.getId()).contentType(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist()) .andExpect(jsonPath("rollouts").doesNotExist())
.andExpect(jsonPath("totalActionsPerStatus").doesNotExist()) .andExpect(jsonPath("actions").doesNotExist())
.andExpect(jsonPath("totalAutoAssignments").doesNotExist()); .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
} }
@@ -1488,16 +1488,16 @@ public class MgmtDistributionSetResourceTest extends AbstractManagementApiIntegr
mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/actions", ds1.getId()).contentType(MediaType.APPLICATION_JSON)) mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/actions", ds1.getId()).contentType(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("totalActionsPerStatus.RUNNING", equalTo(4))) .andExpect(jsonPath("actions.RUNNING", equalTo(4)))
.andExpect(jsonPath("totalActionsPerStatus.total", equalTo(4))) .andExpect(jsonPath("actions.total", equalTo(4)))
.andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist()) .andExpect(jsonPath("rollouts").doesNotExist())
.andExpect(jsonPath("totalAutoAssignments").doesNotExist()); .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/actions", ds2.getId()).contentType(MediaType.APPLICATION_JSON)) mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/actions", ds2.getId()).contentType(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist()) .andExpect(jsonPath("rollouts").doesNotExist())
.andExpect(jsonPath("totalActionsPerStatus").doesNotExist()) .andExpect(jsonPath("actions").doesNotExist())
.andExpect(jsonPath("totalAutoAssignments").doesNotExist()); .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
} }
@@ -1518,14 +1518,14 @@ public class MgmtDistributionSetResourceTest extends AbstractManagementApiIntegr
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("totalAutoAssignments", equalTo(2))) .andExpect(jsonPath("totalAutoAssignments", equalTo(2)))
.andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist()) .andExpect(jsonPath("rollouts").doesNotExist())
.andExpect(jsonPath("totalActionsPerStatus").doesNotExist()); .andExpect(jsonPath("actions").doesNotExist());
mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/autoassignments", ds2.getId()).contentType(MediaType.APPLICATION_JSON)) mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/autoassignments", ds2.getId()).contentType(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist()) .andExpect(jsonPath("rollouts").doesNotExist())
.andExpect(jsonPath("totalActionsPerStatus").doesNotExist()) .andExpect(jsonPath("actions").doesNotExist())
.andExpect(jsonPath("totalAutoAssignments").doesNotExist()); .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
} }
@@ -1550,17 +1550,17 @@ public class MgmtDistributionSetResourceTest extends AbstractManagementApiIntegr
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("totalAutoAssignments", equalTo(1))) .andExpect(jsonPath("totalAutoAssignments", equalTo(1)))
.andExpect(jsonPath("totalActionsPerStatus.RUNNING", equalTo(4))) .andExpect(jsonPath("actions.RUNNING", equalTo(4)))
.andExpect(jsonPath("totalActionsPerStatus.total", equalTo(4))) .andExpect(jsonPath("actions.total", equalTo(4)))
.andExpect(jsonPath("totalRolloutsPerStatus.RUNNING", equalTo(1))) .andExpect(jsonPath("rollouts.RUNNING", equalTo(1)))
.andExpect(jsonPath("totalRolloutsPerStatus.total", equalTo(1))); .andExpect(jsonPath("rollouts.total", equalTo(1)));
mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/autoassignments", ds2.getId()).contentType(MediaType.APPLICATION_JSON)) mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/autoassignments", ds2.getId()).contentType(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()) .andDo(MockMvcResultPrinter.print())
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist()) .andExpect(jsonPath("rollouts").doesNotExist())
.andExpect(jsonPath("totalActionsPerStatus").doesNotExist()) .andExpect(jsonPath("actions").doesNotExist())
.andExpect(jsonPath("totalAutoAssignments").doesNotExist()); .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
} }