Markings

core/base-rest-responses/src/main/java/datawave/marking/ColumnVisibilitySecurityMarking.java

@@ -1,8 +1,7 @@
 package datawave.marking;
 
-import static com.google.common.base.Charsets.UTF_8;
+import static datawave.marking.AccessExpressionMarkings.ACCESS;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -12,7 +11,7 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 
-import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.accumulo.access.AccessExpression;
 
 import com.google.common.base.Preconditions;
 
@@ -31,7 +30,7 @@ public void validate(Map<String,List<String>> parameters) throws IllegalArgument
         if (null == values) {
             throw new IllegalArgumentException("Required parameter " + VISIBILITY_MARKING + " not found");
         }
-        if (values.isEmpty() || values.size() > 1) {
+        if (values.size() != 1) {
             throw new IllegalArgumentException("Required parameter " + VISIBILITY_MARKING + " only accepts one value");
         }
         columnVisibility = values.get(0);
@@ -47,8 +46,16 @@ public void setColumnVisibility(String columnVisibility) {
     }
 
     @Override
-    public ColumnVisibility toColumnVisibility() {
-        return new ColumnVisibility(columnVisibility);
+    public AccessExpression toAccessExpression() {
+        if (columnVisibility == null || columnVisibility.isEmpty()) {
+            return ACCESS.newExpression("");
+        }
+        return ACCESS.newExpression(columnVisibility);
+    }
+
+    @Override
+    public Markings<?> toMarkings() {
+        return AccessExpressionMarkings.builder().accessExpression(toAccessExpression()).build();
     }
 
     @Override
@@ -72,65 +79,29 @@ public boolean equals(Object obj) {
             if (this.columnVisibility == null && other.columnVisibility != null) {
                 return false;
             }
-            if (this.columnVisibility == null && other.columnVisibility == null) {
-                return true;
-            }
-            if (this.columnVisibility.equals(other.columnVisibility)) {
+            if (this.columnVisibility == null) {
                 return true;
-            } else {
-                return false;
             }
+            return this.columnVisibility.equals(other.columnVisibility);
         }
         return false;
     }
 
     @Override
     public String toString() {
-        return toColumnVisibilityString();
+        return toAccessExpressionString();
     }
 
     @Override
-    public String toColumnVisibilityString() {
+    public String toAccessExpressionString() {
         if (null == this.columnVisibility) {
             return null;
         }
-        return new String(toColumnVisibility().flatten(), UTF_8);
+        return AccessExpressionUtil.normalize(toAccessExpression()).getExpression();
     }
 
     public void clear() {
         this.columnVisibility = null;
     }
 
-    @Override
-    public Map<String,String> toMap() {
-        return Collections.singletonMap(VISIBILITY_MARKING, this.columnVisibility);
-    }
-
-    @Override
-    public void fromMap(Map<String,String> map) {
-        this.columnVisibility = map.get(VISIBILITY_MARKING);
-    }
-
-    /**
-     * Turn this set of markings into a serializable string
-     *
-     * @return String
-     */
-    @Override
-    public String mapToString() {
-        return MarkingFunctions.Encoding.toString(toMap());
-    }
-
-    /**
-     * Fill this security markings given an encoded string
-     *
-     * @param encodedMarkings
-     */
-    @Override
-    public void fromString(String encodedMarkings) {
-        Map<String,String> markings = MarkingFunctions.Encoding.fromString(encodedMarkings);
-        this.columnVisibility = markings.get(VISIBILITY_MARKING);
-        Preconditions.checkNotNull(columnVisibility);
-    }
-
 }

core/base-rest-responses/src/main/java/datawave/marking/SecurityMarking.java

@@ -1,24 +1,16 @@
 package datawave.marking;
 
-import java.util.Map;
-
-import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.accumulo.access.AccessExpression;
 
 import datawave.validation.ParameterValidator;
 
 public interface SecurityMarking extends ParameterValidator {
 
-    ColumnVisibility toColumnVisibility() throws MarkingFunctions.Exception;
-
-    String toColumnVisibilityString();
-
-    Map<String,String> toMap();
-
-    void fromMap(Map<String,String> map);
+    AccessExpression toAccessExpression() throws MarkingFunctions.Exception;
 
-    String mapToString();
+    String toAccessExpressionString();
 
-    void fromString(String xmlString);
+    Markings<?> toMarkings() throws MarkingFunctions.Exception;
 
     void clear();
 }

core/base-rest-responses/src/main/java/datawave/webservice/query/result/event/HasMarkings.java

@@ -1,10 +1,10 @@
 package datawave.webservice.query.result.event;
 
-import java.util.Map;
+import datawave.marking.Markings;
 
 public interface HasMarkings {
 
-    void setMarkings(Map<String,String> markings);
+    void setMarkings(Markings<?> markings);
 
-    Map<String,String> getMarkings();
+    Markings<?> getMarkings();
 }