Add Simple UI Source & rename java package (#1542)

avgustinmm · web-flow · commit ae47b1b338e5 · 2024-01-11T18:50:14.000+02:00
Signed-off-by: Marinov Avgustin &lt;Avgustin.Marinov@bosch.com&gt;
diff --git a/hawkbit-runtime/hawkbit-simple-ui/pom.xml b/hawkbit-runtime/hawkbit-simple-ui/pom.xml
@@ -241,6 +241,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitClient.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitClient.java
@@ -7,9 +7,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui;
+package org.eclipse.hawkbit.ui.simple;
 
-import org.eclipse.hawkbit.ui.view.util.Utils;
+import org.eclipse.hawkbit.ui.simple.view.util.Utils;
 import feign.Client;
 import feign.Contract;
 import feign.Feign;
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java
@@ -7,14 +7,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui;
-
-import org.eclipse.hawkbit.ui.view.RolloutView;
-import org.eclipse.hawkbit.ui.view.TargetView;
-import org.eclipse.hawkbit.ui.security.AuthenticatedUser;
-import org.eclipse.hawkbit.ui.view.AboutView;
-import org.eclipse.hawkbit.ui.view.DistributionSetView;
-import org.eclipse.hawkbit.ui.view.SoftwareModuleView;
+package org.eclipse.hawkbit.ui.simple;
+
+import org.eclipse.hawkbit.ui.simple.view.TargetView;
+import org.eclipse.hawkbit.ui.simple.view.RolloutView;
+import org.eclipse.hawkbit.ui.simple.security.AuthenticatedUser;
+import org.eclipse.hawkbit.ui.simple.view.AboutView;
+import org.eclipse.hawkbit.ui.simple.view.DistributionSetView;
+import org.eclipse.hawkbit.ui.simple.view.SoftwareModuleView;
 import com.vaadin.flow.component.Unit;
 import com.vaadin.flow.component.applayout.AppLayout;
 import com.vaadin.flow.component.applayout.DrawerToggle;
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java
@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui;
+package org.eclipse.hawkbit.ui.simple;
 
 import com.vaadin.flow.component.page.AppShellConfigurator;
 import com.vaadin.flow.server.PWA;
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java
@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.security;
+package org.eclipse.hawkbit.ui.simple.security;
 
 import com.vaadin.flow.spring.security.AuthenticationContext;
 import org.springframework.stereotype.Component;
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java
@@ -7,9 +7,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.security;
+package org.eclipse.hawkbit.ui.simple.security;
 
-import org.eclipse.hawkbit.ui.view.LoginView;
+import org.eclipse.hawkbit.ui.simple.view.LoginView;
 import com.vaadin.flow.spring.security.VaadinWebSecurity;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java
@@ -7,9 +7,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.view;
+package org.eclipse.hawkbit.ui.simple.view;
 
-import org.eclipse.hawkbit.ui.MainLayout;
+import org.eclipse.hawkbit.ui.simple.MainLayout;
 import com.vaadin.flow.component.html.H2;
 import com.vaadin.flow.component.html.Image;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java
@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.view;
+package org.eclipse.hawkbit.ui.simple.view;
 
 public interface Constants {
 
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java
@@ -7,14 +7,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.view;
-
-import org.eclipse.hawkbit.ui.HawkbitClient;
-import org.eclipse.hawkbit.ui.view.util.Filter;
-import org.eclipse.hawkbit.ui.MainLayout;
-import org.eclipse.hawkbit.ui.view.util.SelectionGrid;
-import org.eclipse.hawkbit.ui.view.util.TableView;
-import org.eclipse.hawkbit.ui.view.util.Utils;
+package org.eclipse.hawkbit.ui.simple.view;
+
+import org.eclipse.hawkbit.ui.simple.MainLayout;
+import org.eclipse.hawkbit.ui.simple.HawkbitClient;
+import org.eclipse.hawkbit.ui.simple.view.util.Filter;
+import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
+import org.eclipse.hawkbit.ui.simple.view.util.TableView;
+import org.eclipse.hawkbit.ui.simple.view.util.Utils;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.Key;
 import com.vaadin.flow.component.button.Button;
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java
@@ -7,9 +7,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.view;
+package org.eclipse.hawkbit.ui.simple.view;
 
-import org.eclipse.hawkbit.ui.security.AuthenticatedUser;
+import org.eclipse.hawkbit.ui.simple.security.AuthenticatedUser;
 import com.vaadin.flow.component.login.LoginI18n;
 import com.vaadin.flow.component.login.LoginOverlay;
 import com.vaadin.flow.router.BeforeEnterEvent;
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java
@@ -7,14 +7,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.view;
-
-import org.eclipse.hawkbit.ui.HawkbitClient;
-import org.eclipse.hawkbit.ui.view.util.Filter;
-import org.eclipse.hawkbit.ui.MainLayout;
-import org.eclipse.hawkbit.ui.view.util.SelectionGrid;
-import org.eclipse.hawkbit.ui.view.util.TableView;
-import org.eclipse.hawkbit.ui.view.util.Utils;
+package org.eclipse.hawkbit.ui.simple.view;
+
+import org.eclipse.hawkbit.ui.simple.HawkbitClient;
+import org.eclipse.hawkbit.ui.simple.MainLayout;
+import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
+import org.eclipse.hawkbit.ui.simple.view.util.TableView;
+import org.eclipse.hawkbit.ui.simple.view.util.Utils;
+import org.eclipse.hawkbit.ui.simple.view.util.Filter;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.Key;
 import com.vaadin.flow.component.Text;
@@ -69,22 +69,23 @@ public RolloutView(final HawkbitClient hawkbitClient) {
                     private final RolloutDetails details = new RolloutDetails(hawkbitClient);
                     @Override
                     protected void addColumns(final Grid<MgmtRolloutResponseBody> grid) {
-                        grid.addColumn(MgmtRolloutResponseBody::getRolloutId).setHeader(ID).setAutoWidth(true);
-                        grid.addColumn(MgmtRolloutResponseBody::getName).setHeader(NAME).setAutoWidth(true);
-                        grid.addColumn(MgmtRolloutResponseBody::getTotalGroups).setHeader(GROUP_COUNT).setAutoWidth(true);
-                        grid.addColumn(MgmtRolloutResponseBody::getTotalTargets).setHeader(TARGET_COUNT).setAutoWidth(true);
-                        grid.addColumn(MgmtRolloutResponseBody::getTotalTargetsPerStatus).setHeader(STATS).setAutoWidth(true);
-                        grid.addColumn(MgmtRolloutResponseBody::getStatus).setHeader(STATUS).setAutoWidth(true);
+                        grid.addColumn(MgmtRolloutResponseBody::getRolloutId).setHeader(Constants.ID).setAutoWidth(true);
+                        grid.addColumn(MgmtRolloutResponseBody::getName).setHeader(Constants.NAME).setAutoWidth(true);
+                        grid.addColumn(MgmtRolloutResponseBody::getTotalGroups).setHeader(Constants.GROUP_COUNT).setAutoWidth(true);
+                        grid.addColumn(MgmtRolloutResponseBody::getTotalTargets).setHeader(Constants.TARGET_COUNT).setAutoWidth(true);
+                        grid.addColumn(MgmtRolloutResponseBody::getTotalTargetsPerStatus).setHeader(Constants.STATS).setAutoWidth(true);
+                        grid.addColumn(MgmtRolloutResponseBody::getStatus).setHeader(Constants.STATUS).setAutoWidth(true);
 
-                        grid.addComponentColumn(rollout -> new Actions(rollout, grid, hawkbitClient)).setHeader(ACTIONS).setAutoWidth(true);
+                        grid.addComponentColumn(rollout -> new Actions(rollout, grid, hawkbitClient)).setHeader(
+                                Constants.ACTIONS).setAutoWidth(true);
 
                             grid.setItemDetailsRenderer(new ComponentRenderer<>(
                                     () -> details, RolloutDetails::setItem));
                         }
                 },
                 (query, rsqlFilter) -> hawkbitClient.getRolloutRestApi()
                         .getRollouts(
-                                query.getOffset(), query.getPageSize(), NAME_ASC, rsqlFilter, null)
+                                query.getOffset(), query.getPageSize(), Constants.NAME_ASC, rsqlFilter, null)
                         .getBody()
                         .getContent()
                         .stream(),
@@ -102,11 +103,11 @@ private static SelectionGrid<MgmtRolloutGroupResponseBody, Long> createGroupGrid
                 new SelectionGrid.EntityRepresentation<>(MgmtRolloutGroupResponseBody.class, MgmtRolloutGroupResponseBody::getRolloutGroupId) {
                     @Override
                     protected void addColumns(final Grid<MgmtRolloutGroupResponseBody> grid) {
-                        grid.addColumn(MgmtRolloutGroupResponseBody::getRolloutGroupId).setHeader(ID).setAutoWidth(true);
-                        grid.addColumn(MgmtRolloutGroupResponseBody::getName).setHeader(NAME).setAutoWidth(true);
-                        grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargets).setHeader(TARGET_COUNT).setAutoWidth(true);
-                        grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargetsPerStatus).setHeader(STATS).setAutoWidth(true);
-                        grid.addColumn(MgmtRolloutGroupResponseBody::getStatus).setHeader(STATUS).setAutoWidth(true);
+                        grid.addColumn(MgmtRolloutGroupResponseBody::getRolloutGroupId).setHeader(Constants.ID).setAutoWidth(true);
+                        grid.addColumn(MgmtRolloutGroupResponseBody::getName).setHeader(Constants.NAME).setAutoWidth(true);
+                        grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargets).setHeader(Constants.TARGET_COUNT).setAutoWidth(true);
+                        grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargetsPerStatus).setHeader(Constants.STATS).setAutoWidth(true);
+                        grid.addColumn(MgmtRolloutGroupResponseBody::getStatus).setHeader(Constants.STATUS).setAutoWidth(true);
                     }
                 });
     }
@@ -163,7 +164,7 @@ private void refresh() {
 
     private static class RolloutFilter implements Filter.Rsql {
 
-        private final TextField name = Utils.textField(NAME);
+        private final TextField name = Utils.textField(Constants.NAME);
 
         private RolloutFilter() {
             name.setPlaceholder("<name filter>");
@@ -184,15 +185,15 @@ private static class RolloutDetails extends FormLayout {
 
         private final transient HawkbitClient hawkbitClient;
 
-        private final TextArea description = new TextArea(DESCRIPTION);
-        private final TextField createdBy = Utils.textField(CREATED_BY);
-        private final TextField createdAt = Utils.textField(CREATED_AT);
-        private final TextField lastModifiedBy = Utils.textField(LAST_MODIFIED_BY);
-        private final TextField lastModifiedAt = Utils.textField(LAST_MODIFIED_AT);
-        private final TextField targetFilter = Utils.textField(TARGET_FILTER);
-        private final TextField distributionSet = Utils.textField(DISTRIBUTION_SET);
-        private final TextField actonType = Utils.textField(ACTION_TYPE);
-        private final TextField startAt = Utils.textField(START_AT);
+        private final TextArea description = new TextArea(Constants.DESCRIPTION);
+        private final TextField createdBy = Utils.textField(Constants.CREATED_BY);
+        private final TextField createdAt = Utils.textField(Constants.CREATED_AT);
+        private final TextField lastModifiedBy = Utils.textField(Constants.LAST_MODIFIED_BY);
+        private final TextField lastModifiedAt = Utils.textField(Constants.LAST_MODIFIED_AT);
+        private final TextField targetFilter = Utils.textField(Constants.TARGET_FILTER);
+        private final TextField distributionSet = Utils.textField(Constants.DISTRIBUTION_SET);
+        private final TextField actonType = Utils.textField(Constants.ACTION_TYPE);
+        private final TextField startAt = Utils.textField(Constants.START_AT);
         private final SelectionGrid<MgmtRolloutGroupResponseBody, Long> groupGrid;
 
         private RolloutDetails(final HawkbitClient hawkbitClient) {
@@ -228,9 +229,9 @@ private void setItem(final MgmtRolloutResponseBody rollout) {
                     .getDistributionSet(rollout.getDistributionSetId()).getBody();
             distributionSet.setValue(distributionSetMgmt.getName() + ":" + distributionSetMgmt.getVersion());
             actonType.setValue(switch (rollout.getType()) {
-                case SOFT -> SOFT;
-                case FORCED -> FORCED;
-                case DOWNLOAD_ONLY -> DOWNLOAD_ONLY;
+                case SOFT -> Constants.SOFT;
+                case FORCED -> Constants.FORCED;
+                case DOWNLOAD_ONLY -> Constants.DOWNLOAD_ONLY;
                 case TIMEFORCED -> "Scheduled at " + new Date(rollout.getForcetime());
             });
             startAt.setValue(ObjectUtils.isEmpty(rollout.getStartAt()) ? "" : new Date(rollout.getStartAt()).toString());
@@ -261,7 +262,7 @@ private enum StartType {
         private final Select<MgmtActionType> actionType;
         private final DateTimePicker forceTime = new DateTimePicker("Force Time");
         private final Select<StartType> startType;
-        private final DateTimePicker startAt = new DateTimePicker(START_AT);
+        private final DateTimePicker startAt = new DateTimePicker(Constants.START_AT);
         private final NumberField groupNumber;
         private final NumberField triggerThreshold;
         private final NumberField errorThreshold;
@@ -277,7 +278,7 @@ private CreateDialog(final HawkbitClient hawkbitClient) {
                     "Distribution Set",
                     this::readyToCreate,
                     hawkbitClient.getDistributionSetRestApi()
-                            .getDistributionSets(0, 30, NAME_ASC, null)
+                            .getDistributionSets(0, 30, Constants.NAME_ASC, null)
                             .getBody()
                             .getContent()
                             .toArray(new MgmtDistributionSet[0]));
@@ -289,54 +290,54 @@ private CreateDialog(final HawkbitClient hawkbitClient) {
                     "Target Filter",
                     this::readyToCreate,
                     hawkbitClient.getTargetFilterQueryRestApi()
-                            .getFilters(0, 30, NAME_ASC, null, null)
+                            .getFilters(0, 30, Constants.NAME_ASC, null, null)
                             .getBody()
                             .getContent()
                             .toArray(new MgmtTargetFilterQuery[0]));
             targetFilter.setRequiredIndicatorVisible(true);
             targetFilter.setItemLabelGenerator(MgmtTargetFilterQuery::getName);
             targetFilter.setWidthFull();
-            description = new TextArea(DESCRIPTION);
+            description = new TextArea(Constants.DESCRIPTION);
             description.setMinLength(2);
             description.setWidthFull();
 
             actionType = new Select<>();
-            actionType.setLabel(ACTION_TYPE);
+            actionType.setLabel(Constants.ACTION_TYPE);
             actionType.setItems(MgmtActionType.values());
             actionType.setValue(MgmtActionType.FORCED);
             final ComponentRenderer<Component, MgmtActionType> actionTypeRenderer = new ComponentRenderer<>(actionTypeO ->
                     switch (actionTypeO) {
-                        case SOFT -> new Text(SOFT);
-                        case FORCED -> new Text(FORCED);
-                        case DOWNLOAD_ONLY -> new Text(DOWNLOAD_ONLY);
+                        case SOFT -> new Text(Constants.SOFT);
+                        case FORCED -> new Text(Constants.FORCED);
+                        case DOWNLOAD_ONLY -> new Text(Constants.DOWNLOAD_ONLY);
                         case TIMEFORCED -> forceTime;
                     });
             actionType.addValueChangeListener(e -> actionType.setRenderer(actionTypeRenderer));
             actionType.setItemLabelGenerator(startTypeO ->
                     switch (startTypeO) {
-                        case SOFT -> SOFT;
-                        case FORCED -> FORCED;
-                        case DOWNLOAD_ONLY -> DOWNLOAD_ONLY;
+                        case SOFT -> Constants.SOFT;
+                        case FORCED -> Constants.FORCED;
+                        case DOWNLOAD_ONLY -> Constants.DOWNLOAD_ONLY;
                         case TIMEFORCED -> "Time Forced at " + (forceTime.isEmpty() ? "" : " " + forceTime.getValue());
                     });
             actionType.setWidthFull();
             startType = new Select<>();
             startType.setValue(StartType.MANUAL);
-            startType.setLabel(START_TYPE);
+            startType.setLabel(Constants.START_TYPE);
             startType.setItems(StartType.values());
             startType.setValue(StartType.MANUAL);
             final ComponentRenderer<Component, StartType> startTypeRenderer = new ComponentRenderer<>(startTypeO ->
                     switch (startTypeO) {
-                        case MANUAL -> new Text(MANUAL);
-                        case AUTO -> new Text(AUTO);
+                        case MANUAL -> new Text(Constants.MANUAL);
+                        case AUTO -> new Text(Constants.AUTO);
                         case SCHEDULED -> startAt;
                     });
             startType.setRenderer(startTypeRenderer);
             startType.addValueChangeListener(e -> startType.setRenderer(startTypeRenderer));
             startType.setItemLabelGenerator(startTypeO ->
                     switch (startTypeO) {
-                        case MANUAL -> MANUAL;
-                        case AUTO -> AUTO;
+                        case MANUAL -> Constants.MANUAL;
+                        case AUTO -> Constants.AUTO;
                         case SCHEDULED -> "Scheduled" + (startAt.isEmpty() ? "" : "  at " + startAt.getValue());
                     });
             startType.setWidthFull();
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java
@@ -7,14 +7,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.view;
-
-import org.eclipse.hawkbit.ui.HawkbitClient;
-import org.eclipse.hawkbit.ui.view.util.Filter;
-import org.eclipse.hawkbit.ui.view.util.SelectionGrid;
-import org.eclipse.hawkbit.ui.MainLayout;
-import org.eclipse.hawkbit.ui.view.util.TableView;
-import org.eclipse.hawkbit.ui.view.util.Utils;
+package org.eclipse.hawkbit.ui.simple.view;
+
+import org.eclipse.hawkbit.ui.simple.HawkbitClient;
+import org.eclipse.hawkbit.ui.simple.MainLayout;
+import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
+import org.eclipse.hawkbit.ui.simple.view.util.TableView;
+import org.eclipse.hawkbit.ui.simple.view.util.Utils;
+import org.eclipse.hawkbit.ui.simple.view.util.Filter;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.Key;
 import com.vaadin.flow.component.button.Button;
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java
@@ -7,14 +7,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.view;
-
-import org.eclipse.hawkbit.ui.HawkbitClient;
-import org.eclipse.hawkbit.ui.view.util.Filter;
-import org.eclipse.hawkbit.ui.MainLayout;
-import org.eclipse.hawkbit.ui.view.util.SelectionGrid;
-import org.eclipse.hawkbit.ui.view.util.TableView;
-import org.eclipse.hawkbit.ui.view.util.Utils;
+package org.eclipse.hawkbit.ui.simple.view;
+
+import org.eclipse.hawkbit.ui.simple.HawkbitClient;
+import org.eclipse.hawkbit.ui.simple.view.util.Filter;
+import org.eclipse.hawkbit.ui.simple.MainLayout;
+import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
+import org.eclipse.hawkbit.ui.simple.view.util.TableView;
+import org.eclipse.hawkbit.ui.simple.view.util.Utils;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.Key;
 import com.vaadin.flow.component.button.Button;
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java
diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* SPDX-License-Identifier: EPL-2.0`
`9`	`9`	`*/`
`10`		`-package org.eclipse.hawkbit.ui;`
	`10`	`+package org.eclipse.hawkbit.ui.simple;`
`11`	`11`
`12`	`12`	`import com.vaadin.flow.component.page.AppShellConfigurator;`
`13`	`13`	`import com.vaadin.flow.server.PWA;`