change to SOFTWARE_MODULE_DOWNLOAD as more intuitive

Author: vasilchev

hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java

@@ -74,7 +74,7 @@ public final class SpPermission {
      */
     @Deprecated(since = "0.10.0", forRemoval = true)
     public static final String DOWNLOAD_REPOSITORY_ARTIFACT = "DOWNLOAD_REPOSITORY_ARTIFACT";
-    public static final String SOFTWARE_MODULE_DOWNLOAD_ARTIFACT = "SM_DOWNLOAD_ARTIFACT";
+    public static final String SOFTWARE_MODULE_DOWNLOAD_ARTIFACT = SOFTWARE_MODULE + "_DOWNLOAD";
 
     /**
      * Permission to read the tenant settings.
@@ -100,39 +100,33 @@ public final class SpPermission {
     /** Permission to administrate the system on a global, i.e. tenant independent scale. That includes the deletion of tenants. */
     public static final String SYSTEM_ADMIN = "SYSTEM_ADMIN";
 
-    public static final String IMPLY = " > ";
-    public static final String IMPLY_CREATE = IMPLY + CREATE_PREFIX;
-    public static final String IMPLY_READ = IMPLY + READ_PREFIX;
-    public static final String IMPLY_UPDATE = IMPLY + UPDATE_PREFIX;
-    public static final String IMPLY_DELETE = IMPLY + DELETE_PREFIX;
-    private static final String LINE_BREAK = "\n";
+    public static final String IMPLY_CREATE = " > " + CREATE_PREFIX;
+    public static final String IMPLY_READ = " > " + READ_PREFIX;
+    public static final String IMPLY_UPDATE = " > " + UPDATE_PREFIX;
+    public static final String IMPLY_DELETE = " > " + DELETE_PREFIX;
 
     // @formatter:off
     public static final String TARGET_HIERARCHY =
-            CREATE_TARGET + IMPLY_READ + TARGET_TYPE + LINE_BREAK +
-            READ_TARGET + IMPLY_READ + TARGET_TYPE + LINE_BREAK +
-            UPDATE_TARGET + IMPLY_READ + TARGET_TYPE + LINE_BREAK +
-            DELETE_TARGET + IMPLY_READ + TARGET_TYPE + LINE_BREAK;
+            CREATE_TARGET + IMPLY_READ + TARGET_TYPE + "\n" +
+            READ_TARGET + IMPLY_READ + TARGET_TYPE + "\n" +
+            UPDATE_TARGET + IMPLY_READ + TARGET_TYPE + "\n" +
+            DELETE_TARGET + IMPLY_READ + TARGET_TYPE + "\n";
     public static final String SOFTWARE_MODULE_HIERARCHY =
-            CREATE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK +
-            READ_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK +
-            UPDATE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK +
-            DELETE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK;
+            CREATE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + "\n" +
+            READ_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + "\n" +
+            UPDATE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + "\n" +
+            DELETE_PREFIX + SOFTWARE_MODULE + IMPLY_READ + SOFTWARE_MODULE_TYPE + "\n";
     public static final String DISTRIBUTION_SET_HIERARCHY =
-            CREATE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + DISTRIBUTION_SET_TYPE + LINE_BREAK +
-            READ_PREFIX + DISTRIBUTION_SET + IMPLY_READ + DISTRIBUTION_SET_TYPE + LINE_BREAK +
-            UPDATE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + DISTRIBUTION_SET_TYPE + LINE_BREAK +
-            DELETE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + DISTRIBUTION_SET_TYPE + LINE_BREAK  +
-            CREATE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK +
-            READ_PREFIX + DISTRIBUTION_SET + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK +
-            UPDATE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK +
-            DELETE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + SOFTWARE_MODULE_TYPE + LINE_BREAK;
+            CREATE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + SOFTWARE_MODULE_TYPE + "\n" +
+            READ_PREFIX + DISTRIBUTION_SET + IMPLY_READ + SOFTWARE_MODULE_TYPE + "\n" +
+            UPDATE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + SOFTWARE_MODULE_TYPE + "\n" +
+            DELETE_PREFIX + DISTRIBUTION_SET + IMPLY_READ + SOFTWARE_MODULE_TYPE + "\n";
     public static final String TENANT_CONFIGURATION_HIERARCHY =
-            TENANT_CONFIGURATION + IMPLY_CREATE + TENANT_CONFIGURATION + LINE_BREAK +
-            TENANT_CONFIGURATION + IMPLY_READ + TENANT_CONFIGURATION + LINE_BREAK +
-            TENANT_CONFIGURATION + IMPLY_UPDATE + TENANT_CONFIGURATION + LINE_BREAK +
-            TENANT_CONFIGURATION + IMPLY_DELETE + TENANT_CONFIGURATION + LINE_BREAK +
-            TENANT_CONFIGURATION + IMPLY + READ_GATEWAY_SECURITY_TOKEN + LINE_BREAK;
+            TENANT_CONFIGURATION + IMPLY_CREATE + TENANT_CONFIGURATION + "\n" +
+            TENANT_CONFIGURATION + IMPLY_READ + TENANT_CONFIGURATION + "\n" +
+            TENANT_CONFIGURATION + IMPLY_UPDATE + TENANT_CONFIGURATION + "\n" +
+            TENANT_CONFIGURATION + IMPLY_DELETE + TENANT_CONFIGURATION + "\n" +
+            TENANT_CONFIGURATION + " > " + READ_GATEWAY_SECURITY_TOKEN + "\n";
 
     // @formatter:on
     private static final SingletonSupplier<List<String>> ALL_AUTHORITIES = SingletonSupplier.of(() -> {