Adds new constructor to ColumnVisibility

Adds a new constructor that supports an AccessExpression.
Also adds deep copy method for existing ColumnVisibilities.

Author: ddanielr

core/pom.xml

@@ -85,6 +85,10 @@
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-context</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-access</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-start</artifactId>
@@ -274,6 +278,8 @@
                 <allow>javax[.]security[.]auth[.]DestroyFailedException</allow>
                 <!-- allow questionable Hadoop exceptions for mapreduce -->
                 <allow>org[.]apache[.]hadoop[.]mapred[.](FileAlreadyExistsException|InvalidJobConfException)</allow>
+                <!-- allow the following types from the visibility API -->
+                <allow>org[.]apache[.]accumulo[.]access[.].*</allow>
               </allows>
             </configuration>
           </execution>

core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java

@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.TreeSet;
 
+import org.apache.accumulo.access.AccessExpression;
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.util.BadArgumentException;
@@ -133,6 +134,24 @@ public void add(Node child) {
       children.add(child);
     }
 
+    /**
+     * Creates a new node by performing a deep copy of an existing node object
+     *
+     * @param node Node object
+     * @since 2.1.4
+     */
+    private Node(Node node) {
+      List<Node> childrenNew =
+          node.children.isEmpty() ? EMPTY : new ArrayList<>(node.children.size());
+      for (Node child : node.children) {
+        childrenNew.add(new Node(child));
+      }
+      this.type = node.type;
+      this.start = node.start;
+      this.end = node.end;
+      this.children = childrenNew;
+    }
+
     public NodeType getType() {
       return type;
     }
@@ -505,6 +524,31 @@ public ColumnVisibility(byte[] expression) {
     validate(expression);
   }
 
+  /**
+   * Creates a column visibility for a Mutation from an AccessExpression.
+   *
+   * @param expression visibility expression, encoded as UTF-8 bytes
+   * @see #ColumnVisibility(String)
+   * @since 2.1.4
+   */
+  public ColumnVisibility(AccessExpression expression) {
+    // AccessExpression is a validated immutable object, so no need to re validate
+    this.expression = expression.getExpression().getBytes(UTF_8);
+  }
+
+  /**
+   * Creates a new column visibility by performing a deep copy of an existing column visibility
+   * object
+   *
+   * @param visibility ColumnVisibility object
+   * @since 2.1.4
+   */
+  public ColumnVisibility(ColumnVisibility visibility) {
+    byte[] incomingExpression = visibility.expression;
+    this.expression = Arrays.copyOf(incomingExpression, incomingExpression.length);
+    this.node = new Node(visibility.node);
+  }
+
   @Override
   public String toString() {
     return "[" + new String(expression, UTF_8) + "]";

core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java

@@ -22,6 +22,7 @@
 import static org.apache.accumulo.core.security.ColumnVisibility.quote;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -238,6 +239,15 @@ public void testParseTreesOrdering() {
     assertTrue(flat.indexOf('b') < flat.indexOf('a'), "shortest children sort first");
   }
 
+  @Test
+  public void testDeepCopy() {
+    ColumnVisibility cv1 = new ColumnVisibility("(b&c&d)|((a|m)&y&z)|(e&f)");
+    ColumnVisibility cv2 = new ColumnVisibility(cv1);
+    assertNotSame(cv1.getExpression(), cv2.getExpression());
+    assertNotSame(cv1.getParseTree(), cv2.getParseTree());
+    assertEquals(cv1.toString(), cv2.toString());
+  }
+
   private Node parse(String s) {
     ColumnVisibility v = new ColumnVisibility(s);
     return v.getParseTree();

pom.xml

@@ -146,6 +146,7 @@
     <surefire.reuseForks>true</surefire.reuseForks>
     <unitTestMemSize>-Xmx1G</unitTestMemSize>
     <!-- dependency and plugin versions managed with properties -->
+    <version.accumulo-access>1.0.0-SNAPSHOT</version.accumulo-access>
     <version.auto-service>1.1.1</version.auto-service>
     <version.bouncycastle>1.78.1</version.bouncycastle>
     <version.curator>5.5.0</version.curator>
@@ -328,6 +329,11 @@
         <artifactId>junit</artifactId>
         <version>4.13.2</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
+        <artifactId>accumulo-access</artifactId>
+        <version>${version.accumulo-access}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
         <artifactId>accumulo-compaction-coordinator</artifactId>