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

Bugfix NPE in target percentage (#819)

Browse Source 
* Fixed NullPointerException in groups validation callback

Signed-off-by: Natalia Kislicyn <natalia.kislicyn@bosch-si.com>
This commit is contained in:
Natalia Kislicyn
2019-06-06 08:21:28 +02:00
committed by Jeroen Laverman
parent fde0cbdf16
commit 3b15e80e95
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/DefineGroupsLayout.java
View File

@@ -48,6 +48,7 @@ import com.vaadin.data.Item;
import com.vaadin.data.Validator; import com.vaadin.data.Validator;
import com.vaadin.data.util.converter.StringToFloatConverter; import com.vaadin.data.util.converter.StringToFloatConverter;
import com.vaadin.data.util.converter.StringToIntegerConverter; import com.vaadin.data.util.converter.StringToIntegerConverter;
import com.vaadin.data.validator.RangeValidator;
import com.vaadin.data.validator.FloatRangeValidator; import com.vaadin.data.validator.FloatRangeValidator;
import com.vaadin.data.validator.IntegerRangeValidator; import com.vaadin.data.validator.IntegerRangeValidator;
import com.vaadin.server.FontAwesome; import com.vaadin.server.FontAwesome;
@@ -62,6 +63,8 @@ import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField; import com.vaadin.ui.TextField;
import com.vaadin.ui.UI; import com.vaadin.ui.UI;
import static org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil.getCurrentLocale;
/** /**
* Define groups for a Rollout * Define groups for a Rollout
*/ */
@@ -331,8 +334,13 @@ public class DefineGroupsLayout extends GridLayout {
} }
// validate the single groups // validate the single groups
final int maxTargets = quotaManagement.getMaxTargetsPerRolloutGroup(); singleGroupsValidation(lastRow);
}
private void singleGroupsValidation(final GroupRow lastRow) {
final boolean hasRemainingTargetsError = validationStatus == ValidationStatus.INVALID; final boolean hasRemainingTargetsError = validationStatus == ValidationStatus.INVALID;
final int maxTargets = quotaManagement.getMaxTargetsPerRolloutGroup();
for (int i = 0; i < groupRows.size(); ++i) { for (int i = 0; i < groupRows.size(); ++i) {
final GroupRow row = groupRows.get(i); final GroupRow row = groupRows.get(i);
// do not mask the 'remaining targets' error // do not mask the 'remaining targets' error
@@ -340,13 +348,14 @@ public class DefineGroupsLayout extends GridLayout {
continue; continue;
} }
row.resetError(); row.resetError();
final Long count = groupsValidation.getTargetsPerGroup().get(i); if (groupsValidation != null) {
if (count != null && count > maxTargets) { final Long count = groupsValidation.getTargetsPerGroup().get(i);
row.setError(i18n.getMessage(MESSAGE_ROLLOUT_MAX_GROUP_SIZE_EXCEEDED, maxTargets)); if (count != null && count > maxTargets) {
setValidationStatus(ValidationStatus.INVALID); row.setError(i18n.getMessage(MESSAGE_ROLLOUT_MAX_GROUP_SIZE_EXCEEDED, maxTargets));
setValidationStatus(ValidationStatus.INVALID);
}
} }
} }
} }
private List<RolloutGroupCreate> getGroupsFromRows() { private List<RolloutGroupCreate> getGroupsFromRows() {
@@ -463,12 +472,16 @@ public class DefineGroupsLayout extends GridLayout {
private void validateMandatoryPercentage(final Object value) { private void validateMandatoryPercentage(final Object value) {
if (value != null) { if (value != null) {
final String message = i18n.getMessage("message.rollout.field.value.range", 0, 100); final String message = i18n.getMessage("message.rollout.field.value.range", 0, 100);
RangeValidator rangeValidator;
if (value instanceof Float) { if (value instanceof Float) {
new FloatRangeValidator(message, 0F, 100F).validate(value); rangeValidator = new FloatRangeValidator(message, 0F, 100F);
} } else if (value instanceof Integer) {
if (value instanceof Integer) { rangeValidator = new IntegerRangeValidator(message, 0, 100);
new IntegerRangeValidator(message, 0, 100).validate(value); } else {
throw new Validator.InvalidValueException(i18n.getMessage("message.enter.number"));
} }
rangeValidator.setMinValueIncluded(false);
rangeValidator.validate(value);
} else { } else {
throw new Validator.EmptyValueException(i18n.getMessage("message.enter.number")); throw new Validator.EmptyValueException(i18n.getMessage("message.enter.number"));
} }
@@ -615,7 +628,7 @@ public class DefineGroupsLayout extends GridLayout {
targetFilterQuery.setValue(group.getTargetFilterQuery()); targetFilterQuery.setValue(group.getTargetFilterQuery());
populateTargetFilterQuery(group); populateTargetFilterQuery(group);
targetPercentage.setValue(String.format("%.2f", group.getTargetPercentage())); targetPercentage.setValue(String.format(getCurrentLocale(), "%.2f", group.getTargetPercentage()));
triggerThreshold.setValue(group.getSuccessConditionExp()); triggerThreshold.setValue(group.getSuccessConditionExp());
errorThreshold.setValue(group.getErrorConditionExp()); errorThreshold.setValue(group.getErrorConditionExp());