(accumulo) 01/01: Merge branch '2.1'

[kturner]

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 043bcba6088030037448047462d72583776084a9
Merge: 6b88edc2ad 5eb04ebce3
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Sat Sep 20 15:58:40 2025 +0000

    Merge branch '2.1'

 .../core/security/NamespacePermission.java         |  3 ++-
 .../core/security/NamespacePermissionsTest.java    | 31 +++++++++++++++++++---
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
index fb47d2584c,d6b69ad3ed..7f84afff13
--- 
a/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/security/NamespacePermission.java
@@@ -106,15 -113,28 +106,16 @@@ public enum NamespacePermission 
    }
  
    public static NamespacePermission getEquivalent(SystemPermission 
permission) {
 -    switch (permission) {
 -      case CREATE_TABLE:
 -        return NamespacePermission.CREATE_TABLE;
 -      case DROP_TABLE:
 -        return NamespacePermission.DROP_TABLE;
 -      case ALTER_TABLE:
 -        return NamespacePermission.ALTER_TABLE;
 -      case ALTER_NAMESPACE:
 -        return NamespacePermission.ALTER_NAMESPACE;
 -      case DROP_NAMESPACE:
 -        return NamespacePermission.DROP_NAMESPACE;
 -      case GRANT:
 -        throw new IllegalArgumentException(
 -            "SystemPermission.GRANT has no equivalent NamespacePermission. 
GRANT operations require special handling in SecurityOperation.");
 -      case CREATE_NAMESPACE:
 -      case CREATE_USER:
 -      case DROP_USER:
 -      case ALTER_USER:
 -      case SYSTEM:
 -      default:
 -        return null;
 -    }
 +    return switch (permission) {
 +      case CREATE_TABLE -> NamespacePermission.CREATE_TABLE;
 +      case DROP_TABLE -> NamespacePermission.DROP_TABLE;
 +      case ALTER_TABLE -> NamespacePermission.ALTER_TABLE;
 +      case ALTER_NAMESPACE -> NamespacePermission.ALTER_NAMESPACE;
 +      case DROP_NAMESPACE -> NamespacePermission.DROP_NAMESPACE;
-       case GRANT -> NamespacePermission.ALTER_NAMESPACE;
++      case GRANT -> throw new IllegalArgumentException(
++          "SystemPermission.GRANT has no equivalent NamespacePermission. 
GRANT operations require special handling in SecurityOperation.");
 +      default -> null;
 +    };
    }
  
  }