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

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

commit 355ef24bc512ab893f8f6bf33f8d3f4052f9ee10
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Tue Feb 4 18:01:43 2025 +0000

    restores old column visibilty flatten code
    
    accumulo-access removed its normalize functionality that was built in
    and ColumnVisibility was using this.  Restored the old code for
    flattening expression in ColumnVisibility to get things back in working
    order.
---
 .../java/org/apache/accumulo/core/security/ColumnVisibility.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java 
b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
index bc49baca5f..8d5c558d38 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
@@ -297,7 +297,10 @@ public class ColumnVisibility {
    */
   @Deprecated(since = "3.1.0")
   public byte[] flatten() {
-    return AccessExpression.of(expression, 
true).getExpression().getBytes(UTF_8);
+    Node normRoot = normalize(nodeSupplier.get(), expression);
+    StringBuilder builder = new StringBuilder(expression.length);
+    stringify(normRoot, expression, builder);
+    return builder.toString().getBytes(UTF_8);
   }
 
   @Deprecated

Reply via email to