Removing Deprecated Projections

warehouse/query-core/src/main/java/datawave/query/function/DocumentProjection.java

@@ -35,19 +35,7 @@ public class DocumentProjection implements DocumentPermutation {
     /**
      * should track document sizes
      */
-    private boolean trackSizes = true;
-
-    @Deprecated
-    public DocumentProjection() {
-        this(false, false);
-    }
-
-    @Deprecated
-    public DocumentProjection(boolean includeGroupingContext, boolean reducedResponse) {
-        this.includeGroupingContext = includeGroupingContext;
-        this.reducedResponse = reducedResponse;
-        this.projection = new Projection();
-    }
+    private boolean trackSizes;
 
     public DocumentProjection(boolean includeGroupingContext, boolean reducedResponse, boolean trackSizes, Set<String> projections,
                     Projection.ProjectionType projectionType) {
@@ -57,36 +45,13 @@ public DocumentProjection(boolean includeGroupingContext, boolean reducedRespons
         this.trackSizes = trackSizes;
     }
 
-    /*
-     * This contstructor will not include the grouping context and will not reduce the document
-     */
-    @Deprecated
-    public DocumentProjection(Set<String> projections, Projection.ProjectionType projectionType) {
-        this(false, false, projections, projectionType);
-    }
-
-    @Deprecated
-    public DocumentProjection(boolean includeGroupingContext, boolean reducedResponse, Set<String> projections, Projection.ProjectionType projectionType) {
-        this(includeGroupingContext, reducedResponse, true, projections, projectionType);
-    }
-
     public DocumentProjection(boolean includeGroupingContext, boolean isReducedResponse, boolean isTrackSizes, Projection projection) {
         this.includeGroupingContext = includeGroupingContext;
         this.reducedResponse = isReducedResponse;
         this.trackSizes = isTrackSizes;
         this.projection = projection;
     }
 
-    @Deprecated
-    public void setIncludes(Set<String> includes) {
-        this.projection.setIncludes(includes);
-    }
-
-    @Deprecated
-    public void setExcludes(Set<String> excludes) {
-        this.projection.setExcludes(excludes);
-    }
-
     public Projection getProjection() {
         return projection;
     }

warehouse/query-core/src/main/java/datawave/query/predicate/KeyProjection.java

@@ -21,41 +21,6 @@ public KeyProjection(Set<String> projections, Projection.ProjectionType projecti
         projection = new Projection(projections, projectionType);
     }
 
-    public KeyProjection(KeyProjection other) {
-        projection = other.getProjection();
-    }
-
-    @Deprecated
-    public KeyProjection() {
-        projection = new Projection();
-    }
-
-    /**
-     * Set the delegate {@link Projection} with the fields to include
-     *
-     * @param includes
-     *            a set of fields to retain
-     */
-    @Deprecated
-    public void setIncludes(Set<String> includes) {
-        projection.setIncludes(includes);
-    }
-
-    /**
-     * Set the delegate {@link Projection} with the fields to exclude
-     *
-     * @param excludes
-     *            a set of fields to exclude
-     */
-    public void setExcludes(Set<String> excludes) {
-        projection.setExcludes(excludes);
-    }
-
-    @Deprecated
-    public Projection getProjection() {
-        return projection;
-    }
-
     /*
      * (non-Javadoc)
      *

warehouse/query-core/src/main/java/datawave/query/predicate/Projection.java

@@ -20,52 +20,14 @@
 public final class Projection implements Predicate<String> {
 
     private boolean initialized;
-
-    @Deprecated
-    public void setIncludes(Set<String> includes) {
-        if (this.initialized) {
-            throw new RuntimeException("This Projection instance was already initialized");
-        }
-
-        this.projections = includes;
-        this.initialized = true;
-        type = ProjectionType.INCLUDES;
-    }
-
-    @Deprecated
-    public void setExcludes(Set<String> excludes) {
-        if (this.initialized) {
-            throw new RuntimeException("This Projection instance was already initialized");
-        }
-
-        this.projections = Sets.newHashSet(excludes);
-        this.initialized = true;
-        type = ProjectionType.EXCLUDES;
-    }
-
-    @Deprecated
-    public Set<String> getIncludes() {
-        return Collections.unmodifiableSet(this.projections);
-    }
-
-    @Deprecated
-    public Set<String> getExcludes() {
-        return Collections.unmodifiableSet(this.projections);
-    }
-
-    /* Explicit constructor needed now that the new constructor was added */
-    @Deprecated
-    public Projection() {
-        this.initialized = false;
-    }
-
     private Set<String> projections;
     private ProjectionType type;
 
     public Projection(@Nonnull Set<String> items, @Nonnull ProjectionType type) {
         this.initialized = true;
         this.type = type;
         if (type == ProjectionType.INCLUDES) {
+            // do not make a copy of the incoming include fields. It could be a UniversalSet
             this.projections = items;
         } else {
             this.projections = Sets.newHashSet(items);