wip

kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java

@@ -1,5 +1,7 @@
 package com.provectus.kafka.ui.model.rbac;
 
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+
 import com.google.common.base.Preconditions;
 import com.provectus.kafka.ui.model.rbac.permission.PermissibleAction;
 import java.util.List;
@@ -9,7 +11,6 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import org.apache.commons.collections.CollectionUtils;
-import org.springframework.util.Assert;
 
 @Getter
 @ToString
@@ -42,14 +43,14 @@ public class Permission {
   }
 
   public void validate() {
-    Assert.notNull(resource, "resource cannot be null");
+    Preconditions.checkNotNull(resource, "resource cannot be null");
   }
 
   public void transform() {
     if (value != null) {
       this.compiledValuePattern = Pattern.compile(value);
     }
-    Preconditions.checkArgument(CollectionUtils.isNotEmpty(actions), "Actions list can't be null or empty list");
+    Preconditions.checkArgument(isNotEmpty(actions), "Actions list for %s can't be null or empty", resource);
     if (actions.stream().anyMatch("ALL"::equalsIgnoreCase)) {
       this.parsedActions = resource.allActions();
     } else {

kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java

@@ -50,11 +50,11 @@ public enum Resource {
 
   public List<PermissibleAction> parseActions(List<String> actionsToParse) {
     return actionsToParse.stream()
-        .map(String::toUpperCase)
-        .map(toParse -> allActions().stream()
-            .filter(a -> toParse.equals(a.name().toUpperCase()))
+        .map(toParse -> actions.stream()
+            .filter(a -> toParse.equalsIgnoreCase(a.name()))
             .findFirst()
-            .orElseThrow(() -> new IllegalArgumentException("no actions found for string '%s'".formatted(toParse)))
+            .orElseThrow(() -> new IllegalArgumentException(
+                "'%s' actions not applicable for resource %s".formatted(toParse, name())))
         )
         .toList();
   }