From 789dd8ffdcb7931db6f978df9ddaec0799020fb7 Mon Sep 17 00:00:00 2001
From: kaizimmerm <kai.zimmermann@bosch-si.com>
Date: Tue, 29 Nov 2016 11:15:20 +0100
Subject: [PATCH] Fix transient dependencies

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
---
 .../hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java   | 3 +--
 .../ui/artifacts/smtable/SoftwareModuleTableHeader.java     | 5 ++---
 .../ui/artifacts/smtable/SoftwareModuleTableLayout.java     | 6 +++---
 .../eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java   | 2 +-
 .../hawkbit/ui/common/table/AbstractTableHeader.java        | 2 +-
 .../ui/common/tagdetails/AbstractTargetTagToken.java        | 4 ++--
 .../hawkbit/ui/common/tagdetails/DistributionTagToken.java  | 2 +-
 .../hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java   | 4 ++--
 .../hawkbit/ui/management/footer/DeleteActionsLayout.java   | 2 +-
 .../java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java     | 2 +-
 .../eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java | 2 +-
 .../ui/tenantconfiguration/PollingConfigurationView.java    | 2 +-
 ...GatewaySecurityTokenAuthenticationConfigurationItem.java | 2 +-
 .../src/main/java/org/eclipse/hawkbit/ui/utils/I18N.java    | 2 +-
 14 files changed, 19 insertions(+), 21 deletions(-)

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 ddbe308ef..c9f4589b9 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
@@ -12,7 +12,6 @@ import java.util.List;
 import java.util.Map;
 
 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;
@@ -66,7 +65,7 @@ public class SoftwareModuleTable extends AbstractNamedVersionTable<SoftwareModul
 
     SoftwareModuleTable(final UIEventBus eventBus, final I18N i18n, final UINotification uiNotification,
             final ArtifactUploadState artifactUploadState, final SoftwareManagement softwareManagement,
-            final UploadViewAcceptCriteria uploadViewAcceptCriteria, final SpPermissionChecker permChecker,
+            final UploadViewAcceptCriteria uploadViewAcceptCriteria,
             final SwMetadataPopupLayout swMetadataPopupLayout) {
         super(eventBus, i18n, uiNotification);
         this.artifactUploadState = artifactUploadState;
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 ba79bc30f..b8fb8d660 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
@@ -38,9 +38,8 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
     private final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow;
 
     SoftwareModuleTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
-            final ArtifactUploadState artifactUploadState, final UIEventBus eventBus,
-            final SoftwareManagement softwareManagement, final EntityFactory entityFactory,
-            final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow) {
+            final ArtifactUploadState artifactUploadState, final SoftwareManagement softwareManagement,
+            final EntityFactory entityFactory, final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow) {
         super(i18n, permChecker, eventbus, null, null, artifactUploadState);
         this.softwareModuleAddUpdateWindow = softwareModuleAddUpdateWindow;
     }
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 3dac9455f..0195ed0c5 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
@@ -38,10 +38,10 @@ public class SoftwareModuleTableLayout extends AbstractTableLayout {
                 softwareManagement, entityFactory, permChecker);
 
         super.init(
-                new SoftwareModuleTableHeader(i18n, permChecker, eventBus, artifactUploadState, eventBus,
-                        softwareManagement, entityFactory, softwareModuleAddUpdateWindow),
+                new SoftwareModuleTableHeader(i18n, permChecker, eventBus, artifactUploadState, softwareManagement,
+                        entityFactory, softwareModuleAddUpdateWindow),
                 new SoftwareModuleTable(eventBus, i18n, uiNotification, artifactUploadState, softwareManagement,
-                        uploadViewAcceptCriteria, permChecker, swMetadataPopupLayout),
+                        uploadViewAcceptCriteria, swMetadataPopupLayout),
                 new SoftwareModuleDetails(i18n, eventBus, permChecker, softwareModuleAddUpdateWindow,
                         artifactUploadState, softwareManagement, swMetadataPopupLayout, entityFactory));
     }
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 71c7b7265..179fdcf9f 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
@@ -86,7 +86,7 @@ public class UploadLayout extends VerticalLayout {
 
     private final ArtifactUploadState artifactUploadState;
 
-    private final SPInfo spInfo;
+    private final transient SPInfo spInfo;
 
     private final List<String> duplicateFileNamesList = new ArrayList<>();
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
index dc1685d28..4ad92b482 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
@@ -45,7 +45,7 @@ public abstract class AbstractTableHeader extends VerticalLayout {
 
     protected SpPermissionChecker permChecker;
 
-    protected EventBus.UIEventBus eventbus;
+    protected transient EventBus.UIEventBus eventbus;
 
     private Label headerCaption;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTargetTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTargetTagToken.java
index 01a7a23c2..f5e189773 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTargetTagToken.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTargetTagToken.java
@@ -35,7 +35,7 @@ public abstract class AbstractTargetTagToken<T extends BaseEntity> extends Abstr
 
     private static final long serialVersionUID = 7772876588903171201L;
 
-    protected final TagManagement tagManagement;
+    protected final transient TagManagement tagManagement;
 
     protected AbstractTargetTagToken(final SpPermissionChecker checker, final I18N i18n,
             final UINotification uinotification, final UIEventBus eventBus, final ManagementUIState managementUIState,
@@ -58,7 +58,7 @@ public abstract class AbstractTargetTagToken<T extends BaseEntity> extends Abstr
 
     @EventBusListenerMethod(scope = EventScope.UI)
     void onTargetTagUpdateEvent(final List<TargetTagUpdateEvent> events) {
-        events.stream().map(event -> event.getEntity()).forEach(entity -> {
+        events.stream().map(TargetTagUpdateEvent::getEntity).forEach(entity -> {
             final Item item = container.getItem(entity.getId());
             if (item != null) {
                 updateItem(entity.getName(), entity.getColour(), item);
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 fe8112e44..cb9845d65 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
@@ -41,7 +41,7 @@ public class DistributionTagToken extends AbstractTagToken<DistributionSet> {
 
     private static final long serialVersionUID = -8022738301736043396L;
 
-    private final TagManagement tagManagement;
+    private final transient TagManagement tagManagement;
 
     private final transient DistributionSetManagement distributionSetManagement;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
index 0aff8a9c0..1b7aed7ee 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
@@ -72,9 +72,9 @@ public abstract class AbstractCreateUpdateTagLayout<E extends NamedEntity> exten
 
     protected I18N i18n;
 
-    protected TagManagement tagManagement;
+    protected transient TagManagement tagManagement;
 
-    protected EntityFactory entityFactory;
+    protected transient EntityFactory entityFactory;
 
     protected transient EventBus.UIEventBus eventBus;
 
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 a60d7d7c7..b29722028 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
@@ -53,7 +53,7 @@ public class DeleteActionsLayout extends AbstractDeleteActionsLayout {
 
     private static final long serialVersionUID = -8112907467821886253L;
 
-    private final TagManagement tagManagementService;
+    private final transient TagManagement tagManagementService;
 
     private final ManagementViewAcceptCriteria managementViewAcceptCriteria;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
index 54a9a7055..9c3145554 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
@@ -72,7 +72,7 @@ public final class DashboardMenu extends CustomComponent {
     // the buttons directly via events
     private final List<ValoMenuItemButton> menuButtons = new ArrayList<>();
 
-    private final PermissionService permissionService;
+    private final transient PermissionService permissionService;
 
     private final List<DashboardMenuItem> dashboardVaadinViews;
 
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 e991af6fa..39cf8bb3f 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
@@ -99,7 +99,7 @@ public class RolloutListGrid extends AbstractGrid {
 
     private static final String ROLLOUT_RENDERER_DATA = "rolloutRendererData";
 
-    private final RolloutManagement rolloutManagement;
+    private final transient RolloutManagement rolloutManagement;
 
     private final AddUpdateRolloutWindowLayout addUpdateRolloutWindow;
 
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 ee00568ad..0c791e87f 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
@@ -30,7 +30,7 @@ public class PollingConfigurationView extends BaseConfigurationView
 
     private static final long serialVersionUID = 1L;
 
-    private final TenantConfigurationManagement tenantConfigurationManagement;
+    private final transient TenantConfigurationManagement tenantConfigurationManagement;
 
     private final DurationConfigField fieldPollTime;
     private final DurationConfigField fieldPollingOverdueTime;
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 c54130c1f..3fca97f07 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
@@ -33,7 +33,7 @@ public class GatewaySecurityTokenAuthenticationConfigurationItem extends Abstrac
 
     private static final long serialVersionUID = 1L;
 
-    private final SecurityTokenGenerator securityTokenGenerator;
+    private final transient SecurityTokenGenerator securityTokenGenerator;
 
     private final TextField gatewayTokenNameTextField;
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/I18N.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/I18N.java
index dd8b79961..46ee775a4 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/I18N.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/I18N.java
@@ -45,7 +45,7 @@ public class I18N implements Serializable {
 
     private static final Logger LOG = LoggerFactory.getLogger(I18N.class);
 
-    private final MessageSource source;
+    private final transient MessageSource source;
 
     @Autowired
     I18N(final MessageSource source) {