feat: adds the missing AddGroupingPoliciesEx and AddNamedGroupingPoliciesEx APIs to sync jCasbin with Go Casbin (#463)

Author: Copilot

src/main/java/org/casbin/jcasbin/main/ManagementEnforcer.java

@@ -645,6 +645,56 @@ public boolean addNamedGroupingPolicies(String ptype, String[][] rules) {
         return addNamedGroupingPolicies(ptype, Arrays.stream(rules).map(Arrays::asList).collect(Collectors.toList()));
     }
 
+    /**
+     * addGroupingPoliciesEx adds role inheritance rules to the current policy.
+     * If the rule already exists, the rule will not be added.
+     * But unlike AddGroupingPolicies, other non-existent rules are added instead of returning false directly
+     *
+     * @param rules the "g" policy rules, ptype "g" is implicitly used.
+     * @return succeeds or not.
+     */
+    public boolean addGroupingPoliciesEx(List<List<String>> rules) {
+        return addNamedGroupingPoliciesEx("g", rules);
+    }
+
+    /**
+     * addGroupingPoliciesEx adds role inheritance rules to the current policy.
+     * If the rule already exists, the rule will not be added.
+     * But unlike AddGroupingPolicies, other non-existent rules are added instead of returning false directly
+     *
+     * @param rules the "g" policy rules, ptype "g" is implicitly used.
+     * @return succeeds or not.
+     */
+    public boolean addGroupingPoliciesEx(String[][] rules) {
+        return addGroupingPoliciesEx(Arrays.stream(rules).map(Arrays::asList).collect(Collectors.toList()));
+    }
+
+    /**
+     * addNamedGroupingPoliciesEx adds named role inheritance rules to the current policy.
+     * If the rule already exists, the rule will not be added.
+     * But unlike AddNamedGroupingPolicies, other non-existent rules are added instead of returning false directly
+     *
+     * @param ptype the policy type, can be "g", "g2", "g3", ..
+     * @param rules the "g" policy rules.
+     * @return succeeds or not.
+     */
+    public boolean addNamedGroupingPoliciesEx(String ptype, List<List<String>> rules) {
+        return addPolicies("g", ptype, rules, true);
+    }
+
+    /**
+     * addNamedGroupingPoliciesEx adds named role inheritance rules to the current policy.
+     * If the rule already exists, the rule will not be added.
+     * But unlike AddNamedGroupingPolicies, other non-existent rules are added instead of returning false directly
+     *
+     * @param ptype the policy type, can be "g", "g2", "g3", ..
+     * @param rules the "g" policy rules.
+     * @return succeeds or not.
+     */
+    public boolean addNamedGroupingPoliciesEx(String ptype, String[][] rules) {
+        return addNamedGroupingPoliciesEx(ptype, Arrays.stream(rules).map(Arrays::asList).collect(Collectors.toList()));
+    }
+
     /**
      * removeGroupingPolicy removes a role inheritance rule from the current policy.
      *

src/main/java/org/casbin/jcasbin/main/SyncedEnforcer.java

@@ -941,6 +941,60 @@ public boolean addNamedGroupingPolicies(String ptype, String[][] rules) {
         return runSynchronized(() -> super.addNamedGroupingPolicies(ptype, rules), READ_WRITE_LOCK.writeLock());
     }
 
+    /**
+     * addGroupingPoliciesEx adds role inheritance rules to the current policy.
+     * If the rule already exists, the rule will not be added.
+     * But unlike AddGroupingPolicies, other non-existent rules are added instead of returning false directly
+     *
+     * @param rules the "g" policy rules, ptype "g" is implicitly used.
+     * @return succeeds or not.
+     */
+    @Override
+    public boolean addGroupingPoliciesEx(List<List<String>> rules) {
+        return runSynchronized(() -> super.addGroupingPoliciesEx(rules), READ_WRITE_LOCK.writeLock());
+    }
+
+    /**
+     * addGroupingPoliciesEx adds role inheritance rules to the current policy.
+     * If the rule already exists, the rule will not be added.
+     * But unlike AddGroupingPolicies, other non-existent rules are added instead of returning false directly
+     *
+     * @param rules the "g" policy rules, ptype "g" is implicitly used.
+     * @return succeeds or not.
+     */
+    @Override
+    public boolean addGroupingPoliciesEx(String[][] rules) {
+        return runSynchronized(() -> super.addGroupingPoliciesEx(rules), READ_WRITE_LOCK.writeLock());
+    }
+
+    /**
+     * addNamedGroupingPoliciesEx adds named role inheritance rules to the current policy.
+     * If the rule already exists, the rule will not be added.
+     * But unlike AddNamedGroupingPolicies, other non-existent rules are added instead of returning false directly
+     *
+     * @param ptype the policy type, can be "g", "g2", "g3", ..
+     * @param rules the "g" policy rules.
+     * @return succeeds or not.
+     */
+    @Override
+    public boolean addNamedGroupingPoliciesEx(String ptype, List<List<String>> rules) {
+        return runSynchronized(() -> super.addNamedGroupingPoliciesEx(ptype, rules), READ_WRITE_LOCK.writeLock());
+    }
+
+    /**
+     * addNamedGroupingPoliciesEx adds named role inheritance rules to the current policy.
+     * If the rule already exists, the rule will not be added.
+     * But unlike AddNamedGroupingPolicies, other non-existent rules are added instead of returning false directly
+     *
+     * @param ptype the policy type, can be "g", "g2", "g3", ..
+     * @param rules the "g" policy rules.
+     * @return succeeds or not.
+     */
+    @Override
+    public boolean addNamedGroupingPoliciesEx(String ptype, String[][] rules) {
+        return runSynchronized(() -> super.addNamedGroupingPoliciesEx(ptype, rules), READ_WRITE_LOCK.writeLock());
+    }
+
     /**
      * removeGroupingPolicy removes a role inheritance rule from the current policy.
      *

src/test/java/org/casbin/jcasbin/main/ManagementAPIUnitTest.java

@@ -216,6 +216,66 @@ public void testModifyGroupingPolicyAPI() {
         testGetUsers(e, "data3_admin", asList("eve"));
     }
 
+    @Test
+    public void testModifyGroupingPolicyAPIEx() {
+        Enforcer e = new Enforcer("examples/rbac_model.conf", "examples/rbac_policy.csv");
+
+        // Initial state: alice has role data2_admin
+        testGetRoles(e, "alice", asList("data2_admin"));
+
+        String[][] groupingRules = {
+            {"alice", "data2_admin"}, // This rule already exists
+            {"bob", "data1_admin"},   // This is new
+            {"eve", "data3_admin"}    // This is new
+        };
+
+        // Test addGroupingPoliciesEx - should add only new rules (bob and eve), not fail on existing (alice)
+        boolean result = e.addGroupingPoliciesEx(groupingRules);
+        Assert.assertTrue("addGroupingPoliciesEx should return true", result);
+        testGetRoles(e, "alice", asList("data2_admin"));
+        testGetRoles(e, "bob", asList("data1_admin"));
+        testGetRoles(e, "eve", asList("data3_admin"));
+
+        // Clean up for next test
+        e.removeGroupingPolicy("bob", "data1_admin");
+        e.removeGroupingPolicy("eve", "data3_admin");
+
+        // Test with List<List<String>>
+        List<List<String>> groupingRulesList = asList(
+            asList("alice", "data2_admin"), // Already exists
+            asList("bob", "data1_admin"),   // New
+            asList("ham", "data4_admin")    // New
+        );
+
+        result = e.addGroupingPoliciesEx(groupingRulesList);
+        Assert.assertTrue("addGroupingPoliciesEx with List should return true", result);
+        testGetRoles(e, "alice", asList("data2_admin"));
+        testGetRoles(e, "bob", asList("data1_admin"));
+        testGetRoles(e, "ham", asList("data4_admin"));
+
+        // Clean up
+        e.removeGroupingPolicy("bob", "data1_admin");
+        e.removeGroupingPolicy("ham", "data4_admin");
+
+        // Test addNamedGroupingPoliciesEx with List<List<String>>
+        result = e.addNamedGroupingPoliciesEx("g", groupingRulesList);
+        Assert.assertTrue("addNamedGroupingPoliciesEx with List should return true", result);
+        testGetRoles(e, "alice", asList("data2_admin"));
+        testGetRoles(e, "bob", asList("data1_admin"));
+        testGetRoles(e, "ham", asList("data4_admin"));
+
+        // Clean up
+        e.removeGroupingPolicy("bob", "data1_admin");
+        e.removeGroupingPolicy("ham", "data4_admin");
+
+        // Test addNamedGroupingPoliciesEx with String[][]
+        result = e.addNamedGroupingPoliciesEx("g", groupingRules);
+        Assert.assertTrue("addNamedGroupingPoliciesEx with String[][] should return true", result);
+        testGetRoles(e, "alice", asList("data2_admin"));
+        testGetRoles(e, "bob", asList("data1_admin"));
+        testGetRoles(e, "eve", asList("data3_admin"));
+    }
+
     @Test
     public void should_throwsNullPointException_when_setAviatorEvaluator_given_nullInstance() {
         // given

src/test/java/org/casbin/jcasbin/main/SyncedManagementAPIUnitTest.java

@@ -138,4 +138,60 @@ public void testModifyGroupingPolicyAPI() {
         testGetUsers(e, "data2_admin", asList());
         testGetUsers(e, "data3_admin", asList("eve"));
     }
+
+    @Test
+    public void testModifyGroupingPolicyAPIEx() {
+        Enforcer e = new SyncedEnforcer("examples/rbac_model.conf", "examples/rbac_policy.csv");
+
+        // Initial state: alice has role data2_admin
+        testGetRoles(e, "alice", asList("data2_admin"));
+
+        String[][] groupingRules = {
+            {"alice", "data2_admin"}, // This rule already exists
+            {"bob", "data1_admin"},   // This is new
+            {"eve", "data3_admin"}    // This is new
+        };
+
+        // Test addGroupingPoliciesEx - should add only new rules (bob and eve), not fail on existing (alice)
+        e.addGroupingPoliciesEx(groupingRules);
+        testGetRoles(e, "alice", asList("data2_admin"));
+        testGetRoles(e, "bob", asList("data1_admin"));
+        testGetRoles(e, "eve", asList("data3_admin"));
+
+        // Clean up for next test
+        e.removeGroupingPolicy("bob", "data1_admin");
+        e.removeGroupingPolicy("eve", "data3_admin");
+
+        // Test with List<List<String>>
+        List<List<String>> groupingRulesList = asList(
+            asList("alice", "data2_admin"), // Already exists
+            asList("bob", "data1_admin"),   // New
+            asList("ham", "data4_admin")    // New
+        );
+
+        e.addGroupingPoliciesEx(groupingRulesList);
+        testGetRoles(e, "alice", asList("data2_admin"));
+        testGetRoles(e, "bob", asList("data1_admin"));
+        testGetRoles(e, "ham", asList("data4_admin"));
+
+        // Clean up
+        e.removeGroupingPolicy("bob", "data1_admin");
+        e.removeGroupingPolicy("ham", "data4_admin");
+
+        // Test addNamedGroupingPoliciesEx with List<List<String>>
+        e.addNamedGroupingPoliciesEx("g", groupingRulesList);
+        testGetRoles(e, "alice", asList("data2_admin"));
+        testGetRoles(e, "bob", asList("data1_admin"));
+        testGetRoles(e, "ham", asList("data4_admin"));
+
+        // Clean up
+        e.removeGroupingPolicy("bob", "data1_admin");
+        e.removeGroupingPolicy("ham", "data4_admin");
+
+        // Test addNamedGroupingPoliciesEx with String[][]
+        e.addNamedGroupingPoliciesEx("g", groupingRules);
+        testGetRoles(e, "alice", asList("data2_admin"));
+        testGetRoles(e, "bob", asList("data1_admin"));
+        testGetRoles(e, "eve", asList("data3_admin"));
+    }
 }