From effb1e24adaeb3a62c93a874a5e97f2057c342b1 Mon Sep 17 00:00:00 2001 From: Sandeep Ravindranath <47850410+smy4kor@users.noreply.github.com> Date: Mon, 1 Jul 2019 10:24:00 +0200 Subject: [PATCH] fix the logic that marks distributionSet as complete (#838) DistributionSets without SoftwareModules shall not be marked as complete, when no Software Module is assigned Signed-off-by: Ravindranath Sandeep (INST-IOT/ESW-Imb) --- .../repository/jpa/model/JpaDistributionSetType.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java index 0f1cce8b7..67e0a77e1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.jpa.model; import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -209,8 +210,12 @@ public class JpaDistributionSetType extends AbstractJpaNamedEntity implements Di @Override public boolean checkComplete(final DistributionSet distributionSet) { - return distributionSet.getModules().stream().map(SoftwareModule::getType).collect(Collectors.toList()) - .containsAll(getMandatoryModuleTypes()); + List smTypes = distributionSet.getModules().stream().map(SoftwareModule::getType) + .collect(Collectors.toList()); + if (smTypes.isEmpty()) { + return false; + } + return smTypes.containsAll(getMandatoryModuleTypes()); } @Override