Merge branch 'integration' into merged-dependabot-changes

pom.xml

@@ -127,7 +127,7 @@
         <version.spring>5.2.2.RELEASE</version.spring>
         <version.springframework>${version.spring}</version.springframework>
         <version.stream>2.9.6</version.stream>
-        <version.surefire.plugin>3.2.5</version.surefire.plugin>
+        <version.surefire.plugin>3.5.2</version.surefire.plugin>
         <version.thrift>0.17.0</version.thrift>
         <version.weld>3.1.1.Final</version.weld>
         <version.weld-se>3.1.1.Final</version.weld-se>

warehouse/age-off/src/main/java/datawave/iterators/filter/ageoff/FieldAgeOffFilter.java

@@ -84,7 +84,7 @@ protected enum FieldExclusionType {
     private static final Logger log = Logger.getLogger(FieldAgeOffFilter.class);
 
     /**
-     * Determine whether or not the rules are applied
+     * Determine whether the rules are applied
      */
     protected boolean ruleApplied = false;
 
@@ -104,9 +104,9 @@ protected enum FieldExclusionType {
     protected Set<FieldExclusionType> fieldExcludeOptions = null;
 
     /**
-     * Required by the {@code FilterRule} interface. This method returns a {@code boolean} value indicating whether or not to allow the {@code (Key, Value)}
-     * pair through the rule. A value of {@code true} indicates that he pair should be passed onward through the {@code Iterator} stack, and {@code false}
-     * indicates that the {@code (Key, Value)} pair should not be passed on.
+     * Required by the {@code FilterRule} interface. This method returns a {@code boolean} value indicating whether to allow the {@code (Key, Value)} pair
+     * through the rule. A value of {@code true} indicates that he pair should be passed onward through the {@code Iterator} stack, and {@code false} indicates
+     * that the {@code (Key, Value)} pair should not be passed on.
      *
      * <p>
      * If the value provided in the parameter {@code k} does not match the REGEX pattern specified in this filter's configuration options, then a value of
@@ -116,27 +116,20 @@ protected enum FieldExclusionType {
      *            {@code Key} object containing the row, column family, and column qualifier.
      * @param v
      *            {@code Value} object containing the value corresponding to the {@code Key: k}
-     * @return {@code boolean} value indicating whether or not to allow the {@code Key, Value} through the {@code Filter}.
+     * @return {@code boolean} value indicating whether to allow the {@code Key, Value} through the {@code Filter}.
      */
     @Override
     public boolean accept(AgeOffPeriod period, Key k, Value v) {
 
         ruleApplied = false;
-        // if accepted by ColumnVisibilityOrFilter logic, pass the K/V up the iterator stack
-        // otherwise evaluate based on field
-        if (cvOrFilter.hasToken(k, v, this.cvOrFilter.getPatternBytes()) == false) {
-            return true;
-        }
 
         // get the column qualifier, so that we can use it throughout
         final byte[] cq = k.getColumnQualifierData().getBackingArray();
 
         ByteSequence field = null;
         FieldExclusionType candidateExclusionType = null;
 
-        /**
-         * Supports the shard and index table. There should not be a failure, however if either one is used on the incorrect table
-         */
+        // Supports the shard and index table. There should not be a failure, however if either one is used on the incorrect table
         if (isIndextable) {
             field = k.getColumnFamilyData();
 
@@ -206,13 +199,15 @@ public boolean accept(AgeOffPeriod period, Key k, Value v) {
             return true;
         }
 
-        Long dataTypeCutoff = (fieldTimes.containsKey(field)) ? fieldTimes.get(field) : null;
-        if (dataTypeCutoff != null) {
-            ruleApplied = true;
-            return CompositeTimestamp.getAgeOffDate(k.getTimestamp()) > dataTypeCutoff;
+        Long dataTypeCutoff = fieldTimes.get(field);
+
+        // evaluating field first then the ColumnVisibilityOrFilter based on performance test results
+        if (dataTypeCutoff == null || !cvOrFilter.hasToken(k, v, this.cvOrFilter.getPatternBytes())) {
+            return true;
         }
 
-        return true;
+        ruleApplied = true;
+        return CompositeTimestamp.getAgeOffDate(k.getTimestamp()) > dataTypeCutoff;
     }
 
     /**
@@ -275,7 +270,7 @@ protected void init(FilterOptions options, final long startScan, IteratorEnviron
                 isIndextable = Boolean.parseBoolean(iterEnv.getConfig().get("table.custom." + AgeOffConfigParams.IS_INDEX_TABLE));
             }
         } else { // legacy
-            isIndextable = Boolean.valueOf(options.getOption(AgeOffConfigParams.IS_INDEX_TABLE));
+            isIndextable = Boolean.parseBoolean(options.getOption(AgeOffConfigParams.IS_INDEX_TABLE));
         }
 
         fieldExcludeOptions = new HashSet<>();

warehouse/query-core/src/main/java/datawave/query/util/count/CountMap.java

@@ -52,20 +52,20 @@ public boolean containsKey(String key) {
     @Override
     public void read(Kryo kryo, Input input) {
         counts.clear();
-        int size = input.readInt();
+        int size = input.readInt(true);
         for (int i = 0; i < size; i++) {
             String key = input.readString();
-            Long value = input.readLong();
+            Long value = input.readLong(true);
             put(key, value);
         }
     }
 
     @Override
     public void write(Kryo kryo, Output output) {
-        output.writeInt(keySet().size());
+        output.writeInt(keySet().size(), true);
         for (Entry<String,Long> entry : entrySet()) {
             output.writeString(entry.getKey());
-            output.writeLong(entry.getValue());
+            output.writeLong(entry.getValue(), true);
         }
     }
 

warehouse/query-core/src/test/java/datawave/query/util/count/CountMapSerDeTest.java

@@ -17,6 +17,7 @@ void testSerDeBytes() {
         map.put("FIELD_B", 23L);
 
         byte[] data = serDe.serialize(map);
+        assertEquals(18, data.length); // 35 without optimizing integers/longs
         CountMap deserialized = serDe.deserialize(data);
 
         assertMap(map, deserialized);
@@ -29,6 +30,7 @@ void testSerDeString() {
         map.put("FIELD_B", 23L);
 
         String s = serDe.serializeToString(map);
+        assertEquals(18, s.length()); // 35 without optimizing integers/longs
         CountMap deserialized = serDe.deserializeFromString(s);
 
         assertMap(map, deserialized);

web-services/security/src/test/java/datawave/security/authorization/test/TestDatawaveUserServiceTest.java

@@ -236,7 +236,7 @@ private static class MockAccumuloConnectionFactory implements AccumuloConnection
 
         public MockAccumuloConnectionFactory() {
             try {
-                inMemoryInstance.getConnector("root", "").securityOperations().changeUserAuthorizations("root", new Authorizations("PUB", "PVT"));
+                new InMemoryAccumuloClient("root", inMemoryInstance).securityOperations().changeUserAuthorizations("root", new Authorizations("PUB", "PVT"));
             } catch (AccumuloException | AccumuloSecurityException e) {
                 throw new RuntimeException(e);
             }