From 859cd130f2c5083ad5093b9351e8b3bb38a17498 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Thu, 25 Jul 2024 13:47:59 +0300
Subject: [PATCH] Remove UI leftover and small improvements (#1784)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
---
 .../mgmt/rest/api/MgmtDownloadRestApi.java      |  3 +--
 .../mgmt/rest/api/MgmtRestConstants.java        | 17 ++++++++++-------
 .../eclipse/hawkbit/rest/RestConfiguration.java |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadRestApi.java
index a219ff185..5bb556486 100644
--- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadRestApi.java
+++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadRestApi.java
@@ -31,8 +31,7 @@ public interface MgmtDownloadRestApi {
      * 
      * @param tenant the download belongs to
      * @param downloadId the generated download id
-     * @return {@link ResponseEntity} with status {@link HttpStatus#OK} if
-     *         successful
+     * @return {@link ResponseEntity} with status {@link HttpStatus#OK} if successful
      */
     @GetMapping(value = MgmtRestConstants.DOWNLOAD_ID_V1_REQUEST_MAPPING_BASE
             + MgmtRestConstants.DOWNLOAD_ID_V1_REQUEST_MAPPING)
diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRestConstants.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRestConstants.java
index f64ccfbec..fb320614c 100644
--- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRestConstants.java
+++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRestConstants.java
@@ -9,10 +9,13 @@
  */
 package org.eclipse.hawkbit.mgmt.rest.api;
 
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
 /**
  * Constants for RESTful API.
- *
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class MgmtRestConstants {
 
     /**
@@ -23,7 +26,12 @@ public final class MgmtRestConstants {
     /**
      * The base URL mapping of the SP rest resources.
      */
-    public static final String BASE_V1_REQUEST_MAPPING = "/rest/v1";
+    public static final String BASE_REST_MAPPING = "/rest";
+
+    /**
+     * The base URL mapping of the SP rest resources.
+     */
+    public static final String BASE_V1_REQUEST_MAPPING = BASE_REST_MAPPING + "/v1";
 
     /**
      * String representation of
@@ -276,9 +284,4 @@ public final class MgmtRestConstants {
      * Request parameter if the artifact url handler should be used
      */
     public static final String REQUEST_PARAMETER_USE_ARTIFACT_URL_HANDLER = "useartifacturlhandler";
-
-    // constant class, private constructor.
-    private MgmtRestConstants() {
-
-    }
 }
diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java
index 1c6432db3..e1531b269 100644
--- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java
+++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java
@@ -82,7 +82,7 @@ public class RestConfiguration {
         // in the ShallowEtagHeaderFilter, just using the SH1 hash of the
         // artifact itself as 'ETag', because otherwise the file will be copied
         // in memory!
-        filterRegBean.setFilter(new ExcludePathAwareShallowETagFilter("/UI/**",
+        filterRegBean.setFilter(new ExcludePathAwareShallowETagFilter(
                 "/rest/v1/softwaremodules/{smId}/artifacts/{artId}/download",
                 "/{tenant}/controller/v1/{controllerId}/softwaremodules/{softwareModuleId}/artifacts/**",
                 "/api/v1/downloadserver/**"));