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

Sonar issue fixed

Browse Source 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
This commit is contained in:
Dominic Schabel
2019-05-24 11:14:31 +02:00
parent c88e7bb06e
commit 509693d0ae
23 changed files with 97 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java
View File

@@ -249,7 +249,7 @@ public class TargetFilterTable extends Table {
i18n.getMessage(UIMessageIdProvider.BUTTON_AUTO_ASSIGNMENT_DESCRIPTION), null, false, null,
SPUIButtonStyleNoBorder.class);
} else {
updateIcon = actionType.equals(ActionType.FORCED)
updateIcon = actionType == ActionType.FORCED
? SPUIComponentProvider.getButton(buttonId, distSet.getNameVersion(),
i18n.getMessage(UIMessageIdProvider.BUTTON_AUTO_ASSIGNMENT_DESCRIPTION), null, false,
FontAwesome.BOLT, SPUIButtonStyleNoBorderWithIcon.class)

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/TargetAssignmentOperations.java
View File

@@ -250,7 +250,10 @@ public final class TargetAssignmentOperations {
private static final long serialVersionUID = 1L;
@Override
// Vaadin is returning object so "==" might not work
@SuppressWarnings("squid:S4551")
public void valueChange(final Property.ValueChangeEvent event) {
if (event.getProperty().getValue()
.equals(AbstractActionTypeOptionGroupLayout.ActionTypeOption.DOWNLOAD_ONLY)) {
enableMaintenanceWindowControl.setValue(false);

12
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGrid.java
View File

@@ -261,17 +261,17 @@ public class ActionHistoryGrid extends AbstractGrid<LazyQueryContainer> {
}
private StatusFontIcon createTypeLabelMetadata(final Action action) {
if (ActionType.FORCED.equals(action.getActionType()) || ActionType.TIMEFORCED.equals(action.getActionType())) {
if (ActionType.FORCED == action.getActionType() || ActionType.TIMEFORCED == action.getActionType()) {
return new StatusFontIcon(FontAwesome.BOLT, STATUS_ICON_FORCED,
i18n.getMessage(UIMessageIdProvider.CAPTION_ACTION_FORCED),
UIComponentIdProvider.ACTION_HISTORY_TABLE_TYPE_LABEL_ID);
}
if (ActionType.SOFT.equals(action.getActionType())) {
if (ActionType.SOFT == action.getActionType()) {
return new StatusFontIcon(FontAwesome.STEP_FORWARD, STATUS_ICON_SOFT,
i18n.getMessage(UIMessageIdProvider.CAPTION_ACTION_SOFT),
UIComponentIdProvider.ACTION_HISTORY_TABLE_TYPE_LABEL_ID);
}
if (ActionType.DOWNLOAD_ONLY.equals(action.getActionType())) {
if (ActionType.DOWNLOAD_ONLY == action.getActionType()) {
return new StatusFontIcon(FontAwesome.DOWNLOAD, STATUS_ICON_DOWNLOAD_ONLY,
i18n.getMessage(UIMessageIdProvider.CAPTION_ACTION_DOWNLOAD_ONLY),
UIComponentIdProvider.ACTION_HISTORY_TABLE_TYPE_LABEL_ID);
@@ -282,7 +282,7 @@ public class ActionHistoryGrid extends AbstractGrid<LazyQueryContainer> {
private StatusFontIcon createTimeForcedLabelMetadata(final Action action) {
StatusFontIcon result = null;
if (ActionType.TIMEFORCED.equals(action.getActionType())) {
if (ActionType.TIMEFORCED == action.getActionType()) {
final long currentTimeMillis = System.currentTimeMillis();
String style;
String title;
@@ -616,8 +616,8 @@ public class ActionHistoryGrid extends AbstractGrid<LazyQueryContainer> {
setColumnsSize(107.0, 500.0, ProxyAction.PXY_ACTION_DS_NAME_VERSION);
setColumnsSize(100.0, 150.0, ProxyAction.PXY_ACTION_LAST_MODIFIED_AT);
setColumnsSize(53.0, 55.0, ProxyAction.PXY_ACTION_STATUS);
setColumnsSize(FIXED_PIX_MIN, FIXED_PIX_MAX, VIRT_PROP_TYPE, VIRT_PROP_TIMEFORCED,
VIRT_PROP_ACTION_CANCEL, VIRT_PROP_ACTION_FORCE, VIRT_PROP_ACTION_FORCE_QUIT);
setColumnsSize(FIXED_PIX_MIN, FIXED_PIX_MAX, VIRT_PROP_TYPE, VIRT_PROP_TIMEFORCED, VIRT_PROP_ACTION_CANCEL,
VIRT_PROP_ACTION_FORCE, VIRT_PROP_ACTION_FORCE_QUIT);
setColumnsSize(FIXED_PIX_MIN, 500.0, ProxyAction.PXY_ACTION_ROLLOUT_NAME);
}
}

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AbstractActionTypeOptionGroupLayout.java
View File

@@ -109,8 +109,8 @@ public abstract class AbstractActionTypeOptionGroupLayout extends HorizontalLayo
*
*/
public enum ActionTypeOption {
FORCED(ActionType.FORCED), SOFT(ActionType.SOFT), AUTO_FORCED(ActionType.TIMEFORCED),
DOWNLOAD_ONLY(ActionType.DOWNLOAD_ONLY);
FORCED(ActionType.FORCED), SOFT(ActionType.SOFT), AUTO_FORCED(ActionType.TIMEFORCED), DOWNLOAD_ONLY(
ActionType.DOWNLOAD_ONLY);
private final ActionType actionType;
@@ -130,7 +130,7 @@ public abstract class AbstractActionTypeOptionGroupLayout extends HorizontalLayo
* @return action type option if matches, otherwise empty Optional
*/
public static Optional<ActionTypeOption> getOptionForActionType(final ActionType actionType) {
return Arrays.stream(ActionTypeOption.values()).filter(option -> option.getActionType().equals(actionType))
return Arrays.stream(ActionTypeOption.values()).filter(option -> option.getActionType() == actionType)
.findFirst();
}
}

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/ActionTypeOptionGroupAssignmentLayout.java
View File

@@ -52,6 +52,8 @@ public class ActionTypeOptionGroupAssignmentLayout extends AbstractActionTypeOpt
private static final long serialVersionUID = 1L;
@Override
// Vaadin is returning object so "==" might not work
@SuppressWarnings("squid:S4551")
public void valueChange(final ValueChangeEvent event) {
if (event.getProperty().getValue().equals(ActionTypeOption.AUTO_FORCED)) {
forcedTimeDateField.setEnabled(true);
@@ -79,8 +81,6 @@ public class ActionTypeOptionGroupAssignmentLayout extends AbstractActionTypeOpt
addDownloadOnlyItemWithLabel();
}
private void addAutoForceItemWithLabelAndDateField() {
final FlexibleOptionGroupItemComponent autoForceItem = actionTypeOptionGroup
.getItemComponent(ActionTypeOption.AUTO_FORCED);

16
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
View File

@@ -227,7 +227,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
if (editRolloutEnabled) {
editRollout();
if (rollout.getStatus().equals(Rollout.RolloutStatus.WAITING_FOR_APPROVAL)) {
if (rollout.getStatus() == Rollout.RolloutStatus.WAITING_FOR_APPROVAL) {
rolloutManagement.approveOrDeny(rollout.getId(),
(Rollout.ApprovalDecision) approveButtonsGroup.getValue(), approvalRemarkField.getValue());
eventBus.publish(this, RolloutEvent.UPDATE_ROLLOUT);
@@ -274,10 +274,10 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
.name(rolloutName.getValue()).description(description.getValue()).set(distributionSetId)
.actionType(getActionType()).forcedTime(getForcedTimeStamp());
if (AutoStartOptionGroupLayout.AutoStartOption.AUTO_START.equals(getAutoStartOption())) {
if (AutoStartOptionGroupLayout.AutoStartOption.AUTO_START == getAutoStartOption()) {
rolloutUpdate.startAt(System.currentTimeMillis());
}
if (AutoStartOptionGroupLayout.AutoStartOption.SCHEDULED.equals(getAutoStartOption())) {
if (AutoStartOptionGroupLayout.AutoStartOption.SCHEDULED == getAutoStartOption()) {
rolloutUpdate.startAt(getScheduledStartTime());
}
@@ -330,10 +330,10 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
.description(description.getValue()).set(distributionId).targetFilterQuery(getTargetFilterQuery())
.actionType(getActionType()).forcedTime(getForcedTimeStamp());
if (AutoStartOptionGroupLayout.AutoStartOption.AUTO_START.equals(getAutoStartOption())) {
if (AutoStartOptionGroupLayout.AutoStartOption.AUTO_START == getAutoStartOption()) {
rolloutCreate.startAt(System.currentTimeMillis());
}
if (AutoStartOptionGroupLayout.AutoStartOption.SCHEDULED.equals(getAutoStartOption())) {
if (AutoStartOptionGroupLayout.AutoStartOption.SCHEDULED == getAutoStartOption()) {
rolloutCreate.startAt(getScheduledStartTime());
}
@@ -355,7 +355,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
}
private Long getScheduledStartTime() {
return AutoStartOptionGroupLayout.AutoStartOption.SCHEDULED.equals(getAutoStartOption())
return AutoStartOptionGroupLayout.AutoStartOption.SCHEDULED == getAutoStartOption()
? autoStartOptionGroupLayout.getStartAtDateField().getValue().getTime()
: null;
}
@@ -392,8 +392,8 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
private CommonDialogWindow createWindow() {
return new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW)
.caption(i18n.getMessage("caption.create.new", i18n.getMessage("caption.rollout"))).content(this)
.id(UIComponentIdProvider.ROLLOUT_POPUP_ID)
.layout(this).i18n(i18n).helpLink(uiProperties.getLinks().getDocumentation().getRolloutView())
.id(UIComponentIdProvider.ROLLOUT_POPUP_ID).layout(this).i18n(i18n)
.helpLink(uiProperties.getLinks().getDocumentation().getRolloutView())
.saveDialogCloseListener(new SaveOnDialogCloseListener()).buildCommonDialogWindow();
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AutoStartOptionGroupLayout.java
View File

@@ -62,6 +62,8 @@ public class AutoStartOptionGroupLayout extends HorizontalLayout {
private static final long serialVersionUID = 1L;
@Override
// Vaadin is returning object, so "==" might not work
@SuppressWarnings("squid:S4551")
public void valueChange(final ValueChangeEvent event) {
if (event.getProperty().getValue().equals(AutoStartOption.SCHEDULED)) {
startAtDateField.setEnabled(true);

14
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
View File

@@ -545,7 +545,7 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
final RolloutStatus rolloutStatus = (RolloutStatus) row.getItemProperty(SPUILabelDefinitions.VAR_STATUS)
.getValue();
if (!RolloutStatus.RUNNING.equals(rolloutStatus)) {
if (RolloutStatus.RUNNING != rolloutStatus) {
return;
}
@@ -562,13 +562,13 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
.getValue();
final String rolloutName = (String) row.getItemProperty(SPUILabelDefinitions.VAR_NAME).getValue();
if (RolloutStatus.READY.equals(rolloutStatus)) {
if (RolloutStatus.READY == rolloutStatus) {
rolloutManagement.start(rolloutId);
uiNotification.displaySuccess(i18n.getMessage("message.rollout.started", rolloutName));
return;
}
if (RolloutStatus.PAUSED.equals(rolloutStatus)) {
if (RolloutStatus.PAUSED == rolloutStatus) {
rolloutManagement.resumeRollout(rolloutId);
uiNotification.displaySuccess(i18n.getMessage("message.rollout.resumed", rolloutName));
}
@@ -758,22 +758,22 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
}
private StatusFontIcon createTypeLabelAdapter(final ActionType actionType) {
if (ActionType.FORCED.equals(actionType)) {
if (ActionType.FORCED == actionType) {
return new StatusFontIcon(FontAwesome.BOLT, STATUS_ICON_FORCED,
i18n.getMessage(UIMessageIdProvider.CAPTION_ACTION_FORCED),
UIComponentIdProvider.ACTION_HISTORY_TABLE_TYPE_LABEL_ID);
}
if (ActionType.TIMEFORCED.equals(actionType)) {
if (ActionType.TIMEFORCED == actionType) {
return new StatusFontIcon(FontAwesome.HISTORY, STATUS_ICON_FORCED,
i18n.getMessage(UIMessageIdProvider.CAPTION_ACTION_TIME_FORCED),
UIComponentIdProvider.ACTION_HISTORY_TABLE_TYPE_LABEL_ID);
}
if (ActionType.SOFT.equals(actionType)) {
if (ActionType.SOFT == actionType) {
return new StatusFontIcon(FontAwesome.STEP_FORWARD, STATUS_ICON_SOFT,
i18n.getMessage(UIMessageIdProvider.CAPTION_ACTION_SOFT),
UIComponentIdProvider.ACTION_HISTORY_TABLE_TYPE_LABEL_ID);
}
if (ActionType.DOWNLOAD_ONLY.equals(actionType)) {
if (ActionType.DOWNLOAD_ONLY == actionType) {
return new StatusFontIcon(FontAwesome.DOWNLOAD, STATUS_ICON_DOWNLOAD_ONLY,
i18n.getMessage(UIMessageIdProvider.CAPTION_ACTION_DOWNLOAD_ONLY),
UIComponentIdProvider.ACTION_HISTORY_TABLE_TYPE_LABEL_ID);

7
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java
View File

@@ -245,10 +245,9 @@ public class RolloutGroupTargetsListGrid extends AbstractGrid<LazyQueryContainer
}
private StatusFontIcon mapActionStatusToPresentation(final Status status) {
final boolean isFinishedDownloadOnlyAssignment = Status.DOWNLOADED.equals(status)
&& rolloutUIState.getRolloutGroup()
.map(group -> Action.ActionType.DOWNLOAD_ONLY.equals(group.getRollout().getActionType()))
.orElse(false);
final boolean isFinishedDownloadOnlyAssignment = Status.DOWNLOADED == status && rolloutUIState
.getRolloutGroup()
.map(group -> Action.ActionType.DOWNLOAD_ONLY == group.getRollout().getActionType()).orElse(false);
return isFinishedDownloadOnlyAssignment ? statusIconMap.get(Status.FINISHED) : statusIconMap.get(status);
}