From a951137d4f2dca4a073dcf01bd81d823111af7d4 Mon Sep 17 00:00:00 2001 From: kaizimmerm Date: Wed, 23 Nov 2016 22:34:37 +0100 Subject: [PATCH 01/16] Remove unnecessary DB calls from UI Signed-off-by: kaizimmerm --- .../hawkbit/repository/TargetManagement.java | 6 ++++-- .../repository/model/DistributionSet.java | 18 ------------------ .../jpa/JpaDistributionSetManagement.java | 2 +- .../repository/jpa/TargetTagRepository.java | 4 ++-- .../jpa/model/JpaDistributionSet.java | 19 ------------------- .../jpa/model/JpaSoftwareModule.java | 8 -------- .../DistributionSetSpecification.java | 9 ++++----- .../SoftwareModuleAddUpdateWindow.java | 14 +++++++------- .../dstable/DistributionSetDetails.java | 9 ++++++--- .../dstable/DsMetadataPopupLayout.java | 3 ++- .../DistributionAddUpdateWindowLayout.java | 1 - .../dstable/DistributionDetails.java | 3 +-- .../management/dstable/DistributionTable.java | 2 +- 13 files changed, 28 insertions(+), 70 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java index dcadeb689..84092a7d4 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java @@ -63,7 +63,8 @@ public interface TargetManagement { * * @return number of found {@link Target}s. */ - @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET) + @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET + SpringEvalExpressions.HAS_AUTH_OR + + SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY) Long countTargetByAssignedDistributionSet(@NotNull Long distId); /** @@ -104,7 +105,8 @@ public interface TargetManagement { * to search for * @return number of found {@link Target}s. */ - @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET) + @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET + SpringEvalExpressions.HAS_AUTH_OR + + SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY) Long countTargetByInstalledDistributionSet(@NotNull Long distId); /** diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java index 3af310a93..f8fc4a7ff 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java @@ -11,8 +11,6 @@ package org.eclipse.hawkbit.repository.model; import java.util.List; import java.util.Set; -import org.eclipse.hawkbit.repository.DistributionSetManagement; - /** * A {@link DistributionSet} defines a meta package that combines a set of * {@link SoftwareModule}s which have to be or are provisioned to a @@ -36,12 +34,6 @@ public interface DistributionSet extends NamedVersionedEntity { */ boolean isDeleted(); - /** - * @return immutable {@link List} of {@link DistributionSetMetadata} - * elements. See {@link DistributionSetManagement} to alter. - */ - List getMetadata(); - /** * @return true if {@link DistributionSet} contains a mandatory * migration step, i.e. unfinished {@link Action}s will kept active @@ -49,21 +41,11 @@ public interface DistributionSet extends NamedVersionedEntity { */ boolean isRequiredMigrationStep(); - /** - * @return the assignedTargets - */ - List getAssignedTargets(); - /** * @return the auto assign target filters */ List getAutoAssignFilters(); - /** - * @return the installedTargets - */ - List getInstalledTargets(); - /** * * @return unmodifiableSet of {@link SoftwareModule}. diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java index 4a21be5a3..d26a4cb9c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java @@ -231,7 +231,7 @@ public class JpaDistributionSetManagement implements DistributionSetManagement { } private JpaDistributionSet findDistributionSetAndThrowExceptionIfNotFound(final Long setId) { - final JpaDistributionSet set = (JpaDistributionSet) findDistributionSetByIdWithDetails(setId); + final JpaDistributionSet set = (JpaDistributionSet) findDistributionSetById(setId); if (set == null) { throw new EntityNotFoundException("Distribution set cannot be updated as it does not exixt" + setId); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTagRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTagRepository.java index 8000cd8c9..471dd67db 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTagRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTagRepository.java @@ -34,7 +34,7 @@ public interface TargetTagRepository */ @Modifying @Transactional(isolation = Isolation.READ_UNCOMMITTED) - Long deleteByName(final String tagName); + Long deleteByName(String tagName); /** * find {@link TargetTag} by its name. @@ -43,7 +43,7 @@ public interface TargetTagRepository * to filter on * @return the {@link TargetTag} if found, otherwise null */ - JpaTargetTag findByNameEquals(final String tagName); + JpaTargetTag findByNameEquals(String tagName); /** * Returns all instances of the type. diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java index b57d103a3..33842346f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java @@ -209,7 +209,6 @@ public class JpaDistributionSet extends AbstractJpaNamedVersionedEntity implemen return deleted; } - @Override public List getMetadata() { if (metadata == null) { return Collections.emptyList(); @@ -241,29 +240,11 @@ public class JpaDistributionSet extends AbstractJpaNamedVersionedEntity implemen return this; } - @Override - public List getAssignedTargets() { - if (assignedToTargets == null) { - return Collections.emptyList(); - } - - return Collections.unmodifiableList(assignedToTargets); - } - @Override public List getAutoAssignFilters() { return autoAssignFilters; } - @Override - public List getInstalledTargets() { - if (installedAtTargets == null) { - return Collections.emptyList(); - } - - return Collections.unmodifiableList(installedAtTargets); - } - @Override public String toString() { return "DistributionSet [getName()=" + getName() + ", getOptLockRevision()=" + getOptLockRevision() diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java index afa252de5..675fe1b0c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java @@ -176,14 +176,6 @@ public class JpaSoftwareModule extends AbstractJpaNamedVersionedEntity implement this.type = type; } - public List getMetadata() { - if (metadata == null) { - return Collections.emptyList(); - } - - return Collections.unmodifiableList(metadata); - } - @Override public String toString() { return "SoftwareModule [deleted=" + deleted + ", name=" + getName() + ", version=" + getVersion() diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetSpecification.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetSpecification.java index a2c0802a0..b244c906e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetSpecification.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetSpecification.java @@ -83,7 +83,6 @@ public final class DistributionSetSpecification { targetRoot.fetch(JpaDistributionSet_.modules, JoinType.LEFT); targetRoot.fetch(JpaDistributionSet_.tags, JoinType.LEFT); targetRoot.fetch(JpaDistributionSet_.type, JoinType.LEFT); - targetRoot.fetch(JpaDistributionSet_.metadata, JoinType.LEFT); query.distinct(true); return predicate; @@ -110,8 +109,8 @@ public final class DistributionSetSpecification { } /** - * {@link Specification} for retrieving {@link DistributionSet}s by - * "like name or like description or like version". + * {@link Specification} for retrieving {@link DistributionSet}s by "like + * name or like description or like version". * * @param subString * to be filtered on @@ -125,8 +124,8 @@ public final class DistributionSetSpecification { } /** - * {@link Specification} for retrieving {@link DistributionSet}s by - * "has at least one of the given tag names". + * {@link Specification} for retrieving {@link DistributionSet}s by "has at + * least one of the given tag names". * * @param tagNames * to be filtered on diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java index 8c9898639..6d615ead4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java @@ -77,8 +77,6 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent { private TextArea descTextArea; - private CommonDialogWindow window; - private Boolean editSwModule = Boolean.FALSE; private Long baseSwModuleId; @@ -133,9 +131,9 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent { public CommonDialogWindow createUpdateSoftwareModuleWindow(final Long baseSwModuleId) { this.baseSwModuleId = baseSwModuleId; resetComponents(); + populateTypeNameCombo(); populateValuesOfSwModule(); - createWindow(); - return window; + return createWindow(); } private void createRequiredComponents() { @@ -157,7 +155,6 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent { typeComboBox.setStyleName(SPUIDefinitions.COMBO_BOX_SPECIFIC_STYLE + " " + ValoTheme.COMBOBOX_TINY); typeComboBox.setNewItemsAllowed(Boolean.FALSE); typeComboBox.setImmediate(Boolean.TRUE); - populateTypeNameCombo(); } private TextField createTextField(final String in18Key, final String id) { @@ -181,7 +178,7 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent { editSwModule = Boolean.FALSE; } - private void createWindow() { + private CommonDialogWindow createWindow() { final Label madatoryStarLabel = new Label("*"); madatoryStarLabel.setStyleName("v-caption v-required-field-indicator"); madatoryStarLabel.setWidth(null); @@ -198,7 +195,7 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent { setCompositionRoot(formLayout); - window = new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW) + final CommonDialogWindow window = new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW) .caption(i18n.get("upload.caption.add.new.swmodule")).content(this).layout(formLayout).i18n(i18n) .saveDialogCloseListener(new SaveOnDialogCloseListener()).buildCommonDialogWindow(); nameTextField.setEnabled(!editSwModule); @@ -206,6 +203,8 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent { typeComboBox.setEnabled(!editSwModule); typeComboBox.focus(); + + return window; } private void addNewBaseSoftware() { @@ -271,6 +270,7 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent { : HawkbitCommonUtil.trimAndNullIfEmpty(swModle.getVendor())); descTextArea.setValue(swModle.getDescription() == null ? HawkbitCommonUtil.SP_STRING_EMPTY : HawkbitCommonUtil.trimAndNullIfEmpty(swModle.getDescription())); + if (swModle.getType().isDeleted()) { typeComboBox.addItem(swModle.getType().getName()); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java index 1bd7c1368..fa5008523 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java @@ -16,6 +16,7 @@ import java.util.Set; import org.eclipse.hawkbit.repository.DistributionSetManagement; import org.eclipse.hawkbit.repository.EntityFactory; import org.eclipse.hawkbit.repository.SoftwareManagement; +import org.eclipse.hawkbit.repository.TargetManagement; import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.SoftwareModule; import org.eclipse.hawkbit.repository.model.SoftwareModuleIdName; @@ -81,6 +82,9 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet @Autowired private transient DistributionSetManagement distributionSetManagement; + @Autowired + private transient TargetManagement targetManagement; + @Autowired private DsMetadataPopupLayout dsMetadataPopupLayout; @@ -183,9 +187,8 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet private Button assignSoftModuleButton(final String softwareModuleName) { if (getPermissionChecker().hasUpdateDistributionPermission() && manageDistUIState.getLastSelectedDistribution().isPresent() - && distributionSetManagement - .findDistributionSetById(manageDistUIState.getLastSelectedDistribution().get().getId()) - .getAssignedTargets().isEmpty()) { + && targetManagement.countTargetByAssignedDistributionSet( + manageDistUIState.getLastSelectedDistribution().get().getId()) <= 0) { final Button reassignSoftModule = SPUIComponentProvider.getButton(softwareModuleName, "", "", "", true, FontAwesome.TIMES, SPUIButtonStyleSmallNoBorder.class); reassignSoftModule.setEnabled(false); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java index b7b6a65db..26a1bc8b0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java @@ -73,7 +73,8 @@ public class DsMetadataPopupLayout extends AbstractMetadataPopupLayout getMetadataList() { - return Collections.unmodifiableList(getSelectedEntity().getMetadata()); + return Collections.unmodifiableList( + distributionSetManagement.findDistributionSetMetadataByDistributionSetId(getSelectedEntity().getId())); } /** diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java index b3b767bc8..b7ddcf773 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java @@ -149,7 +149,6 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent { distsetTypeNameComboBox.setImmediate(true); distsetTypeNameComboBox.setNullSelectionAllowed(false); distsetTypeNameComboBox.setId(UIComponentIdProvider.DIST_ADD_DISTSETTYPE); - populateDistSetTypeNameCombo(); descTextArea = new TextAreaBuilder().caption(i18n.get("textfield.description")).style("text-area-style") .prompt(i18n.get("textfield.description")).immediate(true).id(UIComponentIdProvider.DIST_ADD_DESC) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java index 19075898b..b838881a9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java @@ -202,8 +202,7 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail @Override protected void showMetadata(final ClickEvent event) { - final DistributionSet ds = distributionSetManagement - .findDistributionSetByIdWithDetails(getSelectedBaseEntityId()); + final DistributionSet ds = distributionSetManagement.findDistributionSetById(getSelectedBaseEntityId()); UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(ds, null)); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java index fe57dc415..a8d207a4c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java @@ -767,7 +767,7 @@ public class DistributionTable extends AbstractNamedVersionTable Date: Wed, 23 Nov 2016 22:47:06 +0100 Subject: [PATCH 02/16] Switch to Ui Scope Signed-off-by: kaizimmerm --- .../org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java | 4 ++-- .../hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java | 4 ++-- .../hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java | 4 ++-- .../hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java | 4 ++-- .../artifacts/footer/UploadViewConfirmationWindowLayout.java | 4 ++-- .../ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java | 4 ++-- .../hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java | 4 ++-- .../hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java | 4 ++-- .../ui/artifacts/smtable/SoftwareModuleTableHeader.java | 4 ++-- .../ui/artifacts/smtable/SoftwareModuleTableLayout.java | 4 ++-- .../ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java | 4 ++-- .../hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java | 4 ++-- .../hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java | 4 ++-- .../hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java | 4 ++-- .../hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java | 4 ++-- .../eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java | 4 ++-- .../hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java | 4 ++-- .../detailslayout/DistributionSetMetadatadetailslayout.java | 4 ++-- .../detailslayout/SoftwareModuleMetadatadetailslayout.java | 4 ++-- .../hawkbit/ui/common/tagdetails/DistributionTagToken.java | 4 ++-- .../eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java | 4 ++-- .../eclipse/hawkbit/ui/distributions/DistributionsView.java | 4 ++-- .../disttype/CreateUpdateDistSetTypeLayout.java | 4 ++-- .../ui/distributions/disttype/DSTypeFilterButtonClick.java | 4 ++-- .../ui/distributions/disttype/DSTypeFilterButtons.java | 4 ++-- .../ui/distributions/disttype/DSTypeFilterHeader.java | 4 ++-- .../ui/distributions/disttype/DSTypeFilterLayout.java | 4 ++-- .../ui/distributions/dstable/DistributionSetDetails.java | 4 ++-- .../ui/distributions/dstable/DistributionSetTable.java | 4 ++-- .../ui/distributions/dstable/DistributionSetTableHeader.java | 4 ++-- .../ui/distributions/dstable/DistributionSetTableLayout.java | 4 ++-- .../ui/distributions/dstable/DsMetadataPopupLayout.java | 4 ++-- .../distributions/event/DistributionsViewAcceptCriteria.java | 4 ++-- .../ui/distributions/footer/DSDeleteActionsLayout.java | 4 ++-- .../footer/DistributionsConfirmationWindowLayout.java | 4 ++-- .../ui/distributions/smtable/SwMetadataPopupLayout.java | 4 ++-- .../hawkbit/ui/distributions/smtable/SwModuleDetails.java | 4 ++-- .../hawkbit/ui/distributions/smtable/SwModuleTable.java | 4 ++-- .../ui/distributions/smtable/SwModuleTableHeader.java | 4 ++-- .../ui/distributions/smtable/SwModuleTableLayout.java | 4 ++-- .../ui/distributions/smtype/DistSMTypeFilterButtonClick.java | 4 ++-- .../ui/distributions/smtype/DistSMTypeFilterButtons.java | 4 ++-- .../ui/distributions/smtype/DistSMTypeFilterHeader.java | 4 ++-- .../ui/distributions/smtype/DistSMTypeFilterLayout.java | 4 ++-- .../ui/filtermanagement/AutoCompleteTextFieldComponent.java | 4 ++-- .../ui/filtermanagement/CreateOrUpdateFilterHeader.java | 4 ++-- .../ui/filtermanagement/CreateOrUpdateFilterTable.java | 4 ++-- .../ui/filtermanagement/DistributionSetSelectTable.java | 4 ++-- .../ui/filtermanagement/DistributionSetSelectWindow.java | 4 ++-- .../hawkbit/ui/filtermanagement/FilterManagementView.java | 4 ++-- .../hawkbit/ui/filtermanagement/TargetFilterHeader.java | 4 ++-- .../hawkbit/ui/filtermanagement/TargetFilterTable.java | 5 ++--- .../footer/TargetFilterCountMessageLabel.java | 4 ++-- .../org/eclipse/hawkbit/ui/management/DeploymentView.java | 4 ++-- .../ui/management/actionhistory/ActionHistoryComponent.java | 4 ++-- .../ui/management/actionhistory/ActionHistoryHeader.java | 4 ++-- .../ui/management/actionhistory/ActionHistoryTable.java | 4 ++-- .../dstable/DistributionAddUpdateWindowLayout.java | 4 ++-- .../hawkbit/ui/management/dstable/DistributionDetails.java | 4 ++-- .../hawkbit/ui/management/dstable/DistributionTable.java | 4 ++-- .../ui/management/dstable/DistributionTableHeader.java | 4 ++-- .../ui/management/dstable/DistributionTableLayout.java | 4 ++-- .../dstag/CreateUpdateDistributionTagLayoutWindow.java | 4 ++-- .../ui/management/dstag/DistributionTagButtonClick.java | 4 ++-- .../hawkbit/ui/management/dstag/DistributionTagButtons.java | 4 ++-- .../hawkbit/ui/management/dstag/DistributionTagHeader.java | 4 ++-- .../hawkbit/ui/management/dstag/DistributionTagLayout.java | 4 ++-- .../ui/management/event/DistributionTagDropEvent.java | 4 ++-- .../ui/management/event/ManagementViewAcceptCriteria.java | 4 ++-- .../ui/management/footer/ActionTypeOptionGroupLayout.java | 4 ++-- .../hawkbit/ui/management/footer/CountMessageLabel.java | 4 ++-- .../hawkbit/ui/management/footer/DeleteActionsLayout.java | 4 ++-- .../footer/ManangementConfirmationWindowLayout.java | 4 ++-- .../management/targettable/TargetAddUpdateWindowLayout.java | 4 ++-- .../ui/management/targettable/TargetBulkTokenTags.java | 4 ++-- .../management/targettable/TargetBulkUpdateWindowLayout.java | 4 ++-- .../hawkbit/ui/management/targettable/TargetDetails.java | 4 ++-- .../hawkbit/ui/management/targettable/TargetTable.java | 4 ++-- .../hawkbit/ui/management/targettable/TargetTableHeader.java | 4 ++-- .../hawkbit/ui/management/targettable/TargetTableLayout.java | 4 ++-- .../targettag/CreateUpdateTargetTagLayoutWindow.java | 4 ++-- .../targettag/CustomTargetTagFilterButtonClick.java | 4 ++-- .../ui/management/targettag/FilterByStatusLayout.java | 4 ++-- .../ui/management/targettag/MultipleTargetFilter.java | 4 ++-- .../ui/management/targettag/TargetFilterQueryButtons.java | 4 ++-- .../ui/management/targettag/TargetTagFilterButtonClick.java | 4 ++-- .../ui/management/targettag/TargetTagFilterButtons.java | 4 ++-- .../ui/management/targettag/TargetTagFilterHeader.java | 4 ++-- .../ui/management/targettag/TargetTagFilterLayout.java | 4 ++-- .../java/org/eclipse/hawkbit/ui/rollout/RolloutView.java | 4 ++-- .../ui/rollout/rollout/AddUpdateRolloutWindowLayout.java | 4 ++-- .../eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java | 4 ++-- .../hawkbit/ui/rollout/rollout/RolloutListHeader.java | 4 ++-- .../eclipse/hawkbit/ui/rollout/rollout/RolloutListView.java | 4 ++-- .../ui/rollout/rolloutgroup/RolloutGroupListGrid.java | 4 ++-- .../ui/rollout/rolloutgroup/RolloutGroupsListHeader.java | 4 ++-- .../ui/rollout/rolloutgroup/RolloutGroupsListView.java | 4 ++-- .../RolloutGroupTargetsCountLabelMessage.java | 4 ++-- .../rolloutgrouptargets/RolloutGroupTargetsListGrid.java | 4 ++-- .../rolloutgrouptargets/RolloutGroupTargetsListHeader.java | 4 ++-- .../rolloutgrouptargets/RolloutGroupTargetsListView.java | 4 ++-- .../tenantconfiguration/AuthenticationConfigurationView.java | 4 ++-- .../DefaultDistributionSetTypeLayout.java | 4 ++-- .../ui/tenantconfiguration/PollingConfigurationView.java | 4 ++-- .../TenantConfigurationDashboardView.java | 4 ++-- .../AnonymousDownloadAuthenticationConfigurationItem.java | 4 ++-- .../CertificateAuthenticationConfigurationItem.java | 4 ++-- .../GatewaySecurityTokenAuthenticationConfigurationItem.java | 4 ++-- .../TargetSecurityTokenAuthenticationConfigurationItem.java | 4 ++-- .../java/org/eclipse/hawkbit/ui/utils/UINotification.java | 4 ++-- 110 files changed, 220 insertions(+), 221 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java index ffbb3b7bd..524925882 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java @@ -37,7 +37,7 @@ import com.vaadin.server.Page; import com.vaadin.server.Page.BrowserWindowResizeEvent; import com.vaadin.server.Page.BrowserWindowResizeListener; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.GridLayout; @@ -51,7 +51,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringView(name = UploadArtifactView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class UploadArtifactView extends VerticalLayout implements View, BrowserWindowResizeListener { public static final String VIEW_NAME = "spUpload"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java index f9713ef2e..f0dd3cc1a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java @@ -51,7 +51,7 @@ import com.vaadin.data.Container; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; @@ -70,7 +70,7 @@ import com.vaadin.ui.themes.ValoTheme; */ @SpringComponent -@ViewScope +@UIScope public class ArtifactDetailsLayout extends VerticalLayout { private static final long serialVersionUID = -5189069028037133891L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java index 2fabb3bb9..1dba95d15 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java @@ -17,7 +17,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import com.google.common.collect.Maps; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; /** @@ -25,7 +25,7 @@ import com.vaadin.ui.Component; * */ @SpringComponent -@ViewScope +@UIScope public class UploadViewAcceptCriteria extends AbstractAcceptCriteria { private static final long serialVersionUID = 5158811326115667378L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java index 3caea342b..42eb6088b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java @@ -25,7 +25,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.Table; import com.vaadin.ui.Table.TableTransferable; @@ -36,7 +36,7 @@ import com.vaadin.ui.UI; * */ @SpringComponent -@ViewScope +@UIScope public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout { private static final long serialVersionUID = -3273982053389866299L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java index 3d875e450..ec4df46ae 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java @@ -31,7 +31,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Table.Align; @@ -43,7 +43,7 @@ import com.vaadin.ui.Table.Align; * */ @SpringComponent -@ViewScope +@UIScope public class UploadViewConfirmationWindowLayout extends AbstractConfirmationWindowLayout { private static final long serialVersionUID = 1804036019105286988L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java index 6d615ead4..8ec87254f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java @@ -34,7 +34,7 @@ import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.ComboBox; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.FormLayout; @@ -47,7 +47,7 @@ import com.vaadin.ui.themes.ValoTheme; * Generates window for Software module add or update. */ @SpringComponent -@ViewScope +@UIScope public class SoftwareModuleAddUpdateWindow extends CustomComponent { private static final long serialVersionUID = -5217675246477211483L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java index 6dd0b8983..61009037d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java @@ -26,7 +26,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; @@ -40,7 +40,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDetailsLayout { private static final long serialVersionUID = -4900381301076646366L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java index 13f3addf5..999e3bc2f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java @@ -43,7 +43,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Table; import com.vaadin.ui.UI; @@ -51,7 +51,7 @@ import com.vaadin.ui.UI; /** * Header of Software module table. */ -@ViewScope +@UIScope @SpringComponent public class SoftwareModuleTable extends AbstractNamedVersionTable { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java index 223a0e3fc..b49282b93 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java @@ -21,7 +21,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DropHandler; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -33,7 +33,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class SoftwareModuleTableHeader extends AbstractTableHeader { private static final long serialVersionUID = 242961845006626297L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java index 421fbc89c..cde264ea9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java @@ -14,13 +14,13 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software module table layout. (Upload Management) */ @SpringComponent -@ViewScope +@UIScope public class SoftwareModuleTableLayout extends AbstractTableLayout { private static final long serialVersionUID = 6464291374980641235L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java index f45b785b5..0c24f5e63 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java @@ -33,7 +33,7 @@ import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.TextField; @@ -45,7 +45,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class CreateUpdateSoftwareTypeLayout extends CreateUpdateTypeLayout { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java index 4a4006c2a..0184f5d86 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java @@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; /** @@ -29,7 +29,7 @@ import com.vaadin.ui.Button; * */ @SpringComponent -@ViewScope +@UIScope public class SMTypeFilterButtonClick extends AbstractFilterSingleButtonClick implements Serializable { private static final long serialVersionUID = 3707945900524967887L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java index ce494fb69..b66a023b4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java @@ -29,14 +29,14 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software module type filter buttons. * */ @SpringComponent -@ViewScope +@UIScope public class SMTypeFilterButtons extends AbstractFilterButtons { private static final long serialVersionUID = 169198312654380358L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java index cb7dfba33..d040e4a15 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java @@ -19,7 +19,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -28,7 +28,7 @@ import com.vaadin.ui.Window; * Software module type filter buttons header. */ @SpringComponent -@ViewScope +@UIScope public class SMTypeFilterHeader extends AbstractFilterHeader { private static final long serialVersionUID = -4855810338059032342L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java index 6bd57d945..e03cb16ad 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java @@ -20,7 +20,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software module type filter buttons layout. @@ -29,7 +29,7 @@ import com.vaadin.spring.annotation.ViewScope; * */ @SpringComponent -@ViewScope +@UIScope public class SMTypeFilterLayout extends AbstractFilterLayout { private static final long serialVersionUID = 1581066345157393665L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java index 2808d0619..f5a813228 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java @@ -59,7 +59,7 @@ import com.vaadin.server.Page; import com.vaadin.server.StreamVariable; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.DragAndDropWrapper; @@ -74,7 +74,7 @@ import com.vaadin.ui.VerticalLayout; /** * Upload files layout. */ -@ViewScope +@UIScope @SpringComponent public class UploadLayout extends VerticalLayout { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java index 31ff2b589..06e0ba2c1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java @@ -39,7 +39,7 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.window.WindowMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Grid; @@ -58,7 +58,7 @@ import elemental.json.JsonValue; /** * Shows upload status during upload. */ -@ViewScope +@UIScope @SpringComponent public class UploadStatusInfoWindow extends Window { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java index b4fd28f3c..cd7085b99 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java @@ -25,7 +25,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.Table; @@ -39,7 +39,7 @@ import com.vaadin.ui.themes.ValoTheme; */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetMetadatadetailslayout extends Table { private static final long serialVersionUID = 2913758299611837718L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java index 5ad02876d..49fc1b0a0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java @@ -25,7 +25,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Table; import com.vaadin.ui.UI; @@ -38,7 +38,7 @@ import com.vaadin.ui.themes.ValoTheme; */ @SpringComponent -@ViewScope +@UIScope public class SoftwareModuleMetadatadetailslayout extends Table { private static final long serialVersionUID = 2913758299611838818L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java index 50153a27d..4f0c17529 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java @@ -29,14 +29,14 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.google.common.collect.Sets; import com.vaadin.data.Item; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Implementation of target/ds tag token layout. * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagToken extends AbstractTagToken { private static final long serialVersionUID = -8022738301736043396L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java index c72c3ff1b..bce5bf1f9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java @@ -23,7 +23,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Implementation of Target tag token. @@ -31,7 +31,7 @@ import com.vaadin.spring.annotation.ViewScope; * */ @SpringComponent -@ViewScope +@UIScope public class TargetTagToken extends AbstractTargetTagToken { private static final long serialVersionUID = 7124887018280196721L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java index ab41bc579..147ccc555 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java @@ -37,7 +37,7 @@ import com.vaadin.server.Page; import com.vaadin.server.Page.BrowserWindowResizeEvent; import com.vaadin.server.Page.BrowserWindowResizeListener; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI; @@ -50,7 +50,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringView(name = DistributionsView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class DistributionsView extends VerticalLayout implements View, BrowserWindowResizeListener { public static final String VIEW_NAME = "distributions"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java index dbeda7f17..0b5a9ed67 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java @@ -42,7 +42,7 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.AbstractSelect.ItemDescriptionGenerator; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -58,7 +58,7 @@ import com.vaadin.ui.themes.ValoTheme; * Window for create update Distribution Set Type. */ @SpringComponent -@ViewScope +@UIScope public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java index 7284b1a9a..4a538dbec 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java @@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; /** @@ -30,7 +30,7 @@ import com.vaadin.ui.Button; */ @SpringComponent -@ViewScope +@UIScope public class DSTypeFilterButtonClick extends AbstractFilterSingleButtonClick implements Serializable { private static final long serialVersionUID = -584783755917528648L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java index 02caa4ba2..c585496c1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java @@ -27,13 +27,13 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Distribution Set Type filter buttons. */ @SpringComponent -@ViewScope +@UIScope public class DSTypeFilterButtons extends AbstractFilterButtons { private static final long serialVersionUID = 771251569981876005L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java index 5e19657d2..c09c1a9cd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java @@ -19,7 +19,7 @@ import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; @@ -27,7 +27,7 @@ import com.vaadin.ui.UI; * Distribution Set Type filter buttons header. */ @SpringComponent -@ViewScope +@UIScope public class DSTypeFilterHeader extends AbstractFilterHeader { private static final long serialVersionUID = 3433417459392880222L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterLayout.java index ff7ba5ab7..fdb2c6f0a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterLayout.java @@ -20,7 +20,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Distribution Set Type filter buttons layout. @@ -30,7 +30,7 @@ import com.vaadin.spring.annotation.ViewScope; */ @SpringComponent -@ViewScope +@UIScope public class DSTypeFilterLayout extends AbstractFilterLayout { private static final long serialVersionUID = 2689002932344750781L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java index fa5008523..22521c27d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java @@ -43,7 +43,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.data.Item; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; @@ -60,7 +60,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDetailsLayout { private static final long serialVersionUID = -4595004466943546669L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java index 51bc1caf4..e9ea42a0a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java @@ -66,7 +66,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.Table; @@ -76,7 +76,7 @@ import com.vaadin.ui.UI; * Distribution set table. */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetTable extends AbstractNamedVersionTable { private static final long serialVersionUID = -7731776093470487988L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java index 12749bc09..549be4eb7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java @@ -23,7 +23,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DropHandler; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -32,7 +32,7 @@ import com.vaadin.ui.Window; * Distribution table header. */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetTableHeader extends AbstractTableHeader { private static final long serialVersionUID = -3483238438474530748L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java index e15189f6a..2aea99210 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java @@ -14,13 +14,13 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * DistributionSet table layout */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetTableLayout extends AbstractTableLayout { private static final long serialVersionUID = 6464291374980641235L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java index 26a1bc8b0..396076ce6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java @@ -22,13 +22,13 @@ import org.springframework.beans.factory.annotation.Autowired; import com.google.common.collect.Lists; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Pop up layout to display distribution metadata. */ @SpringComponent -@ViewScope +@UIScope public class DsMetadataPopupLayout extends AbstractMetadataPopupLayout { private static final long serialVersionUID = -7778944849012048106L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionsViewAcceptCriteria.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionsViewAcceptCriteria.java index 10782dbf3..f7831c85b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionsViewAcceptCriteria.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionsViewAcceptCriteria.java @@ -18,7 +18,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import com.google.common.collect.Maps; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; /** @@ -26,7 +26,7 @@ import com.vaadin.ui.Component; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionsViewAcceptCriteria extends AbstractAcceptCriteria { private static final long serialVersionUID = -7686564967583118935L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DSDeleteActionsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DSDeleteActionsLayout.java index 2bdaf7341..e1566e73b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DSDeleteActionsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DSDeleteActionsLayout.java @@ -36,7 +36,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.Table; import com.vaadin.ui.Table.TableTransferable; @@ -49,7 +49,7 @@ import com.vaadin.ui.UI; * */ @org.springframework.stereotype.Component -@ViewScope +@UIScope public class DSDeleteActionsLayout extends AbstractDeleteActionsLayout { private static final long serialVersionUID = 3494052985006132714L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java index e56a91db2..86e8a6af8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java @@ -39,7 +39,7 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Table.Align; @@ -52,7 +52,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @org.springframework.stereotype.Component -@ViewScope +@UIScope public class DistributionsConfirmationWindowLayout extends AbstractConfirmationWindowLayout { private static final long serialVersionUID = 3641621131320823058L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java index cee06b822..a8eae2252 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java @@ -23,13 +23,13 @@ import org.eclipse.hawkbit.ui.distributions.event.MetadataEvent.MetadataUIEvent; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Pop up layout to display software module metadata. */ @SpringComponent -@ViewScope +@UIScope public class SwMetadataPopupLayout extends AbstractMetadataPopupLayout { private static final long serialVersionUID = -1252090014161012563L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java index 221d57a6a..9afd488c8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java @@ -26,7 +26,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; @@ -39,7 +39,7 @@ import com.vaadin.ui.Window; * details style . */ @SpringComponent -@ViewScope +@UIScope public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLayout { private static final long serialVersionUID = -1052279281066089812L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java index e8504e7a4..1a4fb2cba 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java @@ -48,7 +48,7 @@ import com.vaadin.server.FontAwesome; import com.vaadin.server.Page; import com.vaadin.shared.ui.window.WindowMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.JavaScript; @@ -61,7 +61,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class SwModuleTable extends AbstractNamedVersionTable { private static final long serialVersionUID = 6785314784507424750L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java index 732dc94c0..0b45e30a3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java @@ -22,7 +22,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DropHandler; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -32,7 +32,7 @@ import com.vaadin.ui.Window; * style . */ @SpringComponent -@ViewScope +@UIScope public class SwModuleTableHeader extends AbstractTableHeader { private static final long serialVersionUID = 242961845006626297L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableLayout.java index 9d298207a..061d14078 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableLayout.java @@ -14,13 +14,13 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Implementation of software module Layout */ @SpringComponent -@ViewScope +@UIScope public class SwModuleTableLayout extends AbstractTableLayout { private static final long serialVersionUID = 6464291374980641235L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java index 6f29ed661..a12374da7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java @@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; /** @@ -30,7 +30,7 @@ import com.vaadin.ui.Button; */ @SpringComponent -@ViewScope +@UIScope public class DistSMTypeFilterButtonClick extends AbstractFilterSingleButtonClick implements Serializable { private static final long serialVersionUID = -4166632002904286983L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java index 378080692..e8a0679e3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java @@ -34,12 +34,12 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software Module Type filter buttons. */ -@ViewScope +@UIScope @SpringComponent public class DistSMTypeFilterButtons extends AbstractFilterButtons { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java index c09931ef4..08d7d1c38 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java @@ -20,7 +20,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -29,7 +29,7 @@ import com.vaadin.ui.Window; * Software Module Type filter buttons header. */ @SpringComponent -@ViewScope +@UIScope public class DistSMTypeFilterHeader extends AbstractFilterHeader { private static final long serialVersionUID = -8763788280848718344L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterLayout.java index 04c42f3b7..23368e2cd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterLayout.java @@ -20,7 +20,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software Module Type filter layout. @@ -30,7 +30,7 @@ import com.vaadin.spring.annotation.ViewScope; */ @SpringComponent -@ViewScope +@UIScope public class DistSMTypeFilterLayout extends AbstractFilterLayout { private static final long serialVersionUID = 3042297420534417538L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java index 66afc502e..3e52d36dd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java @@ -31,7 +31,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.AbstractTextField.TextChangeEventMode; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; @@ -44,7 +44,7 @@ import com.vaadin.ui.UI; * suggestions in a suggestion-pop-up window while typing. */ @SpringComponent -@ViewScope +@UIScope public class AutoCompleteTextFieldComponent extends HorizontalLayout { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java index 97a1ff046..fa04355b3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java @@ -41,7 +41,7 @@ import com.vaadin.event.FieldEvents.TextChangeEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -57,7 +57,7 @@ import com.vaadin.ui.themes.ValoTheme; * A Vaadin layout for create or update the target filter. */ @SpringComponent -@ViewScope +@UIScope public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button.ClickListener { private static final long serialVersionUID = 7474232427119031474L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java index e009989cb..5a4861496 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java @@ -41,7 +41,7 @@ import com.vaadin.data.Item; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Table; @@ -53,7 +53,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class CreateOrUpdateFilterTable extends Table { private static final long serialVersionUID = 6887304217281629713L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java index efa591579..c3cf991b3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java @@ -35,7 +35,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.data.Container; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Table; import com.vaadin.ui.themes.ValoTheme; @@ -43,7 +43,7 @@ import com.vaadin.ui.themes.ValoTheme; * Table for selecting a distribution set. */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetSelectTable extends Table { private static final long serialVersionUID = -4307487829435471759L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java index 9ba409938..cc48cf7af 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java @@ -31,7 +31,7 @@ import com.vaadin.data.Property; import com.vaadin.server.FontAwesome; import com.vaadin.server.Sizeable; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; @@ -46,7 +46,7 @@ import com.vaadin.ui.Window; * query. */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetSelectWindow implements CommonDialogWindow.SaveDialogCloseListener, Property.ValueChangeListener { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java index 88f7c003d..6348b89ad 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java @@ -23,7 +23,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.UI; @@ -36,7 +36,7 @@ import com.vaadin.ui.VerticalLayout; */ @SpringView(name = FilterManagementView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class FilterManagementView extends VerticalLayout implements View { private static final long serialVersionUID = 8751545414237389386L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterHeader.java index 5b3320d00..0dc5a1301 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterHeader.java @@ -26,7 +26,7 @@ import org.vaadin.spring.events.EventBus; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; @@ -39,7 +39,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringComponent -@ViewScope +@UIScope public class TargetFilterHeader extends VerticalLayout { private static final long serialVersionUID = -7022704971955491673L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java index 8dc037449..74649f5bd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java @@ -16,7 +16,6 @@ import java.util.Map; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import org.eclipse.hawkbit.repository.DistributionSetManagement; import org.eclipse.hawkbit.repository.TargetFilterQueryManagement; import org.eclipse.hawkbit.repository.model.TargetFilterQuery; import org.eclipse.hawkbit.ui.common.ConfirmationDialog; @@ -44,7 +43,7 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Link; @@ -57,7 +56,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class TargetFilterTable extends Table { private static final long serialVersionUID = -4307487829435474759L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java index 88e6cb0fb..7f195233b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java @@ -26,7 +26,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; import com.vaadin.ui.UI; @@ -37,7 +37,7 @@ import com.vaadin.ui.UI; * on pinning. */ @SpringComponent -@ViewScope +@UIScope public class TargetFilterCountMessageLabel extends Label { private static final long serialVersionUID = -7188528790042766877L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java index e260a3bf4..f55a7dbf6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java @@ -39,7 +39,7 @@ import com.vaadin.server.Page; import com.vaadin.server.Page.BrowserWindowResizeEvent; import com.vaadin.server.Page.BrowserWindowResizeListener; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI; @@ -50,7 +50,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringView(name = DeploymentView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class DeploymentView extends VerticalLayout implements View, BrowserWindowResizeListener { public static final String VIEW_NAME = "deployment"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryComponent.java index 25448fbe1..21a4a531d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryComponent.java @@ -21,7 +21,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; @@ -31,7 +31,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringComponent -@ViewScope +@UIScope public class ActionHistoryComponent extends VerticalLayout { private static final long serialVersionUID = -3766179797384539821L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java index 22551f28c..ee9748ce5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java @@ -25,7 +25,7 @@ import org.vaadin.spring.events.EventBus; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -36,7 +36,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringComponent -@ViewScope +@UIScope public class ActionHistoryHeader extends VerticalLayout { private static final long serialVersionUID = -6276188234115774351L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java index 5ae0fcb8d..300beaea9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java @@ -56,7 +56,7 @@ import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; @@ -72,7 +72,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class ActionHistoryTable extends TreeTable { private static final long serialVersionUID = -1631514704696786653L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java index b7ddcf773..b172ef617 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java @@ -46,7 +46,7 @@ import org.vaadin.spring.events.EventBus; import com.google.common.collect.Sets; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.CheckBox; import com.vaadin.ui.ComboBox; import com.vaadin.ui.CustomComponent; @@ -59,7 +59,7 @@ import com.vaadin.ui.themes.ValoTheme; * WindowContent for adding/editing a Distribution */ @SpringComponent -@ViewScope +@UIScope public class DistributionAddUpdateWindowLayout extends CustomComponent { private static final long serialVersionUID = -5602182034230568435L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java index b838881a9..5d844736b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java @@ -26,7 +26,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; @@ -38,7 +38,7 @@ import com.vaadin.ui.Window; * Distribution set details layout. */ @SpringComponent -@ViewScope +@UIScope public class DistributionDetails extends AbstractNamedVersionedEntityTableDetailsLayout { private static final long serialVersionUID = 350360207334118826L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java index a8d207a4c..7c3190d97 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java @@ -65,7 +65,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.DragAndDropWrapper; @@ -77,7 +77,7 @@ import com.vaadin.ui.UI; * Distribution set table. */ @SpringComponent -@ViewScope +@UIScope public class DistributionTable extends AbstractNamedVersionTable { private static final long serialVersionUID = -1928335256399519494L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java index d4f56b5c6..b5498ad45 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java @@ -22,7 +22,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DropHandler; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -33,7 +33,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTableHeader extends AbstractTableHeader { private static final long serialVersionUID = 7597766804650170127L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java index 0d9a782a1..85ca66d35 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java @@ -14,13 +14,13 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software module table layout. */ @SpringComponent -@ViewScope +@UIScope public class DistributionTableLayout extends AbstractTableLayout { private static final long serialVersionUID = 6464291374980641235L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java index aa2103ae5..31e1cef1b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java @@ -25,14 +25,14 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.UI; /** * Class for Create/Update Tag Layout of distribution set */ @SpringComponent -@ViewScope +@UIScope public class CreateUpdateDistributionTagLayoutWindow extends AbstractCreateUpdateTagLayout { private static final long serialVersionUID = 444276149954167545L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java index c30f57b06..52b4c3e6c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; /** @@ -24,7 +24,7 @@ import com.vaadin.ui.Button; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagButtonClick extends AbstractFilterMultiButtonClick { /** diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java index 00e701450..a0c4c3175 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java @@ -35,7 +35,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.data.Item; import com.vaadin.event.dd.DropHandler; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.UI; /** @@ -43,7 +43,7 @@ import com.vaadin.ui.UI; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagButtons extends AbstractFilterButtons { private static final String NO_TAG = "NO TAG"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java index 6229ff4ff..c04f3d978 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java @@ -18,7 +18,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -28,7 +28,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagHeader extends AbstractFilterHeader { private static final long serialVersionUID = -1439667766337270066L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagLayout.java index 4a9b90696..b58b32f61 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagLayout.java @@ -20,14 +20,14 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagLayout extends AbstractFilterLayout { /** diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTagDropEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTagDropEvent.java index 4034aa8fd..b12a616d3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTagDropEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTagDropEvent.java @@ -31,7 +31,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.Table; @@ -42,7 +42,7 @@ import com.vaadin.ui.Table.TableTransferable; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagDropEvent implements DropHandler { private static final long serialVersionUID = 7338133229709850212L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/ManagementViewAcceptCriteria.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/ManagementViewAcceptCriteria.java index 5627291f3..784f31e20 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/ManagementViewAcceptCriteria.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/ManagementViewAcceptCriteria.java @@ -18,7 +18,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import com.google.common.collect.Maps; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; /** @@ -28,7 +28,7 @@ import com.vaadin.ui.Component; * */ @SpringComponent -@ViewScope +@UIScope public class ManagementViewAcceptCriteria extends AbstractAcceptCriteria { private static final long serialVersionUID = 1718217664674701006L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ActionTypeOptionGroupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ActionTypeOptionGroupLayout.java index fb5d37557..d3124eaeb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ActionTypeOptionGroupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ActionTypeOptionGroupLayout.java @@ -27,7 +27,7 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.DateField; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -39,7 +39,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class ActionTypeOptionGroupLayout extends HorizontalLayout { private static final long serialVersionUID = -5624576558669213864L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java index 6d5cb8d13..53ac04c88 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java @@ -36,7 +36,7 @@ import com.google.common.base.Optional; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; /** @@ -46,7 +46,7 @@ import com.vaadin.ui.Label; * */ @SpringComponent -@ViewScope +@UIScope public class CountMessageLabel extends Label { private static final long serialVersionUID = -1533826352473259653L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/DeleteActionsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/DeleteActionsLayout.java index 96bf52a3f..c7e259ebb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/DeleteActionsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/DeleteActionsLayout.java @@ -33,7 +33,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Table; @@ -45,7 +45,7 @@ import com.vaadin.ui.UI; * */ @SpringComponent -@ViewScope +@UIScope public class DeleteActionsLayout extends AbstractDeleteActionsLayout { private static final long serialVersionUID = -8112907467821886253L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java index 4f8b8cfc3..b41877c31 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java @@ -43,7 +43,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Table.Align; @@ -54,7 +54,7 @@ import com.vaadin.ui.Table.Align; * */ @SpringComponent -@ViewScope +@UIScope public class ManangementConfirmationWindowLayout extends AbstractConfirmationWindowLayout { private static final long serialVersionUID = 2114943830055679554L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java index 478b7e17f..81cbc8f5c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java @@ -34,7 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.FormLayout; import com.vaadin.ui.TextArea; @@ -45,7 +45,7 @@ import com.vaadin.ui.Window; * Add and Update Target. */ @SpringComponent -@ViewScope +@UIScope public class TargetAddUpdateWindowLayout extends CustomComponent { private static final long serialVersionUID = -6659290471705262389L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java index bbcba62ff..dd159cfe2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java @@ -14,14 +14,14 @@ import org.eclipse.hawkbit.repository.model.TargetTag; import org.eclipse.hawkbit.ui.common.tagdetails.AbstractTargetTagToken; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Target tag layout in bulk upload popup. * */ @SpringComponent -@ViewScope +@UIScope public class TargetBulkTokenTags extends AbstractTargetTagToken { private static final long serialVersionUID = 4159616629565523717L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java index d7272a395..ebc02e376 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java @@ -42,7 +42,7 @@ import com.vaadin.data.Container; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; @@ -64,7 +64,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class TargetBulkUpdateWindowLayout extends CustomComponent { @Autowired diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java index 13608ca90..fb3af6852 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java @@ -29,7 +29,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; @@ -45,7 +45,7 @@ import com.vaadin.ui.themes.ValoTheme; * Target details layout. */ @SpringComponent -@ViewScope +@UIScope public class TargetDetails extends AbstractTableDetailsLayout { private static final long serialVersionUID = 4571732743399605843L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java index 238a9e709..9fc41a2cd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java @@ -84,7 +84,7 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.DragAndDropWrapper; @@ -97,7 +97,7 @@ import com.vaadin.ui.themes.ValoTheme; * Concrete implementation of Target table. */ @SpringComponent -@ViewScope +@UIScope public class TargetTable extends AbstractTable { private static final Logger LOG = LoggerFactory.getLogger(TargetTable.class); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java index 98bbdca30..12a0d8167 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java @@ -38,7 +38,7 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -53,7 +53,7 @@ import com.vaadin.ui.themes.ValoTheme; * Target table header layout. */ @SpringComponent -@ViewScope +@UIScope public class TargetTableHeader extends AbstractTableHeader { private static final long serialVersionUID = -8647521126666320022L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java index 8c3ec3a1a..070d29d0a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java @@ -17,13 +17,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Target table layout. */ @SpringComponent -@ViewScope +@UIScope public class TargetTableLayout extends AbstractTableLayout { private static final long serialVersionUID = 2248703121998709112L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayoutWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayoutWindow.java index ddbf4562c..e40549bbf 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayoutWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayoutWindow.java @@ -23,14 +23,14 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * * Class for Create / Update Tag Layout of target */ @SpringComponent -@ViewScope +@UIScope public class CreateUpdateTargetTagLayoutWindow extends AbstractCreateUpdateTagLayout { private static final long serialVersionUID = 2446682350481560235L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CustomTargetTagFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CustomTargetTagFilterButtonClick.java index ac85b928b..a1f315fba 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CustomTargetTagFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CustomTargetTagFilterButtonClick.java @@ -20,7 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -31,7 +31,7 @@ import com.vaadin.ui.Button.ClickEvent; * */ @SpringComponent -@ViewScope +@UIScope public class CustomTargetTagFilterButtonClick extends AbstractFilterSingleButtonClick implements Serializable { private static final long serialVersionUID = -6173433602055291533L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java index 09d82d360..10705eff6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java @@ -28,7 +28,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -41,7 +41,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringComponent -@ViewScope +@UIScope public class FilterByStatusLayout extends VerticalLayout implements Button.ClickListener { private static final long serialVersionUID = -6930348859189929850L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java index 6eac40455..4312ce83b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java @@ -23,7 +23,7 @@ import org.vaadin.spring.events.EventBus; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Accordion; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -41,7 +41,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class MultipleTargetFilter extends Accordion implements SelectedTabChangeListener { private static final long serialVersionUID = -2887693289126893943L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java index f74a29fdc..0c5667630 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java @@ -32,7 +32,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.data.Item; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Table; import com.vaadin.ui.themes.ValoTheme; @@ -41,7 +41,7 @@ import com.vaadin.ui.themes.ValoTheme; * Target filter query{#link {@link TargetFilterQuery} buttons layout. */ @SpringComponent -@ViewScope +@UIScope public class TargetFilterQueryButtons extends Table { private static final long serialVersionUID = 9188095103191937850L; protected static final String FILTER_BUTTON_COLUMN = "filterButton"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java index a5a6b4b91..2b134d6ef 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java @@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; /** @@ -30,7 +30,7 @@ import com.vaadin.ui.Button; */ @SpringComponent -@ViewScope +@UIScope public class TargetTagFilterButtonClick extends AbstractFilterMultiButtonClick implements Serializable { private static final long serialVersionUID = -6173433602055291533L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java index ba9b2f8b8..2eee0e553 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java @@ -47,7 +47,7 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.Page; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.Table; @@ -57,7 +57,7 @@ import com.vaadin.ui.UI; * Target Tag filter buttons table. */ @SpringComponent -@ViewScope +@UIScope public class TargetTagFilterButtons extends AbstractFilterButtons { private static final String NO_TAG = "NO TAG"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java index f2bcf5b63..0f3c0d5ee 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java @@ -18,14 +18,14 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; /** * Target Tag filter by Tag Header. */ @SpringComponent -@ViewScope +@UIScope public class TargetTagFilterHeader extends AbstractFilterHeader { private static final long serialVersionUID = 3046367045669148009L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterLayout.java index 74699729a..be6dd5ab6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterLayout.java @@ -18,7 +18,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Target Tag filter layout. @@ -29,7 +29,7 @@ import com.vaadin.spring.annotation.ViewScope; */ @SpringComponent -@ViewScope +@UIScope public class TargetTagFilterLayout extends AbstractTargetTagFilterLayout { private static final long serialVersionUID = 2153612878428575009L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java index 1d514c545..74b859d55 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java @@ -25,14 +25,14 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.VerticalLayout; /** * Rollout management view. */ @SpringView(name = RolloutView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class RolloutView extends VerticalLayout implements View { private static final long serialVersionUID = -6199789714170913988L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java index 0706feea9..a7b86d834 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java @@ -62,7 +62,7 @@ import com.vaadin.data.validator.IntegerRangeValidator; import com.vaadin.data.validator.NullValidator; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.ComboBox; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; @@ -75,7 +75,7 @@ import com.vaadin.ui.themes.ValoTheme; * Rollout add or update popup layout. */ @SpringComponent -@ViewScope +@UIScope public class AddUpdateRolloutWindowLayout extends GridLayout { private static final long serialVersionUID = 2999293468801479916L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java index 0e870a6e5..6d8d46e19 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java @@ -71,7 +71,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.converter.Converter; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.UI; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent; import com.vaadin.ui.renderers.HtmlRenderer; @@ -80,7 +80,7 @@ import com.vaadin.ui.renderers.HtmlRenderer; * Rollout list grid component. */ @SpringComponent -@ViewScope +@UIScope public class RolloutListGrid extends AbstractGrid { private static final long serialVersionUID = 4060904914954370524L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java index 02478fd44..d0b8d5fcd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java @@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -34,7 +34,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutListHeader extends AbstractGridHeader { private static final long serialVersionUID = 2365400733081333174L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListView.java index 84aba0aff..ce2f9befb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListView.java @@ -14,7 +14,7 @@ import org.eclipse.hawkbit.ui.common.grid.AbstractGridLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; /** @@ -23,7 +23,7 @@ import com.vaadin.ui.Label; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutListView extends AbstractGridLayout { private static final long serialVersionUID = -2703552177439393208L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java index aa0a27192..5e197fe99 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java @@ -45,7 +45,7 @@ import com.vaadin.data.Container; import com.vaadin.data.util.converter.Converter; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickListener; import com.vaadin.ui.renderers.HtmlRenderer; @@ -56,7 +56,7 @@ import com.vaadin.ui.renderers.HtmlRenderer; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupListGrid extends AbstractGrid { private static final long serialVersionUID = 4060904914954370524L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java index c5aa3848d..683083b74 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java @@ -25,7 +25,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; @@ -37,7 +37,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupsListHeader extends AbstractGridHeader { private static final long serialVersionUID = 5077741997839715209L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListView.java index 7d7561274..42ba2a6e1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListView.java @@ -14,7 +14,7 @@ import org.eclipse.hawkbit.ui.common.grid.AbstractGridLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; /** @@ -22,7 +22,7 @@ import com.vaadin.ui.Label; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupsListView extends AbstractGridLayout { private static final long serialVersionUID = 7252345838154270259L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsCountLabelMessage.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsCountLabelMessage.java index 7f09d8633..87a6ec520 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsCountLabelMessage.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsCountLabelMessage.java @@ -26,14 +26,14 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; /** * Count message label for the targets of the rollout group. */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupTargetsCountLabelMessage extends Label { private static final long serialVersionUID = -3876685878918411453L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java index f80a3337d..0bc28fbb9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java @@ -38,7 +38,7 @@ import com.vaadin.data.Container; import com.vaadin.data.util.converter.Converter; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * @@ -46,7 +46,7 @@ import com.vaadin.spring.annotation.ViewScope; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupTargetsListGrid extends AbstractGrid { private static final long serialVersionUID = -2244756637458984597L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListHeader.java index 62c6142a3..d3c3488e0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListHeader.java @@ -26,7 +26,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; @@ -38,7 +38,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupTargetsListHeader extends AbstractGridHeader { private static final long serialVersionUID = 5613986489156507581L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListView.java index 672da2f29..173cd5f60 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListView.java @@ -14,14 +14,14 @@ import org.eclipse.hawkbit.ui.common.grid.AbstractGridLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; /** * Rollout Group Targets List View. */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupTargetsListView extends AbstractGridLayout { private static final long serialVersionUID = 26089134783467012L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java index 55bb526b5..f3e7cdad1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java @@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.CheckBox; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; @@ -34,7 +34,7 @@ import com.vaadin.ui.VerticalLayout; * View to configure the authentication mode. */ @SpringComponent -@ViewScope +@UIScope public class AuthenticationConfigurationView extends BaseConfigurationView implements ConfigurationGroup, ConfigurationItem.ConfigurationItemChangeListener, ValueChangeListener { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java index 8cbdaef65..a1f45f436 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java @@ -23,7 +23,7 @@ import org.springframework.data.domain.Pageable; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.ComboBox; import com.vaadin.ui.HorizontalLayout; @@ -35,7 +35,7 @@ import com.vaadin.ui.VerticalLayout; * Default DistributionSet Panel. */ @SpringComponent -@ViewScope +@UIScope public class DefaultDistributionSetTypeLayout extends BaseConfigurationView implements ConfigurationGroup { private static final long serialVersionUID = 17896542758L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java index 2389a2efa..8874404a0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java @@ -22,7 +22,7 @@ import org.eclipse.hawkbit.ui.utils.I18N; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; @@ -31,7 +31,7 @@ import com.vaadin.ui.VerticalLayout; * View to configure the polling interval and the overdue time. */ @SpringComponent -@ViewScope +@UIScope public class PollingConfigurationView extends BaseConfigurationView implements ConfigurationGroup, ConfigurationItem.ConfigurationItemChangeListener { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java index 696672288..264f3ba2f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java @@ -27,7 +27,7 @@ import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.CustomComponent; @@ -40,7 +40,7 @@ import com.vaadin.ui.VerticalLayout; * Main UI for the system configuration view. */ @SpringView(name = TenantConfigurationDashboardView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class TenantConfigurationDashboardView extends CustomComponent implements View, ConfigurationItemChangeListener { public static final String VIEW_NAME = "spSystemConfig"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java index 1180eba64..1faba4cb5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java @@ -15,14 +15,14 @@ import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * This class represents the UI item for the anonymous download by in the * authentication configuration view. */ @SpringComponent -@ViewScope +@UIScope public class AnonymousDownloadAuthenticationConfigurationItem extends AbstractAuthenticationTenantConfigurationItem { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java index e041f5564..4c07e09ac 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java @@ -17,7 +17,7 @@ import org.eclipse.hawkbit.ui.common.builder.TextFieldBuilder; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.TextField; @@ -28,7 +28,7 @@ import com.vaadin.ui.VerticalLayout; * reverse proxy in the authentication configuration view. */ @SpringComponent -@ViewScope +@UIScope public class CertificateAuthenticationConfigurationItem extends AbstractAuthenticationTenantConfigurationItem { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java index 300e6186e..33a4c7a17 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java @@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -34,7 +34,7 @@ import com.vaadin.ui.themes.ValoTheme; * the authentication configuration view. */ @SpringComponent -@ViewScope +@UIScope public class GatewaySecurityTokenAuthenticationConfigurationItem extends AbstractAuthenticationTenantConfigurationItem { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java index 9ca82e7ea..37727a80e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java @@ -15,14 +15,14 @@ import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * This class represents the UI item for the target security token section in * the authentication configuration view. */ @SpringComponent -@ViewScope +@UIScope public class TargetSecurityTokenAuthenticationConfigurationItem extends AbstractAuthenticationTenantConfigurationItem { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java index 8e7c52bc6..51d99a3bd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java @@ -14,12 +14,12 @@ import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Show success and error messages. */ -@ViewScope +@UIScope @SpringComponent public class UINotification implements Serializable { From 7a469d8da0d67b63c3a3ec93dd03099c9d7b2137 Mon Sep 17 00:00:00 2001 From: kaizimmerm Date: Mon, 28 Nov 2016 15:52:06 +0100 Subject: [PATCH 03/16] Removed dependency injection where not necessary Signed-off-by: kaizimmerm --- .../org/eclipse/hawkbit/app/MyLoginUI.java | 8 + .../java/org/eclipse/hawkbit/app/MyUI.java | 5 +- .../org/eclipse/hawkbit/app/MyLoginUI.java | 8 + .../java/org/eclipse/hawkbit/app/MyUI.java | 5 +- .../scenarios/ConfigurableScenario.java | 3 - .../autoconfigure/ui/UIAutoConfiguration.java | 10 +- .../hawkbit/ControllerPollProperties.java | 5 +- .../repository/SpPermissionChecker.java | 11 +- .../org/eclipse/hawkbit/ui/ErrorView.java | 17 +- .../org/eclipse/hawkbit/ui/HawkbitUI.java | 15 +- .../org/eclipse/hawkbit/ui/UiProperties.java | 21 ++- .../ui/artifacts/UploadArtifactView.java | 71 ++++++--- .../details/ArtifactDetailsLayout.java | 66 +++----- .../event/UploadViewAcceptCriteria.java | 8 + .../footer/SMDeleteActionsLayout.java | 41 +++-- .../UploadViewConfirmationWindowLayout.java | 23 ++- .../SoftwareModuleAddUpdateWindow.java | 42 ++--- .../smtable/SoftwareModuleDetails.java | 49 +++--- .../smtable/SoftwareModuleTable.java | 45 ++++-- .../smtable/SoftwareModuleTableHeader.java | 33 ++-- .../smtable/SoftwareModuleTableLayout.java | 44 +++--- .../CreateUpdateSoftwareTypeLayout.java | 21 ++- .../smtype/SMTypeFilterButtonClick.java | 37 ++--- .../artifacts/smtype/SMTypeFilterButtons.java | 31 ++-- .../artifacts/smtype/SMTypeFilterHeader.java | 35 ++--- .../artifacts/smtype/SMTypeFilterLayout.java | 68 +++----- .../artifacts/state/ArtifactUploadState.java | 8 +- .../ui/artifacts/upload/UploadHandler.java | 17 +- .../ui/artifacts/upload/UploadLayout.java | 66 +++----- .../artifacts/upload/UploadResultWindow.java | 4 +- .../upload/UploadStatusInfoWindow.java | 47 ++---- .../ui/common/AbstractAcceptCriteria.java | 13 +- .../common/AbstractMetadataPopupLayout.java | 31 ++-- .../AbstractConfirmationWindowLayout.java | 20 +-- ...amedVersionedEntityTableDetailsLayout.java | 9 ++ .../AbstractTableDetailsLayout.java | 57 +++---- .../SoftwareModuleDetailsTable.java | 15 +- .../AbstractFilterButtonClickBehaviour.java | 4 - .../filterlayout/AbstractFilterButtons.java | 25 +-- .../filterlayout/AbstractFilterHeader.java | 21 ++- .../filterlayout/AbstractFilterLayout.java | 22 +-- .../AbstractFilterMultiButtonClick.java | 16 -- .../AbstractFilterSingleButtonClick.java | 26 ---- .../footer/AbstractDeleteActionsLayout.java | 39 ++--- .../hawkbit/ui/common/grid/AbstractGrid.java | 32 ++-- .../ui/common/grid/AbstractGridHeader.java | 15 +- .../ui/common/grid/AbstractGridLayout.java | 22 ++- .../table/AbstractNamedVersionTable.java | 11 +- .../ui/common/table/AbstractTable.java | 36 ++--- .../ui/common/table/AbstractTableHeader.java | 40 +++-- .../ui/common/table/AbstractTableLayout.java | 2 + .../common/tagdetails/AbstractTagToken.java | 26 ++-- .../tagdetails/AbstractTargetTagToken.java | 22 ++- .../tagdetails/DistributionTagToken.java | 33 ++-- .../ui/common/tagdetails/TargetTagToken.java | 24 +-- .../ui/distributions/DistributionsView.java | 116 ++++++++------ .../CreateUpdateDistSetTypeLayout.java | 26 ++-- .../disttype/DSTypeFilterButtonClick.java | 38 ++--- .../disttype/DSTypeFilterButtons.java | 28 ++-- .../disttype/DSTypeFilterHeader.java | 37 ++--- .../disttype/DSTypeFilterLayout.java | 74 +++------ .../dstable/DistributionSetDetails.java | 80 +++++----- .../dstable/DistributionSetTable.java | 66 ++++---- .../dstable/DistributionSetTableHeader.java | 20 +-- .../dstable/DistributionSetTableLayout.java | 57 ++++--- .../dstable/DsMetadataPopupLayout.java | 23 +-- .../DistributionsViewAcceptCriteria.java | 8 + .../footer/DSDeleteActionsLayout.java | 46 +++--- ...DistributionsConfirmationWindowLayout.java | 28 ++-- .../smtable/SwMetadataPopupLayout.java | 24 +-- .../smtable/SwModuleBeanQuery.java | 2 +- .../smtable/SwModuleDetails.java | 51 +++--- .../distributions/smtable/SwModuleTable.java | 52 ++++--- .../smtable/SwModuleTableHeader.java | 42 +++-- .../smtable/SwModuleTableLayout.java | 45 +++--- .../smtype/DistSMTypeFilterButtonClick.java | 39 ++--- .../smtype/DistSMTypeFilterButtons.java | 25 +-- .../smtype/DistSMTypeFilterHeader.java | 33 ++-- .../smtype/DistSMTypeFilterLayout.java | 73 +++------ .../state/ManageDistUIState.java | 13 +- .../AutoCompleteTextFieldComponent.java | 47 +++--- .../CreateOrUpdateFilterHeader.java | 63 ++++---- .../CreateOrUpdateFilterTable.java | 51 +++--- .../DistributionSetSelectTable.java | 35 +---- .../DistributionSetSelectWindow.java | 40 +++-- .../FilterManagementView.java | 74 ++++++--- .../filtermanagement/TargetFilterHeader.java | 28 ++-- .../filtermanagement/TargetFilterTable.java | 63 ++++---- .../footer/TargetFilterCountMessageLabel.java | 34 +--- .../AbstractCreateUpdateTagLayout.java | 34 ++-- .../ui/layouts/CreateUpdateTypeLayout.java | 11 ++ .../hawkbit/ui/login/HawkbitLoginUI.java | 15 +- .../eclipse/hawkbit/ui/login/LoginView.java | 21 ++- .../hawkbit/ui/management/DeploymentView.java | 147 ++++++++++++------ .../actionhistory/ActionHistoryComponent.java | 44 ++---- .../actionhistory/ActionHistoryHeader.java | 24 +-- .../actionhistory/ActionHistoryTable.java | 55 +++---- .../DistributionAddUpdateWindowLayout.java | 53 +++---- .../dstable/DistributionDetails.java | 60 +++---- .../management/dstable/DistributionTable.java | 87 +++++------ .../dstable/DistributionTableHeader.java | 22 +-- .../dstable/DistributionTableLayout.java | 50 +++--- ...eateUpdateDistributionTagLayoutWindow.java | 22 ++- .../dstag/DistributionTagButtonClick.java | 32 +--- .../dstag/DistributionTagButtons.java | 45 +++--- .../dstag/DistributionTagHeader.java | 33 ++-- .../dstag/DistributionTagLayout.java | 72 +++------ .../event/DistributionTagDropEvent.java | 40 ++--- .../event/ManagementViewAcceptCriteria.java | 11 +- .../footer/ActionTypeOptionGroupLayout.java | 15 +- .../management/footer/CountMessageLabel.java | 48 ++---- .../footer/DeleteActionsLayout.java | 58 ++++--- .../ManangementConfirmationWindowLayout.java | 34 ++-- .../management/state/ManagementUIState.java | 25 +-- .../targettable/BulkUploadHandler.java | 13 +- .../TargetAddUpdateWindowLayout.java | 42 +++-- .../targettable/TargetBulkTokenTags.java | 46 ++---- .../TargetBulkUpdateWindowLayout.java | 58 ++++--- .../management/targettable/TargetDetails.java | 38 +++-- .../management/targettable/TargetTable.java | 64 ++++---- .../targettable/TargetTableHeader.java | 68 ++++---- .../targettable/TargetTableLayout.java | 50 +++--- .../AbstractTargetTagFilterLayout.java | 13 +- .../CreateUpdateTargetTagLayoutWindow.java | 23 ++- .../CustomTargetTagFilterButtonClick.java | 36 ++--- .../targettag/FilterByStatusLayout.java | 44 ++---- .../targettag/MultipleTargetFilter.java | 80 +++++----- .../targettag/TargetFilterQueryButtons.java | 28 ++-- .../targettag/TargetTagFilterButtonClick.java | 33 +--- .../targettag/TargetTagFilterButtons.java | 62 ++++---- .../targettag/TargetTagFilterHeader.java | 29 ++-- .../targettag/TargetTagFilterLayout.java | 63 +++----- .../hawkbit/ui/menu/DashboardEvent.java | 5 +- .../hawkbit/ui/menu/DashboardMenu.java | 25 +-- .../ui/push/DelayedEventBusPushStrategy.java | 18 ++- .../hawkbit/ui/rollout/RolloutView.java | 73 +++++---- .../rollout/AddUpdateRolloutWindowLayout.java | 57 ++++--- .../rollout/DistributionBeanQuery.java | 25 --- .../ui/rollout/rollout/RolloutBeanQuery.java | 17 +- .../ui/rollout/rollout/RolloutListGrid.java | 78 +++++----- .../ui/rollout/rollout/RolloutListHeader.java | 43 +++-- .../ui/rollout/rollout/RolloutListView.java | 35 +++-- .../rolloutgroup/RolloutGroupBeanQuery.java | 11 +- .../rolloutgroup/RolloutGroupListGrid.java | 58 ++++--- .../rolloutgroup/RolloutGroupsListHeader.java | 36 +---- .../rolloutgroup/RolloutGroupsListView.java | 27 ++-- .../RolloutGroupTargetsBeanQuery.java | 94 +++++------ .../RolloutGroupTargetsCountLabelMessage.java | 38 ++--- .../RolloutGroupTargetsListGrid.java | 74 +++++---- .../RolloutGroupTargetsListHeader.java | 46 ++---- .../RolloutGroupTargetsListView.java | 32 ++-- .../ui/rollout/state/RolloutUIState.java | 8 +- .../AuthenticationConfigurationView.java | 46 +++--- .../DefaultDistributionSetTypeLayout.java | 30 ++-- .../PollingConfigurationView.java | 47 ++---- .../TenantConfigurationDashboardView.java | 66 +++++--- ...AuthenticationTenantConfigurationItem.java | 11 +- ...wnloadAuthenticationConfigurationItem.java | 21 +-- ...ficateAuthenticationConfigurationItem.java | 31 ++-- ...yTokenAuthenticationConfigurationItem.java | 36 ++--- ...yTokenAuthenticationConfigurationItem.java | 29 +--- .../org/eclipse/hawkbit/ui/utils/I18N.java | 9 +- .../hawkbit/ui/utils/UINotification.java | 6 +- 163 files changed, 2697 insertions(+), 3189 deletions(-) diff --git a/examples/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java b/examples/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java index c31086a70..bc6aaa147 100644 --- a/examples/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java +++ b/examples/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java @@ -10,10 +10,13 @@ package org.eclipse.hawkbit.app; import org.eclipse.hawkbit.ui.login.HawkbitLoginUI; import org.eclipse.hawkbit.ui.themes.HawkbitTheme; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; import com.vaadin.annotations.Theme; import com.vaadin.annotations.Title; import com.vaadin.spring.annotation.SpringUI; +import com.vaadin.spring.navigator.SpringViewProvider; /** * Example hawkBit login UI implementation. @@ -31,4 +34,9 @@ public class MyLoginUI extends HawkbitLoginUI { private static final long serialVersionUID = 1L; + @Autowired + protected MyLoginUI(final SpringViewProvider viewProvider, final ApplicationContext context) { + super(viewProvider, context); + } + } diff --git a/examples/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyUI.java b/examples/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyUI.java index 07e7b7f7c..c5fa5f979 100644 --- a/examples/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyUI.java +++ b/examples/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyUI.java @@ -10,7 +10,6 @@ package org.eclipse.hawkbit.app; import org.eclipse.hawkbit.ui.HawkbitUI; import org.eclipse.hawkbit.ui.push.EventPushStrategy; -import org.vaadin.spring.events.EventBus.SessionEventBus; import com.vaadin.annotations.Push; import com.vaadin.annotations.Theme; @@ -43,7 +42,7 @@ public class MyUI extends HawkbitUI { * @param eventBus * the event bus */ - public MyUI(final EventPushStrategy pushStrategy, final SessionEventBus eventBus) { - super(pushStrategy, eventBus); + public MyUI(final EventPushStrategy pushStrategy) { + super(pushStrategy); } } diff --git a/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java b/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java index d8c5c8493..28d262491 100644 --- a/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java +++ b/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java @@ -10,8 +10,11 @@ package org.eclipse.hawkbit.app; import org.eclipse.hawkbit.ui.login.HawkbitLoginUI; import org.eclipse.hawkbit.ui.themes.HawkbitTheme; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; import com.vaadin.spring.annotation.SpringUI; +import com.vaadin.spring.navigator.SpringViewProvider; /** * Example hawkBit login UI implementation. @@ -27,6 +30,11 @@ import com.vaadin.spring.annotation.SpringUI; @SuppressWarnings({ "squid:MaximumInheritanceDepth" }) public class MyLoginUI extends HawkbitLoginUI { + @Autowired + protected MyLoginUI(final SpringViewProvider viewProvider, final ApplicationContext context) { + super(viewProvider, context); + } + private static final long serialVersionUID = 1L; } diff --git a/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyUI.java b/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyUI.java index f731f5660..5a6ce146c 100644 --- a/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyUI.java +++ b/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyUI.java @@ -10,7 +10,6 @@ package org.eclipse.hawkbit.app; import org.eclipse.hawkbit.ui.HawkbitUI; import org.eclipse.hawkbit.ui.push.EventPushStrategy; -import org.vaadin.spring.events.EventBus.SessionEventBus; import com.vaadin.annotations.Push; import com.vaadin.shared.communication.PushMode; @@ -41,8 +40,8 @@ public class MyUI extends HawkbitUI { * @param eventBus * the event bus */ - public MyUI(final EventPushStrategy pushStrategy, final SessionEventBus eventBus) { - super(pushStrategy, eventBus); + public MyUI(final EventPushStrategy pushStrategy) { + super(pushStrategy); } } diff --git a/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/ConfigurableScenario.java b/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/ConfigurableScenario.java index 590e52a3b..a343b6576 100644 --- a/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/ConfigurableScenario.java +++ b/examples/hawkbit-example-mgmt-simulator/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/ConfigurableScenario.java @@ -69,9 +69,6 @@ public class ConfigurableScenario { private final MgmtSoftwareModuleClientResource uploadSoftwareModule; - // Exception - squid:S00107 - this is a simulator that leverages multiple - // resouces/feign beans. - @SuppressWarnings("squid:S00107") public ConfigurableScenario(final MgmtDistributionSetClientResource distributionSetResource, final MgmtSoftwareModuleClientResource softwareModuleResource, final MgmtSoftwareModuleClientResource uploadSoftwareModule, final MgmtTargetClientResource targetResource, diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ui/UIAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ui/UIAutoConfiguration.java index ea98d52a3..71e0a904d 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ui/UIAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ui/UIAutoConfiguration.java @@ -8,6 +8,8 @@ */ package org.eclipse.hawkbit.autoconfigure.ui; +import java.util.concurrent.ScheduledExecutorService; + import org.eclipse.hawkbit.DistributedResourceBundleMessageSource; import org.eclipse.hawkbit.ui.push.DelayedEventBusPushStrategy; import org.eclipse.hawkbit.ui.push.EventPushStrategy; @@ -18,6 +20,7 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.vaadin.spring.annotation.EnableVaadinExtensions; +import org.vaadin.spring.events.EventBus.UIEventBus; import org.vaadin.spring.events.annotation.EnableEventBus; import org.vaadin.spring.security.annotation.EnableVaadinSecurity; @@ -65,8 +68,11 @@ public class UIAutoConfiguration { @Bean @ConditionalOnMissingBean @UIScope - public EventPushStrategy eventPushStrategy(final ConfigurableApplicationContext applicationContext) { - final DelayedEventBusPushStrategy delayedEventBusPushStrategy = new DelayedEventBusPushStrategy(); + public EventPushStrategy eventPushStrategy(final ConfigurableApplicationContext applicationContext, + final ScheduledExecutorService executorService, final UIEventBus eventBus, + final UIEventProvider eventProvider) { + final DelayedEventBusPushStrategy delayedEventBusPushStrategy = new DelayedEventBusPushStrategy(executorService, + eventBus, eventProvider); applicationContext.addApplicationListener(delayedEventBusPushStrategy); return delayedEventBusPushStrategy; } diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java index 0d70ae69d..4eba5c0f5 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java @@ -8,6 +8,8 @@ */ package org.eclipse.hawkbit; +import java.io.Serializable; + import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.EnvironmentAware; @@ -25,7 +27,8 @@ import org.springframework.stereotype.Component; */ @Component @ConfigurationProperties(prefix = "hawkbit.controller") -public class ControllerPollProperties { +public class ControllerPollProperties implements Serializable { + private static final long serialVersionUID = 1L; /** * Maximum polling time that can be configured by a tenant in HH:MM:SS diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/repository/SpPermissionChecker.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/repository/SpPermissionChecker.java index 1bb103e51..5253f899a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/repository/SpPermissionChecker.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/repository/SpPermissionChecker.java @@ -14,23 +14,22 @@ import org.eclipse.hawkbit.im.authentication.PermissionService; import org.eclipse.hawkbit.im.authentication.SpPermission; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; /** * Bean which contains all SP permissions. * - * - * - * */ -@Validated @Service public class SpPermissionChecker implements Serializable { private static final long serialVersionUID = 2757865286212875704L; - @Autowired private transient PermissionService permissionService; + @Autowired + SpPermissionChecker(final PermissionService permissionService) { + this.permissionService = permissionService; + } + /** * Gets the SP monitor View Permission. * diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/ErrorView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/ErrorView.java index 710d6d97c..ced736b96 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/ErrorView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/ErrorView.java @@ -32,23 +32,22 @@ import com.vaadin.ui.VerticalLayout; * * @see Navigator#setErrorView(Class) */ -@SuppressWarnings("serial") @SpringComponent @UIScope class ErrorView extends VerticalLayout implements View { + private static final long serialVersionUID = 1L; + private final Label message; - @Autowired - private I18N i18n; + private final I18N i18n; + + private final DashboardMenu dashboardMenu; @Autowired - private DashboardMenu dashboardMenu; - - /** - * Constructor. - */ - public ErrorView() { + ErrorView(final I18N i18n, final DashboardMenu dashboardMenu) { + this.i18n = i18n; + this.dashboardMenu = dashboardMenu; setMargin(true); message = new Label(); addComponent(message); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java index d0f7d4538..890f483ba 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUI.java @@ -61,7 +61,8 @@ public class HawkbitUI extends DefaultHawkbitUI implements DetachListener { private transient EventPushStrategy pushStrategy; - protected transient EventBus.SessionEventBus eventBus; + @Autowired + protected transient EventBus.UIEventBus eventBus; @Autowired private SpringViewProvider viewProvider; @@ -80,23 +81,13 @@ public class HawkbitUI extends DefaultHawkbitUI implements DetachListener { @Autowired private ErrorView errorview; - /** - * Default constructor. - */ - @Autowired - public HawkbitUI(final EventBus.SessionEventBus eventBus) { - this.eventBus = eventBus; - } - /** * Constructor taking the push strategy. * * @param pushStrategy * the strategy to push events from the backend to the UI */ - @Autowired - public HawkbitUI(final EventPushStrategy pushStrategy, final EventBus.SessionEventBus eventBus) { - this(eventBus); + public HawkbitUI(final EventPushStrategy pushStrategy) { this.pushStrategy = pushStrategy; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java index cc880fca8..119b57b10 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java @@ -8,6 +8,8 @@ */ package org.eclipse.hawkbit.ui; +import java.io.Serializable; + import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -17,13 +19,15 @@ import org.springframework.stereotype.Component; */ @Component @ConfigurationProperties("hawkbit.server.ui") -public class UiProperties { +public class UiProperties implements Serializable { + private static final long serialVersionUID = 1L; /** * Demo account login information. * */ - public static class Demo { + public static class Demo implements Serializable { + private static final long serialVersionUID = 1L; /** * Demo tenant. @@ -72,12 +76,15 @@ public class UiProperties { * documentation etc.). * */ - public static class Links { + public static class Links implements Serializable { + private static final long serialVersionUID = 1L; + /** * Configuration of UI documentation links. * */ - public static class Documentation { + public static class Documentation implements Serializable { + private static final long serialVersionUID = 1L; /** * Link to root of documentation and user guides. */ @@ -235,13 +242,15 @@ public class UiProperties { * Configuration of login view. * */ - public static class Login { + public static class Login implements Serializable { + private static final long serialVersionUID = 1L; /** * Cookie configuration for login credential cookie. * */ - public static class Cookie { + public static class Cookie implements Serializable { + private static final long serialVersionUID = 1L; /** * Secure cookie enabled. */ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java index 524925882..1a86ed049 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java @@ -8,13 +8,18 @@ */ package org.eclipse.hawkbit.ui.artifacts; +import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import org.eclipse.hawkbit.repository.EntityFactory; +import org.eclipse.hawkbit.repository.SoftwareManagement; import org.eclipse.hawkbit.repository.SpPermissionChecker; +import org.eclipse.hawkbit.repository.TagManagement; import org.eclipse.hawkbit.ui.HawkbitUI; import org.eclipse.hawkbit.ui.artifacts.details.ArtifactDetailsLayout; import org.eclipse.hawkbit.ui.artifacts.event.ArtifactDetailsEvent; import org.eclipse.hawkbit.ui.artifacts.event.SoftwareModuleEvent; +import org.eclipse.hawkbit.ui.artifacts.event.UploadViewAcceptCriteria; import org.eclipse.hawkbit.ui.artifacts.footer.SMDeleteActionsLayout; import org.eclipse.hawkbit.ui.artifacts.smtable.SoftwareModuleTableLayout; import org.eclipse.hawkbit.ui.artifacts.smtype.SMTypeFilterLayout; @@ -25,8 +30,10 @@ import org.eclipse.hawkbit.ui.management.event.DragEvent; import org.eclipse.hawkbit.ui.utils.I18N; import org.eclipse.hawkbit.ui.utils.SPUIDefinitions; import org.eclipse.hawkbit.ui.utils.UINotification; +import org.eclipse.hawkbit.util.SPInfo; import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; +import org.vaadin.spring.events.EventBus.UIEventBus; import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; @@ -57,35 +64,25 @@ public class UploadArtifactView extends VerticalLayout implements View, BrowserW public static final String VIEW_NAME = "spUpload"; private static final long serialVersionUID = 8754632011301553682L; - @Autowired - private transient EventBus.SessionEventBus eventBus; + private final EventBus.UIEventBus eventBus; - @Autowired - private SpPermissionChecker permChecker; + private final SpPermissionChecker permChecker; - @Autowired - private I18N i18n; + private final I18N i18n; - @Autowired - private transient UINotification uiNotification; + private final UINotification uiNotification; - @Autowired - private ArtifactUploadState artifactUploadState; + private final ArtifactUploadState artifactUploadState; - @Autowired - private SMTypeFilterLayout filterByTypeLayout; + private final SMTypeFilterLayout filterByTypeLayout; - @Autowired - private SoftwareModuleTableLayout smTableLayout; + private final SoftwareModuleTableLayout smTableLayout; - @Autowired - private ArtifactDetailsLayout artifactDetailsLayout; + private final ArtifactDetailsLayout artifactDetailsLayout; - @Autowired - private UploadLayout uploadLayout; + private final UploadLayout uploadLayout; - @Autowired - private SMDeleteActionsLayout deleteActionsLayout; + private final SMDeleteActionsLayout deleteActionsLayout; private VerticalLayout detailAndUploadLayout; @@ -94,8 +91,29 @@ public class UploadArtifactView extends VerticalLayout implements View, BrowserW private GridLayout mainLayout; private DragAndDropWrapper dadw; - @Override - public void enter(final ViewChangeEvent event) { + @Autowired + UploadArtifactView(final UIEventBus eventBus, final SpPermissionChecker permChecker, final I18N i18n, + final UINotification uiNotification, final ArtifactUploadState artifactUploadState, + final TagManagement tagManagement, final EntityFactory entityFactory, + final SoftwareManagement softwareManagement, final UploadViewAcceptCriteria uploadViewAcceptCriteria, + final SPInfo spInfo) { + this.eventBus = eventBus; + this.permChecker = permChecker; + this.i18n = i18n; + this.uiNotification = uiNotification; + this.artifactUploadState = artifactUploadState; + this.filterByTypeLayout = new SMTypeFilterLayout(artifactUploadState, i18n, permChecker, eventBus, + tagManagement, entityFactory, uiNotification, softwareManagement, uploadViewAcceptCriteria); + this.smTableLayout = new SoftwareModuleTableLayout(i18n, permChecker, artifactUploadState, uiNotification, + eventBus, softwareManagement, entityFactory, uploadViewAcceptCriteria); + this.artifactDetailsLayout = new ArtifactDetailsLayout(i18n, eventBus, artifactUploadState, uiNotification); + this.uploadLayout = new UploadLayout(i18n, uiNotification, eventBus, artifactUploadState, spInfo); + this.deleteActionsLayout = new SMDeleteActionsLayout(i18n, permChecker, eventBus, uiNotification, + artifactUploadState, softwareManagement, uploadViewAcceptCriteria); + } + + @PostConstruct + void init() { buildLayout(); restoreState(); checkNoDataAvaialble(); @@ -109,7 +127,7 @@ public class UploadArtifactView extends VerticalLayout implements View, BrowserW eventBus.unsubscribe(this); } - @EventBusListenerMethod(scope = EventScope.SESSION) + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final SoftwareModuleEvent event) { if (BaseEntityEventType.MINIMIZED == event.getEventType()) { minimizeSwTable(); @@ -118,7 +136,7 @@ public class UploadArtifactView extends VerticalLayout implements View, BrowserW } } - @EventBusListenerMethod(scope = EventScope.SESSION) + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final ArtifactDetailsEvent event) { if (event == ArtifactDetailsEvent.MINIMIZED) { minimizeArtifactoryDetails(); @@ -272,4 +290,9 @@ public class UploadArtifactView extends VerticalLayout implements View, BrowserW } } + @Override + public void enter(final ViewChangeEvent event) { + // This view is constructed in the init() method() + } + } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java index f0dd3cc1a..bf19e6bbe 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java @@ -14,9 +14,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.eclipse.hawkbit.repository.ArtifactManagement; import org.eclipse.hawkbit.repository.model.SoftwareModule; import org.eclipse.hawkbit.ui.artifacts.event.ArtifactDetailsEvent; @@ -37,11 +34,11 @@ import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.eclipse.hawkbit.ui.utils.SpringContextHelper; import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.eclipse.hawkbit.ui.utils.UINotification; -import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory; import org.vaadin.addons.lazyquerycontainer.LazyQueryContainer; import org.vaadin.addons.lazyquerycontainer.LazyQueryDefinition; import org.vaadin.spring.events.EventBus; +import org.vaadin.spring.events.EventBus.UIEventBus; import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; @@ -50,8 +47,6 @@ import com.google.common.collect.Maps; import com.vaadin.data.Container; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; @@ -65,12 +60,7 @@ import com.vaadin.ui.themes.ValoTheme; /** * Display the details of the artifacts for a selected software module. - * - * */ - -@SpringComponent -@UIScope public class ArtifactDetailsLayout extends VerticalLayout { private static final long serialVersionUID = -5189069028037133891L; @@ -91,17 +81,13 @@ public class ArtifactDetailsLayout extends VerticalLayout { private static final String MD5HASH = "md5Hash"; - @Autowired - private I18N i18n; + private final I18N i18n; - @Autowired - private transient EventBus.SessionEventBus eventBus; + private final EventBus.UIEventBus eventBus; - @Autowired - private ArtifactUploadState artifactUploadState; + private final ArtifactUploadState artifactUploadState; - @Autowired - private transient UINotification uINotification; + private final UINotification uINotification; private Label titleOfArtifactDetails; @@ -111,15 +97,17 @@ public class ArtifactDetailsLayout extends VerticalLayout { private Table maxArtifactDetailsTable; - private boolean fullWindowMode = false; + private boolean fullWindowMode; - private boolean readOnly = false; + private boolean readOnly; + + public ArtifactDetailsLayout(final I18N i18n, final UIEventBus eventBus, + final ArtifactUploadState artifactUploadState, final UINotification uINotification) { + this.i18n = i18n; + this.eventBus = eventBus; + this.artifactUploadState = artifactUploadState; + this.uINotification = uINotification; - /** - * Initialize the artifact details layout. - */ - @PostConstruct - private void init() { createComponents(); buildLayout(); eventBus.subscribe(this); @@ -140,9 +128,9 @@ public class ArtifactDetailsLayout extends VerticalLayout { * @param readOnly * value true for read only. */ + // TODO kaizimmerm: fix this public void init(final boolean readOnly) { this.readOnly = readOnly; - init(); } private void createComponents() { @@ -192,7 +180,7 @@ public class ArtifactDetailsLayout extends VerticalLayout { header.addComponents(titleOfArtifactDetails, maxMinButton); header.setComponentAlignment(titleOfArtifactDetails, Alignment.TOP_LEFT); header.setComponentAlignment(maxMinButton, Alignment.TOP_RIGHT); - header.setExpandRatio(titleOfArtifactDetails, 1.0f); + header.setExpandRatio(titleOfArtifactDetails, 1.0F); setSizeFull(); setImmediate(true); @@ -202,7 +190,7 @@ public class ArtifactDetailsLayout extends VerticalLayout { setComponentAlignment(header, Alignment.MIDDLE_CENTER); addComponent(artifactDetailsTable); setComponentAlignment(artifactDetailsTable, Alignment.MIDDLE_CENTER); - setExpandRatio(artifactDetailsTable, 1.0f); + setExpandRatio(artifactDetailsTable, 1.0F); } @@ -308,15 +296,15 @@ public class ArtifactDetailsLayout extends VerticalLayout { table.setColumnHeader(ACTION, i18n.get("upload.action")); } - table.setColumnExpandRatio(PROVIDED_FILE_NAME, 3.5f); + table.setColumnExpandRatio(PROVIDED_FILE_NAME, 3.5F); table.setColumnExpandRatio(SIZE, 2f); if (fullWindowMode) { - table.setColumnExpandRatio(SHA1HASH, 2.8f); - table.setColumnExpandRatio(MD5HASH, 2.4f); + table.setColumnExpandRatio(SHA1HASH, 2.8F); + table.setColumnExpandRatio(MD5HASH, 2.4F); } - table.setColumnExpandRatio(CREATE_MODIFIED_DATE_UPLOAD, 3f); + table.setColumnExpandRatio(CREATE_MODIFIED_DATE_UPLOAD, 3F); if (!readOnly) { - table.setColumnExpandRatio(ACTION, 2.5f); + table.setColumnExpandRatio(ACTION, 2.5F); } table.setVisibleColumns(getVisbleColumns().toArray()); @@ -460,7 +448,7 @@ public class ArtifactDetailsLayout extends VerticalLayout { setVisible(false); } - @EventBusListenerMethod(scope = EventScope.SESSION) + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final SoftwareModuleEvent softwareModuleEvent) { if (BaseEntityEventType.SELECTED_ENTITY == softwareModuleEvent.getEventType()) { UI.getCurrent().access(() -> { @@ -486,14 +474,6 @@ public class ArtifactDetailsLayout extends VerticalLayout { } } - @PreDestroy - void destroy() { - eventBus.unsubscribe(this); // It's good manners to do this, even though - // we should be - // automatically unsubscribed when the UI is - // garbage collected - } - public Table getArtifactDetailsTable() { return artifactDetailsTable; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java index 1dba95d15..98d9b49c8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java @@ -14,6 +14,9 @@ import java.util.Map; import org.eclipse.hawkbit.ui.common.AbstractAcceptCriteria; import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; +import org.eclipse.hawkbit.ui.utils.UINotification; +import org.springframework.beans.factory.annotation.Autowired; +import org.vaadin.spring.events.EventBus.UIEventBus; import com.google.common.collect.Maps; import com.vaadin.spring.annotation.SpringComponent; @@ -34,6 +37,11 @@ public class UploadViewAcceptCriteria extends AbstractAcceptCriteria { private static final Map DROP_HINTS_CONFIGS = createDropHintConfigurations(); + @Autowired + UploadViewAcceptCriteria(final UINotification uiNotification, final UIEventBus eventBus) { + super(uiNotification, eventBus); + } + @Override protected String getComponentId(final Component component) { String id = component.getId(); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java index 42eb6088b..b6bdb4546 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java @@ -10,22 +10,24 @@ package org.eclipse.hawkbit.ui.artifacts.footer; import java.util.Set; +import org.eclipse.hawkbit.repository.SoftwareManagement; +import org.eclipse.hawkbit.repository.SpPermissionChecker; import org.eclipse.hawkbit.ui.artifacts.event.UploadArtifactUIEvent; import org.eclipse.hawkbit.ui.artifacts.event.UploadViewAcceptCriteria; import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState; import org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout; import org.eclipse.hawkbit.ui.common.table.AbstractTable; import org.eclipse.hawkbit.ui.management.event.DragEvent; +import org.eclipse.hawkbit.ui.utils.I18N; import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; -import org.springframework.beans.factory.annotation.Autowired; +import org.eclipse.hawkbit.ui.utils.UINotification; +import org.vaadin.spring.events.EventBus.UIEventBus; import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; -import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.Table; import com.vaadin.ui.Table.TableTransferable; @@ -33,24 +35,30 @@ import com.vaadin.ui.UI; /** * Upload view footer layout implementation. - * */ -@SpringComponent -@UIScope public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout { private static final long serialVersionUID = -3273982053389866299L; - @Autowired - private ArtifactUploadState artifactUploadState; + private final ArtifactUploadState artifactUploadState; - @Autowired - private UploadViewConfirmationWindowLayout uploadViewConfirmationWindowLayout; + private final UploadViewConfirmationWindowLayout uploadViewConfirmationWindowLayout; - @Autowired - private UploadViewAcceptCriteria uploadViewAcceptCriteria; + private final UploadViewAcceptCriteria uploadViewAcceptCriteria; - @EventBusListenerMethod(scope = EventScope.SESSION) + public SMDeleteActionsLayout(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventBus, + final UINotification notification, final ArtifactUploadState artifactUploadState, + final SoftwareManagement softwareManagement, final UploadViewAcceptCriteria uploadViewAcceptCriteria) { + super(i18n, permChecker, eventBus, notification); + this.artifactUploadState = artifactUploadState; + this.uploadViewConfirmationWindowLayout = new UploadViewConfirmationWindowLayout(i18n, eventBus, + softwareManagement, artifactUploadState); + this.uploadViewAcceptCriteria = uploadViewAcceptCriteria; + + init(); + } + + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final UploadArtifactUIEvent event) { if (isSoftwareEvent(event) || isSoftwareTypeEvent(event)) { @@ -84,7 +92,7 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout { || event == UploadArtifactUIEvent.DISCARD_DELETE_SOFTWARE_TYPE; } - @EventBusListenerMethod(scope = EventScope.SESSION) + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final DragEvent event) { if (event == DragEvent.HIDE_DROP_HINT) { UI.getCurrent().access(() -> hideDropHints()); @@ -134,9 +142,8 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout { final String swModuleTypeName = sourceComponent.getId() .replace(UIComponentIdProvider.UPLOAD_TYPE_BUTTON_PREFIX, ""); - if (artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType().isPresent() - && artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType().get().getName() - .equalsIgnoreCase(swModuleTypeName)) { + if (artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType() + .map(type -> type.getName().equalsIgnoreCase(swModuleTypeName)).orElse(false)) { notification.displayValidationError( i18n.get("message.swmodule.type.check.delete", new Object[] { swModuleTypeName })); } else { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java index ec4df46ae..28f760583 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java @@ -20,30 +20,24 @@ import org.eclipse.hawkbit.ui.artifacts.state.CustomFile; import org.eclipse.hawkbit.ui.common.confirmwindow.layout.AbstractConfirmationWindowLayout; import org.eclipse.hawkbit.ui.common.confirmwindow.layout.ConfirmationTab; import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil; +import org.eclipse.hawkbit.ui.utils.I18N; import org.eclipse.hawkbit.ui.utils.SPUIDefinitions; import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; -import org.springframework.beans.factory.annotation.Autowired; +import org.vaadin.spring.events.EventBus.UIEventBus; import com.google.common.collect.Maps; import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; -import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Table.Align; /** * Abstract layout of confirm actions window. - * - * - * */ -@SpringComponent -@UIScope public class UploadViewConfirmationWindowLayout extends AbstractConfirmationWindowLayout { private static final long serialVersionUID = 1804036019105286988L; @@ -56,11 +50,16 @@ public class UploadViewConfirmationWindowLayout extends AbstractConfirmationWind private static final String DISCARD = "Discard"; - @Autowired - private transient SoftwareManagement softwareManagement; + private final SoftwareManagement softwareManagement; - @Autowired - private ArtifactUploadState artifactUploadState; + private final ArtifactUploadState artifactUploadState; + + public UploadViewConfirmationWindowLayout(final I18N i18n, final UIEventBus eventBus, + final SoftwareManagement softwareManagement, final ArtifactUploadState artifactUploadState) { + super(i18n, eventBus); + this.softwareManagement = softwareManagement; + this.artifactUploadState = artifactUploadState; + } @Override protected Map getConfimrationTabs() { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java index 8ec87254f..1d6e29016 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java @@ -8,8 +8,6 @@ */ package org.eclipse.hawkbit.ui.artifacts.smtable; -import javax.annotation.PostConstruct; - import org.eclipse.hawkbit.repository.EntityFactory; import org.eclipse.hawkbit.repository.SoftwareManagement; import org.eclipse.hawkbit.repository.model.SoftwareModule; @@ -29,12 +27,10 @@ import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.eclipse.hawkbit.ui.utils.SpringContextHelper; import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.eclipse.hawkbit.ui.utils.UINotification; -import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory; import org.vaadin.spring.events.EventBus; +import org.vaadin.spring.events.EventBus.UIEventBus; -import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.ComboBox; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.FormLayout; @@ -46,26 +42,19 @@ import com.vaadin.ui.themes.ValoTheme; /** * Generates window for Software module add or update. */ -@SpringComponent -@UIScope public class SoftwareModuleAddUpdateWindow extends CustomComponent { private static final long serialVersionUID = -5217675246477211483L; - @Autowired - private I18N i18n; + private final I18N i18n; - @Autowired - private transient UINotification uiNotifcation; + private final UINotification uiNotifcation; - @Autowired - private transient EventBus.SessionEventBus eventBus; + private final EventBus.UIEventBus eventBus; - @Autowired - private transient SoftwareManagement softwareManagement; + private final SoftwareManagement softwareManagement; - @Autowired - private transient EntityFactory entityFactory; + private final EntityFactory entityFactory; private TextField nameTextField; @@ -83,6 +72,17 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent { private FormLayout formLayout; + public SoftwareModuleAddUpdateWindow(final I18N i18n, final UINotification uiNotifcation, final UIEventBus eventBus, + final SoftwareManagement softwareManagement, final EntityFactory entityFactory) { + this.i18n = i18n; + this.uiNotifcation = uiNotifcation; + this.eventBus = eventBus; + this.softwareManagement = softwareManagement; + this.entityFactory = entityFactory; + + createRequiredComponents(); + } + /** * Save or update the sw module. */ @@ -102,14 +102,6 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent { } } - /** - * Initialize Distribution Add and Edit Window. - */ - @PostConstruct - void init() { - createRequiredComponents(); - } - /** * Create window for new software module. * diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java index 61009037d..4fd194926 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java @@ -10,6 +10,7 @@ package org.eclipse.hawkbit.ui.artifacts.smtable; import org.eclipse.hawkbit.repository.EntityFactory; import org.eclipse.hawkbit.repository.SoftwareManagement; +import org.eclipse.hawkbit.repository.SpPermissionChecker; import org.eclipse.hawkbit.repository.model.MetaData; import org.eclipse.hawkbit.repository.model.SoftwareModule; import org.eclipse.hawkbit.ui.artifacts.event.SoftwareModuleEvent; @@ -20,13 +21,12 @@ import org.eclipse.hawkbit.ui.components.SPUIComponentProvider; import org.eclipse.hawkbit.ui.distributions.event.MetadataEvent; import org.eclipse.hawkbit.ui.distributions.smtable.SwMetadataPopupLayout; import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil; +import org.eclipse.hawkbit.ui.utils.I18N; import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; -import org.springframework.beans.factory.annotation.Autowired; +import org.vaadin.spring.events.EventBus.UIEventBus; import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; -import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; @@ -39,41 +39,39 @@ import com.vaadin.ui.Window; * * */ -@SpringComponent -@UIScope public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDetailsLayout { private static final long serialVersionUID = -4900381301076646366L; - @Autowired - private SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow; + private final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow; - @Autowired - private ArtifactUploadState artifactUploadState; + private final ArtifactUploadState artifactUploadState; - @Autowired - private transient SoftwareManagement softwareManagement; + private final SoftwareManagement softwareManagement; - @Autowired - private SwMetadataPopupLayout swMetadataPopupLayout; + private final SwMetadataPopupLayout swMetadataPopupLayout; - @Autowired - private transient EntityFactory entityFactory; + private final SoftwareModuleMetadatadetailslayout swmMetadataTable; - private SoftwareModuleMetadatadetailslayout swmMetadataTable; + public SoftwareModuleDetails(final I18N i18n, final UIEventBus eventBus, + final SpPermissionChecker permissionChecker, + final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow, + final ArtifactUploadState artifactUploadState, final SoftwareManagement softwareManagement, + final SwMetadataPopupLayout swMetadataPopupLayout, final EntityFactory entityFactory) { + super(i18n, eventBus, permissionChecker, null); + this.softwareModuleAddUpdateWindow = softwareModuleAddUpdateWindow; + this.artifactUploadState = artifactUploadState; + this.softwareManagement = softwareManagement; + this.swMetadataPopupLayout = swMetadataPopupLayout; - /** - * softwareLayout Initialize the component. - */ - @Override - protected void init() { swmMetadataTable = new SoftwareModuleMetadatadetailslayout(); swmMetadataTable.init(getI18n(), getPermissionChecker(), softwareManagement, swMetadataPopupLayout, entityFactory); - super.init(); + addTabs(detailsTab); + restoreState(); } - @EventBusListenerMethod(scope = EventScope.SESSION) + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final MetadataEvent event) { UI.getCurrent().access(() -> { final MetaData softwareModuleMetadata = event.getMetaData(); @@ -168,7 +166,7 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta return artifactUploadState.isSwModuleTableMaximized(); } - @EventBusListenerMethod(scope = EventScope.SESSION) + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final SoftwareModuleEvent softwareModuleEvent) { onBaseEntityEvent(softwareModuleEvent); } @@ -194,8 +192,7 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta } private boolean isSoftwareModuleSelected(final SoftwareModule softwareModule) { - final SoftwareModule selectedUploadSWModule = artifactUploadState.getSelectedBaseSoftwareModule().isPresent() - ? artifactUploadState.getSelectedBaseSoftwareModule().get() : null; + final SoftwareModule selectedUploadSWModule = artifactUploadState.getSelectedBaseSoftwareModule().orElse(null); return softwareModule != null && selectedUploadSWModule != null && selectedUploadSWModule.getName().equals(softwareModule.getName()) && selectedUploadSWModule.getVersion().equals(softwareModule.getVersion()); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java index 999e3bc2f..57fa5a65a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java @@ -11,7 +11,9 @@ package org.eclipse.hawkbit.ui.artifacts.smtable; import java.util.List; import java.util.Map; +import org.eclipse.hawkbit.repository.EntityFactory; import org.eclipse.hawkbit.repository.SoftwareManagement; +import org.eclipse.hawkbit.repository.SpPermissionChecker; import org.eclipse.hawkbit.repository.model.SoftwareModule; import org.eclipse.hawkbit.ui.artifacts.event.SMFilterEvent; import org.eclipse.hawkbit.ui.artifacts.event.SoftwareModuleEvent; @@ -24,15 +26,17 @@ import org.eclipse.hawkbit.ui.components.SPUIComponentProvider; import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder; import org.eclipse.hawkbit.ui.distributions.smtable.SwMetadataPopupLayout; import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil; +import org.eclipse.hawkbit.ui.utils.I18N; import org.eclipse.hawkbit.ui.utils.SPUIDefinitions; import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions; import org.eclipse.hawkbit.ui.utils.TableColumn; import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; -import org.springframework.beans.factory.annotation.Autowired; +import org.eclipse.hawkbit.ui.utils.UINotification; import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory; import org.vaadin.addons.lazyquerycontainer.LazyQueryContainer; import org.vaadin.addons.lazyquerycontainer.LazyQueryDefinition; +import org.vaadin.spring.events.EventBus.UIEventBus; import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; @@ -42,34 +46,41 @@ import com.vaadin.data.Item; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; -import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Table; import com.vaadin.ui.UI; /** - * Header of Software module table. + * The Software module table. */ -@UIScope -@SpringComponent public class SoftwareModuleTable extends AbstractNamedVersionTable { private static final long serialVersionUID = 6469417305487144809L; - @Autowired - private ArtifactUploadState artifactUploadState; + private final ArtifactUploadState artifactUploadState; - @Autowired - private transient SoftwareManagement softwareManagement; + private final SoftwareManagement softwareManagement; - @Autowired - private UploadViewAcceptCriteria uploadViewAcceptCriteria; + private final UploadViewAcceptCriteria uploadViewAcceptCriteria; - @Autowired - private SwMetadataPopupLayout swMetadataPopupLayout; + private final SwMetadataPopupLayout swMetadataPopupLayout; - @EventBusListenerMethod(scope = EventScope.SESSION) + public SoftwareModuleTable(final UIEventBus eventBus, final I18N i18n, final UINotification uiNotification, + final ArtifactUploadState artifactUploadState, final SoftwareManagement softwareManagement, + final UploadViewAcceptCriteria uploadViewAcceptCriteria, final EntityFactory entityFactory, + final SpPermissionChecker permChecker, final SwMetadataPopupLayout swMetadataPopupLayout) { + super(eventBus, i18n, uiNotification); + this.artifactUploadState = artifactUploadState; + this.softwareManagement = softwareManagement; + this.uploadViewAcceptCriteria = uploadViewAcceptCriteria; + this.swMetadataPopupLayout = swMetadataPopupLayout; + + addNewContainerDS(); + setColumnProperties(); + setDataAvailable(getContainerDataSource().size() != 0); + } + + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final SMFilterEvent filterEvent) { UI.getCurrent().access(() -> { @@ -153,12 +164,12 @@ public class SoftwareModuleTable extends AbstractNamedVersionTable { private static final long serialVersionUID = 1L; private static final Logger LOG = LoggerFactory.getLogger(CreateUpdateSoftwareTypeLayout.class); - @Autowired - private transient SoftwareManagement swTypeManagementService; + private final SoftwareManagement swTypeManagementService; private String singleAssignStr; private String multiAssignStr; @@ -60,6 +60,13 @@ public class CreateUpdateSoftwareTypeLayout extends CreateUpdateTypeLayout(SoftwareModuleTypeBeanQuery.class)); + return HawkbitCommonUtil.createLazyQueryContainer(new BeanQueryFactory<>(SoftwareModuleTypeBeanQuery.class)); } @Override protected boolean isClickedByDefault(final String typeName) { - return artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType().isPresent() && artifactUploadState - .getSoftwareModuleFilters().getSoftwareModuleType().get().getName().equals(typeName); + return artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType() + .map(type -> type.getName().equals(typeName)).orElse(false); } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java index d040e4a15..2c0984b02 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java @@ -8,18 +8,20 @@ */ package org.eclipse.hawkbit.ui.artifacts.smtype; -import javax.annotation.PostConstruct; - +import org.eclipse.hawkbit.repository.EntityFactory; +import org.eclipse.hawkbit.repository.SoftwareManagement; +import org.eclipse.hawkbit.repository.SpPermissionChecker; +import org.eclipse.hawkbit.repository.TagManagement; import org.eclipse.hawkbit.ui.artifacts.event.UploadArtifactUIEvent; import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState; import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader; +import org.eclipse.hawkbit.ui.utils.I18N; import org.eclipse.hawkbit.ui.utils.SPUIDefinitions; import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; -import org.springframework.beans.factory.annotation.Autowired; +import org.eclipse.hawkbit.ui.utils.UINotification; +import org.vaadin.spring.events.EventBus.UIEventBus; -import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -27,25 +29,22 @@ import com.vaadin.ui.Window; /** * Software module type filter buttons header. */ -@SpringComponent -@UIScope public class SMTypeFilterHeader extends AbstractFilterHeader { private static final long serialVersionUID = -4855810338059032342L; - @Autowired - private ArtifactUploadState artifactUploadState; + private final ArtifactUploadState artifactUploadState; + private final CreateUpdateSoftwareTypeLayout createUpdateSWTypeLayout; - @Autowired - private CreateUpdateSoftwareTypeLayout createUpdateSWTypeLayout; + public SMTypeFilterHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventBus, + final ArtifactUploadState artifactUploadState, final TagManagement tagManagement, + final EntityFactory entityFactory, final UINotification uiNotification, + final SoftwareManagement softwareManagement) { + super(permChecker, eventBus, i18n); + this.artifactUploadState = artifactUploadState; + this.createUpdateSWTypeLayout = new CreateUpdateSoftwareTypeLayout(i18n, tagManagement, entityFactory, eventBus, + permChecker, uiNotification, softwareManagement); - /** - * Initialize the components. - */ - @Override - @PostConstruct - protected void init() { - super.init(); if (permChecker.hasCreateDistributionPermission() || permChecker.hasUpdateDistributionPermission()) { createUpdateSWTypeLayout.init(); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java index e03cb16ad..7e4b23570 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java @@ -8,57 +8,44 @@ */ package org.eclipse.hawkbit.ui.artifacts.smtype; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - +import org.eclipse.hawkbit.repository.EntityFactory; +import org.eclipse.hawkbit.repository.SoftwareManagement; +import org.eclipse.hawkbit.repository.SpPermissionChecker; +import org.eclipse.hawkbit.repository.TagManagement; import org.eclipse.hawkbit.ui.artifacts.event.UploadArtifactUIEvent; +import org.eclipse.hawkbit.ui.artifacts.event.UploadViewAcceptCriteria; import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState; import org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterLayout; -import org.springframework.beans.factory.annotation.Autowired; -import org.vaadin.spring.events.EventBus; +import org.eclipse.hawkbit.ui.utils.I18N; +import org.eclipse.hawkbit.ui.utils.UINotification; +import org.vaadin.spring.events.EventBus.UIEventBus; import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; -import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.UIScope; - /** * Software module type filter buttons layout. - * - * - * */ -@SpringComponent -@UIScope public class SMTypeFilterLayout extends AbstractFilterLayout { private static final long serialVersionUID = 1581066345157393665L; - @Autowired - private transient EventBus.SessionEventBus eventbus; + private final ArtifactUploadState artifactUploadState; - @Autowired - private SMTypeFilterHeader smTypeFilterHeader; + public SMTypeFilterLayout(final ArtifactUploadState artifactUploadState, final I18N i18n, + final SpPermissionChecker permChecker, final UIEventBus eventBus, final TagManagement tagManagement, + final EntityFactory entityFactory, final UINotification uiNotification, + final SoftwareManagement softwareManagement, final UploadViewAcceptCriteria uploadViewAcceptCriteria) { + super(new SMTypeFilterHeader(i18n, permChecker, eventBus, artifactUploadState, tagManagement, entityFactory, + uiNotification, softwareManagement), + new SMTypeFilterButtons(eventBus, artifactUploadState, uploadViewAcceptCriteria, softwareManagement)); - @Autowired - private SMTypeFilterButtons smTypeFilterButtons; + this.artifactUploadState = artifactUploadState; + restoreState(); - @Autowired - private SMTypeFilterButtonClick smTypeFilterButtonClick; - - @Autowired - private ArtifactUploadState artifactUploadState; - - /** - * Initialize the filter layout. - */ - @PostConstruct - void init() { - super.init(smTypeFilterHeader, smTypeFilterButtons, smTypeFilterButtonClick); - eventbus.subscribe(this); + eventBus.subscribe(this); } - @EventBusListenerMethod(scope = EventScope.SESSION) + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final UploadArtifactUIEvent event) { if (event == UploadArtifactUIEvent.HIDE_FILTER_BY_TYPE) { setVisible(false); @@ -68,21 +55,6 @@ public class SMTypeFilterLayout extends AbstractFilterLayout { } } - @PreDestroy - void destroy() { - /* - * It's good manners to do this, even though vaadin-spring will - * automatically unsubscribe when this UI is garbage collected. - */ - eventbus.unsubscribe(this); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.hawkbit.server.ui.common.filterlayout.SPFilterLayout# - * onLoadIsTypeFilterIsClosed() - */ @Override public Boolean onLoadIsTypeFilterIsClosed() { return artifactUploadState.isSwTypeFilterClosed(); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadState.java index ed2feef0a..869776667 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadState.java @@ -38,8 +38,7 @@ public class ArtifactUploadState implements ManagmentEntityState, Serializ private static final long serialVersionUID = 8273440375917450859L; - @Autowired - private SoftwareModuleFilters softwareModuleFilters; + private final SoftwareModuleFilters softwareModuleFilters; private final Map deleteSofwareModules = new HashMap<>(); @@ -75,6 +74,11 @@ public class ArtifactUploadState implements ManagmentEntityState, Serializ private final AtomicInteger numberOfFileUploadsFailed = new AtomicInteger(); + @Autowired + ArtifactUploadState(final SoftwareModuleFilters softwareModuleFilters) { + this.softwareModuleFilters = softwareModuleFilters; + } + public AtomicInteger getNumberOfFileUploadsFailed() { return numberOfFileUploadsFailed; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java index cd6d82194..781aa0c1d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java @@ -11,8 +11,6 @@ package org.eclipse.hawkbit.ui.artifacts.upload; import java.io.IOException; import java.io.OutputStream; -import javax.annotation.PreDestroy; - import org.eclipse.hawkbit.repository.exception.ArtifactUploadFailedException; import org.eclipse.hawkbit.repository.model.SoftwareModule; import org.eclipse.hawkbit.ui.artifacts.event.UploadFileStatus; @@ -68,7 +66,7 @@ public class UploadHandler implements StreamVariable, Receiver, SucceededListene private String failureReason; private final I18N i18n; - private transient EventBus.SessionEventBus eventBus; + private transient EventBus.UIEventBus eventBus; private final SoftwareModule selectedSw; private SoftwareModule selectedSwForUpload; private final ArtifactUploadState artifactUploadState; @@ -85,21 +83,12 @@ public class UploadHandler implements StreamVariable, Receiver, SucceededListene this.mimeType = mimeType; this.selectedSw = selectedSw; this.i18n = SpringContextHelper.getBean(I18N.class); - this.eventBus = SpringContextHelper.getBean(EventBus.SessionEventBus.class); + this.eventBus = SpringContextHelper.getBean(EventBus.UIEventBus.class); this.artifactUploadState = SpringContextHelper.getBean(ArtifactUploadState.class); eventBus.subscribe(this); } - @PreDestroy - void destroy() { - /* - * It's good manners to do this, even though vaadin-spring will - * automatically unsubscribe when this UI is garbage collected. - */ - eventBus.unsubscribe(this); - } - - @EventBusListenerMethod(scope = EventScope.SESSION) + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final UploadStatusEventType event) { if (event == UploadStatusEventType.ABORT_UPLOAD) { aborted = true; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java index f5a813228..2b35366c9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java @@ -17,9 +17,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.apache.commons.io.FileUtils; import org.eclipse.hawkbit.repository.exception.ArtifactUploadFailedException; import org.eclipse.hawkbit.repository.model.SoftwareModule; @@ -43,9 +40,9 @@ import org.eclipse.hawkbit.ui.utils.UINotification; import org.eclipse.hawkbit.util.SPInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.vaadin.spring.events.EventBus; +import org.vaadin.spring.events.EventBus.UIEventBus; import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; @@ -58,8 +55,6 @@ import com.vaadin.server.FontAwesome; import com.vaadin.server.Page; import com.vaadin.server.StreamVariable; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.DragAndDropWrapper; @@ -74,36 +69,24 @@ import com.vaadin.ui.VerticalLayout; /** * Upload files layout. */ -@UIScope -@SpringComponent public class UploadLayout extends VerticalLayout { - - /** - * - */ private static final String HTML_DIV = ""; private static final long serialVersionUID = -566164756606779220L; private static final Logger LOG = LoggerFactory.getLogger(UploadLayout.class); - @Autowired - private UploadStatusInfoWindow uploadInfoWindow; + private final UploadStatusInfoWindow uploadInfoWindow; - @Autowired - private I18N i18n; + private final I18N i18n; - @Autowired - private transient UINotification uiNotification; + private final UINotification uiNotification; - @Autowired - private transient EventBus.SessionEventBus eventBus; + private final EventBus.UIEventBus eventBus; - @Autowired - private ArtifactUploadState artifactUploadState; + private final ArtifactUploadState artifactUploadState; - @Autowired - private transient SPInfo spInfo; + private final SPInfo spInfo; private final List duplicateFileNamesList = new ArrayList<>(); @@ -115,7 +98,7 @@ public class UploadLayout extends VerticalLayout { private VerticalLayout dropAreaLayout; - private UI ui; + private final UI ui; private HorizontalLayout fileUploadLayout; @@ -125,11 +108,15 @@ public class UploadLayout extends VerticalLayout { private Button uploadStatusButton; - /** - * Initialize the upload layout. - */ - @PostConstruct - void init() { + public UploadLayout(final I18N i18n, final UINotification uiNotification, final UIEventBus eventBus, + final ArtifactUploadState artifactUploadState, final SPInfo spInfo) { + this.uploadInfoWindow = new UploadStatusInfoWindow(eventBus, artifactUploadState, i18n); + this.i18n = i18n; + this.uiNotification = uiNotification; + this.eventBus = eventBus; + this.artifactUploadState = artifactUploadState; + this.spInfo = spInfo; + createComponents(); buildLayout(); restoreState(); @@ -137,7 +124,7 @@ public class UploadLayout extends VerticalLayout { ui = UI.getCurrent(); } - @EventBusListenerMethod(scope = EventScope.SESSION) + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final UploadArtifactUIEvent event) { if (event == UploadArtifactUIEvent.DELETED_ALL_SOFWARE) { ui.access(() -> updateActionCount()); @@ -150,32 +137,23 @@ public class UploadLayout extends VerticalLayout { } } - @EventBusListenerMethod(scope = EventScope.SESSION) + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final UploadStatusEvent event) { if (event.getUploadProgressEventType() == UploadStatusEventType.UPLOAD_STARTED) { - ui.access(() -> onStartOfUpload()); + ui.access(this::onStartOfUpload); } else if (event.getUploadProgressEventType() == UploadStatusEventType.UPLOAD_FAILED) { ui.access(() -> onUploadFailure(event)); } else if (event.getUploadProgressEventType() == UploadStatusEventType.UPLOAD_FINISHED) { - ui.access(() -> onUploadCompletion()); + ui.access(this::onUploadCompletion); } else if (event.getUploadProgressEventType() == UploadStatusEventType.UPLOAD_SUCCESSFUL) { ui.access(() -> onUploadSuccess(event)); } else if (event.getUploadProgressEventType() == UploadStatusEventType.UPLOAD_STREAMING_FAILED) { ui.access(() -> onUploadStreamingFailure(event)); } else if (event.getUploadProgressEventType() == UploadStatusEventType.UPLOAD_STREAMING_FINISHED) { - ui.access(() -> onUploadStreamingSuccess()); + ui.access(this::onUploadStreamingSuccess); } } - @PreDestroy - void destroy() { - /* - * It's good manners to do this, even though vaadin-spring will - * automatically unsubscribe when this UI is garbage collected. - */ - eventBus.unsubscribe(this); - } - private void createComponents() { createUploadStatusButton(); createProcessButton(); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadResultWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadResultWindow.java index 9b27b07f0..e3bcc0856 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadResultWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadResultWindow.java @@ -67,7 +67,7 @@ public class UploadResultWindow implements Button.ClickListener { private static final String REASON = "reason"; - private transient EventBus.SessionEventBus eventBus; + private transient EventBus.UIEventBus eventBus; /** @@ -81,7 +81,7 @@ public class UploadResultWindow implements Button.ClickListener { public UploadResultWindow(final List uploadResultList, final I18N i18n) { this.uploadResultList = uploadResultList; this.i18n = i18n; - eventBus = SpringContextHelper.getBean( EventBus.SessionEventBus.class); + eventBus = SpringContextHelper.getBean( EventBus.UIEventBus.class); createComponents(); createLayout(); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java index 06e0ba2c1..992ea64fe 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java @@ -11,9 +11,6 @@ package org.eclipse.hawkbit.ui.artifacts.upload; import java.util.List; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.eclipse.hawkbit.repository.model.SoftwareModule; import org.eclipse.hawkbit.ui.artifacts.event.UploadArtifactUIEvent; import org.eclipse.hawkbit.ui.artifacts.event.UploadFileStatus; @@ -28,8 +25,8 @@ import org.eclipse.hawkbit.ui.utils.I18N; import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions; import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; -import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; +import org.vaadin.spring.events.EventBus.UIEventBus; import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; @@ -38,8 +35,6 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.window.WindowMode; -import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Grid; @@ -58,18 +53,13 @@ import elemental.json.JsonValue; /** * Shows upload status during upload. */ -@UIScope -@SpringComponent public class UploadStatusInfoWindow extends Window { - @Autowired - private transient EventBus.SessionEventBus eventBus; + private final EventBus.UIEventBus eventBus; - @Autowired - private ArtifactUploadState artifactUploadState; + private final ArtifactUploadState artifactUploadState; - @Autowired - private I18N i18n; + private final I18N i18n; private static final String PROGRESS = "Progress"; @@ -81,9 +71,9 @@ public class UploadStatusInfoWindow extends Window { private static final long serialVersionUID = 1L; - private Grid grid; + private final Grid grid; - private IndexedContainer uploads; + private final IndexedContainer uploads; private volatile boolean errorOccured = false; @@ -91,7 +81,7 @@ public class UploadStatusInfoWindow extends Window { private Button minimizeButton; - private VerticalLayout mainLayout; + private final VerticalLayout mainLayout; private Label windowCaption; @@ -99,15 +89,15 @@ public class UploadStatusInfoWindow extends Window { private Button resizeButton; - private UI ui; + private final UI ui; private ConfirmationDialog confirmDialog; - /** - * Default Constructor. - */ - @PostConstruct - void init() { + public UploadStatusInfoWindow(final UIEventBus eventBus, final ArtifactUploadState artifactUploadState, + final I18N i18n) { + this.eventBus = eventBus; + this.artifactUploadState = artifactUploadState; + this.i18n = i18n; setPopupProperties(); createStatusPopupHeaderComponents(); @@ -130,7 +120,7 @@ public class UploadStatusInfoWindow extends Window { createConfirmDialog(); } - @EventBusListenerMethod(scope = EventScope.SESSION) + @EventBusListenerMethod(scope = EventScope.UI) void onEvent(final UploadStatusEvent event) { final UploadFileStatus uploadStatus = event.getUploadStatus(); @@ -166,15 +156,6 @@ public class UploadStatusInfoWindow extends Window { uploadStarted(event.getUploadStatus().getFileName(), event.getUploadStatus().getSoftwareModule()); } - @PreDestroy - void destroy() { - /* - * It's good manners to do this, even though vaadin-spring will - * automatically unsubscribe when this UI is garbage collected. - */ - eventBus.unsubscribe(this); - } - private void restoreState() { final Indexed container = grid.getContainerDataSource(); if (container.getItemIds().isEmpty()) { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAcceptCriteria.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAcceptCriteria.java index a5f2e195a..564d133c7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAcceptCriteria.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAcceptCriteria.java @@ -18,8 +18,8 @@ import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil; import org.eclipse.hawkbit.ui.utils.SPUIDefinitions; import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.eclipse.hawkbit.ui.utils.UINotification; -import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; +import org.vaadin.spring.events.EventBus.UIEventBus; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; @@ -39,11 +39,14 @@ public abstract class AbstractAcceptCriteria extends ServerSideCriterion { private int previousRowCount; - @Autowired - protected transient UINotification uiNotification; + protected UINotification uiNotification; - @Autowired - protected transient EventBus.SessionEventBus eventBus; + protected EventBus.UIEventBus eventBus; + + protected AbstractAcceptCriteria(final UINotification uiNotification, final UIEventBus eventBus) { + this.uiNotification = uiNotification; + this.eventBus = eventBus; + } @Override public boolean accept(final DragAndDropEvent dragEvent) { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java index 71434cdff..bbaacde1f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java @@ -11,8 +11,7 @@ package org.eclipse.hawkbit.ui.common; import java.util.List; import java.util.Set; -import javax.annotation.PostConstruct; - +import org.eclipse.hawkbit.repository.SpPermissionChecker; import org.eclipse.hawkbit.repository.exception.EntityNotFoundException; import org.eclipse.hawkbit.repository.model.MetaData; import org.eclipse.hawkbit.repository.model.NamedVersionedEntity; @@ -30,8 +29,8 @@ import org.eclipse.hawkbit.ui.utils.SPUIDefinitions; import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions; import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.eclipse.hawkbit.ui.utils.UINotification; -import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; +import org.vaadin.spring.events.EventBus.UIEventBus; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; @@ -73,14 +72,11 @@ public abstract class AbstractMetadataPopupLayout extends private static final long serialVersionUID = 4862529368471627190L; - @Autowired - private I18N i18n; + private final I18N i18n; - @Autowired - private transient EventBus.SessionEventBus eventBus; + private final EventBus.UIEventBus eventBus; - @Autowired - private SpPermissionChecker permissionChecker; + private final SpPermissionChecker permissionChecker; private T selectedBaseEntity; @@ -65,37 +60,38 @@ public abstract class AbstractTableDetailsLayout extends private Button manageMetadataBtn; - private TabSheet detailsTab; + protected TabSheet detailsTab; - private VerticalLayout detailsLayout; + private final VerticalLayout detailsLayout; - private VerticalLayout descriptionLayout; + private final VerticalLayout descriptionLayout; - private VerticalLayout logLayout; + private final VerticalLayout logLayout; - private VerticalLayout attributesLayout; + private final VerticalLayout attributesLayout; - /** - * Initialize components. - */ - @PostConstruct - protected void init() { + protected final ManagementUIState managementUIState; + + protected AbstractTableDetailsLayout(final I18N i18n, final UIEventBus eventBus, + final SpPermissionChecker permissionChecker, final ManagementUIState managementUIState) { + this.i18n = i18n; + this.eventBus = eventBus; + this.permissionChecker = permissionChecker; + this.managementUIState = managementUIState; + detailsLayout = getTabLayout(); + descriptionLayout = getTabLayout(); + logLayout = getTabLayout(); + attributesLayout = getTabLayout(); createComponents(); buildLayout(); - restoreState(); eventBus.subscribe(this); } - @PreDestroy - void destroy() { - eventBus.unsubscribe(this); - } - protected SpPermissionChecker getPermissionChecker() { return permissionChecker; } - protected EventBus.SessionEventBus getEventBus() { + protected EventBus.UIEventBus getEventBus() { return eventBus; } @@ -153,7 +149,6 @@ public abstract class AbstractTableDetailsLayout extends detailsTab.setHeight(90, Unit.PERCENTAGE); detailsTab.addStyleName(SPUIStyleDefinitions.DETAILS_LAYOUT_STYLE); detailsTab.setId(getTabSheetId()); - addTabs(detailsTab); } private void buildLayout() { @@ -196,7 +191,7 @@ public abstract class AbstractTableDetailsLayout extends caption.setValue(HawkbitCommonUtil.getSoftwareModuleName(headerCaption, value)); } - private void restoreState() { + protected void restoreState() { if (onLoadIsTableRowSelected()) { populateData(null); editButton.setEnabled(true); @@ -276,22 +271,18 @@ public abstract class AbstractTableDetailsLayout extends } protected VerticalLayout createLogLayout() { - logLayout = getTabLayout(); return logLayout; } protected VerticalLayout createAttributesLayout() { - attributesLayout = getTabLayout(); return attributesLayout; } protected VerticalLayout createDetailsLayout() { - detailsLayout = getTabLayout(); return detailsLayout; } protected VerticalLayout createDescriptionLayout() { - descriptionLayout = getTabLayout(); return descriptionLayout; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsTable.java index e1398a6c9..1e858e836 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsTable.java @@ -30,7 +30,7 @@ import org.eclipse.hawkbit.ui.utils.SpringContextHelper; import org.eclipse.hawkbit.ui.utils.UINotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.vaadin.spring.events.EventBus.SessionEventBus; +import org.vaadin.spring.events.EventBus; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; @@ -46,9 +46,6 @@ import com.vaadin.ui.themes.ValoTheme; /** * Software module details table. * - * - * - * */ public class SoftwareModuleDetailsTable extends Table { @@ -67,15 +64,15 @@ public class SoftwareModuleDetailsTable extends Table { private boolean isUnassignSoftModAllowed; private SpPermissionChecker permissionChecker; - private transient DistributionSetManagement distributionSetManagement; + private DistributionSetManagement distributionSetManagement; private I18N i18n; - private transient SessionEventBus eventBus; + private EventBus.UIEventBus eventBus; - private transient ManageDistUIState manageDistUIState; + private ManageDistUIState manageDistUIState; - private transient UINotification uiNotification; + private UINotification uiNotification; /** * Initialize software module table- to be displayed in details layout. @@ -96,7 +93,7 @@ public class SoftwareModuleDetailsTable extends Table { */ public void init(final I18N i18n, final boolean isUnassignSoftModAllowed, final SpPermissionChecker permissionChecker, final DistributionSetManagement distributionSetManagement, - final SessionEventBus eventBus, final ManageDistUIState manageDistUIState) { + final EventBus.UIEventBus eventBus, final ManageDistUIState manageDistUIState) { this.i18n = i18n; this.isUnassignSoftModAllowed = isUnassignSoftModAllowed; this.permissionChecker = permissionChecker; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtonClickBehaviour.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtonClickBehaviour.java index e035b8050..c58c3890b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtonClickBehaviour.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtonClickBehaviour.java @@ -14,10 +14,6 @@ import com.vaadin.ui.Button; /** * Abstract button click behaviour of filter buttons layout. - * - * - * - * */ public abstract class AbstractFilterButtonClickBehaviour implements Serializable { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java index 621bf3b8f..730f64a67 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java @@ -13,17 +13,15 @@ import static org.eclipse.hawkbit.ui.utils.SPUIDefinitions.NO_TAG_BUTTON_ID; import java.util.ArrayList; import java.util.List; -import javax.annotation.PreDestroy; - import org.eclipse.hawkbit.ui.components.SPUIComponentProvider; import org.eclipse.hawkbit.ui.decorators.SPUITagButtonStyle; import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil; import org.eclipse.hawkbit.ui.utils.SPUIDefinitions; import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions; -import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.addons.lazyquerycontainer.LazyQueryContainer; import org.vaadin.spring.events.EventBus; +import org.vaadin.spring.events.EventBus.UIEventBus; import com.vaadin.data.Item; import com.vaadin.event.dd.DropHandler; @@ -45,28 +43,19 @@ public abstract class AbstractFilterButtons extends Table { protected static final String FILTER_BUTTON_COLUMN = "filterButton"; - @Autowired - protected transient EventBus.SessionEventBus eventBus; + protected EventBus.UIEventBus eventBus; - private AbstractFilterButtonClickBehaviour filterButtonClickBehaviour; + protected final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour; + + protected AbstractFilterButtons(final UIEventBus eventBus, + final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour) { + this.eventBus = eventBus; - /** - * Initialize layout of filter buttons. - * - * @param filterButtonClickBehaviour - * click behaviour of filter buttons. - */ - public void init(final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour) { this.filterButtonClickBehaviour = filterButtonClickBehaviour; createTable(); eventBus.subscribe(this); } - @PreDestroy - void destroy() { - eventBus.unsubscribe(this); - } - private void createTable() { setImmediate(true); setId(getButtonsTableId()); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterHeader.java index 22e813d25..5101985ad 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterHeader.java @@ -12,9 +12,10 @@ import org.eclipse.hawkbit.repository.SpPermissionChecker; import org.eclipse.hawkbit.ui.common.builder.LabelBuilder; import org.eclipse.hawkbit.ui.components.SPUIComponentProvider; import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder; +import org.eclipse.hawkbit.ui.utils.I18N; import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions; -import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; +import org.vaadin.spring.events.EventBus.UIEventBus; import com.vaadin.server.FontAwesome; import com.vaadin.ui.Alignment; @@ -25,20 +26,14 @@ import com.vaadin.ui.VerticalLayout; /** * Parent class for filter button header layout. - * - * - * - * */ public abstract class AbstractFilterHeader extends VerticalLayout { private static final long serialVersionUID = -1388340600522323332L; - @Autowired protected SpPermissionChecker permChecker; - @Autowired - protected transient EventBus.SessionEventBus eventBus; + protected EventBus.UIEventBus eventBus; private Label title; @@ -46,10 +41,12 @@ public abstract class AbstractFilterHeader extends VerticalLayout { private Button hideIcon; - /** - * Initialize the header layout. - */ - protected void init() { + protected final I18N i18n; + + protected AbstractFilterHeader(final SpPermissionChecker permChecker, final UIEventBus eventBus, final I18N i18n) { + this.permChecker = permChecker; + this.eventBus = eventBus; + this.i18n = i18n; createComponents(); buildLayout(); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterLayout.java index 9c3f6db9f..7b05adf45 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterLayout.java @@ -15,35 +15,25 @@ import com.vaadin.ui.VerticalLayout; /** * Parent class for filter button layout. - * - * - * - * */ public abstract class AbstractFilterLayout extends VerticalLayout { private static final long serialVersionUID = 9190616426688385851L; - private AbstractFilterHeader filterHeader; + private final AbstractFilterHeader filterHeader; - private AbstractFilterButtons filterButtons; + private final AbstractFilterButtons filterButtons; - /** - * Initialize the artifact details layout. - */ - protected void init(final AbstractFilterHeader filterHeader, final AbstractFilterButtons filterButtons, - final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour) { + protected AbstractFilterLayout(final AbstractFilterHeader filterHeader, final AbstractFilterButtons filterButtons) { this.filterHeader = filterHeader; this.filterButtons = filterButtons; - filterButtons.init(filterButtonClickBehaviour); buildLayout(); - restoreState(); } private void buildLayout() { setWidth(SPUIDefinitions.FILTER_BY_TYPE_WIDTH, Unit.PIXELS); setStyleName("filter-btns-main-layout"); - setHeight(100.0f, Unit.PERCENTAGE); + setHeight(100.0F, Unit.PERCENTAGE); setSpacing(false); setMargin(false); @@ -52,10 +42,10 @@ public abstract class AbstractFilterLayout extends VerticalLayout { setComponentAlignment(filterHeader, Alignment.TOP_CENTER); setComponentAlignment(filterButtons, Alignment.TOP_CENTER); - setExpandRatio(filterButtons, 1.0f); + setExpandRatio(filterButtons, 1.0F); } - private void restoreState() { + protected void restoreState() { if (onLoadIsTypeFilterIsClosed()) { setVisible(false); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterMultiButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterMultiButtonClick.java index f7d3656b1..db907c86f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterMultiButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterMultiButtonClick.java @@ -25,12 +25,6 @@ public abstract class AbstractFilterMultiButtonClick extends AbstractFilterButto private static final long serialVersionUID = 1L; protected final transient Set