Remove 'Simple' from Simple UI (#2809)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

.github/workflows/release_docker.yaml

@@ -30,7 +30,7 @@ jobs:
         run: |
           ALL_APPS=(
             # microservices
-            "hawkbit-ddi-server",  "hawkbit-dmf-server", "hawkbit-mgmt-server", "hawkbit-simple-ui", 
+            "hawkbit-ddi-server",  "hawkbit-dmf-server", "hawkbit-mgmt-server", "hawkbit-ui", 
             # monolith
             "hawkbit-update-server",
             # db init

.github/workflows/reusable_workflow_trivy-scan.yaml

@@ -83,11 +83,11 @@ jobs:
         with:
           sarif_file: 'scans/eclipse-hawkbit/hawkbit/hawkbit-mgmt-server:latest.sarif'
           category: "Container Images (hawkbit-mgmt-server)"
-      - name: Upload Docker image scan results to GitHub Security tab hawkbit-simple-ui
+      - name: Upload Docker image scan results to GitHub Security tab hawkbit-ui
         uses: github/codeql-action/upload-sarif@v4
         with:
-          sarif_file: 'scans/eclipse-hawkbit/hawkbit/hawkbit-simple-ui:latest.sarif'
+          sarif_file: 'scans/eclipse-hawkbit/hawkbit/hawkbit-ui:latest.sarif'
-          category: "Container Images (hawkbit-simple-ui)"
+          category: "Container Images (hawkbit-ui)"
 
       - name: Upload Docker image scan results to GitHub Security tab hawkbit-update-server
         uses: github/codeql-action/upload-sarif@v4

docker/README.md

@@ -38,7 +38,7 @@ $ docker compose -f mysql/docker-compose-monolith-mysql.yml down
 
 You could, also start it in different flavours, with UI or in microservices mode (see Docker Compose files in [mysql](./mysql) and [postgres](./postgres) folders). For instance to start with PostgreSQL, with RabbitMQ, in microservices mode and with UI you could use:
 ```bash
-$ docker compose -f postgres/docker-compose-micro-services-with-simple-ui-postgres.yml up
+$ docker compose -f postgres/docker-compose-micro-services-with-ui-postgres.yml up
 ```
 
 ### Access

docker/build/build_dev.sh

@@ -57,7 +57,7 @@ if [ -z "$1" ]; then
     build "hawkbit-ddi-server"
     build "hawkbit-dmf-server"
     build "hawkbit-mgmt-server"
-    build "hawkbit-simple-ui"
+    build "hawkbit-ui"
     # monolith
     build "hawkbit-update-server"
     # db init

docker/mysql/docker-compose-micro-services-with-ui-dbinit-mysql.yml

@@ -15,17 +15,17 @@ include:
 services:
 
   # ---------------------
-  # HawkBit Simple UI
+  # HawkBit UI
   # ---------------------
-  hawkbit-simple-ui:
+  hawkbit-ui:
-    image: "hawkbit/hawkbit-simple-ui:latest"
+    image: "hawkbit/hawkbit-ui:latest"
     environment:
       - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit-mgmt:8080"}'
     restart: always
     ports:
       - 8088:8088
     labels:
-      NAME: "hawkbit-simple-ui"
+      NAME: "hawkbit-ui"
 
 volumes:
   artifactrepo:

docker/mysql/docker-compose-micro-services-with-ui-mysql.yml

@@ -15,17 +15,17 @@ include:
 services:
 
   # ---------------------
-  # HawkBit Simple UI
+  # HawkBit UI
   # ---------------------
-  hawkbit-simple-ui:
+  hawkbit-ui:
-    image: "hawkbit/hawkbit-simple-ui:latest"
+    image: "hawkbit/hawkbit-ui:latest"
     environment:
       - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit-mgmt:8080"}'
     restart: always
     ports:
       - 8088:8088
     labels:
-      NAME: "hawkbit-simple-ui"
+      NAME: "hawkbit-ui"
 
 volumes:
   artifactrepo:

docker/mysql/docker-compose-monolith-with-ui-dbinit-mysql.yml

@@ -15,17 +15,17 @@ include:
 services:
 
   # ---------------------
-  # HawkBit Simple UI service
+  # HawkBit UI service
   # ---------------------
-  hawkbit-simple-ui:
+  hawkbit-ui:
-    image: "hawkbit/hawkbit-simple-ui:latest"
+    image: "hawkbit/hawkbit-ui:latest"
     environment:
       - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit:8080"}'
     restart: always
     ports:
       - 8088:8088
     labels:
-      NAME: "hawkbit-simple-ui"
+      NAME: "hawkbit-ui"
 
 volumes:
   artifactrepo:

docker/mysql/docker-compose-monolith-with-ui-mysql.yml

@@ -15,17 +15,17 @@ include:
 services:
 
   # ---------------------
-  # HawkBit Simple UI service
+  # HawkBit UI service
   # ---------------------
-  hawkbit-simple-ui:
+  hawkbit-ui:
-    image: "hawkbit/hawkbit-simple-ui:latest"
+    image: "hawkbit/hawkbit-ui:latest"
     environment:
       - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit:8080"}'
     restart: always
     ports:
       - 8088:8088
     labels:
-      NAME: "hawkbit-simple-ui"
+      NAME: "hawkbit-ui"
 
 volumes:
   artifactrepo:

docker/postgres/docker-compose-micro-services-with-simple-ui-dbinit-postgres.yml

@@ -15,17 +15,17 @@ include:
 services:
 
   # ---------------------
-  # HawkBit Simple UI
+  # HawkBit UI
   # ---------------------
-  hawkbit-simple-ui:
+  hawkbit-ui:
-    image: "hawkbit/hawkbit-simple-ui:latest"
+    image: "hawkbit/hawkbit-ui:latest"
     environment:
       - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit-mgmt:8080"}'
     restart: always
     ports:
       - 8088:8088
     labels:
-      NAME: "hawkbit-simple-ui"
+      NAME: "hawkbit-ui"
 
 volumes:
   artifactrepo:

docker/postgres/docker-compose-micro-services-with-simple-ui-postgres.yml

@@ -15,17 +15,17 @@ include:
 services:
 
   # ---------------------
-  # HawkBit Simple UI
+  # HawkBit UI
   # ---------------------
-  hawkbit-simple-ui:
+  hawkbit-ui:
-    image: "hawkbit/hawkbit-simple-ui:latest"
+    image: "hawkbit/hawkbit-ui:latest"
     environment:
       - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit-mgmt:8080"}'
     restart: always
     ports:
       - 8088:8088
     labels:
-      NAME: "hawkbit-simple-ui"
+      NAME: "hawkbit-ui"
 
 volumes:
   artifactrepo:

docker/postgres/docker-compose-monolith-with-simple-ui-dbinit-postgres.yml

@@ -15,17 +15,17 @@ include:
 services:
 
   # ---------------------
-  # HawkBit Simple UI service
+  # HawkBit UI service
   # ---------------------
-  hawkbit-simple-ui:
+  hawkbit-ui:
-    image: "hawkbit/hawkbit-simple-ui:latest"
+    image: "hawkbit/hawkbit-ui:latest"
     environment:
       - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit:8080"}'
     restart: always
     ports:
       - 8088:8088
     labels:
-      NAME: "hawkbit-simple-ui"
+      NAME: "hawkbit-ui"
 
 volumes:
   artifactrepo:

docker/postgres/docker-compose-monolith-with-simple-ui-postgres.yml

@@ -15,17 +15,17 @@ include:
 services:
 
   # ---------------------
-  # HawkBit Simple UI service
+  # HawkBit UI service
   # ---------------------
-  hawkbit-simple-ui:
+  hawkbit-ui:
-    image: "hawkbit/hawkbit-simple-ui:latest"
+    image: "hawkbit/hawkbit-ui:latest"
     environment:
       - 'SPRING_APPLICATION_JSON={"hawkbit.server.mgmtUrl": "http://hawkbit:8080"}'
     restart: always
     ports:
       - 8088:8088
     labels:
-      NAME: "hawkbit-simple-ui"
+      NAME: "hawkbit-ui"
 
 volumes:
   artifactrepo:

docs/quick-start.md

@@ -45,12 +45,12 @@ $ cd hawkbit/docker
 $ docker-compose -f docker-compose-monolith-mysql.yml up -d
 ```
 
-If you want to start also the Simple UI, you can use, for PostgreSQL:
+If you want to start also the hawkBit UI, you can use, for PostgreSQL:
 
 ```bash
 $ git clone https://github.com/eclipse-hawkbit/hawkbit.git
 $ cd hawkbit/docker
-$ docker-compose -f docker-compose-monolith-with-simple-ui-postgres.yml up -d
+$ docker-compose -f docker-compose-monolith-with-ui-postgres.yml up -d
 ```
 
 or with MySQL:
@@ -58,7 +58,7 @@ or with MySQL:
 ```bash
 $ git clone https://github.com/eclipse-hawkbit/hawkbit.git
 $ cd hawkbit/docker
-$ docker-compose -f docker-compose-monolith-with-simple-ui-mysql.yml up -d
+$ docker-compose -f docker-compose-monolith-with-ui-mysql.yml up -d
 ```
 
 > **Note:** `-d` flag is used to run the containers in detached mode.  
@@ -84,12 +84,12 @@ $ cd hawkbit/docker
 $ docker-compose -f docker-compose-micro-services-mysql.yml up -d
 ```
 
-If you want to start also the Simple UI, you can use, for PostgreSQL:
+If you want to start also the hawkBit UI, you can use, for PostgreSQL:
 
 ```bash
 $ git clone https://github.com/eclipse-hawkbit/hawkbit.git
 $ cd hawkbit/docker
-$ docker-compose -f docker-compose-micro-services-with-simple-ui-postgres.yml up -d
+$ docker-compose -f docker-compose-micro-services-with-ui-postgres.yml up -d
 ```
 
 or with MySQL:
@@ -97,7 +97,7 @@ or with MySQL:
 ```bash
 $ git clone https://github.com/eclipse-hawkbit/hawkbit.git
 $ cd hawkbit/docker
-$ docker-compose -f docker-compose-micro-services-with-simple-ui-mysql.yml up -d
+$ docker-compose -f docker-compose-micro-services-with-ui-mysql.yml up -d
 ```
 
 > **Note:** `-d` flag is used to run the containers in detached mode.  
@@ -137,10 +137,10 @@ And (only if you want to use the DMF feature):
 $ java -jar ./hawkbit-monolith/hawkbit-update-server/target/hawkbit-update-server-0-SNAPSHOT.jar
 ```
 
-You could also start the **Simple UI** by:
+You could also start the **hawkBit UI** by:
 
 ```bash
-$ java -jar ./hawkbit-simple-ui/target/hawkbit-simple-ui-0-SNAPSHOT.jar
+$ java -jar ./hawkbit--ui/target/hawkbit-ui-0-SNAPSHOT.jar
 ```
 
 ---

hawkbit-ui/pom.xml

@@ -19,10 +19,10 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>hawkbit-simple-ui</artifactId>
+    <artifactId>hawkbit-ui</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
-    <name>hawkBit :: Simple UI</name>
+    <name>hawkBit :: UI</name>
 
     <properties>
         <vaadin.version>24.9.5</vaadin.version>
@@ -51,6 +51,13 @@
     </dependencyManagement>
 
     <dependencies>
+        <!-- Override vulnerable feign-form-spring dependency on commons-text -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${commons-text.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.eclipse.hawkbit</groupId>
             <artifactId>hawkbit-sdk-commons</artifactId>
@@ -94,8 +101,8 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
-                    <finalName>Simple-UI</finalName>
+                    <finalName>hawkBit-UI</finalName>
-                    <mainClass>org.eclipse.hawkbit.ui.simple.SimpleUIApp</mainClass>
+                    <mainClass>org.eclipse.hawkbit.ui.HawkbitUiApp</mainClass>
                 </configuration>
             </plugin>
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitMgmtClient.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple;
+package org.eclipse.hawkbit.ui;
 
 import java.util.function.Supplier;
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitUiApp.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple;
+package org.eclipse.hawkbit.ui;
 
 import com.vaadin.flow.component.page.AppShellConfigurator;
 import com.vaadin.flow.server.PWA;
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.eclipse.hawkbit.sdk.HawkbitClient;
 import org.eclipse.hawkbit.sdk.HawkbitServer;
 import org.eclipse.hawkbit.sdk.Tenant;
-import org.eclipse.hawkbit.ui.simple.view.util.Utils;
+import org.eclipse.hawkbit.ui.view.util.Utils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
@@ -51,7 +51,7 @@ import static feign.Util.ISO_8859_1;
 @EnableScheduling
 @SpringBootApplication
 @Import(FeignClientsConfiguration.class)
-public class SimpleUIApp implements AppShellConfigurator {
+public class HawkbitUiApp implements AppShellConfigurator {
 
     private static final String AUTHORIZATION_HEADER = "Authorization";
     private static final RequestInterceptor AUTHORIZATION = requestTemplate -> {
@@ -75,7 +75,7 @@ public class SimpleUIApp implements AppShellConfigurator {
     };
 
     public static void main(String[] args) {
-        SpringApplication.run(SimpleUIApp.class, args);
+        SpringApplication.run(HawkbitUiApp.class, args);
     }
 
     @Bean

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple;
+package org.eclipse.hawkbit.ui;
 
 import java.util.List;
 import java.util.Optional;
@@ -37,13 +37,13 @@ import com.vaadin.flow.component.sidenav.SideNavItem;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.server.auth.AccessAnnotationChecker;
 import com.vaadin.flow.theme.lumo.LumoUtility;
-import org.eclipse.hawkbit.ui.simple.security.AuthenticatedUser;
+import org.eclipse.hawkbit.ui.security.AuthenticatedUser;
-import org.eclipse.hawkbit.ui.simple.view.AboutView;
+import org.eclipse.hawkbit.ui.view.AboutView;
-import org.eclipse.hawkbit.ui.simple.view.ConfigView;
+import org.eclipse.hawkbit.ui.view.ConfigView;
-import org.eclipse.hawkbit.ui.simple.view.DistributionSetView;
+import org.eclipse.hawkbit.ui.view.DistributionSetView;
-import org.eclipse.hawkbit.ui.simple.view.RolloutView;
+import org.eclipse.hawkbit.ui.view.RolloutView;
-import org.eclipse.hawkbit.ui.simple.view.SoftwareModuleView;
+import org.eclipse.hawkbit.ui.view.SoftwareModuleView;
-import org.eclipse.hawkbit.ui.simple.view.TargetView;
+import org.eclipse.hawkbit.ui.view.TargetView;
 
 /**
  * The main view is a top-level placeholder for other views.

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SimpleI18NProvider.java

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.hawkbit.ui.simple;
+package org.eclipse.hawkbit.ui;
 
 import java.util.Arrays;
 import java.util.Locale;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/VaadinServiceInit.java

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.hawkbit.ui.simple;
+package org.eclipse.hawkbit.ui;
 
 import com.vaadin.flow.server.ServiceInitEvent;
 import com.vaadin.flow.server.VaadinServiceInitListener;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/component/TargetActionsHistory.java

@@ -8,9 +8,9 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.hawkbit.ui.simple.component;
+package org.eclipse.hawkbit.ui.component;
 
-import static org.eclipse.hawkbit.ui.simple.view.Constants.STATUS;
+import static org.eclipse.hawkbit.ui.view.Constants.STATUS;
 
 import java.util.List;
 import java.util.Optional;
@@ -34,9 +34,9 @@ import org.eclipse.hawkbit.mgmt.json.model.action.MgmtActionRequestBodyPut;
 import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType;
 import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet;
 import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget;
-import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient;
+import org.eclipse.hawkbit.ui.HawkbitMgmtClient;
-import org.eclipse.hawkbit.ui.simple.view.TargetView;
+import org.eclipse.hawkbit.ui.view.TargetView;
-import org.eclipse.hawkbit.ui.simple.view.util.Utils;
+import org.eclipse.hawkbit.ui.view.util.Utils;
 
 @Slf4j
 public class TargetActionsHistory extends Grid<TargetActionsHistory.ActionStatusEntry> {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/AuthenticatedUser.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.security;
+package org.eclipse.hawkbit.ui.security;
 
 import java.util.Optional;
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/GrantedAuthoritiesService.java

@@ -7,14 +7,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.security;
+package org.eclipse.hawkbit.ui.security;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient;
+import org.eclipse.hawkbit.ui.HawkbitMgmtClient;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.scheduling.annotation.Scheduled;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/Oauth2ClientConfig.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.security;
+package org.eclipse.hawkbit.ui.security;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/OidcClientProperties.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.security;
+package org.eclipse.hawkbit.ui.security;
 
 import lombok.Data;
 import lombok.ToString;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/SecurityConfiguration.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.security;
+package org.eclipse.hawkbit.ui.security;
 
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -15,7 +15,7 @@ import java.nio.charset.StandardCharsets;
 import com.vaadin.flow.spring.security.VaadinAwareSecurityContextHolderStrategyConfiguration;
 import com.vaadin.flow.spring.security.VaadinSecurityConfigurer;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.hawkbit.ui.simple.view.LoginView;
+import org.eclipse.hawkbit.ui.view.LoginView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/security/UserDetailsSetter.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.security;
+package org.eclipse.hawkbit.ui.security;
 
 import java.io.IOException;
 import java.time.Instant;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view;
+package org.eclipse.hawkbit.ui.view;
 
 import jakarta.annotation.security.RolesAllowed;
 
@@ -18,7 +18,7 @@ import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.router.RouteAlias;
 import com.vaadin.flow.theme.lumo.LumoUtility.Margin;
-import org.eclipse.hawkbit.ui.simple.MainLayout;
+import org.eclipse.hawkbit.ui.MainLayout;
 
 @PageTitle("About")
 @Route(value = "about", layout = MainLayout.class)

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/ConfigView.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view;
+package org.eclipse.hawkbit.ui.view;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,8 +25,8 @@ import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValueRequest;
-import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient;
+import org.eclipse.hawkbit.ui.HawkbitMgmtClient;
-import org.eclipse.hawkbit.ui.simple.MainLayout;
+import org.eclipse.hawkbit.ui.MainLayout;
 
 @PageTitle("Config")
 @Route(value = "config", layout = MainLayout.class)

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/Constants.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view;
+package org.eclipse.hawkbit.ui.view;
 
 // java:S1214 - implementations of Constants interface extends other classes, so if make this class we shall go for static imports
 // which is not not better

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view;
+package org.eclipse.hawkbit.ui.view;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -50,12 +50,12 @@ import org.eclipse.hawkbit.mgmt.json.model.distributionsettype.MgmtDistributionS
 import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule;
 import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleAssignment;
 import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTag;
-import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient;
+import org.eclipse.hawkbit.ui.HawkbitMgmtClient;
-import org.eclipse.hawkbit.ui.simple.MainLayout;
+import org.eclipse.hawkbit.ui.MainLayout;
-import org.eclipse.hawkbit.ui.simple.view.util.Filter;
+import org.eclipse.hawkbit.ui.view.util.Filter;
-import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
+import org.eclipse.hawkbit.ui.view.util.SelectionGrid;
-import org.eclipse.hawkbit.ui.simple.view.util.TableView;
+import org.eclipse.hawkbit.ui.view.util.TableView;
-import org.eclipse.hawkbit.ui.simple.view.util.Utils;
+import org.eclipse.hawkbit.ui.view.util.Utils;
 
 @PageTitle("Distribution Sets")
 @Route(value = "distribution_sets", layout = MainLayout.class)

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/LoginView.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view;
+package org.eclipse.hawkbit.ui.view;
 
 import com.vaadin.flow.component.login.LoginI18n;
 import com.vaadin.flow.component.login.LoginOverlay;
@@ -18,7 +18,7 @@ import com.vaadin.flow.router.Route;
 import com.vaadin.flow.router.internal.RouteUtil;
 import com.vaadin.flow.server.VaadinService;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import org.eclipse.hawkbit.ui.simple.security.AuthenticatedUser;
+import org.eclipse.hawkbit.ui.security.AuthenticatedUser;
 
 @AnonymousAllowed
 @PageTitle("Login")

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view;
+package org.eclipse.hawkbit.ui.view;
 
 import java.time.ZoneOffset;
 import java.util.List;
@@ -48,12 +48,12 @@ import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutResponseBody;
 import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutRestRequestBodyPost;
 import org.eclipse.hawkbit.mgmt.json.model.rolloutgroup.MgmtRolloutGroupResponseBody;
 import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery;
-import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient;
+import org.eclipse.hawkbit.ui.HawkbitMgmtClient;
-import org.eclipse.hawkbit.ui.simple.MainLayout;
+import org.eclipse.hawkbit.ui.MainLayout;
-import org.eclipse.hawkbit.ui.simple.view.util.Filter;
+import org.eclipse.hawkbit.ui.view.util.Filter;
-import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
+import org.eclipse.hawkbit.ui.view.util.SelectionGrid;
-import org.eclipse.hawkbit.ui.simple.view.util.TableView;
+import org.eclipse.hawkbit.ui.view.util.TableView;
-import org.eclipse.hawkbit.ui.simple.view.util.Utils;
+import org.eclipse.hawkbit.ui.view.util.Utils;
 import org.springframework.util.ObjectUtils;
 
 @PageTitle("Rollouts")

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view;
+package org.eclipse.hawkbit.ui.view;
 
 import java.io.File;
 import java.io.IOException;
@@ -52,12 +52,12 @@ import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule;
 import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleAssignment;
 import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleRequestBodyPost;
 import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleType;
-import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient;
+import org.eclipse.hawkbit.ui.HawkbitMgmtClient;
-import org.eclipse.hawkbit.ui.simple.MainLayout;
+import org.eclipse.hawkbit.ui.MainLayout;
-import org.eclipse.hawkbit.ui.simple.view.util.Filter;
+import org.eclipse.hawkbit.ui.view.util.Filter;
-import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
+import org.eclipse.hawkbit.ui.view.util.SelectionGrid;
-import org.eclipse.hawkbit.ui.simple.view.util.TableView;
+import org.eclipse.hawkbit.ui.view.util.TableView;
-import org.eclipse.hawkbit.ui.simple.view.util.Utils;
+import org.eclipse.hawkbit.ui.view.util.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view;
+package org.eclipse.hawkbit.ui.view;
 
 import java.time.ZoneOffset;
 import java.util.ArrayList;
@@ -74,14 +74,14 @@ import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetRequestBody;
 import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery;
 import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQueryRequestBody;
 import org.eclipse.hawkbit.mgmt.json.model.targettype.MgmtTargetType;
-import org.eclipse.hawkbit.ui.simple.HawkbitMgmtClient;
+import org.eclipse.hawkbit.ui.HawkbitMgmtClient;
-import org.eclipse.hawkbit.ui.simple.MainLayout;
+import org.eclipse.hawkbit.ui.MainLayout;
-import org.eclipse.hawkbit.ui.simple.component.TargetActionsHistory;
+import org.eclipse.hawkbit.ui.component.TargetActionsHistory;
-import org.eclipse.hawkbit.ui.simple.view.util.Filter;
+import org.eclipse.hawkbit.ui.view.util.Filter;
-import org.eclipse.hawkbit.ui.simple.view.util.LinkedTextArea;
+import org.eclipse.hawkbit.ui.view.util.LinkedTextArea;
-import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid;
+import org.eclipse.hawkbit.ui.view.util.SelectionGrid;
-import org.eclipse.hawkbit.ui.simple.view.util.TableView;
+import org.eclipse.hawkbit.ui.view.util.TableView;
-import org.eclipse.hawkbit.ui.simple.view.util.Utils;
+import org.eclipse.hawkbit.ui.view.util.Utils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.ObjectUtils;
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Filter.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view.util;
+package org.eclipse.hawkbit.ui.view.util;
 
 import java.util.Collection;
 import java.util.HashMap;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/LinkedTextArea.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view.util;
+package org.eclipse.hawkbit.ui.view.util;
 
 import com.vaadin.flow.component.card.Card;
 import com.vaadin.flow.component.card.CardVariant;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/SelectionGrid.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view.util;
+package org.eclipse.hawkbit.ui.view.util;
 
 import java.util.HashSet;
 import java.util.List;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view.util;
+package org.eclipse.hawkbit.ui.view.util;
 
 import java.util.concurrent.CompletionStage;
 import java.util.function.BiFunction;
@@ -34,7 +34,7 @@ import com.vaadin.flow.router.BeforeEnterObserver;
 import com.vaadin.flow.router.NavigationTrigger;
 import com.vaadin.flow.theme.lumo.LumoUtility;
 
-import org.eclipse.hawkbit.ui.simple.view.Constants;
+import org.eclipse.hawkbit.ui.view.Constants;
 
 @SuppressWarnings("java:S119") // better readability
 public class TableView<T, ID> extends Div implements Constants, BeforeEnterObserver {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Utils.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.hawkbit.ui.simple.view.util;
+package org.eclipse.hawkbit.ui.view.util;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -35,7 +35,7 @@ import com.vaadin.flow.data.provider.SortDirection;
 import com.vaadin.flow.data.renderer.LocalDateTimeRenderer;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType;
-import org.eclipse.hawkbit.ui.simple.view.Constants;
+import org.eclipse.hawkbit.ui.view.Constants;
 
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.HasValue;

hawkbit-ui/src/main/resources/application.properties

@@ -27,6 +27,6 @@ vaadin.launch-browser=true
 # To improve the performance during development.
 # For more information https://vaadin.com/docs/flow/spring/tutorial-spring-configuration.html#special-configuration-parameters
 vaadin.allowed-packages=com.vaadin,org.vaadin,dev.hilla,org.eclipse.hawkbit
-spring.application.name=Simple-UI
+spring.application.name=hawkBit-UI
 server.servlet.session.persistent=false
 ### Vaadin end ###

pom.xml

@@ -572,7 +572,7 @@
                                         <exclude>eclipse_codeformatter.xml</exclude>
                                         <exclude>intellij_codeformatter.xml</exclude>
                                         <exclude>**/*.sql</exclude>
-                                        <!-- hawkbit-simple-ui - start-->
+                                        <!-- hawkbit-ui - start-->
                                         <exclude>**/banner.txt</exclude>
                                         <exclude>**/robots.txt</exclude>
                                         <exclude>**/frontend/**</exclude>
@@ -581,7 +581,7 @@
                                         <exclude>**/types.d.ts</exclude>
                                         <exclude>**/vite.config.ts</exclude>
                                         <exclude>**/vite.generated.ts</exclude>
-                                        <!-- hawkbit-simple-ui - end -->
+                                        <!-- hawkbit-ui - end -->
                                         <!-- development files -->
                                         <exclude>**/application-local.properties</exclude>
                                     </excludes>
@@ -722,7 +722,7 @@
         <module>hawkbit-dmf</module>
         <module>hawkbit-monolith</module>
 
-        <module>hawkbit-simple-ui</module>
+        <module>hawkbit-ui</module>
         <module>hawkbit-sdk</module>
     </modules>
 </project>