tag cloud fixes

Author: Joe Alphonso

warehouse/keyword-common/src/main/java/datawave/util/keyword/DefaultTagCloudUtils.java

@@ -11,7 +11,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.accumulo.access.AccessExpression;
 import org.apache.commons.lang3.StringUtils;
 
 import datawave.marking.AccessExpressionUtil;
@@ -27,14 +26,14 @@ public class DefaultTagCloudUtils implements TagCloudUtils, Serializable {
     private static final String MULTI_VALUE_SEPARATOR = ",";
 
     @Override
-    public AccessExpression generateCombinedVisibility(Set<String> visibilities) {
+    public Markings<?> generateCombinedVisibility(Set<String> visibilities) {
         if (visibilities == null || visibilities.isEmpty()) {
             return null;
         }
         Set<Markings<?>> markings = visibilities.stream().map(v -> AccessExpressionUtil.toAccessExpressionMarkings(ACCESS.newExpression(v)))
                         .collect(Collectors.toSet());
         try {
-            return AccessExpressionUtil.toAccessExpression(AccessExpressionUtil.combine(new MarkingFunctions.Default(), markings));
+            return AccessExpressionUtil.combine(new MarkingFunctions.Default(), markings);
         } catch (MarkingFunctions.Exception e) {
             throw new IllegalArgumentException("Failed to combine visibilities", e);
         }

warehouse/keyword-common/src/main/java/datawave/util/keyword/TagCloud.java

@@ -18,6 +18,9 @@
 
 import com.google.gson.Gson;
 
+import datawave.marking.AccessExpressionMarkings;
+import datawave.marking.Markings;
+
 /** A tag cloud - a collection of tags that have a keyword, score, frequency and list of sources from which they originated */
 public class TagCloud {
 
@@ -42,9 +45,9 @@ public class TagCloud {
      * @param results
      *            the entries that belong in the tag cloud.
      */
-    protected TagCloud(Map<String,String> metadata, AccessExpression visibility, SortedSet<TagCloudEntry> results) {
+    protected TagCloud(Map<String,String> metadata, Markings<?> visibility, SortedSet<TagCloudEntry> results) {
         this.metadata = metadata;
-        this.visibility = (visibility != null) ? visibility.getExpression() : "";
+        this.visibility = (visibility != null) ? ((AccessExpressionMarkings) visibility).getMarkings().getExpression() : "";
         this.results = results;
     }
 
@@ -221,7 +224,7 @@ public List<TagCloud> build() {
                 final SortedSet<TagCloudEntry> results = new TreeSet<>(comparator);
                 results.addAll(e.getValue());
                 String partition = getPartition(e.getKey());
-                AccessExpression visibility = utils.generateCombinedVisibility(visibilities.get(partition));
+                Markings<?> visibility = utils.generateCombinedVisibility(visibilities.get(partition));
                 Map<String,String> tagCloudMetadata = utils.generateCombinedMetadata(this.metadata.get(partition));
                 tagClouds.add(new TagCloud(tagCloudMetadata, visibility, results));
             }

warehouse/keyword-common/src/main/java/datawave/util/keyword/TagCloudUtils.java

@@ -5,7 +5,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.accumulo.access.AccessExpression;
+import datawave.marking.Markings;
 
 /**
  * Interface for pluggable utilities for generating tag clouds, includes mechanisms to partition keywords into separate tag clouds, combine or merge visibility
@@ -17,9 +17,9 @@ public interface TagCloudUtils {
      *
      * @param visibilities
      *            a set of valid visibility strings.
-     * @return a combined {@link AccessExpression}, or {@code null} if there are no visibilities
+     * @return a combined {@link Markings}, or {@code null} if there are no visibilities
      */
-    AccessExpression generateCombinedVisibility(Set<String> visibilities);
+    Markings<?> generateCombinedVisibility(Set<String> visibilities);
 
     /**
      * Aggregate metadata from multiple sources, combining multi-valued entries into a flattened string