refactor: ConditionalOnRole (#824)

traas-stack · Mar 20, 2024 · 106d483 · 106d483
1 parent 9ec77ab
commit 106d483
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/...ommon/common/src/main/java/io/holoinsight/server/common/springboot/ConditionalOnRole.java b/...ommon/common/src/main/java/io/holoinsight/server/common/springboot/ConditionalOnRole.java
@@ -30,4 +30,6 @@
    * @return
    */
   String[] value();
+
+  boolean any() default true;
 }
diff --git a/...mon/src/main/java/io/holoinsight/server/common/springboot/ConditionalOnRoleCondition.java b/...mon/src/main/java/io/holoinsight/server/common/springboot/ConditionalOnRoleCondition.java
@@ -28,17 +28,25 @@ public ConditionOutcome getMatchOutcome(ConditionContext context,
       AnnotatedTypeMetadata metadata) {
     Map<String, Object> attributes =
         metadata.getAnnotationAttributes(ConditionalOnRole.class.getName(), true);
-    String[] anyRole = (String[]) attributes.get("value");
-
+    String[] expectedRoles = (String[]) attributes.get("value");
+    boolean any = (Boolean) attributes.get("any");
     String roles = context.getEnvironment().getProperty("holoinsight.roles.active", "");
     Iterable<String> iter = Splitter.on(',').trimResults().omitEmptyStrings().split(roles);
 
-    for (String role : anyRole) {
-      if (Iterables.contains(iter, role)) {
-        return ConditionOutcome.match("match '" + role + "' role");
+    if (any) {
+      for (String role : expectedRoles) {
+        if (Iterables.contains(iter, role)) {
+          return ConditionOutcome.match("match '" + role + "' role");
+        }
+      }
+    } else {
+      for (String role : expectedRoles) {
+        if (!Iterables.contains(iter, role)) {
+          return ConditionOutcome.match("no match '" + role + "' role");
+        }
       }
     }
 
-    return ConditionOutcome.noMatch("no any roles: " + Arrays.toString(anyRole));
+    return ConditionOutcome.noMatch("no match roles: " + Arrays.toString(expectedRoles));
   }
 }