You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2021/09/29 11:53:24 UTC

[accumulo] branch main updated: Generated classes for 0.15.0 Thrift upgrade (#2273)

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new a3aea30  Generated classes for 0.15.0 Thrift upgrade (#2273)
a3aea30 is described below

commit a3aea30ad1903d91df55773c44d39a408cf82ded
Author: Mike Miller <mm...@apache.org>
AuthorDate: Wed Sep 29 07:52:12 2021 -0400

    Generated classes for 0.15.0 Thrift upgrade (#2273)
---
 .../core/clientImpl/thrift/ClientService.java      | 452 ++++++---------
 .../core/clientImpl/thrift/ConfigurationType.java  |   2 +-
 .../core/clientImpl/thrift/SecurityErrorCode.java  |   2 +-
 .../core/clientImpl/thrift/TDiskUsage.java         |  10 +-
 .../core/clientImpl/thrift/TableOperation.java     |   2 +-
 .../thrift/TableOperationExceptionType.java        |   2 +-
 .../thrift/ThriftNotActiveServiceException.java    |   4 +-
 .../clientImpl/thrift/ThriftSecurityException.java |   8 +-
 .../thrift/ThriftTableOperationException.java      |  14 +-
 .../core/clientImpl/thrift/ThriftTest.java         |  22 +-
 .../thrift/CompactionCoordinatorService.java       |  60 +-
 .../core/compaction/thrift/CompactorService.java   |  40 +-
 .../accumulo/core/compaction/thrift/Status.java    |  14 +-
 .../core/compaction/thrift/TCompactionState.java   |   2 +-
 .../thrift/UnknownCompactionIdException.java       |   4 +-
 .../core/dataImpl/thrift/InitialMultiScan.java     |   8 +-
 .../accumulo/core/dataImpl/thrift/InitialScan.java |   8 +-
 .../accumulo/core/dataImpl/thrift/IterInfo.java    |  10 +-
 .../accumulo/core/dataImpl/thrift/MapFileInfo.java |   6 +-
 .../core/dataImpl/thrift/MultiScanResult.java      |  26 +-
 .../accumulo/core/dataImpl/thrift/ScanResult.java  |  10 +-
 .../accumulo/core/dataImpl/thrift/TCMResult.java   |   8 +-
 .../accumulo/core/dataImpl/thrift/TCMStatus.java   |   2 +-
 .../accumulo/core/dataImpl/thrift/TColumn.java     |  10 +-
 .../accumulo/core/dataImpl/thrift/TCondition.java  |  18 +-
 .../core/dataImpl/thrift/TConditionalMutation.java |  12 +-
 .../core/dataImpl/thrift/TConditionalSession.java  |  10 +-
 .../thrift/TConstraintViolationSummary.java        |  12 +-
 .../apache/accumulo/core/dataImpl/thrift/TKey.java |  14 +-
 .../accumulo/core/dataImpl/thrift/TKeyExtent.java  |  10 +-
 .../accumulo/core/dataImpl/thrift/TKeyValue.java   |   8 +-
 .../accumulo/core/dataImpl/thrift/TMutation.java   |  18 +-
 .../accumulo/core/dataImpl/thrift/TRange.java      |  16 +-
 .../accumulo/core/dataImpl/thrift/TRowRange.java   |   8 +-
 .../accumulo/core/dataImpl/thrift/TSummaries.java  |  16 +-
 .../dataImpl/thrift/TSummarizerConfiguration.java  |  12 +-
 .../accumulo/core/dataImpl/thrift/TSummary.java    |  16 +-
 .../core/dataImpl/thrift/TSummaryRequest.java      |  14 +-
 .../core/dataImpl/thrift/UpdateErrors.java         |  16 +-
 .../accumulo/core/gc/thrift/GCMonitorService.java  |  14 +-
 .../apache/accumulo/core/gc/thrift/GCStatus.java   |  12 +-
 .../accumulo/core/gc/thrift/GcCycleStats.java      |  16 +-
 .../accumulo/core/manager/thrift/DeadServer.java   |  10 +-
 .../core/manager/thrift/FateOperation.java         |   2 +-
 .../accumulo/core/manager/thrift/FateService.java  |  76 +--
 .../core/manager/thrift/ManagerClientService.java  | 288 ++++------
 .../core/manager/thrift/ManagerGoalState.java      |   2 +-
 .../core/manager/thrift/ManagerMonitorInfo.java    |  34 +-
 .../accumulo/core/manager/thrift/ManagerState.java |   2 +-
 .../core/manager/thrift/RecoveryException.java     |   6 +-
 .../core/manager/thrift/TabletLoadState.java       |   2 +-
 .../accumulo/core/manager/thrift/TabletSplit.java  |  10 +-
 .../core/master/thrift/BulkImportState.java        |   2 +-
 .../core/master/thrift/BulkImportStatus.java       |  10 +-
 .../accumulo/core/master/thrift/Compacting.java    |   8 +-
 .../core/master/thrift/RecoveryStatus.java         |  10 +-
 .../accumulo/core/master/thrift/TableInfo.java     |  28 +-
 .../core/master/thrift/TabletServerStatus.java     |  42 +-
 .../core/replication/thrift/KeyValues.java         |   8 +-
 .../thrift/RemoteReplicationErrorCode.java         |   2 +-
 .../thrift/RemoteReplicationException.java         |   8 +-
 .../replication/thrift/ReplicationCoordinator.java |  14 +-
 .../thrift/ReplicationCoordinatorErrorCode.java    |   2 +-
 .../thrift/ReplicationCoordinatorException.java    |   8 +-
 .../replication/thrift/ReplicationServicer.java    |  30 +-
 .../accumulo/core/replication/thrift/WalEdits.java |   8 +-
 .../securityImpl/thrift/TAuthenticationKey.java    |  12 +-
 .../thrift/TAuthenticationTokenIdentifier.java     |  14 +-
 .../core/securityImpl/thrift/TCredentials.java     |  12 +-
 .../core/securityImpl/thrift/TDelegationToken.java |   8 +-
 .../thrift/TDelegationTokenConfig.java             |   6 +-
 .../core/tabletserver/thrift/ActionStats.java      |  20 +-
 .../core/tabletserver/thrift/ActiveCompaction.java |  34 +-
 .../core/tabletserver/thrift/ActiveScan.java       |  42 +-
 .../thrift/ConstraintViolationException.java       |   8 +-
 .../core/tabletserver/thrift/InputFile.java        |  12 +-
 .../core/tabletserver/thrift/IteratorConfig.java   |   8 +-
 .../tabletserver/thrift/NoSuchScanIDException.java |   4 +-
 .../thrift/NotServingTabletException.java          |   6 +-
 .../core/tabletserver/thrift/ScanState.java        |   2 +-
 .../core/tabletserver/thrift/ScanType.java         |   2 +-
 .../core/tabletserver/thrift/TCompactionKind.java  |   2 +-
 .../thrift/TCompactionQueueSummary.java            |   8 +-
 .../tabletserver/thrift/TCompactionReason.java     |   2 +-
 .../core/tabletserver/thrift/TCompactionStats.java |  10 +-
 .../core/tabletserver/thrift/TCompactionType.java  |   2 +-
 .../core/tabletserver/thrift/TDurability.java      |   2 +-
 .../thrift/TExternalCompactionJob.java             |  26 +-
 .../core/tabletserver/thrift/TIteratorSetting.java |  14 +-
 .../thrift/TSampleNotPresentException.java         |   6 +-
 .../tabletserver/thrift/TSamplerConfiguration.java |  10 +-
 .../tabletserver/thrift/TUnloadTabletGoal.java     |   2 +-
 .../tabletserver/thrift/TabletClientService.java   | 640 ++++++++-------------
 .../core/tabletserver/thrift/TabletStats.java      |  20 +-
 .../tabletserver/thrift/TooManyFilesException.java |   6 +-
 .../apache/accumulo/core/trace/thrift/TInfo.java   |   8 +-
 .../apache/accumulo/tracer/thrift/Annotation.java  |   8 +-
 .../apache/accumulo/tracer/thrift/RemoteSpan.java  |  30 +-
 .../accumulo/tracer/thrift/SpanReceiver.java       |   6 +-
 .../apache/accumulo/tracer/thrift/TestService.java |  12 +-
 .../test/rpc/thrift/SimpleThriftService.java       |  38 +-
 101 files changed, 1035 insertions(+), 1587 deletions(-)

diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java
index 6a5c2af..f18da4a 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ClientService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -5247,8 +5247,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getRootTabletLocation_args)
         return this.equals((getRootTabletLocation_args)that);
       return false;
@@ -5558,8 +5556,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getRootTabletLocation_result)
         return this.equals((getRootTabletLocation_result)that);
       return false;
@@ -5602,7 +5598,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5868,8 +5864,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getInstanceId_args)
         return this.equals((getInstanceId_args)that);
       return false;
@@ -6179,8 +6173,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getInstanceId_result)
         return this.equals((getInstanceId_result)that);
       return false;
@@ -6223,7 +6215,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -6489,8 +6481,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getZooKeepers_args)
         return this.equals((getZooKeepers_args)that);
       return false;
@@ -6800,8 +6790,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getZooKeepers_result)
         return this.equals((getZooKeepers_result)that);
       return false;
@@ -6844,7 +6832,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7491,8 +7479,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof bulkImportFiles_args)
         return this.equals((bulkImportFiles_args)that);
       return false;
@@ -7609,7 +7595,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7619,7 +7605,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7629,7 +7615,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTid()).compareTo(other.isSetTid());
+      lastComparison = java.lang.Boolean.compare(isSetTid(), other.isSetTid());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7639,7 +7625,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableId()).compareTo(other.isSetTableId());
+      lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7649,7 +7635,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetFiles()).compareTo(other.isSetFiles());
+      lastComparison = java.lang.Boolean.compare(isSetFiles(), other.isSetFiles());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7659,7 +7645,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetErrorDir()).compareTo(other.isSetErrorDir());
+      lastComparison = java.lang.Boolean.compare(isSetErrorDir(), other.isSetErrorDir());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7669,7 +7655,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSetTime()).compareTo(other.isSetSetTime());
+      lastComparison = java.lang.Boolean.compare(isSetSetTime(), other.isSetSetTime());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8012,7 +7998,7 @@ public class ClientService {
         }
         if (incoming.get(4)) {
           {
-            org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TList _list13 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
             struct.files = new java.util.ArrayList<java.lang.String>(_list13.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _elem14;
             for (int _i15 = 0; _i15 < _list13.size; ++_i15)
@@ -8330,8 +8316,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof bulkImportFiles_result)
         return this.equals((bulkImportFiles_result)that);
       return false;
@@ -8400,7 +8384,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8410,7 +8394,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8420,7 +8404,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8641,7 +8625,7 @@ public class ClientService {
         java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TList _list21 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
             struct.success = new java.util.ArrayList<java.lang.String>(_list21.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _elem22;
             for (int _i23 = 0; _i23 < _list21.size; ++_i23)
@@ -8893,8 +8877,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof isActive_args)
         return this.equals((isActive_args)that);
       return false;
@@ -8948,7 +8930,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8958,7 +8940,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTid()).compareTo(other.isSetTid());
+      lastComparison = java.lang.Boolean.compare(isSetTid(), other.isSetTid());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9314,8 +9296,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof isActive_result)
         return this.equals((isActive_result)that);
       return false;
@@ -9356,7 +9336,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9677,8 +9657,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof ping_args)
         return this.equals((ping_args)that);
       return false;
@@ -9721,7 +9699,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10049,8 +10027,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof ping_result)
         return this.equals((ping_result)that);
       return false;
@@ -10093,7 +10069,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10487,8 +10463,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getDiskUsage_args)
         return this.equals((getDiskUsage_args)that);
       return false;
@@ -10544,7 +10518,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTables()).compareTo(other.isSetTables());
+      lastComparison = java.lang.Boolean.compare(isSetTables(), other.isSetTables());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10554,7 +10528,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10750,7 +10724,7 @@ public class ClientService {
         java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TSet _set29 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TSet _set29 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING);
             struct.tables = new java.util.HashSet<java.lang.String>(2*_set29.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _elem30;
             for (int _i31 = 0; _i31 < _set29.size; ++_i31)
@@ -11068,8 +11042,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getDiskUsage_result)
         return this.equals((getDiskUsage_result)that);
       return false;
@@ -11138,7 +11110,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11148,7 +11120,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11158,7 +11130,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetToe()).compareTo(other.isSetToe());
+      lastComparison = java.lang.Boolean.compare(isSetToe(), other.isSetToe());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11380,7 +11352,7 @@ public class ClientService {
         java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list37 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            org.apache.thrift.protocol.TList _list37 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
             struct.success = new java.util.ArrayList<TDiskUsage>(_list37.size);
             @org.apache.thrift.annotation.Nullable TDiskUsage _elem38;
             for (int _i39 = 0; _i39 < _list37.size; ++_i39)
@@ -11632,8 +11604,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof listLocalUsers_args)
         return this.equals((listLocalUsers_args)that);
       return false;
@@ -11689,7 +11659,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11699,7 +11669,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12132,8 +12102,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof listLocalUsers_result)
         return this.equals((listLocalUsers_result)that);
       return false;
@@ -12189,7 +12157,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12199,7 +12167,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12392,7 +12360,7 @@ public class ClientService {
         java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TSet _set45 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TSet _set45 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING);
             struct.success = new java.util.HashSet<java.lang.String>(2*_set45.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _elem46;
             for (int _i47 = 0; _i47 < _set45.size; ++_i47)
@@ -12753,8 +12721,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof createLocalUser_args)
         return this.equals((createLocalUser_args)that);
       return false;
@@ -12836,7 +12802,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12846,7 +12812,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12856,7 +12822,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12866,7 +12832,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
+      lastComparison = java.lang.Boolean.compare(isSetPassword(), other.isSetPassword());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13292,8 +13258,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof createLocalUser_result)
         return this.equals((createLocalUser_result)that);
       return false;
@@ -13336,7 +13300,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13763,8 +13727,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof dropLocalUser_args)
         return this.equals((dropLocalUser_args)that);
       return false;
@@ -13833,7 +13795,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13843,7 +13805,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13853,7 +13815,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14248,8 +14210,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof dropLocalUser_result)
         return this.equals((dropLocalUser_result)that);
       return false;
@@ -14292,7 +14252,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14783,8 +14743,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof changeLocalUserPassword_args)
         return this.equals((changeLocalUserPassword_args)that);
       return false;
@@ -14866,7 +14824,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14876,7 +14834,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14886,7 +14844,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14896,7 +14854,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
+      lastComparison = java.lang.Boolean.compare(isSetPassword(), other.isSetPassword());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15322,8 +15280,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof changeLocalUserPassword_result)
         return this.equals((changeLocalUserPassword_result)that);
       return false;
@@ -15366,7 +15322,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15742,8 +15698,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof authenticate_args)
         return this.equals((authenticate_args)that);
       return false;
@@ -15799,7 +15753,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15809,7 +15763,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16225,8 +16179,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof authenticate_result)
         return this.equals((authenticate_result)that);
       return false;
@@ -16280,7 +16232,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16290,7 +16242,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16746,8 +16698,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof authenticateUser_args)
         return this.equals((authenticateUser_args)that);
       return false;
@@ -16816,7 +16766,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16826,7 +16776,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16836,7 +16786,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetToAuth()).compareTo(other.isSetToAuth());
+      lastComparison = java.lang.Boolean.compare(isSetToAuth(), other.isSetToAuth());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17288,8 +17238,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof authenticateUser_result)
         return this.equals((authenticateUser_result)that);
       return false;
@@ -17343,7 +17291,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17353,7 +17301,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17878,8 +17826,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof changeAuthorizations_args)
         return this.equals((changeAuthorizations_args)that);
       return false;
@@ -17961,7 +17907,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17971,7 +17917,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17981,7 +17927,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17991,7 +17937,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
+      lastComparison = java.lang.Boolean.compare(isSetAuthorizations(), other.isSetAuthorizations());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18259,7 +18205,7 @@ public class ClientService {
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TList _list53 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TList _list53 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
             struct.authorizations = new java.util.ArrayList<java.nio.ByteBuffer>(_list53.size);
             @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem54;
             for (int _i55 = 0; _i55 < _list53.size; ++_i55)
@@ -18449,8 +18395,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof changeAuthorizations_result)
         return this.equals((changeAuthorizations_result)that);
       return false;
@@ -18493,7 +18437,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18920,8 +18864,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getUserAuthorizations_args)
         return this.equals((getUserAuthorizations_args)that);
       return false;
@@ -18990,7 +18932,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19000,7 +18942,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19010,7 +18952,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19474,8 +19416,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getUserAuthorizations_result)
         return this.equals((getUserAuthorizations_result)that);
       return false;
@@ -19531,7 +19471,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19541,7 +19481,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19734,7 +19674,7 @@ public class ClientService {
         java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list61 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TList _list61 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
             struct.success = new java.util.ArrayList<java.nio.ByteBuffer>(_list61.size);
             @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem62;
             for (int _i63 = 0; _i63 < _list61.size; ++_i63)
@@ -20083,8 +20023,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof hasSystemPermission_args)
         return this.equals((hasSystemPermission_args)that);
       return false;
@@ -20164,7 +20102,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20174,7 +20112,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20184,7 +20122,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20194,7 +20132,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSysPerm()).compareTo(other.isSetSysPerm());
+      lastComparison = java.lang.Boolean.compare(isSetSysPerm(), other.isSetSysPerm());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20668,8 +20606,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof hasSystemPermission_result)
         return this.equals((hasSystemPermission_result)that);
       return false;
@@ -20723,7 +20659,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20733,7 +20669,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21292,8 +21228,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof hasTablePermission_args)
         return this.equals((hasTablePermission_args)that);
       return false;
@@ -21386,7 +21320,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21396,7 +21330,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21406,7 +21340,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21416,7 +21350,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
+      lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21426,7 +21360,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTblPerm()).compareTo(other.isSetTblPerm());
+      lastComparison = java.lang.Boolean.compare(isSetTblPerm(), other.isSetTblPerm());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21982,8 +21916,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof hasTablePermission_result)
         return this.equals((hasTablePermission_result)that);
       return false;
@@ -22050,7 +21982,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22060,7 +21992,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22070,7 +22002,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22662,8 +22594,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof hasNamespacePermission_args)
         return this.equals((hasNamespacePermission_args)that);
       return false;
@@ -22756,7 +22686,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22766,7 +22696,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22776,7 +22706,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22786,7 +22716,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNs()).compareTo(other.isSetNs());
+      lastComparison = java.lang.Boolean.compare(isSetNs(), other.isSetNs());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22796,7 +22726,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTblNspcPerm()).compareTo(other.isSetTblNspcPerm());
+      lastComparison = java.lang.Boolean.compare(isSetTblNspcPerm(), other.isSetTblNspcPerm());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -23352,8 +23282,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof hasNamespacePermission_result)
         return this.equals((hasNamespacePermission_result)that);
       return false;
@@ -23420,7 +23348,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -23430,7 +23358,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -23440,7 +23368,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -23981,8 +23909,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof grantSystemPermission_args)
         return this.equals((grantSystemPermission_args)that);
       return false;
@@ -24062,7 +23988,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -24072,7 +23998,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -24082,7 +24008,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -24092,7 +24018,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPermission()).compareTo(other.isSetPermission());
+      lastComparison = java.lang.Boolean.compare(isSetPermission(), other.isSetPermission());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -24514,8 +24440,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof grantSystemPermission_result)
         return this.equals((grantSystemPermission_result)that);
       return false;
@@ -24558,7 +24482,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25037,8 +24961,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof revokeSystemPermission_args)
         return this.equals((revokeSystemPermission_args)that);
       return false;
@@ -25118,7 +25040,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25128,7 +25050,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25138,7 +25060,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25148,7 +25070,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPermission()).compareTo(other.isSetPermission());
+      lastComparison = java.lang.Boolean.compare(isSetPermission(), other.isSetPermission());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25570,8 +25492,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof revokeSystemPermission_result)
         return this.equals((revokeSystemPermission_result)that);
       return false;
@@ -25614,7 +25534,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26144,8 +26064,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof grantTablePermission_args)
         return this.equals((grantTablePermission_args)that);
       return false;
@@ -26238,7 +26156,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26248,7 +26166,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26258,7 +26176,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26268,7 +26186,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
+      lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26278,7 +26196,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPermission()).compareTo(other.isSetPermission());
+      lastComparison = java.lang.Boolean.compare(isSetPermission(), other.isSetPermission());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26782,8 +26700,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof grantTablePermission_result)
         return this.equals((grantTablePermission_result)that);
       return false;
@@ -26839,7 +26755,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26849,7 +26765,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27412,8 +27328,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof revokeTablePermission_args)
         return this.equals((revokeTablePermission_args)that);
       return false;
@@ -27506,7 +27420,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27516,7 +27430,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27526,7 +27440,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27536,7 +27450,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
+      lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27546,7 +27460,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPermission()).compareTo(other.isSetPermission());
+      lastComparison = java.lang.Boolean.compare(isSetPermission(), other.isSetPermission());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -28050,8 +27964,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof revokeTablePermission_result)
         return this.equals((revokeTablePermission_result)that);
       return false;
@@ -28107,7 +28019,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -28117,7 +28029,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -28680,8 +28592,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof grantNamespacePermission_args)
         return this.equals((grantNamespacePermission_args)that);
       return false;
@@ -28774,7 +28684,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -28784,7 +28694,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -28794,7 +28704,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -28804,7 +28714,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNs()).compareTo(other.isSetNs());
+      lastComparison = java.lang.Boolean.compare(isSetNs(), other.isSetNs());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -28814,7 +28724,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPermission()).compareTo(other.isSetPermission());
+      lastComparison = java.lang.Boolean.compare(isSetPermission(), other.isSetPermission());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -29318,8 +29228,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof grantNamespacePermission_result)
         return this.equals((grantNamespacePermission_result)that);
       return false;
@@ -29375,7 +29283,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -29385,7 +29293,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -29948,8 +29856,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof revokeNamespacePermission_args)
         return this.equals((revokeNamespacePermission_args)that);
       return false;
@@ -30042,7 +29948,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30052,7 +29958,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30062,7 +29968,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+      lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30072,7 +29978,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNs()).compareTo(other.isSetNs());
+      lastComparison = java.lang.Boolean.compare(isSetNs(), other.isSetNs());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30082,7 +29988,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetPermission()).compareTo(other.isSetPermission());
+      lastComparison = java.lang.Boolean.compare(isSetPermission(), other.isSetPermission());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30586,8 +30492,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof revokeNamespacePermission_result)
         return this.equals((revokeNamespacePermission_result)that);
       return false;
@@ -30643,7 +30547,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30653,7 +30557,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -31129,8 +31033,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getConfiguration_args)
         return this.equals((getConfiguration_args)that);
       return false;
@@ -31199,7 +31101,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -31209,7 +31111,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -31219,7 +31121,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+      lastComparison = java.lang.Boolean.compare(isSetType(), other.isSetType());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -31628,8 +31530,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getConfiguration_result)
         return this.equals((getConfiguration_result)that);
       return false;
@@ -31672,7 +31572,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -31841,7 +31741,7 @@ public class ClientService {
         java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map70 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TMap _map70 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
             struct.success = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map70.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _key71;
             @org.apache.thrift.annotation.Nullable java.lang.String _val72;
@@ -32135,8 +32035,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getTableConfiguration_args)
         return this.equals((getTableConfiguration_args)that);
       return false;
@@ -32205,7 +32103,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -32215,7 +32113,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -32225,7 +32123,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
+      lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -32685,8 +32583,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getTableConfiguration_result)
         return this.equals((getTableConfiguration_result)that);
       return false;
@@ -32742,7 +32638,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -32752,7 +32648,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -32949,7 +32845,7 @@ public class ClientService {
         java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map80 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TMap _map80 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
             struct.success = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map80.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _key81;
             @org.apache.thrift.annotation.Nullable java.lang.String _val82;
@@ -33248,8 +33144,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getNamespaceConfiguration_args)
         return this.equals((getNamespaceConfiguration_args)that);
       return false;
@@ -33318,7 +33212,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -33328,7 +33222,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -33338,7 +33232,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNs()).compareTo(other.isSetNs());
+      lastComparison = java.lang.Boolean.compare(isSetNs(), other.isSetNs());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -33798,8 +33692,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getNamespaceConfiguration_result)
         return this.equals((getNamespaceConfiguration_result)that);
       return false;
@@ -33855,7 +33747,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -33865,7 +33757,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -34062,7 +33954,7 @@ public class ClientService {
         java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map90 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TMap _map90 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
             struct.success = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map90.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _key91;
             @org.apache.thrift.annotation.Nullable java.lang.String _val92;
@@ -34412,8 +34304,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof checkClass_args)
         return this.equals((checkClass_args)that);
       return false;
@@ -34495,7 +34385,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -34505,7 +34395,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -34515,7 +34405,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetClassName()).compareTo(other.isSetClassName());
+      lastComparison = java.lang.Boolean.compare(isSetClassName(), other.isSetClassName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -34525,7 +34415,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetInterfaceMatch()).compareTo(other.isSetInterfaceMatch());
+      lastComparison = java.lang.Boolean.compare(isSetInterfaceMatch(), other.isSetInterfaceMatch());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -34952,8 +34842,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof checkClass_result)
         return this.equals((checkClass_result)that);
       return false;
@@ -34994,7 +34882,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35519,8 +35407,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof checkTableClass_args)
         return this.equals((checkTableClass_args)that);
       return false;
@@ -35615,7 +35501,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35625,7 +35511,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35635,7 +35521,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableId()).compareTo(other.isSetTableId());
+      lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35645,7 +35531,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetClassName()).compareTo(other.isSetClassName());
+      lastComparison = java.lang.Boolean.compare(isSetClassName(), other.isSetClassName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35655,7 +35541,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetInterfaceMatch()).compareTo(other.isSetInterfaceMatch());
+      lastComparison = java.lang.Boolean.compare(isSetInterfaceMatch(), other.isSetInterfaceMatch());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -36215,8 +36101,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof checkTableClass_result)
         return this.equals((checkTableClass_result)that);
       return false;
@@ -36283,7 +36167,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -36293,7 +36177,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -36303,7 +36187,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -36894,8 +36778,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof checkNamespaceClass_args)
         return this.equals((checkNamespaceClass_args)that);
       return false;
@@ -36990,7 +36872,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -37000,7 +36882,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -37010,7 +36892,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNamespaceId()).compareTo(other.isSetNamespaceId());
+      lastComparison = java.lang.Boolean.compare(isSetNamespaceId(), other.isSetNamespaceId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -37020,7 +36902,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetClassName()).compareTo(other.isSetClassName());
+      lastComparison = java.lang.Boolean.compare(isSetClassName(), other.isSetClassName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -37030,7 +36912,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetInterfaceMatch()).compareTo(other.isSetInterfaceMatch());
+      lastComparison = java.lang.Boolean.compare(isSetInterfaceMatch(), other.isSetInterfaceMatch());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -37590,8 +37472,6 @@ public class ClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof checkNamespaceClass_result)
         return this.equals((checkNamespaceClass_result)that);
       return false;
@@ -37658,7 +37538,7 @@ public class ClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -37668,7 +37548,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -37678,7 +37558,7 @@ public class ClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java
index 4afb725..694211e 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ConfigurationType.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java
index 1dd5007..efcee87 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/SecurityErrorCode.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java
index 7b04e7d..b37975b 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TDiskUsage.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -266,8 +266,6 @@ public class TDiskUsage implements org.apache.thrift.TBase<TDiskUsage, TDiskUsag
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TDiskUsage)
       return this.equals((TDiskUsage)that);
     return false;
@@ -321,7 +319,7 @@ public class TDiskUsage implements org.apache.thrift.TBase<TDiskUsage, TDiskUsag
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetTables()).compareTo(other.isSetTables());
+    lastComparison = java.lang.Boolean.compare(isSetTables(), other.isSetTables());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -331,7 +329,7 @@ public class TDiskUsage implements org.apache.thrift.TBase<TDiskUsage, TDiskUsag
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetUsage()).compareTo(other.isSetUsage());
+    lastComparison = java.lang.Boolean.compare(isSetUsage(), other.isSetUsage());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -519,7 +517,7 @@ public class TDiskUsage implements org.apache.thrift.TBase<TDiskUsage, TDiskUsag
       java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.thrift.protocol.TList _list5 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
           struct.tables = new java.util.ArrayList<java.lang.String>(_list5.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _elem6;
           for (int _i7 = 0; _i7 < _list5.size; ++_i7)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java
index 5846572..6372398 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperation.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java
index 7f2a714..76c34dc 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/TableOperationExceptionType.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java
index 84498ba..0d86beb 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftNotActiveServiceException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -139,8 +139,6 @@ public class ThriftNotActiveServiceException extends org.apache.thrift.TExceptio
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ThriftNotActiveServiceException)
       return this.equals((ThriftNotActiveServiceException)that);
     return false;
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java
index 59dbd18..625e35d 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftSecurityException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -263,8 +263,6 @@ public class ThriftSecurityException extends org.apache.thrift.TException implem
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ThriftSecurityException)
       return this.equals((ThriftSecurityException)that);
     return false;
@@ -320,7 +318,7 @@ public class ThriftSecurityException extends org.apache.thrift.TException implem
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetUser()).compareTo(other.isSetUser());
+    lastComparison = java.lang.Boolean.compare(isSetUser(), other.isSetUser());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -330,7 +328,7 @@ public class ThriftSecurityException extends org.apache.thrift.TException implem
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetCode()).compareTo(other.isSetCode());
+    lastComparison = java.lang.Boolean.compare(isSetCode(), other.isSetCode());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java
index 33d9538..0f3c772 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTableOperationException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -432,8 +432,6 @@ public class ThriftTableOperationException extends org.apache.thrift.TException
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ThriftTableOperationException)
       return this.equals((ThriftTableOperationException)that);
     return false;
@@ -528,7 +526,7 @@ public class ThriftTableOperationException extends org.apache.thrift.TException
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetTableId()).compareTo(other.isSetTableId());
+    lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -538,7 +536,7 @@ public class ThriftTableOperationException extends org.apache.thrift.TException
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
+    lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -548,7 +546,7 @@ public class ThriftTableOperationException extends org.apache.thrift.TException
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetOp()).compareTo(other.isSetOp());
+    lastComparison = java.lang.Boolean.compare(isSetOp(), other.isSetOp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -558,7 +556,7 @@ public class ThriftTableOperationException extends org.apache.thrift.TException
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+    lastComparison = java.lang.Boolean.compare(isSetType(), other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -568,7 +566,7 @@ public class ThriftTableOperationException extends org.apache.thrift.TException
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = java.lang.Boolean.compare(isSetDescription(), other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java
index a298551..54f3373 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/clientImpl/thrift/ThriftTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -667,8 +667,6 @@ public class ThriftTest {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof success_args)
         return this.equals((success_args)that);
       return false;
@@ -979,8 +977,6 @@ public class ThriftTest {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof success_result)
         return this.equals((success_result)that);
       return false;
@@ -1021,7 +1017,7 @@ public class ThriftTest {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1285,8 +1281,6 @@ public class ThriftTest {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof fails_args)
         return this.equals((fails_args)that);
       return false;
@@ -1597,8 +1591,6 @@ public class ThriftTest {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof fails_result)
         return this.equals((fails_result)that);
       return false;
@@ -1639,7 +1631,7 @@ public class ThriftTest {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1903,8 +1895,6 @@ public class ThriftTest {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof throwsError_args)
         return this.equals((throwsError_args)that);
       return false;
@@ -2266,8 +2256,6 @@ public class ThriftTest {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof throwsError_result)
         return this.equals((throwsError_result)that);
       return false;
@@ -2321,7 +2309,7 @@ public class ThriftTest {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2331,7 +2319,7 @@ public class ThriftTest {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetEx()).compareTo(other.isSetEx());
+      lastComparison = java.lang.Boolean.compare(isSetEx(), other.isSetEx());
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinatorService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinatorService.java
index a1abd9c..aa8ca9d 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinatorService.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactionCoordinatorService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -1122,8 +1122,6 @@ public class CompactionCoordinatorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof compactionCompleted_args)
         return this.equals((compactionCompleted_args)that);
       return false;
@@ -1218,7 +1216,7 @@ public class CompactionCoordinatorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1228,7 +1226,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1238,7 +1236,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetExternalCompactionId()).compareTo(other.isSetExternalCompactionId());
+      lastComparison = java.lang.Boolean.compare(isSetExternalCompactionId(), other.isSetExternalCompactionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1248,7 +1246,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent());
+      lastComparison = java.lang.Boolean.compare(isSetExtent(), other.isSetExtent());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1258,7 +1256,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetStats()).compareTo(other.isSetStats());
+      lastComparison = java.lang.Boolean.compare(isSetStats(), other.isSetStats());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1668,8 +1666,6 @@ public class CompactionCoordinatorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof compactionCompleted_result)
         return this.equals((compactionCompleted_result)that);
       return false;
@@ -2183,8 +2179,6 @@ public class CompactionCoordinatorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getCompactionJob_args)
         return this.equals((getCompactionJob_args)that);
       return false;
@@ -2279,7 +2273,7 @@ public class CompactionCoordinatorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2289,7 +2283,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2299,7 +2293,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetQueueName()).compareTo(other.isSetQueueName());
+      lastComparison = java.lang.Boolean.compare(isSetQueueName(), other.isSetQueueName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2309,7 +2303,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCompactor()).compareTo(other.isSetCompactor());
+      lastComparison = java.lang.Boolean.compare(isSetCompactor(), other.isSetCompactor());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2319,7 +2313,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetExternalCompactionId()).compareTo(other.isSetExternalCompactionId());
+      lastComparison = java.lang.Boolean.compare(isSetExternalCompactionId(), other.isSetExternalCompactionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2776,8 +2770,6 @@ public class CompactionCoordinatorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getCompactionJob_result)
         return this.equals((getCompactionJob_result)that);
       return false;
@@ -2820,7 +2812,7 @@ public class CompactionCoordinatorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3420,8 +3412,6 @@ public class CompactionCoordinatorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof updateCompactionStatus_args)
         return this.equals((updateCompactionStatus_args)that);
       return false;
@@ -3527,7 +3517,7 @@ public class CompactionCoordinatorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3537,7 +3527,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3547,7 +3537,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetExternalCompactionId()).compareTo(other.isSetExternalCompactionId());
+      lastComparison = java.lang.Boolean.compare(isSetExternalCompactionId(), other.isSetExternalCompactionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3557,7 +3547,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetState()).compareTo(other.isSetState());
+      lastComparison = java.lang.Boolean.compare(isSetState(), other.isSetState());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3567,7 +3557,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+      lastComparison = java.lang.Boolean.compare(isSetMessage(), other.isSetMessage());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3577,7 +3567,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
+      lastComparison = java.lang.Boolean.compare(isSetTimestamp(), other.isSetTimestamp());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4004,8 +3994,6 @@ public class CompactionCoordinatorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof updateCompactionStatus_result)
         return this.equals((updateCompactionStatus_result)that);
       return false;
@@ -4468,8 +4456,6 @@ public class CompactionCoordinatorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof compactionFailed_args)
         return this.equals((compactionFailed_args)that);
       return false;
@@ -4551,7 +4537,7 @@ public class CompactionCoordinatorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4561,7 +4547,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4571,7 +4557,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetExternalCompactionId()).compareTo(other.isSetExternalCompactionId());
+      lastComparison = java.lang.Boolean.compare(isSetExternalCompactionId(), other.isSetExternalCompactionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4581,7 +4567,7 @@ public class CompactionCoordinatorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent());
+      lastComparison = java.lang.Boolean.compare(isSetExtent(), other.isSetExtent());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4955,8 +4941,6 @@ public class CompactionCoordinatorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof compactionFailed_result)
         return this.equals((compactionFailed_result)that);
       return false;
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactorService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactorService.java
index 4530c5f..f9f2cb0 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactorService.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/CompactorService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -815,8 +815,6 @@ public class CompactorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getRunningCompaction_args)
         return this.equals((getRunningCompaction_args)that);
       return false;
@@ -872,7 +870,7 @@ public class CompactorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -882,7 +880,7 @@ public class CompactorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1297,8 +1295,6 @@ public class CompactorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getRunningCompaction_result)
         return this.equals((getRunningCompaction_result)that);
       return false;
@@ -1354,7 +1350,7 @@ public class CompactorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1364,7 +1360,7 @@ public class CompactorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1776,8 +1772,6 @@ public class CompactorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getRunningCompactionId_args)
         return this.equals((getRunningCompactionId_args)that);
       return false;
@@ -1833,7 +1827,7 @@ public class CompactorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1843,7 +1837,7 @@ public class CompactorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2258,8 +2252,6 @@ public class CompactorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getRunningCompactionId_result)
         return this.equals((getRunningCompactionId_result)that);
       return false;
@@ -2315,7 +2307,7 @@ public class CompactorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2325,7 +2317,7 @@ public class CompactorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2732,8 +2724,6 @@ public class CompactorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getActiveCompactions_args)
         return this.equals((getActiveCompactions_args)that);
       return false;
@@ -2789,7 +2779,7 @@ public class CompactorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2799,7 +2789,7 @@ public class CompactorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3235,8 +3225,6 @@ public class CompactorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getActiveCompactions_result)
         return this.equals((getActiveCompactions_result)that);
       return false;
@@ -3292,7 +3280,7 @@ public class CompactorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3302,7 +3290,7 @@ public class CompactorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3496,7 +3484,7 @@ public class CompactorService {
         java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            org.apache.thrift.protocol.TList _list5 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
             struct.success = new java.util.ArrayList<org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction>(_list5.size);
             @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction _elem6;
             for (int _i7 = 0; _i7 < _list5.size; ++_i7)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/Status.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/Status.java
index bd505d4..4b94e1c 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/Status.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/Status.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -417,8 +417,6 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>,
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof Status)
       return this.equals((Status)that);
     return false;
@@ -511,7 +509,7 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>,
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
+    lastComparison = java.lang.Boolean.compare(isSetTimestamp(), other.isSetTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -521,7 +519,7 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetExternalCompactionId()).compareTo(other.isSetExternalCompactionId());
+    lastComparison = java.lang.Boolean.compare(isSetExternalCompactionId(), other.isSetExternalCompactionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -531,7 +529,7 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetCompactor()).compareTo(other.isSetCompactor());
+    lastComparison = java.lang.Boolean.compare(isSetCompactor(), other.isSetCompactor());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -541,7 +539,7 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetState()).compareTo(other.isSetState());
+    lastComparison = java.lang.Boolean.compare(isSetState(), other.isSetState());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -551,7 +549,7 @@ public class Status implements org.apache.thrift.TBase<Status, Status._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = java.lang.Boolean.compare(isSetMessage(), other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionState.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionState.java
index 815c8d8..5e0cb52 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionState.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/TCompactionState.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/UnknownCompactionIdException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/UnknownCompactionIdException.java
index d6ae20f..dbba18c 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/UnknownCompactionIdException.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/compaction/thrift/UnknownCompactionIdException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -139,8 +139,6 @@ public class UnknownCompactionIdException extends org.apache.thrift.TException i
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof UnknownCompactionIdException)
       return this.equals((UnknownCompactionIdException)that);
     return false;
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java
index a70489d..3209c9e 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialMultiScan.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -248,8 +248,6 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof InitialMultiScan)
       return this.equals((InitialMultiScan)that);
     return false;
@@ -303,7 +301,7 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
+    lastComparison = java.lang.Boolean.compare(isSetScanID(), other.isSetScanID());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -313,7 +311,7 @@ public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetResult()).compareTo(other.isSetResult());
+    lastComparison = java.lang.Boolean.compare(isSetResult(), other.isSetResult());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java
index 4533fec..c18d439 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/InitialScan.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -248,8 +248,6 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof InitialScan)
       return this.equals((InitialScan)that);
     return false;
@@ -303,7 +301,7 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
+    lastComparison = java.lang.Boolean.compare(isSetScanID(), other.isSetScanID());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -313,7 +311,7 @@ public class InitialScan implements org.apache.thrift.TBase<InitialScan, Initial
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetResult()).compareTo(other.isSetResult());
+    lastComparison = java.lang.Boolean.compare(isSetResult(), other.isSetResult());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java
index 9ad4288..5b129e8 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/IterInfo.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -299,8 +299,6 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof IterInfo)
       return this.equals((IterInfo)that);
     return false;
@@ -367,7 +365,7 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetPriority()).compareTo(other.isSetPriority());
+    lastComparison = java.lang.Boolean.compare(isSetPriority(), other.isSetPriority());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -377,7 +375,7 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetClassName()).compareTo(other.isSetClassName());
+    lastComparison = java.lang.Boolean.compare(isSetClassName(), other.isSetClassName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -387,7 +385,7 @@ public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIterName()).compareTo(other.isSetIterName());
+    lastComparison = java.lang.Boolean.compare(isSetIterName(), other.isSetIterName());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java
index 0dbc331..45c3438 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MapFileInfo.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -197,8 +197,6 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof MapFileInfo)
       return this.equals((MapFileInfo)that);
     return false;
@@ -239,7 +237,7 @@ public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFile
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetEstimatedSize()).compareTo(other.isSetEstimatedSize());
+    lastComparison = java.lang.Boolean.compare(isSetEstimatedSize(), other.isSetEstimatedSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java
index 417a997..b8b6636 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/MultiScanResult.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -570,8 +570,6 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof MultiScanResult)
       return this.equals((MultiScanResult)that);
     return false;
@@ -688,7 +686,7 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetResults()).compareTo(other.isSetResults());
+    lastComparison = java.lang.Boolean.compare(isSetResults(), other.isSetResults());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -698,7 +696,7 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetFailures()).compareTo(other.isSetFailures());
+    lastComparison = java.lang.Boolean.compare(isSetFailures(), other.isSetFailures());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -708,7 +706,7 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetFullScans()).compareTo(other.isSetFullScans());
+    lastComparison = java.lang.Boolean.compare(isSetFullScans(), other.isSetFullScans());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -718,7 +716,7 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetPartScan()).compareTo(other.isSetPartScan());
+    lastComparison = java.lang.Boolean.compare(isSetPartScan(), other.isSetPartScan());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -728,7 +726,7 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetPartNextKey()).compareTo(other.isSetPartNextKey());
+    lastComparison = java.lang.Boolean.compare(isSetPartNextKey(), other.isSetPartNextKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -738,7 +736,7 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetPartNextKeyInclusive()).compareTo(other.isSetPartNextKeyInclusive());
+    lastComparison = java.lang.Boolean.compare(isSetPartNextKeyInclusive(), other.isSetPartNextKeyInclusive());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -748,7 +746,7 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetMore()).compareTo(other.isSetMore());
+    lastComparison = java.lang.Boolean.compare(isSetMore(), other.isSetMore());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1150,7 +1148,7 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
       java.util.BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list45 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.results = new java.util.ArrayList<TKeyValue>(_list45.size);
           @org.apache.thrift.annotation.Nullable TKeyValue _elem46;
           for (int _i47 = 0; _i47 < _list45.size; ++_i47)
@@ -1164,7 +1162,7 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TMap _map48 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST); 
           struct.failures = new java.util.HashMap<TKeyExtent,java.util.List<TRange>>(2*_map48.size);
           @org.apache.thrift.annotation.Nullable TKeyExtent _key49;
           @org.apache.thrift.annotation.Nullable java.util.List<TRange> _val50;
@@ -1173,7 +1171,7 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
             _key49 = new TKeyExtent();
             _key49.read(iprot);
             {
-              org.apache.thrift.protocol.TList _list52 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+              org.apache.thrift.protocol.TList _list52 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
               _val50 = new java.util.ArrayList<TRange>(_list52.size);
               @org.apache.thrift.annotation.Nullable TRange _elem53;
               for (int _i54 = 0; _i54 < _list52.size; ++_i54)
@@ -1190,7 +1188,7 @@ public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult,
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list55 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list55 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.fullScans = new java.util.ArrayList<TKeyExtent>(_list55.size);
           @org.apache.thrift.annotation.Nullable TKeyExtent _elem56;
           for (int _i57 = 0; _i57 < _list55.size; ++_i57)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java
index 3307fdd..f91e691 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/ScanResult.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -269,8 +269,6 @@ public class ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResul
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ScanResult)
       return this.equals((ScanResult)that);
     return false;
@@ -324,7 +322,7 @@ public class ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResul
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetResults()).compareTo(other.isSetResults());
+    lastComparison = java.lang.Boolean.compare(isSetResults(), other.isSetResults());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -334,7 +332,7 @@ public class ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResul
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetMore()).compareTo(other.isSetMore());
+    lastComparison = java.lang.Boolean.compare(isSetMore(), other.isSetMore());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -523,7 +521,7 @@ public class ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResul
       java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list21 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.results = new java.util.ArrayList<TKeyValue>(_list21.size);
           @org.apache.thrift.annotation.Nullable TKeyValue _elem22;
           for (int _i23 = 0; _i23 < _list21.size; ++_i23)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java
index 80a342d..6508f0f 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMResult.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -264,8 +264,6 @@ public class TCMResult implements org.apache.thrift.TBase<TCMResult, TCMResult._
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TCMResult)
       return this.equals((TCMResult)that);
     return false;
@@ -319,7 +317,7 @@ public class TCMResult implements org.apache.thrift.TBase<TCMResult, TCMResult._
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetCmid()).compareTo(other.isSetCmid());
+    lastComparison = java.lang.Boolean.compare(isSetCmid(), other.isSetCmid());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -329,7 +327,7 @@ public class TCMResult implements org.apache.thrift.TBase<TCMResult, TCMResult._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
+    lastComparison = java.lang.Boolean.compare(isSetStatus(), other.isSetStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java
index 7f6832e..c11e300 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCMStatus.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java
index 372dc0d..7b2ef5a 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TColumn.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -337,8 +337,6 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TColumn)
       return this.equals((TColumn)that);
     return false;
@@ -407,7 +405,7 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetColumnFamily()).compareTo(other.isSetColumnFamily());
+    lastComparison = java.lang.Boolean.compare(isSetColumnFamily(), other.isSetColumnFamily());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -417,7 +415,7 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetColumnQualifier()).compareTo(other.isSetColumnQualifier());
+    lastComparison = java.lang.Boolean.compare(isSetColumnQualifier(), other.isSetColumnQualifier());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -427,7 +425,7 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetColumnVisibility()).compareTo(other.isSetColumnVisibility());
+    lastComparison = java.lang.Boolean.compare(isSetColumnVisibility(), other.isSetColumnVisibility());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java
index f576d72..ec6b01e 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TCondition.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -567,8 +567,6 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TCondition)
       return this.equals((TCondition)that);
     return false;
@@ -685,7 +683,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetCf()).compareTo(other.isSetCf());
+    lastComparison = java.lang.Boolean.compare(isSetCf(), other.isSetCf());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -695,7 +693,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetCq()).compareTo(other.isSetCq());
+    lastComparison = java.lang.Boolean.compare(isSetCq(), other.isSetCq());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -705,7 +703,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetCv()).compareTo(other.isSetCv());
+    lastComparison = java.lang.Boolean.compare(isSetCv(), other.isSetCv());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -715,7 +713,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetTs()).compareTo(other.isSetTs());
+    lastComparison = java.lang.Boolean.compare(isSetTs(), other.isSetTs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -725,7 +723,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetHasTimestamp()).compareTo(other.isSetHasTimestamp());
+    lastComparison = java.lang.Boolean.compare(isSetHasTimestamp(), other.isSetHasTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -735,7 +733,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetVal()).compareTo(other.isSetVal());
+    lastComparison = java.lang.Boolean.compare(isSetVal(), other.isSetVal());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -745,7 +743,7 @@ public class TCondition implements org.apache.thrift.TBase<TCondition, TConditio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators());
+    lastComparison = java.lang.Boolean.compare(isSetIterators(), other.isSetIterators());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java
index 4aca776..65cc907 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalMutation.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -320,8 +320,6 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TConditionalMutation)
       return this.equals((TConditionalMutation)that);
     return false;
@@ -388,7 +386,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetConditions()).compareTo(other.isSetConditions());
+    lastComparison = java.lang.Boolean.compare(isSetConditions(), other.isSetConditions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -398,7 +396,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetMutation()).compareTo(other.isSetMutation());
+    lastComparison = java.lang.Boolean.compare(isSetMutation(), other.isSetMutation());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -408,7 +406,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetId()).compareTo(other.isSetId());
+    lastComparison = java.lang.Boolean.compare(isSetId(), other.isSetId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -628,7 +626,7 @@ public class TConditionalMutation implements org.apache.thrift.TBase<TConditiona
       java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list91 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list91 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.conditions = new java.util.ArrayList<TCondition>(_list91.size);
           @org.apache.thrift.annotation.Nullable TCondition _elem92;
           for (int _i93 = 0; _i93 < _list91.size; ++_i93)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java
index 8500434..36650b6 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConditionalSession.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -298,8 +298,6 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TConditionalSession)
       return this.equals((TConditionalSession)that);
     return false;
@@ -364,7 +362,7 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+    lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -374,7 +372,7 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetTserverLock()).compareTo(other.isSetTserverLock());
+    lastComparison = java.lang.Boolean.compare(isSetTserverLock(), other.isSetTserverLock());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -384,7 +382,7 @@ public class TConditionalSession implements org.apache.thrift.TBase<TConditional
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetTtl()).compareTo(other.isSetTtl());
+    lastComparison = java.lang.Boolean.compare(isSetTtl(), other.isSetTtl());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java
index b732530..72779be 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TConstraintViolationSummary.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -349,8 +349,6 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TConstraintViolationSummary)
       return this.equals((TConstraintViolationSummary)that);
     return false;
@@ -428,7 +426,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetConstrainClass()).compareTo(other.isSetConstrainClass());
+    lastComparison = java.lang.Boolean.compare(isSetConstrainClass(), other.isSetConstrainClass());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -438,7 +436,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetViolationCode()).compareTo(other.isSetViolationCode());
+    lastComparison = java.lang.Boolean.compare(isSetViolationCode(), other.isSetViolationCode());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -448,7 +446,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetViolationDescription()).compareTo(other.isSetViolationDescription());
+    lastComparison = java.lang.Boolean.compare(isSetViolationDescription(), other.isSetViolationDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -458,7 +456,7 @@ public class TConstraintViolationSummary implements org.apache.thrift.TBase<TCon
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetNumberOfViolatingMutations()).compareTo(other.isSetNumberOfViolatingMutations());
+    lastComparison = java.lang.Boolean.compare(isSetNumberOfViolatingMutations(), other.isSetNumberOfViolatingMutations());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKey.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKey.java
index f9b50f7..bd5b876 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKey.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKey.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -453,8 +453,6 @@ public class TKey implements org.apache.thrift.TBase<TKey, TKey._Fields>, java.i
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TKey)
       return this.equals((TKey)that);
     return false;
@@ -547,7 +545,7 @@ public class TKey implements org.apache.thrift.TBase<TKey, TKey._Fields>, java.i
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
+    lastComparison = java.lang.Boolean.compare(isSetRow(), other.isSetRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -557,7 +555,7 @@ public class TKey implements org.apache.thrift.TBase<TKey, TKey._Fields>, java.i
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetColFamily()).compareTo(other.isSetColFamily());
+    lastComparison = java.lang.Boolean.compare(isSetColFamily(), other.isSetColFamily());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -567,7 +565,7 @@ public class TKey implements org.apache.thrift.TBase<TKey, TKey._Fields>, java.i
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetColQualifier()).compareTo(other.isSetColQualifier());
+    lastComparison = java.lang.Boolean.compare(isSetColQualifier(), other.isSetColQualifier());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -577,7 +575,7 @@ public class TKey implements org.apache.thrift.TBase<TKey, TKey._Fields>, java.i
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetColVisibility()).compareTo(other.isSetColVisibility());
+    lastComparison = java.lang.Boolean.compare(isSetColVisibility(), other.isSetColVisibility());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -587,7 +585,7 @@ public class TKey implements org.apache.thrift.TBase<TKey, TKey._Fields>, java.i
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
+    lastComparison = java.lang.Boolean.compare(isSetTimestamp(), other.isSetTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java
index 13f77d3..9aa183a 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyExtent.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -337,8 +337,6 @@ public class TKeyExtent implements org.apache.thrift.TBase<TKeyExtent, TKeyExten
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TKeyExtent)
       return this.equals((TKeyExtent)that);
     return false;
@@ -407,7 +405,7 @@ public class TKeyExtent implements org.apache.thrift.TBase<TKeyExtent, TKeyExten
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetTable()).compareTo(other.isSetTable());
+    lastComparison = java.lang.Boolean.compare(isSetTable(), other.isSetTable());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -417,7 +415,7 @@ public class TKeyExtent implements org.apache.thrift.TBase<TKeyExtent, TKeyExten
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetEndRow()).compareTo(other.isSetEndRow());
+    lastComparison = java.lang.Boolean.compare(isSetEndRow(), other.isSetEndRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -427,7 +425,7 @@ public class TKeyExtent implements org.apache.thrift.TBase<TKeyExtent, TKeyExten
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetPrevEndRow()).compareTo(other.isSetPrevEndRow());
+    lastComparison = java.lang.Boolean.compare(isSetPrevEndRow(), other.isSetPrevEndRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java
index bca4d1a..11be77f 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TKeyValue.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -260,8 +260,6 @@ public class TKeyValue implements org.apache.thrift.TBase<TKeyValue, TKeyValue._
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TKeyValue)
       return this.equals((TKeyValue)that);
     return false;
@@ -317,7 +315,7 @@ public class TKeyValue implements org.apache.thrift.TBase<TKeyValue, TKeyValue._
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
+    lastComparison = java.lang.Boolean.compare(isSetKey(), other.isSetKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -327,7 +325,7 @@ public class TKeyValue implements org.apache.thrift.TBase<TKeyValue, TKeyValue._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+    lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java
index 55f0ca8..62c038f 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TMutation.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -462,8 +462,6 @@ public class TMutation implements org.apache.thrift.TBase<TMutation, TMutation._
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TMutation)
       return this.equals((TMutation)that);
     return false;
@@ -556,7 +554,7 @@ public class TMutation implements org.apache.thrift.TBase<TMutation, TMutation._
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
+    lastComparison = java.lang.Boolean.compare(isSetRow(), other.isSetRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -566,7 +564,7 @@ public class TMutation implements org.apache.thrift.TBase<TMutation, TMutation._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetData()).compareTo(other.isSetData());
+    lastComparison = java.lang.Boolean.compare(isSetData(), other.isSetData());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -576,7 +574,7 @@ public class TMutation implements org.apache.thrift.TBase<TMutation, TMutation._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetValues()).compareTo(other.isSetValues());
+    lastComparison = java.lang.Boolean.compare(isSetValues(), other.isSetValues());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -586,7 +584,7 @@ public class TMutation implements org.apache.thrift.TBase<TMutation, TMutation._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetEntries()).compareTo(other.isSetEntries());
+    lastComparison = java.lang.Boolean.compare(isSetEntries(), other.isSetEntries());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -596,7 +594,7 @@ public class TMutation implements org.apache.thrift.TBase<TMutation, TMutation._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSources()).compareTo(other.isSetSources());
+    lastComparison = java.lang.Boolean.compare(isSetSources(), other.isSetSources());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -900,7 +898,7 @@ public class TMutation implements org.apache.thrift.TBase<TMutation, TMutation._
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list10 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.thrift.protocol.TList _list10 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
           struct.values = new java.util.ArrayList<java.nio.ByteBuffer>(_list10.size);
           @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem11;
           for (int _i12 = 0; _i12 < _list10.size; ++_i12)
@@ -917,7 +915,7 @@ public class TMutation implements org.apache.thrift.TBase<TMutation, TMutation._
       }
       if (incoming.get(4)) {
         {
-          org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.thrift.protocol.TList _list13 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
           struct.sources = new java.util.ArrayList<java.lang.String>(_list13.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _elem14;
           for (int _i15 = 0; _i15 < _list13.size; ++_i15)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java
index 7b88378..6322c69 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRange.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -449,8 +449,6 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>,
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TRange)
       return this.equals((TRange)that);
     return false;
@@ -550,7 +548,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>,
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetStart()).compareTo(other.isSetStart());
+    lastComparison = java.lang.Boolean.compare(isSetStart(), other.isSetStart());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -560,7 +558,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetStop()).compareTo(other.isSetStop());
+    lastComparison = java.lang.Boolean.compare(isSetStop(), other.isSetStop());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -570,7 +568,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetStartKeyInclusive()).compareTo(other.isSetStartKeyInclusive());
+    lastComparison = java.lang.Boolean.compare(isSetStartKeyInclusive(), other.isSetStartKeyInclusive());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -580,7 +578,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetStopKeyInclusive()).compareTo(other.isSetStopKeyInclusive());
+    lastComparison = java.lang.Boolean.compare(isSetStopKeyInclusive(), other.isSetStopKeyInclusive());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -590,7 +588,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetInfiniteStartKey()).compareTo(other.isSetInfiniteStartKey());
+    lastComparison = java.lang.Boolean.compare(isSetInfiniteStartKey(), other.isSetInfiniteStartKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -600,7 +598,7 @@ public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetInfiniteStopKey()).compareTo(other.isSetInfiniteStopKey());
+    lastComparison = java.lang.Boolean.compare(isSetInfiniteStopKey(), other.isSetInfiniteStopKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java
index ce9d7ea..c2f684c 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TRowRange.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -273,8 +273,6 @@ public class TRowRange implements org.apache.thrift.TBase<TRowRange, TRowRange._
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TRowRange)
       return this.equals((TRowRange)that);
     return false;
@@ -330,7 +328,7 @@ public class TRowRange implements org.apache.thrift.TBase<TRowRange, TRowRange._
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetStartRow()).compareTo(other.isSetStartRow());
+    lastComparison = java.lang.Boolean.compare(isSetStartRow(), other.isSetStartRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -340,7 +338,7 @@ public class TRowRange implements org.apache.thrift.TBase<TRowRange, TRowRange._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetEndRow()).compareTo(other.isSetEndRow());
+    lastComparison = java.lang.Boolean.compare(isSetEndRow(), other.isSetEndRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java
index fa28593..4293fcc 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaries.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -419,8 +419,6 @@ public class TSummaries implements org.apache.thrift.TBase<TSummaries, TSummarie
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TSummaries)
       return this.equals((TSummaries)that);
     return false;
@@ -507,7 +505,7 @@ public class TSummaries implements org.apache.thrift.TBase<TSummaries, TSummarie
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetFinished()).compareTo(other.isSetFinished());
+    lastComparison = java.lang.Boolean.compare(isSetFinished(), other.isSetFinished());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -517,7 +515,7 @@ public class TSummaries implements org.apache.thrift.TBase<TSummaries, TSummarie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+    lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -527,7 +525,7 @@ public class TSummaries implements org.apache.thrift.TBase<TSummaries, TSummarie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetTotalFiles()).compareTo(other.isSetTotalFiles());
+    lastComparison = java.lang.Boolean.compare(isSetTotalFiles(), other.isSetTotalFiles());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -537,7 +535,7 @@ public class TSummaries implements org.apache.thrift.TBase<TSummaries, TSummarie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetDeletedFiles()).compareTo(other.isSetDeletedFiles());
+    lastComparison = java.lang.Boolean.compare(isSetDeletedFiles(), other.isSetDeletedFiles());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -547,7 +545,7 @@ public class TSummaries implements org.apache.thrift.TBase<TSummaries, TSummarie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSummaries()).compareTo(other.isSetSummaries());
+    lastComparison = java.lang.Boolean.compare(isSetSummaries(), other.isSetSummaries());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -815,7 +813,7 @@ public class TSummaries implements org.apache.thrift.TBase<TSummaries, TSummarie
       }
       if (incoming.get(4)) {
         {
-          org.apache.thrift.protocol.TList _list119 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list119 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.summaries = new java.util.ArrayList<TSummary>(_list119.size);
           @org.apache.thrift.annotation.Nullable TSummary _elem120;
           for (int _i121 = 0; _i121 < _list119.size; ++_i121)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java
index 87c2508..9f6d5b0 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummarizerConfiguration.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -312,8 +312,6 @@ public class TSummarizerConfiguration implements org.apache.thrift.TBase<TSummar
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TSummarizerConfiguration)
       return this.equals((TSummarizerConfiguration)that);
     return false;
@@ -382,7 +380,7 @@ public class TSummarizerConfiguration implements org.apache.thrift.TBase<TSummar
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetClassname()).compareTo(other.isSetClassname());
+    lastComparison = java.lang.Boolean.compare(isSetClassname(), other.isSetClassname());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -392,7 +390,7 @@ public class TSummarizerConfiguration implements org.apache.thrift.TBase<TSummar
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetOptions()).compareTo(other.isSetOptions());
+    lastComparison = java.lang.Boolean.compare(isSetOptions(), other.isSetOptions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -402,7 +400,7 @@ public class TSummarizerConfiguration implements org.apache.thrift.TBase<TSummar
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetConfigId()).compareTo(other.isSetConfigId());
+    lastComparison = java.lang.Boolean.compare(isSetConfigId(), other.isSetConfigId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -629,7 +627,7 @@ public class TSummarizerConfiguration implements org.apache.thrift.TBase<TSummar
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TMap _map100 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map100 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
           struct.options = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map100.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key101;
           @org.apache.thrift.annotation.Nullable java.lang.String _val102;
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java
index 21ce90b..ad570fc 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummary.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -413,8 +413,6 @@ public class TSummary implements org.apache.thrift.TBase<TSummary, TSummary._Fie
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TSummary)
       return this.equals((TSummary)that);
     return false;
@@ -503,7 +501,7 @@ public class TSummary implements org.apache.thrift.TBase<TSummary, TSummary._Fie
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetSummary()).compareTo(other.isSetSummary());
+    lastComparison = java.lang.Boolean.compare(isSetSummary(), other.isSetSummary());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -513,7 +511,7 @@ public class TSummary implements org.apache.thrift.TBase<TSummary, TSummary._Fie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetConfig()).compareTo(other.isSetConfig());
+    lastComparison = java.lang.Boolean.compare(isSetConfig(), other.isSetConfig());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -523,7 +521,7 @@ public class TSummary implements org.apache.thrift.TBase<TSummary, TSummary._Fie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetFilesContaining()).compareTo(other.isSetFilesContaining());
+    lastComparison = java.lang.Boolean.compare(isSetFilesContaining(), other.isSetFilesContaining());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -533,7 +531,7 @@ public class TSummary implements org.apache.thrift.TBase<TSummary, TSummary._Fie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetFilesExceeding()).compareTo(other.isSetFilesExceeding());
+    lastComparison = java.lang.Boolean.compare(isSetFilesExceeding(), other.isSetFilesExceeding());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -543,7 +541,7 @@ public class TSummary implements org.apache.thrift.TBase<TSummary, TSummary._Fie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetFilesLarge()).compareTo(other.isSetFilesLarge());
+    lastComparison = java.lang.Boolean.compare(isSetFilesLarge(), other.isSetFilesLarge());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -808,7 +806,7 @@ public class TSummary implements org.apache.thrift.TBase<TSummary, TSummary._Fie
       java.util.BitSet incoming = iprot.readBitSet(5);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map110 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map110 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64); 
           struct.summary = new java.util.HashMap<java.lang.String,java.lang.Long>(2*_map110.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key111;
           long _val112;
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java
index f07d829..851f099 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/TSummaryRequest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -370,8 +370,6 @@ public class TSummaryRequest implements org.apache.thrift.TBase<TSummaryRequest,
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TSummaryRequest)
       return this.equals((TSummaryRequest)that);
     return false;
@@ -453,7 +451,7 @@ public class TSummaryRequest implements org.apache.thrift.TBase<TSummaryRequest,
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetTableId()).compareTo(other.isSetTableId());
+    lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -463,7 +461,7 @@ public class TSummaryRequest implements org.apache.thrift.TBase<TSummaryRequest,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetBounds()).compareTo(other.isSetBounds());
+    lastComparison = java.lang.Boolean.compare(isSetBounds(), other.isSetBounds());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -473,7 +471,7 @@ public class TSummaryRequest implements org.apache.thrift.TBase<TSummaryRequest,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSummarizers()).compareTo(other.isSetSummarizers());
+    lastComparison = java.lang.Boolean.compare(isSetSummarizers(), other.isSetSummarizers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -483,7 +481,7 @@ public class TSummaryRequest implements org.apache.thrift.TBase<TSummaryRequest,
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSummarizerPattern()).compareTo(other.isSetSummarizerPattern());
+    lastComparison = java.lang.Boolean.compare(isSetSummarizerPattern(), other.isSetSummarizerPattern());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -743,7 +741,7 @@ public class TSummaryRequest implements org.apache.thrift.TBase<TSummaryRequest,
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list127 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list127 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.summarizers = new java.util.ArrayList<TSummarizerConfiguration>(_list127.size);
           @org.apache.thrift.annotation.Nullable TSummarizerConfiguration _elem128;
           for (int _i129 = 0; _i129 < _list127.size; ++_i129)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java
index 57dca3e..482e105 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/dataImpl/thrift/UpdateErrors.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -369,8 +369,6 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof UpdateErrors)
       return this.equals((UpdateErrors)that);
     return false;
@@ -439,7 +437,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetFailedExtents()).compareTo(other.isSetFailedExtents());
+    lastComparison = java.lang.Boolean.compare(isSetFailedExtents(), other.isSetFailedExtents());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -449,7 +447,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetViolationSummaries()).compareTo(other.isSetViolationSummaries());
+    lastComparison = java.lang.Boolean.compare(isSetViolationSummaries(), other.isSetViolationSummaries());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -459,7 +457,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetAuthorizationFailures()).compareTo(other.isSetAuthorizationFailures());
+    lastComparison = java.lang.Boolean.compare(isSetAuthorizationFailures(), other.isSetAuthorizationFailures());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -735,7 +733,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat
       java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map75 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map75 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64); 
           struct.failedExtents = new java.util.HashMap<TKeyExtent,java.lang.Long>(2*_map75.size);
           @org.apache.thrift.annotation.Nullable TKeyExtent _key76;
           long _val77;
@@ -751,7 +749,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list79 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list79 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.violationSummaries = new java.util.ArrayList<TConstraintViolationSummary>(_list79.size);
           @org.apache.thrift.annotation.Nullable TConstraintViolationSummary _elem80;
           for (int _i81 = 0; _i81 < _list79.size; ++_i81)
@@ -765,7 +763,7 @@ public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, Updat
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TMap _map82 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map82 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I32); 
           struct.authorizationFailures = new java.util.HashMap<TKeyExtent,org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode>(2*_map82.size);
           @org.apache.thrift.annotation.Nullable TKeyExtent _key83;
           @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode _val84;
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
index 7ee62e4..5a3802e 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -491,8 +491,6 @@ public class GCMonitorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getStatus_args)
         return this.equals((getStatus_args)that);
       return false;
@@ -548,7 +546,7 @@ public class GCMonitorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -558,7 +556,7 @@ public class GCMonitorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -973,8 +971,6 @@ public class GCMonitorService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getStatus_result)
         return this.equals((getStatus_result)that);
       return false;
@@ -1030,7 +1026,7 @@ public class GCMonitorService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1040,7 +1036,7 @@ public class GCMonitorService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCStatus.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCStatus.java
index 65df8cf..94a390d 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCStatus.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GCStatus.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -349,8 +349,6 @@ public class GCStatus implements org.apache.thrift.TBase<GCStatus, GCStatus._Fie
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof GCStatus)
       return this.equals((GCStatus)that);
     return false;
@@ -432,7 +430,7 @@ public class GCStatus implements org.apache.thrift.TBase<GCStatus, GCStatus._Fie
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetLast()).compareTo(other.isSetLast());
+    lastComparison = java.lang.Boolean.compare(isSetLast(), other.isSetLast());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -442,7 +440,7 @@ public class GCStatus implements org.apache.thrift.TBase<GCStatus, GCStatus._Fie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetLastLog()).compareTo(other.isSetLastLog());
+    lastComparison = java.lang.Boolean.compare(isSetLastLog(), other.isSetLastLog());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -452,7 +450,7 @@ public class GCStatus implements org.apache.thrift.TBase<GCStatus, GCStatus._Fie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetCurrent()).compareTo(other.isSetCurrent());
+    lastComparison = java.lang.Boolean.compare(isSetCurrent(), other.isSetCurrent());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -462,7 +460,7 @@ public class GCStatus implements org.apache.thrift.TBase<GCStatus, GCStatus._Fie
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetCurrentLog()).compareTo(other.isSetCurrentLog());
+    lastComparison = java.lang.Boolean.compare(isSetCurrentLog(), other.isSetCurrentLog());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
index ab193e6..c28b60c 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -447,8 +447,6 @@ public class GcCycleStats implements org.apache.thrift.TBase<GcCycleStats, GcCyc
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof GcCycleStats)
       return this.equals((GcCycleStats)that);
     return false;
@@ -544,7 +542,7 @@ public class GcCycleStats implements org.apache.thrift.TBase<GcCycleStats, GcCyc
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetStarted()).compareTo(other.isSetStarted());
+    lastComparison = java.lang.Boolean.compare(isSetStarted(), other.isSetStarted());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -554,7 +552,7 @@ public class GcCycleStats implements org.apache.thrift.TBase<GcCycleStats, GcCyc
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetFinished()).compareTo(other.isSetFinished());
+    lastComparison = java.lang.Boolean.compare(isSetFinished(), other.isSetFinished());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -564,7 +562,7 @@ public class GcCycleStats implements org.apache.thrift.TBase<GcCycleStats, GcCyc
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetCandidates()).compareTo(other.isSetCandidates());
+    lastComparison = java.lang.Boolean.compare(isSetCandidates(), other.isSetCandidates());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -574,7 +572,7 @@ public class GcCycleStats implements org.apache.thrift.TBase<GcCycleStats, GcCyc
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetInUse()).compareTo(other.isSetInUse());
+    lastComparison = java.lang.Boolean.compare(isSetInUse(), other.isSetInUse());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -584,7 +582,7 @@ public class GcCycleStats implements org.apache.thrift.TBase<GcCycleStats, GcCyc
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetDeleted()).compareTo(other.isSetDeleted());
+    lastComparison = java.lang.Boolean.compare(isSetDeleted(), other.isSetDeleted());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -594,7 +592,7 @@ public class GcCycleStats implements org.apache.thrift.TBase<GcCycleStats, GcCyc
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetErrors()).compareTo(other.isSetErrors());
+    lastComparison = java.lang.Boolean.compare(isSetErrors(), other.isSetErrors());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java
index 3c73a0a..2457480 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -299,8 +299,6 @@ public class DeadServer implements org.apache.thrift.TBase<DeadServer, DeadServe
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof DeadServer)
       return this.equals((DeadServer)that);
     return false;
@@ -367,7 +365,7 @@ public class DeadServer implements org.apache.thrift.TBase<DeadServer, DeadServe
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetServer()).compareTo(other.isSetServer());
+    lastComparison = java.lang.Boolean.compare(isSetServer(), other.isSetServer());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -377,7 +375,7 @@ public class DeadServer implements org.apache.thrift.TBase<DeadServer, DeadServe
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetLastStatus()).compareTo(other.isSetLastStatus());
+    lastComparison = java.lang.Boolean.compare(isSetLastStatus(), other.isSetLastStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -387,7 +385,7 @@ public class DeadServer implements org.apache.thrift.TBase<DeadServer, DeadServe
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
+    lastComparison = java.lang.Boolean.compare(isSetStatus(), other.isSetStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateOperation.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateOperation.java
index e7faaae..d6125b5 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateOperation.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateOperation.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
index 7dce29c..6b87c3a 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -1053,8 +1053,6 @@ public class FateService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof beginFateOperation_args)
         return this.equals((beginFateOperation_args)that);
       return false;
@@ -1110,7 +1108,7 @@ public class FateService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1120,7 +1118,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1587,8 +1585,6 @@ public class FateService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof beginFateOperation_result)
         return this.equals((beginFateOperation_result)that);
       return false;
@@ -1655,7 +1651,7 @@ public class FateService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1665,7 +1661,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1675,7 +1671,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2416,8 +2412,6 @@ public class FateService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof executeFateOperation_args)
         return this.equals((executeFateOperation_args)that);
       return false;
@@ -2534,7 +2528,7 @@ public class FateService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2544,7 +2538,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2554,7 +2548,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetOpid()).compareTo(other.isSetOpid());
+      lastComparison = java.lang.Boolean.compare(isSetOpid(), other.isSetOpid());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2564,7 +2558,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetOp()).compareTo(other.isSetOp());
+      lastComparison = java.lang.Boolean.compare(isSetOp(), other.isSetOp());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2574,7 +2568,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetArguments()).compareTo(other.isSetArguments());
+      lastComparison = java.lang.Boolean.compare(isSetArguments(), other.isSetArguments());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2584,7 +2578,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetOptions()).compareTo(other.isSetOptions());
+      lastComparison = java.lang.Boolean.compare(isSetOptions(), other.isSetOptions());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2594,7 +2588,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetAutoClean()).compareTo(other.isSetAutoClean());
+      lastComparison = java.lang.Boolean.compare(isSetAutoClean(), other.isSetAutoClean());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2964,7 +2958,7 @@ public class FateService {
         }
         if (incoming.get(4)) {
           {
-            org.apache.thrift.protocol.TList _list71 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TList _list71 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
             struct.arguments = new java.util.ArrayList<java.nio.ByteBuffer>(_list71.size);
             @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem72;
             for (int _i73 = 0; _i73 < _list71.size; ++_i73)
@@ -2977,7 +2971,7 @@ public class FateService {
         }
         if (incoming.get(5)) {
           {
-            org.apache.thrift.protocol.TMap _map74 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TMap _map74 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
             struct.options = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map74.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _key75;
             @org.apache.thrift.annotation.Nullable java.lang.String _val76;
@@ -3275,8 +3269,6 @@ public class FateService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof executeFateOperation_result)
         return this.equals((executeFateOperation_result)that);
       return false;
@@ -3345,7 +3337,7 @@ public class FateService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3355,7 +3347,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3365,7 +3357,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3859,8 +3851,6 @@ public class FateService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof waitForFateOperation_args)
         return this.equals((waitForFateOperation_args)that);
       return false;
@@ -3927,7 +3917,7 @@ public class FateService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3937,7 +3927,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3947,7 +3937,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetOpid()).compareTo(other.isSetOpid());
+      lastComparison = java.lang.Boolean.compare(isSetOpid(), other.isSetOpid());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4491,8 +4481,6 @@ public class FateService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof waitForFateOperation_result)
         return this.equals((waitForFateOperation_result)that);
       return false;
@@ -4574,7 +4562,7 @@ public class FateService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4584,7 +4572,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4594,7 +4582,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4604,7 +4592,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5129,8 +5117,6 @@ public class FateService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof finishFateOperation_args)
         return this.equals((finishFateOperation_args)that);
       return false;
@@ -5197,7 +5183,7 @@ public class FateService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5207,7 +5193,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5217,7 +5203,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetOpid()).compareTo(other.isSetOpid());
+      lastComparison = java.lang.Boolean.compare(isSetOpid(), other.isSetOpid());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5659,8 +5645,6 @@ public class FateService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof finishFateOperation_result)
         return this.equals((finishFateOperation_result)that);
       return false;
@@ -5716,7 +5700,7 @@ public class FateService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5726,7 +5710,7 @@ public class FateService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
index 4adc1ac..24dc777 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -3456,8 +3456,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof initiateFlush_args)
         return this.equals((initiateFlush_args)that);
       return false;
@@ -3526,7 +3524,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3536,7 +3534,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -3546,7 +3544,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
+      lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4095,8 +4093,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof initiateFlush_result)
         return this.equals((initiateFlush_result)that);
       return false;
@@ -4176,7 +4172,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4186,7 +4182,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4196,7 +4192,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4206,7 +4202,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4958,8 +4954,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof waitForFlush_args)
         return this.equals((waitForFlush_args)that);
       return false;
@@ -5076,7 +5070,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5086,7 +5080,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5096,7 +5090,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
+      lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5106,7 +5100,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetStartRow()).compareTo(other.isSetStartRow());
+      lastComparison = java.lang.Boolean.compare(isSetStartRow(), other.isSetStartRow());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5116,7 +5110,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetEndRow()).compareTo(other.isSetEndRow());
+      lastComparison = java.lang.Boolean.compare(isSetEndRow(), other.isSetEndRow());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5126,7 +5120,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetFlushID()).compareTo(other.isSetFlushID());
+      lastComparison = java.lang.Boolean.compare(isSetFlushID(), other.isSetFlushID());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5136,7 +5130,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetMaxLoops()).compareTo(other.isSetMaxLoops());
+      lastComparison = java.lang.Boolean.compare(isSetMaxLoops(), other.isSetMaxLoops());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5747,8 +5741,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof waitForFlush_result)
         return this.equals((waitForFlush_result)that);
       return false;
@@ -5817,7 +5809,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5827,7 +5819,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5837,7 +5829,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -6432,8 +6424,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof setTableProperty_args)
         return this.equals((setTableProperty_args)that);
       return false;
@@ -6528,7 +6518,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -6538,7 +6528,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -6548,7 +6538,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
+      lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -6558,7 +6548,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetProperty()).compareTo(other.isSetProperty());
+      lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -6568,7 +6558,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+      lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7127,8 +7117,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof setTableProperty_result)
         return this.equals((setTableProperty_result)that);
       return false;
@@ -7197,7 +7185,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7207,7 +7195,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7217,7 +7205,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7761,8 +7749,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof removeTableProperty_args)
         return this.equals((removeTableProperty_args)that);
       return false;
@@ -7844,7 +7830,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7854,7 +7840,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7864,7 +7850,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
+      lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7874,7 +7860,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetProperty()).compareTo(other.isSetProperty());
+      lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8402,8 +8388,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof removeTableProperty_result)
         return this.equals((removeTableProperty_result)that);
       return false;
@@ -8472,7 +8456,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8482,7 +8466,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8492,7 +8476,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9087,8 +9071,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof setNamespaceProperty_args)
         return this.equals((setNamespaceProperty_args)that);
       return false;
@@ -9183,7 +9165,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9193,7 +9175,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9203,7 +9185,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNs()).compareTo(other.isSetNs());
+      lastComparison = java.lang.Boolean.compare(isSetNs(), other.isSetNs());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9213,7 +9195,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetProperty()).compareTo(other.isSetProperty());
+      lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9223,7 +9205,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+      lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9782,8 +9764,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof setNamespaceProperty_result)
         return this.equals((setNamespaceProperty_result)that);
       return false;
@@ -9852,7 +9832,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9862,7 +9842,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9872,7 +9852,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10416,8 +10396,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof removeNamespaceProperty_args)
         return this.equals((removeNamespaceProperty_args)that);
       return false;
@@ -10499,7 +10477,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10509,7 +10487,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10519,7 +10497,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNs()).compareTo(other.isSetNs());
+      lastComparison = java.lang.Boolean.compare(isSetNs(), other.isSetNs());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10529,7 +10507,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetProperty()).compareTo(other.isSetProperty());
+      lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11057,8 +11035,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof removeNamespaceProperty_result)
         return this.equals((removeNamespaceProperty_result)that);
       return false;
@@ -11127,7 +11103,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11137,7 +11113,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTope()).compareTo(other.isSetTope());
+      lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11147,7 +11123,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11656,8 +11632,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof setManagerGoalState_args)
         return this.equals((setManagerGoalState_args)that);
       return false;
@@ -11726,7 +11700,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11736,7 +11710,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11746,7 +11720,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetState()).compareTo(other.isSetState());
+      lastComparison = java.lang.Boolean.compare(isSetState(), other.isSetState());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12192,8 +12166,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof setManagerGoalState_result)
         return this.equals((setManagerGoalState_result)that);
       return false;
@@ -12249,7 +12221,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12259,7 +12231,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12720,8 +12692,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof shutdown_args)
         return this.equals((shutdown_args)that);
       return false;
@@ -12788,7 +12758,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12798,7 +12768,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12808,7 +12778,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetStopTabletServers()).compareTo(other.isSetStopTabletServers());
+      lastComparison = java.lang.Boolean.compare(isSetStopTabletServers(), other.isSetStopTabletServers());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13250,8 +13220,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof shutdown_result)
         return this.equals((shutdown_result)that);
       return false;
@@ -13307,7 +13275,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13317,7 +13285,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13829,8 +13797,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof shutdownTabletServer_args)
         return this.equals((shutdownTabletServer_args)that);
       return false;
@@ -13910,7 +13876,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13920,7 +13886,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13930,7 +13896,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTabletServer()).compareTo(other.isSetTabletServer());
+      lastComparison = java.lang.Boolean.compare(isSetTabletServer(), other.isSetTabletServer());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13940,7 +13906,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetForce()).compareTo(other.isSetForce());
+      lastComparison = java.lang.Boolean.compare(isSetForce(), other.isSetForce());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14413,8 +14379,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof shutdownTabletServer_result)
         return this.equals((shutdownTabletServer_result)that);
       return false;
@@ -14470,7 +14434,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14480,7 +14444,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14991,8 +14955,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof setSystemProperty_args)
         return this.equals((setSystemProperty_args)that);
       return false;
@@ -15074,7 +15036,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15084,7 +15046,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15094,7 +15056,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetProperty()).compareTo(other.isSetProperty());
+      lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15104,7 +15066,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+      lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15581,8 +15543,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof setSystemProperty_result)
         return this.equals((setSystemProperty_result)that);
       return false;
@@ -15638,7 +15598,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15648,7 +15608,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16108,8 +16068,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof removeSystemProperty_args)
         return this.equals((removeSystemProperty_args)that);
       return false;
@@ -16178,7 +16136,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16188,7 +16146,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16198,7 +16156,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetProperty()).compareTo(other.isSetProperty());
+      lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16644,8 +16602,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof removeSystemProperty_result)
         return this.equals((removeSystemProperty_result)that);
       return false;
@@ -16701,7 +16657,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16711,7 +16667,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17120,8 +17076,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getManagerStats_args)
         return this.equals((getManagerStats_args)that);
       return false;
@@ -17177,7 +17131,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17187,7 +17141,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17653,8 +17607,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getManagerStats_result)
         return this.equals((getManagerStats_result)that);
       return false;
@@ -17723,7 +17675,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17733,7 +17685,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17743,7 +17695,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18137,8 +18089,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof waitForBalance_args)
         return this.equals((waitForBalance_args)that);
       return false;
@@ -18181,7 +18131,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18509,8 +18459,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof waitForBalance_result)
         return this.equals((waitForBalance_result)that);
       return false;
@@ -18553,7 +18501,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19031,8 +18979,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof reportSplitExtent_args)
         return this.equals((reportSplitExtent_args)that);
       return false;
@@ -19114,7 +19060,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19124,7 +19070,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19134,7 +19080,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetServerName()).compareTo(other.isSetServerName());
+      lastComparison = java.lang.Boolean.compare(isSetServerName(), other.isSetServerName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19144,7 +19090,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSplit()).compareTo(other.isSetSplit());
+      lastComparison = java.lang.Boolean.compare(isSetSplit(), other.isSetSplit());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19795,8 +19741,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof reportTabletStatus_args)
         return this.equals((reportTabletStatus_args)that);
       return false;
@@ -19891,7 +19835,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19901,7 +19845,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19911,7 +19855,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetServerName()).compareTo(other.isSetServerName());
+      lastComparison = java.lang.Boolean.compare(isSetServerName(), other.isSetServerName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19921,7 +19865,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
+      lastComparison = java.lang.Boolean.compare(isSetStatus(), other.isSetStatus());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19931,7 +19875,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTablet()).compareTo(other.isSetTablet());
+      lastComparison = java.lang.Boolean.compare(isSetTablet(), other.isSetTablet());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20444,8 +20388,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getActiveTservers_args)
         return this.equals((getActiveTservers_args)that);
       return false;
@@ -20501,7 +20443,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20511,7 +20453,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20995,8 +20937,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getActiveTservers_result)
         return this.equals((getActiveTservers_result)that);
       return false;
@@ -21065,7 +21005,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21075,7 +21015,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21085,7 +21025,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21306,7 +21246,7 @@ public class ManagerClientService {
         java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list83 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TList _list83 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
             struct.success = new java.util.ArrayList<java.lang.String>(_list83.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _elem84;
             for (int _i85 = 0; _i85 < _list83.size; ++_i85)
@@ -21608,8 +21548,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getDelegationToken_args)
         return this.equals((getDelegationToken_args)that);
       return false;
@@ -21678,7 +21616,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21688,7 +21626,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21698,7 +21636,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCfg()).compareTo(other.isSetCfg());
+      lastComparison = java.lang.Boolean.compare(isSetCfg(), other.isSetCfg());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22200,8 +22138,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getDelegationToken_result)
         return this.equals((getDelegationToken_result)that);
       return false;
@@ -22270,7 +22206,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22280,7 +22216,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22290,7 +22226,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22855,8 +22791,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof drainReplicationTable_args)
         return this.equals((drainReplicationTable_args)that);
       return false;
@@ -22938,7 +22872,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTfino()).compareTo(other.isSetTfino());
+      lastComparison = java.lang.Boolean.compare(isSetTfino(), other.isSetTfino());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22948,7 +22882,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22958,7 +22892,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
+      lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22968,7 +22902,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetLogsToWatch()).compareTo(other.isSetLogsToWatch());
+      lastComparison = java.lang.Boolean.compare(isSetLogsToWatch(), other.isSetLogsToWatch());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -23236,7 +23170,7 @@ public class ManagerClientService {
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TSet _set91 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TSet _set91 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING);
             struct.logsToWatch = new java.util.HashSet<java.lang.String>(2*_set91.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _elem92;
             for (int _i93 = 0; _i93 < _set91.size; ++_i93)
@@ -23478,8 +23412,6 @@ public class ManagerClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof drainReplicationTable_result)
         return this.equals((drainReplicationTable_result)that);
       return false;
@@ -23533,7 +23465,7 @@ public class ManagerClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -23543,7 +23475,7 @@ public class ManagerClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTnase()).compareTo(other.isSetTnase());
+      lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase());
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerGoalState.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerGoalState.java
index 77f3d2c02..c72e5c6 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerGoalState.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerGoalState.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java
index afd9c9b..a7b5aa2 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -757,8 +757,6 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ManagerMonitorInfo)
       return this.equals((ManagerMonitorInfo)that);
     return false;
@@ -903,7 +901,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetTableMap()).compareTo(other.isSetTableMap());
+    lastComparison = java.lang.Boolean.compare(isSetTableMap(), other.isSetTableMap());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -913,7 +911,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetTServerInfo()).compareTo(other.isSetTServerInfo());
+    lastComparison = java.lang.Boolean.compare(isSetTServerInfo(), other.isSetTServerInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -923,7 +921,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetBadTServers()).compareTo(other.isSetBadTServers());
+    lastComparison = java.lang.Boolean.compare(isSetBadTServers(), other.isSetBadTServers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -933,7 +931,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetState()).compareTo(other.isSetState());
+    lastComparison = java.lang.Boolean.compare(isSetState(), other.isSetState());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -943,7 +941,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetGoalState()).compareTo(other.isSetGoalState());
+    lastComparison = java.lang.Boolean.compare(isSetGoalState(), other.isSetGoalState());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -953,7 +951,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetUnassignedTablets()).compareTo(other.isSetUnassignedTablets());
+    lastComparison = java.lang.Boolean.compare(isSetUnassignedTablets(), other.isSetUnassignedTablets());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -963,7 +961,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetServersShuttingDown()).compareTo(other.isSetServersShuttingDown());
+    lastComparison = java.lang.Boolean.compare(isSetServersShuttingDown(), other.isSetServersShuttingDown());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -973,7 +971,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetDeadTabletServers()).compareTo(other.isSetDeadTabletServers());
+    lastComparison = java.lang.Boolean.compare(isSetDeadTabletServers(), other.isSetDeadTabletServers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -983,7 +981,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetBulkImports()).compareTo(other.isSetBulkImports());
+    lastComparison = java.lang.Boolean.compare(isSetBulkImports(), other.isSetBulkImports());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1487,7 +1485,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
       java.util.BitSet incoming = iprot.readBitSet(9);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map40 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map40 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
           struct.tableMap = new java.util.HashMap<java.lang.String,org.apache.accumulo.core.master.thrift.TableInfo>(2*_map40.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key41;
           @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.master.thrift.TableInfo _val42;
@@ -1503,7 +1501,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list44 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list44 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.tServerInfo = new java.util.ArrayList<org.apache.accumulo.core.master.thrift.TabletServerStatus>(_list44.size);
           @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.master.thrift.TabletServerStatus _elem45;
           for (int _i46 = 0; _i46 < _list44.size; ++_i46)
@@ -1517,7 +1515,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TMap _map47 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.BYTE, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map47 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.BYTE); 
           struct.badTServers = new java.util.HashMap<java.lang.String,java.lang.Byte>(2*_map47.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key48;
           byte _val49;
@@ -1544,7 +1542,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
       }
       if (incoming.get(6)) {
         {
-          org.apache.thrift.protocol.TSet _set51 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.thrift.protocol.TSet _set51 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING);
           struct.serversShuttingDown = new java.util.HashSet<java.lang.String>(2*_set51.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _elem52;
           for (int _i53 = 0; _i53 < _set51.size; ++_i53)
@@ -1557,7 +1555,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
       }
       if (incoming.get(7)) {
         {
-          org.apache.thrift.protocol.TList _list54 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list54 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.deadTabletServers = new java.util.ArrayList<DeadServer>(_list54.size);
           @org.apache.thrift.annotation.Nullable DeadServer _elem55;
           for (int _i56 = 0; _i56 < _list54.size; ++_i56)
@@ -1571,7 +1569,7 @@ public class ManagerMonitorInfo implements org.apache.thrift.TBase<ManagerMonito
       }
       if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TList _list57 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list57 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.bulkImports = new java.util.ArrayList<org.apache.accumulo.core.master.thrift.BulkImportStatus>(_list57.size);
           @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.master.thrift.BulkImportStatus _elem58;
           for (int _i59 = 0; _i59 < _list57.size; ++_i59)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerState.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerState.java
index 233f5be..4edabf6 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerState.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerState.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryException.java
index be54e6f..12d7e16 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryException.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/RecoveryException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -196,8 +196,6 @@ public class RecoveryException extends org.apache.thrift.TException implements o
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof RecoveryException)
       return this.equals((RecoveryException)that);
     return false;
@@ -240,7 +238,7 @@ public class RecoveryException extends org.apache.thrift.TException implements o
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetWhy()).compareTo(other.isSetWhy());
+    lastComparison = java.lang.Boolean.compare(isSetWhy(), other.isSetWhy());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletLoadState.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletLoadState.java
index 58075bc..97ed4c9 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletLoadState.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletLoadState.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java
index fa4c1c7..d54e978 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TabletSplit.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -268,8 +268,6 @@ public class TabletSplit implements org.apache.thrift.TBase<TabletSplit, TabletS
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TabletSplit)
       return this.equals((TabletSplit)that);
     return false;
@@ -325,7 +323,7 @@ public class TabletSplit implements org.apache.thrift.TBase<TabletSplit, TabletS
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetOldTablet()).compareTo(other.isSetOldTablet());
+    lastComparison = java.lang.Boolean.compare(isSetOldTablet(), other.isSetOldTablet());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -335,7 +333,7 @@ public class TabletSplit implements org.apache.thrift.TBase<TabletSplit, TabletS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetNewTablets()).compareTo(other.isSetNewTablets());
+    lastComparison = java.lang.Boolean.compare(isSetNewTablets(), other.isSetNewTablets());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -537,7 +535,7 @@ public class TabletSplit implements org.apache.thrift.TBase<TabletSplit, TabletS
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list5 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.newTablets = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent>(_list5.size);
           @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem6;
           for (int _i7 = 0; _i7 < _list5.size; ++_i7)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportState.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportState.java
index c18844d..875a03f 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportState.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportState.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java
index 89212a1..af60869 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -315,8 +315,6 @@ public class BulkImportStatus implements org.apache.thrift.TBase<BulkImportStatu
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof BulkImportStatus)
       return this.equals((BulkImportStatus)that);
     return false;
@@ -383,7 +381,7 @@ public class BulkImportStatus implements org.apache.thrift.TBase<BulkImportStatu
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
+    lastComparison = java.lang.Boolean.compare(isSetStartTime(), other.isSetStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -393,7 +391,7 @@ public class BulkImportStatus implements org.apache.thrift.TBase<BulkImportStatu
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetFilename()).compareTo(other.isSetFilename());
+    lastComparison = java.lang.Boolean.compare(isSetFilename(), other.isSetFilename());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -403,7 +401,7 @@ public class BulkImportStatus implements org.apache.thrift.TBase<BulkImportStatu
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetState()).compareTo(other.isSetState());
+    lastComparison = java.lang.Boolean.compare(isSetState(), other.isSetState());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/Compacting.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/Compacting.java
index e13a7ba..af7b3e2 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/Compacting.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/Compacting.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -247,8 +247,6 @@ public class Compacting implements org.apache.thrift.TBase<Compacting, Compactin
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof Compacting)
       return this.equals((Compacting)that);
     return false;
@@ -300,7 +298,7 @@ public class Compacting implements org.apache.thrift.TBase<Compacting, Compactin
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetRunning()).compareTo(other.isSetRunning());
+    lastComparison = java.lang.Boolean.compare(isSetRunning(), other.isSetRunning());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -310,7 +308,7 @@ public class Compacting implements org.apache.thrift.TBase<Compacting, Compactin
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetQueued()).compareTo(other.isSetQueued());
+    lastComparison = java.lang.Boolean.compare(isSetQueued(), other.isSetQueued());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
index 1faa097..9fceb72 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -298,8 +298,6 @@ public class RecoveryStatus implements org.apache.thrift.TBase<RecoveryStatus, R
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof RecoveryStatus)
       return this.equals((RecoveryStatus)that);
     return false;
@@ -364,7 +362,7 @@ public class RecoveryStatus implements org.apache.thrift.TBase<RecoveryStatus, R
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = java.lang.Boolean.compare(isSetName(), other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -374,7 +372,7 @@ public class RecoveryStatus implements org.apache.thrift.TBase<RecoveryStatus, R
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetRuntime()).compareTo(other.isSetRuntime());
+    lastComparison = java.lang.Boolean.compare(isSetRuntime(), other.isSetRuntime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -384,7 +382,7 @@ public class RecoveryStatus implements org.apache.thrift.TBase<RecoveryStatus, R
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetProgress()).compareTo(other.isSetProgress());
+    lastComparison = java.lang.Boolean.compare(isSetProgress(), other.isSetProgress());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TableInfo.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TableInfo.java
index 1bfb18e..581c6c5 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TableInfo.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TableInfo.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -750,8 +750,6 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TableInfo)
       return this.equals((TableInfo)that);
     return false;
@@ -919,7 +917,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetRecs()).compareTo(other.isSetRecs());
+    lastComparison = java.lang.Boolean.compare(isSetRecs(), other.isSetRecs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -929,7 +927,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetRecsInMemory()).compareTo(other.isSetRecsInMemory());
+    lastComparison = java.lang.Boolean.compare(isSetRecsInMemory(), other.isSetRecsInMemory());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -939,7 +937,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetTablets()).compareTo(other.isSetTablets());
+    lastComparison = java.lang.Boolean.compare(isSetTablets(), other.isSetTablets());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -949,7 +947,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetOnlineTablets()).compareTo(other.isSetOnlineTablets());
+    lastComparison = java.lang.Boolean.compare(isSetOnlineTablets(), other.isSetOnlineTablets());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -959,7 +957,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIngestRate()).compareTo(other.isSetIngestRate());
+    lastComparison = java.lang.Boolean.compare(isSetIngestRate(), other.isSetIngestRate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -969,7 +967,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIngestByteRate()).compareTo(other.isSetIngestByteRate());
+    lastComparison = java.lang.Boolean.compare(isSetIngestByteRate(), other.isSetIngestByteRate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -979,7 +977,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetQueryRate()).compareTo(other.isSetQueryRate());
+    lastComparison = java.lang.Boolean.compare(isSetQueryRate(), other.isSetQueryRate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -989,7 +987,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetQueryByteRate()).compareTo(other.isSetQueryByteRate());
+    lastComparison = java.lang.Boolean.compare(isSetQueryByteRate(), other.isSetQueryByteRate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -999,7 +997,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetMinors()).compareTo(other.isSetMinors());
+    lastComparison = java.lang.Boolean.compare(isSetMinors(), other.isSetMinors());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1009,7 +1007,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetMajors()).compareTo(other.isSetMajors());
+    lastComparison = java.lang.Boolean.compare(isSetMajors(), other.isSetMajors());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1019,7 +1017,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetScans()).compareTo(other.isSetScans());
+    lastComparison = java.lang.Boolean.compare(isSetScans(), other.isSetScans());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1029,7 +1027,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetScanRate()).compareTo(other.isSetScanRate());
+    lastComparison = java.lang.Boolean.compare(isSetScanRate(), other.isSetScanRate());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
index 17a89ad..e19d4ac 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -1019,8 +1019,6 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TabletServerStatus)
       return this.equals((TabletServerStatus)that);
     return false;
@@ -1236,7 +1234,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetTableMap()).compareTo(other.isSetTableMap());
+    lastComparison = java.lang.Boolean.compare(isSetTableMap(), other.isSetTableMap());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1246,7 +1244,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetLastContact()).compareTo(other.isSetLastContact());
+    lastComparison = java.lang.Boolean.compare(isSetLastContact(), other.isSetLastContact());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1256,7 +1254,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = java.lang.Boolean.compare(isSetName(), other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1266,7 +1264,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetOsLoad()).compareTo(other.isSetOsLoad());
+    lastComparison = java.lang.Boolean.compare(isSetOsLoad(), other.isSetOsLoad());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1276,7 +1274,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetHoldTime()).compareTo(other.isSetHoldTime());
+    lastComparison = java.lang.Boolean.compare(isSetHoldTime(), other.isSetHoldTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1286,7 +1284,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetLookups()).compareTo(other.isSetLookups());
+    lastComparison = java.lang.Boolean.compare(isSetLookups(), other.isSetLookups());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1296,7 +1294,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIndexCacheHits()).compareTo(other.isSetIndexCacheHits());
+    lastComparison = java.lang.Boolean.compare(isSetIndexCacheHits(), other.isSetIndexCacheHits());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1306,7 +1304,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIndexCacheRequest()).compareTo(other.isSetIndexCacheRequest());
+    lastComparison = java.lang.Boolean.compare(isSetIndexCacheRequest(), other.isSetIndexCacheRequest());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1316,7 +1314,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetDataCacheHits()).compareTo(other.isSetDataCacheHits());
+    lastComparison = java.lang.Boolean.compare(isSetDataCacheHits(), other.isSetDataCacheHits());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1326,7 +1324,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetDataCacheRequest()).compareTo(other.isSetDataCacheRequest());
+    lastComparison = java.lang.Boolean.compare(isSetDataCacheRequest(), other.isSetDataCacheRequest());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1336,7 +1334,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetLogSorts()).compareTo(other.isSetLogSorts());
+    lastComparison = java.lang.Boolean.compare(isSetLogSorts(), other.isSetLogSorts());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1346,7 +1344,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetFlushs()).compareTo(other.isSetFlushs());
+    lastComparison = java.lang.Boolean.compare(isSetFlushs(), other.isSetFlushs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1356,7 +1354,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSyncs()).compareTo(other.isSetSyncs());
+    lastComparison = java.lang.Boolean.compare(isSetSyncs(), other.isSetSyncs());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1366,7 +1364,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetBulkImports()).compareTo(other.isSetBulkImports());
+    lastComparison = java.lang.Boolean.compare(isSetBulkImports(), other.isSetBulkImports());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1376,7 +1374,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion());
+    lastComparison = java.lang.Boolean.compare(isSetVersion(), other.isSetVersion());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1386,7 +1384,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetResponseTime()).compareTo(other.isSetResponseTime());
+    lastComparison = java.lang.Boolean.compare(isSetResponseTime(), other.isSetResponseTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1945,7 +1943,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
       java.util.BitSet incoming = iprot.readBitSet(16);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map16 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
           struct.tableMap = new java.util.HashMap<java.lang.String,TableInfo>(2*_map16.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key17;
           @org.apache.thrift.annotation.Nullable TableInfo _val18;
@@ -1997,7 +1995,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
       }
       if (incoming.get(10)) {
         {
-          org.apache.thrift.protocol.TList _list20 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list20 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.logSorts = new java.util.ArrayList<RecoveryStatus>(_list20.size);
           @org.apache.thrift.annotation.Nullable RecoveryStatus _elem21;
           for (int _i22 = 0; _i22 < _list20.size; ++_i22)
@@ -2019,7 +2017,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS
       }
       if (incoming.get(13)) {
         {
-          org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list23 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.bulkImports = new java.util.ArrayList<BulkImportStatus>(_list23.size);
           @org.apache.thrift.annotation.Nullable BulkImportStatus _elem24;
           for (int _i25 = 0; _i25 < _list23.size; ++_i25)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/KeyValues.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/KeyValues.java
index d4f1fef..9702ed8 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/KeyValues.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/KeyValues.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -217,8 +217,6 @@ public class KeyValues implements org.apache.thrift.TBase<KeyValues, KeyValues._
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof KeyValues)
       return this.equals((KeyValues)that);
     return false;
@@ -261,7 +259,7 @@ public class KeyValues implements org.apache.thrift.TBase<KeyValues, KeyValues._
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetKeyValues()).compareTo(other.isSetKeyValues());
+    lastComparison = java.lang.Boolean.compare(isSetKeyValues(), other.isSetKeyValues());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -427,7 +425,7 @@ public class KeyValues implements org.apache.thrift.TBase<KeyValues, KeyValues._
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list13 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.keyValues = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TKeyValue>(_list13.size);
           @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyValue _elem14;
           for (int _i15 = 0; _i15 < _list13.size; ++_i15)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
index 43c7319..23458c7 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
index 7f64cc7..be933fd6 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -263,8 +263,6 @@ public class RemoteReplicationException extends org.apache.thrift.TException imp
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof RemoteReplicationException)
       return this.equals((RemoteReplicationException)that);
     return false;
@@ -320,7 +318,7 @@ public class RemoteReplicationException extends org.apache.thrift.TException imp
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetCode()).compareTo(other.isSetCode());
+    lastComparison = java.lang.Boolean.compare(isSetCode(), other.isSetCode());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -330,7 +328,7 @@ public class RemoteReplicationException extends org.apache.thrift.TException imp
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetReason()).compareTo(other.isSetReason());
+    lastComparison = java.lang.Boolean.compare(isSetReason(), other.isSetReason());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
index 828440c..8e744d2 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -491,8 +491,6 @@ public class ReplicationCoordinator {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getServicerAddress_args)
         return this.equals((getServicerAddress_args)that);
       return false;
@@ -548,7 +546,7 @@ public class ReplicationCoordinator {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetRemoteTableId()).compareTo(other.isSetRemoteTableId());
+      lastComparison = java.lang.Boolean.compare(isSetRemoteTableId(), other.isSetRemoteTableId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -558,7 +556,7 @@ public class ReplicationCoordinator {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -968,8 +966,6 @@ public class ReplicationCoordinator {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof getServicerAddress_result)
         return this.equals((getServicerAddress_result)that);
       return false;
@@ -1025,7 +1021,7 @@ public class ReplicationCoordinator {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1035,7 +1031,7 @@ public class ReplicationCoordinator {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetE()).compareTo(other.isSetE());
+      lastComparison = java.lang.Boolean.compare(isSetE(), other.isSetE());
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
index 672b6cd..80e579e 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
index 11e5d8e..fed6447 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -263,8 +263,6 @@ public class ReplicationCoordinatorException extends org.apache.thrift.TExceptio
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ReplicationCoordinatorException)
       return this.equals((ReplicationCoordinatorException)that);
     return false;
@@ -320,7 +318,7 @@ public class ReplicationCoordinatorException extends org.apache.thrift.TExceptio
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetCode()).compareTo(other.isSetCode());
+    lastComparison = java.lang.Boolean.compare(isSetCode(), other.isSetCode());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -330,7 +328,7 @@ public class ReplicationCoordinatorException extends org.apache.thrift.TExceptio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetReason()).compareTo(other.isSetReason());
+    lastComparison = java.lang.Boolean.compare(isSetReason(), other.isSetReason());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
index 0ab1d11..c7ad404 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -716,8 +716,6 @@ public class ReplicationServicer {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof replicateLog_args)
         return this.equals((replicateLog_args)that);
       return false;
@@ -786,7 +784,7 @@ public class ReplicationServicer {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetRemoteTableId()).compareTo(other.isSetRemoteTableId());
+      lastComparison = java.lang.Boolean.compare(isSetRemoteTableId(), other.isSetRemoteTableId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -796,7 +794,7 @@ public class ReplicationServicer {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetData()).compareTo(other.isSetData());
+      lastComparison = java.lang.Boolean.compare(isSetData(), other.isSetData());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -806,7 +804,7 @@ public class ReplicationServicer {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1253,8 +1251,6 @@ public class ReplicationServicer {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof replicateLog_result)
         return this.equals((replicateLog_result)that);
       return false;
@@ -1308,7 +1304,7 @@ public class ReplicationServicer {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1318,7 +1314,7 @@ public class ReplicationServicer {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetE()).compareTo(other.isSetE());
+      lastComparison = java.lang.Boolean.compare(isSetE(), other.isSetE());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1774,8 +1770,6 @@ public class ReplicationServicer {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof replicateKeyValues_args)
         return this.equals((replicateKeyValues_args)that);
       return false;
@@ -1844,7 +1838,7 @@ public class ReplicationServicer {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetRemoteTableId()).compareTo(other.isSetRemoteTableId());
+      lastComparison = java.lang.Boolean.compare(isSetRemoteTableId(), other.isSetRemoteTableId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1854,7 +1848,7 @@ public class ReplicationServicer {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetData()).compareTo(other.isSetData());
+      lastComparison = java.lang.Boolean.compare(isSetData(), other.isSetData());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1864,7 +1858,7 @@ public class ReplicationServicer {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2311,8 +2305,6 @@ public class ReplicationServicer {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof replicateKeyValues_result)
         return this.equals((replicateKeyValues_result)that);
       return false;
@@ -2366,7 +2358,7 @@ public class ReplicationServicer {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2376,7 +2368,7 @@ public class ReplicationServicer {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetE()).compareTo(other.isSetE());
+      lastComparison = java.lang.Boolean.compare(isSetE(), other.isSetE());
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/WalEdits.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/WalEdits.java
index 072a0e3..212c0a5 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/WalEdits.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/replication/thrift/WalEdits.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -214,8 +214,6 @@ public class WalEdits implements org.apache.thrift.TBase<WalEdits, WalEdits._Fie
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof WalEdits)
       return this.equals((WalEdits)that);
     return false;
@@ -258,7 +256,7 @@ public class WalEdits implements org.apache.thrift.TBase<WalEdits, WalEdits._Fie
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetEdits()).compareTo(other.isSetEdits());
+    lastComparison = java.lang.Boolean.compare(isSetEdits(), other.isSetEdits());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -423,7 +421,7 @@ public class WalEdits implements org.apache.thrift.TBase<WalEdits, WalEdits._Fie
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.thrift.protocol.TList _list5 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
           struct.edits = new java.util.ArrayList<java.nio.ByteBuffer>(_list5.size);
           @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem6;
           for (int _i7 = 0; _i7 < _list5.size; ++_i7)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java
index f433a22..3be7c8b 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationKey.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -353,8 +353,6 @@ public class TAuthenticationKey implements org.apache.thrift.TBase<TAuthenticati
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TAuthenticationKey)
       return this.equals((TAuthenticationKey)that);
     return false;
@@ -436,7 +434,7 @@ public class TAuthenticationKey implements org.apache.thrift.TBase<TAuthenticati
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetSecret()).compareTo(other.isSetSecret());
+    lastComparison = java.lang.Boolean.compare(isSetSecret(), other.isSetSecret());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -446,7 +444,7 @@ public class TAuthenticationKey implements org.apache.thrift.TBase<TAuthenticati
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetKeyId()).compareTo(other.isSetKeyId());
+    lastComparison = java.lang.Boolean.compare(isSetKeyId(), other.isSetKeyId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -456,7 +454,7 @@ public class TAuthenticationKey implements org.apache.thrift.TBase<TAuthenticati
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetExpirationDate()).compareTo(other.isSetExpirationDate());
+    lastComparison = java.lang.Boolean.compare(isSetExpirationDate(), other.isSetExpirationDate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -466,7 +464,7 @@ public class TAuthenticationKey implements org.apache.thrift.TBase<TAuthenticati
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetCreationDate()).compareTo(other.isSetCreationDate());
+    lastComparison = java.lang.Boolean.compare(isSetCreationDate(), other.isSetCreationDate());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java
index 5a9515b..b6933f4 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TAuthenticationTokenIdentifier.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -389,8 +389,6 @@ public class TAuthenticationTokenIdentifier implements org.apache.thrift.TBase<T
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TAuthenticationTokenIdentifier)
       return this.equals((TAuthenticationTokenIdentifier)that);
     return false;
@@ -485,7 +483,7 @@ public class TAuthenticationTokenIdentifier implements org.apache.thrift.TBase<T
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+    lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -495,7 +493,7 @@ public class TAuthenticationTokenIdentifier implements org.apache.thrift.TBase<T
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetKeyId()).compareTo(other.isSetKeyId());
+    lastComparison = java.lang.Boolean.compare(isSetKeyId(), other.isSetKeyId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -505,7 +503,7 @@ public class TAuthenticationTokenIdentifier implements org.apache.thrift.TBase<T
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIssueDate()).compareTo(other.isSetIssueDate());
+    lastComparison = java.lang.Boolean.compare(isSetIssueDate(), other.isSetIssueDate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -515,7 +513,7 @@ public class TAuthenticationTokenIdentifier implements org.apache.thrift.TBase<T
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetExpirationDate()).compareTo(other.isSetExpirationDate());
+    lastComparison = java.lang.Boolean.compare(isSetExpirationDate(), other.isSetExpirationDate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -525,7 +523,7 @@ public class TAuthenticationTokenIdentifier implements org.apache.thrift.TBase<T
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetInstanceId()).compareTo(other.isSetInstanceId());
+    lastComparison = java.lang.Boolean.compare(isSetInstanceId(), other.isSetInstanceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java
index 957f3ca..8ba3073 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TCredentials.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -362,8 +362,6 @@ public class TCredentials implements org.apache.thrift.TBase<TCredentials, TCred
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TCredentials)
       return this.equals((TCredentials)that);
     return false;
@@ -445,7 +443,7 @@ public class TCredentials implements org.apache.thrift.TBase<TCredentials, TCred
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetPrincipal()).compareTo(other.isSetPrincipal());
+    lastComparison = java.lang.Boolean.compare(isSetPrincipal(), other.isSetPrincipal());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -455,7 +453,7 @@ public class TCredentials implements org.apache.thrift.TBase<TCredentials, TCred
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetTokenClassName()).compareTo(other.isSetTokenClassName());
+    lastComparison = java.lang.Boolean.compare(isSetTokenClassName(), other.isSetTokenClassName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -465,7 +463,7 @@ public class TCredentials implements org.apache.thrift.TBase<TCredentials, TCred
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
+    lastComparison = java.lang.Boolean.compare(isSetToken(), other.isSetToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -475,7 +473,7 @@ public class TCredentials implements org.apache.thrift.TBase<TCredentials, TCred
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetInstanceId()).compareTo(other.isSetInstanceId());
+    lastComparison = java.lang.Boolean.compare(isSetInstanceId(), other.isSetInstanceId());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java
index 7a487dc..5f0a947 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationToken.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -260,8 +260,6 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TDelegationToken)
       return this.equals((TDelegationToken)that);
     return false;
@@ -317,7 +315,7 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
+    lastComparison = java.lang.Boolean.compare(isSetPassword(), other.isSetPassword());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -327,7 +325,7 @@ public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToke
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIdentifier()).compareTo(other.isSetIdentifier());
+    lastComparison = java.lang.Boolean.compare(isSetIdentifier(), other.isSetIdentifier());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java
index 64cd841..5c3c6db 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/securityImpl/thrift/TDelegationTokenConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -190,8 +190,6 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TDelegationTokenConfig)
       return this.equals((TDelegationTokenConfig)that);
     return false;
@@ -234,7 +232,7 @@ public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegati
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetLifetime()).compareTo(other.isSetLifetime());
+    lastComparison = java.lang.Boolean.compare(isSetLifetime(), other.isSetLifetime());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
index af28f52..3108eef 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -547,8 +547,6 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ActionStats)
       return this.equals((ActionStats)that);
     return false;
@@ -666,7 +664,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
+    lastComparison = java.lang.Boolean.compare(isSetStatus(), other.isSetStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -676,7 +674,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetElapsed()).compareTo(other.isSetElapsed());
+    lastComparison = java.lang.Boolean.compare(isSetElapsed(), other.isSetElapsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -686,7 +684,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetNum()).compareTo(other.isSetNum());
+    lastComparison = java.lang.Boolean.compare(isSetNum(), other.isSetNum());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -696,7 +694,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
+    lastComparison = java.lang.Boolean.compare(isSetCount(), other.isSetCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -706,7 +704,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSumDev()).compareTo(other.isSetSumDev());
+    lastComparison = java.lang.Boolean.compare(isSetSumDev(), other.isSetSumDev());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -716,7 +714,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetFail()).compareTo(other.isSetFail());
+    lastComparison = java.lang.Boolean.compare(isSetFail(), other.isSetFail());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -726,7 +724,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetQueueTime()).compareTo(other.isSetQueueTime());
+    lastComparison = java.lang.Boolean.compare(isSetQueueTime(), other.isSetQueueTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -736,7 +734,7 @@ public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionS
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetQueueSumDev()).compareTo(other.isSetQueueSumDev());
+    lastComparison = java.lang.Boolean.compare(isSetQueueSumDev(), other.isSetQueueSumDev());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
index 70c4422..f43b032 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -803,8 +803,6 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ActiveCompaction)
       return this.equals((ActiveCompaction)that);
     return false;
@@ -971,7 +969,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent());
+    lastComparison = java.lang.Boolean.compare(isSetExtent(), other.isSetExtent());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -981,7 +979,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetAge()).compareTo(other.isSetAge());
+    lastComparison = java.lang.Boolean.compare(isSetAge(), other.isSetAge());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -991,7 +989,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetInputFiles()).compareTo(other.isSetInputFiles());
+    lastComparison = java.lang.Boolean.compare(isSetInputFiles(), other.isSetInputFiles());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1001,7 +999,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetOutputFile()).compareTo(other.isSetOutputFile());
+    lastComparison = java.lang.Boolean.compare(isSetOutputFile(), other.isSetOutputFile());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1011,7 +1009,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+    lastComparison = java.lang.Boolean.compare(isSetType(), other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1021,7 +1019,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetReason()).compareTo(other.isSetReason());
+    lastComparison = java.lang.Boolean.compare(isSetReason(), other.isSetReason());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1031,7 +1029,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetLocalityGroup()).compareTo(other.isSetLocalityGroup());
+    lastComparison = java.lang.Boolean.compare(isSetLocalityGroup(), other.isSetLocalityGroup());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1041,7 +1039,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetEntriesRead()).compareTo(other.isSetEntriesRead());
+    lastComparison = java.lang.Boolean.compare(isSetEntriesRead(), other.isSetEntriesRead());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1051,7 +1049,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetEntriesWritten()).compareTo(other.isSetEntriesWritten());
+    lastComparison = java.lang.Boolean.compare(isSetEntriesWritten(), other.isSetEntriesWritten());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1061,7 +1059,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSsiList()).compareTo(other.isSetSsiList());
+    lastComparison = java.lang.Boolean.compare(isSetSsiList(), other.isSetSsiList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1071,7 +1069,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSsio()).compareTo(other.isSetSsio());
+    lastComparison = java.lang.Boolean.compare(isSetSsio(), other.isSetSsio());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1581,7 +1579,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list74 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.thrift.protocol.TList _list74 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
           struct.inputFiles = new java.util.ArrayList<java.lang.String>(_list74.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _elem75;
           for (int _i76 = 0; _i76 < _list74.size; ++_i76)
@@ -1618,7 +1616,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
       }
       if (incoming.get(9)) {
         {
-          org.apache.thrift.protocol.TList _list77 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list77 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.ssiList = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.IterInfo>(_list77.size);
           @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.IterInfo _elem78;
           for (int _i79 = 0; _i79 < _list77.size; ++_i79)
@@ -1632,7 +1630,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
       }
       if (incoming.get(10)) {
         {
-          org.apache.thrift.protocol.TMap _map80 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map80 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP); 
           struct.ssio = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(2*_map80.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key81;
           @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> _val82;
@@ -1640,7 +1638,7 @@ public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompactio
           {
             _key81 = iprot.readString();
             {
-              org.apache.thrift.protocol.TMap _map84 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+              org.apache.thrift.protocol.TMap _map84 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
               _val82 = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map84.size);
               @org.apache.thrift.annotation.Nullable java.lang.String _key85;
               @org.apache.thrift.annotation.Nullable java.lang.String _val86;
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
index 6260a2b..0a32ec5 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -975,8 +975,6 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ActiveScan)
       return this.equals((ActiveScan)that);
     return false;
@@ -1184,7 +1182,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetClient()).compareTo(other.isSetClient());
+    lastComparison = java.lang.Boolean.compare(isSetClient(), other.isSetClient());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1194,7 +1192,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetUser()).compareTo(other.isSetUser());
+    lastComparison = java.lang.Boolean.compare(isSetUser(), other.isSetUser());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1204,7 +1202,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetTableId()).compareTo(other.isSetTableId());
+    lastComparison = java.lang.Boolean.compare(isSetTableId(), other.isSetTableId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1214,7 +1212,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetAge()).compareTo(other.isSetAge());
+    lastComparison = java.lang.Boolean.compare(isSetAge(), other.isSetAge());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1224,7 +1222,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIdleTime()).compareTo(other.isSetIdleTime());
+    lastComparison = java.lang.Boolean.compare(isSetIdleTime(), other.isSetIdleTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1234,7 +1232,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+    lastComparison = java.lang.Boolean.compare(isSetType(), other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1244,7 +1242,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetState()).compareTo(other.isSetState());
+    lastComparison = java.lang.Boolean.compare(isSetState(), other.isSetState());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1254,7 +1252,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent());
+    lastComparison = java.lang.Boolean.compare(isSetExtent(), other.isSetExtent());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1264,7 +1262,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
+    lastComparison = java.lang.Boolean.compare(isSetColumns(), other.isSetColumns());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1274,7 +1272,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSsiList()).compareTo(other.isSetSsiList());
+    lastComparison = java.lang.Boolean.compare(isSetSsiList(), other.isSetSsiList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1284,7 +1282,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSsio()).compareTo(other.isSetSsio());
+    lastComparison = java.lang.Boolean.compare(isSetSsio(), other.isSetSsio());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1294,7 +1292,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
+    lastComparison = java.lang.Boolean.compare(isSetAuthorizations(), other.isSetAuthorizations());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1304,7 +1302,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetScanId()).compareTo(other.isSetScanId());
+    lastComparison = java.lang.Boolean.compare(isSetScanId(), other.isSetScanId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1314,7 +1312,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetClassLoaderContext()).compareTo(other.isSetClassLoaderContext());
+    lastComparison = java.lang.Boolean.compare(isSetClassLoaderContext(), other.isSetClassLoaderContext());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1957,7 +1955,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
       }
       if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TList _list35 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list35 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.columns = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TColumn>(_list35.size);
           @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TColumn _elem36;
           for (int _i37 = 0; _i37 < _list35.size; ++_i37)
@@ -1971,7 +1969,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
       }
       if (incoming.get(9)) {
         {
-          org.apache.thrift.protocol.TList _list38 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list38 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.ssiList = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.IterInfo>(_list38.size);
           @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.IterInfo _elem39;
           for (int _i40 = 0; _i40 < _list38.size; ++_i40)
@@ -1985,7 +1983,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
       }
       if (incoming.get(10)) {
         {
-          org.apache.thrift.protocol.TMap _map41 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map41 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP); 
           struct.ssio = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(2*_map41.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key42;
           @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> _val43;
@@ -1993,7 +1991,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
           {
             _key42 = iprot.readString();
             {
-              org.apache.thrift.protocol.TMap _map45 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+              org.apache.thrift.protocol.TMap _map45 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
               _val43 = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map45.size);
               @org.apache.thrift.annotation.Nullable java.lang.String _key46;
               @org.apache.thrift.annotation.Nullable java.lang.String _val47;
@@ -2011,7 +2009,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca
       }
       if (incoming.get(11)) {
         {
-          org.apache.thrift.protocol.TList _list49 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.thrift.protocol.TList _list49 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
           struct.authorizations = new java.util.ArrayList<java.nio.ByteBuffer>(_list49.size);
           @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem50;
           for (int _i51 = 0; _i51 < _list49.size; ++_i51)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
index a3c2aae..ebbe551 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -217,8 +217,6 @@ public class ConstraintViolationException extends org.apache.thrift.TException i
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof ConstraintViolationException)
       return this.equals((ConstraintViolationException)that);
     return false;
@@ -261,7 +259,7 @@ public class ConstraintViolationException extends org.apache.thrift.TException i
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetViolationSummaries()).compareTo(other.isSetViolationSummaries());
+    lastComparison = java.lang.Boolean.compare(isSetViolationSummaries(), other.isSetViolationSummaries());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -427,7 +425,7 @@ public class ConstraintViolationException extends org.apache.thrift.TException i
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list5 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.violationSummaries = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TConstraintViolationSummary>(_list5.size);
           @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TConstraintViolationSummary _elem6;
           for (int _i7 = 0; _i7 < _list5.size; ++_i7)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java
index 10c0008..710edbf 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/InputFile.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -348,8 +348,6 @@ public class InputFile implements org.apache.thrift.TBase<InputFile, InputFile._
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof InputFile)
       return this.equals((InputFile)that);
     return false;
@@ -425,7 +423,7 @@ public class InputFile implements org.apache.thrift.TBase<InputFile, InputFile._
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetMetadataFileEntry()).compareTo(other.isSetMetadataFileEntry());
+    lastComparison = java.lang.Boolean.compare(isSetMetadataFileEntry(), other.isSetMetadataFileEntry());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -435,7 +433,7 @@ public class InputFile implements org.apache.thrift.TBase<InputFile, InputFile._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetSize()).compareTo(other.isSetSize());
+    lastComparison = java.lang.Boolean.compare(isSetSize(), other.isSetSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -445,7 +443,7 @@ public class InputFile implements org.apache.thrift.TBase<InputFile, InputFile._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetEntries()).compareTo(other.isSetEntries());
+    lastComparison = java.lang.Boolean.compare(isSetEntries(), other.isSetEntries());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -455,7 +453,7 @@ public class InputFile implements org.apache.thrift.TBase<InputFile, InputFile._
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
+    lastComparison = java.lang.Boolean.compare(isSetTimestamp(), other.isSetTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
index f6d0cef..c1517e8 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -217,8 +217,6 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof IteratorConfig)
       return this.equals((IteratorConfig)that);
     return false;
@@ -261,7 +259,7 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators());
+    lastComparison = java.lang.Boolean.compare(isSetIterators(), other.isSetIterators());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -427,7 +425,7 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list103 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.iterators = new java.util.ArrayList<TIteratorSetting>(_list103.size);
           @org.apache.thrift.annotation.Nullable TIteratorSetting _elem104;
           for (int _i105 = 0; _i105 < _list103.size; ++_i105)
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
index c14b47f..78fd3a3 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -139,8 +139,6 @@ public class NoSuchScanIDException extends org.apache.thrift.TException implemen
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof NoSuchScanIDException)
       return this.equals((NoSuchScanIDException)that);
     return false;
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
index 32dd846..4a400ce 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -196,8 +196,6 @@ public class NotServingTabletException extends org.apache.thrift.TException impl
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof NotServingTabletException)
       return this.equals((NotServingTabletException)that);
     return false;
@@ -240,7 +238,7 @@ public class NotServingTabletException extends org.apache.thrift.TException impl
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent());
+    lastComparison = java.lang.Boolean.compare(isSetExtent(), other.isSetExtent());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
index 2560634..84b6124 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
index b0dc520..b23a9a3 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionKind.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionKind.java
index 6223671..8f06724 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionKind.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionKind.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java
index 11888c4..01b6364 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionQueueSummary.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -248,8 +248,6 @@ public class TCompactionQueueSummary implements org.apache.thrift.TBase<TCompact
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TCompactionQueueSummary)
       return this.equals((TCompactionQueueSummary)that);
     return false;
@@ -303,7 +301,7 @@ public class TCompactionQueueSummary implements org.apache.thrift.TBase<TCompact
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetQueue()).compareTo(other.isSetQueue());
+    lastComparison = java.lang.Boolean.compare(isSetQueue(), other.isSetQueue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -313,7 +311,7 @@ public class TCompactionQueueSummary implements org.apache.thrift.TBase<TCompact
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetPriority()).compareTo(other.isSetPriority());
+    lastComparison = java.lang.Boolean.compare(isSetPriority(), other.isSetPriority());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionReason.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionReason.java
index d4364b4..1d51d70 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionReason.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionReason.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionStats.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionStats.java
index daf0e40..15fdccf 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionStats.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionStats.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -297,8 +297,6 @@ public class TCompactionStats implements org.apache.thrift.TBase<TCompactionStat
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TCompactionStats)
       return this.equals((TCompactionStats)that);
     return false;
@@ -361,7 +359,7 @@ public class TCompactionStats implements org.apache.thrift.TBase<TCompactionStat
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetEntriesRead()).compareTo(other.isSetEntriesRead());
+    lastComparison = java.lang.Boolean.compare(isSetEntriesRead(), other.isSetEntriesRead());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -371,7 +369,7 @@ public class TCompactionStats implements org.apache.thrift.TBase<TCompactionStat
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetEntriesWritten()).compareTo(other.isSetEntriesWritten());
+    lastComparison = java.lang.Boolean.compare(isSetEntriesWritten(), other.isSetEntriesWritten());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -381,7 +379,7 @@ public class TCompactionStats implements org.apache.thrift.TBase<TCompactionStat
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetFileSize()).compareTo(other.isSetFileSize());
+    lastComparison = java.lang.Boolean.compare(isSetFileSize(), other.isSetFileSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionType.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionType.java
index c0de733..773ae56 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionType.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TCompactionType.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
index 16f5c7f..baaa7ea 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java
index fc90fb4..ad32bf4 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TExternalCompactionJob.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -639,8 +639,6 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TExternalCompactionJob)
       return this.equals((TExternalCompactionJob)that);
     return false;
@@ -783,7 +781,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetExternalCompactionId()).compareTo(other.isSetExternalCompactionId());
+    lastComparison = java.lang.Boolean.compare(isSetExternalCompactionId(), other.isSetExternalCompactionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -793,7 +791,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent());
+    lastComparison = java.lang.Boolean.compare(isSetExtent(), other.isSetExtent());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -803,7 +801,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetFiles()).compareTo(other.isSetFiles());
+    lastComparison = java.lang.Boolean.compare(isSetFiles(), other.isSetFiles());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -813,7 +811,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIteratorSettings()).compareTo(other.isSetIteratorSettings());
+    lastComparison = java.lang.Boolean.compare(isSetIteratorSettings(), other.isSetIteratorSettings());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -823,7 +821,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetOutputFile()).compareTo(other.isSetOutputFile());
+    lastComparison = java.lang.Boolean.compare(isSetOutputFile(), other.isSetOutputFile());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -833,7 +831,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetPropagateDeletes()).compareTo(other.isSetPropagateDeletes());
+    lastComparison = java.lang.Boolean.compare(isSetPropagateDeletes(), other.isSetPropagateDeletes());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -843,7 +841,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetKind()).compareTo(other.isSetKind());
+    lastComparison = java.lang.Boolean.compare(isSetKind(), other.isSetKind());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -853,7 +851,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetUserCompactionId()).compareTo(other.isSetUserCompactionId());
+    lastComparison = java.lang.Boolean.compare(isSetUserCompactionId(), other.isSetUserCompactionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -863,7 +861,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetOverrides()).compareTo(other.isSetOverrides());
+    lastComparison = java.lang.Boolean.compare(isSetOverrides(), other.isSetOverrides());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1279,7 +1277,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list127 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          org.apache.thrift.protocol.TList _list127 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
           struct.files = new java.util.ArrayList<InputFile>(_list127.size);
           @org.apache.thrift.annotation.Nullable InputFile _elem128;
           for (int _i129 = 0; _i129 < _list127.size; ++_i129)
@@ -1314,7 +1312,7 @@ public class TExternalCompactionJob implements org.apache.thrift.TBase<TExternal
       }
       if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TMap _map130 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map130 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
           struct.overrides = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map130.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key131;
           @org.apache.thrift.annotation.Nullable java.lang.String _val132;
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
index 2a2fd35..4bf0d01 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -364,8 +364,6 @@ public class TIteratorSetting implements org.apache.thrift.TBase<TIteratorSettin
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TIteratorSetting)
       return this.equals((TIteratorSetting)that);
     return false;
@@ -445,7 +443,7 @@ public class TIteratorSetting implements org.apache.thrift.TBase<TIteratorSettin
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetPriority()).compareTo(other.isSetPriority());
+    lastComparison = java.lang.Boolean.compare(isSetPriority(), other.isSetPriority());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -455,7 +453,7 @@ public class TIteratorSetting implements org.apache.thrift.TBase<TIteratorSettin
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+    lastComparison = java.lang.Boolean.compare(isSetName(), other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -465,7 +463,7 @@ public class TIteratorSetting implements org.apache.thrift.TBase<TIteratorSettin
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetIteratorClass()).compareTo(other.isSetIteratorClass());
+    lastComparison = java.lang.Boolean.compare(isSetIteratorClass(), other.isSetIteratorClass());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -475,7 +473,7 @@ public class TIteratorSetting implements org.apache.thrift.TBase<TIteratorSettin
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetProperties()).compareTo(other.isSetProperties());
+    lastComparison = java.lang.Boolean.compare(isSetProperties(), other.isSetProperties());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -733,7 +731,7 @@ public class TIteratorSetting implements org.apache.thrift.TBase<TIteratorSettin
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TMap _map94 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map94 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
           struct.properties = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map94.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key95;
           @org.apache.thrift.annotation.Nullable java.lang.String _val96;
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
index 6698f8b..03e3f14 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -196,8 +196,6 @@ public class TSampleNotPresentException extends org.apache.thrift.TException imp
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TSampleNotPresentException)
       return this.equals((TSampleNotPresentException)that);
     return false;
@@ -240,7 +238,7 @@ public class TSampleNotPresentException extends org.apache.thrift.TException imp
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent());
+    lastComparison = java.lang.Boolean.compare(isSetExtent(), other.isSetExtent());
     if (lastComparison != 0) {
       return lastComparison;
     }
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
index e5aadd2..19889f7 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -261,8 +261,6 @@ public class TSamplerConfiguration implements org.apache.thrift.TBase<TSamplerCo
 
   @Override
   public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
     if (that instanceof TSamplerConfiguration)
       return this.equals((TSamplerConfiguration)that);
     return false;
@@ -318,7 +316,7 @@ public class TSamplerConfiguration implements org.apache.thrift.TBase<TSamplerCo
 
     int lastComparison = 0;
 
-    lastComparison = java.lang.Boolean.valueOf(isSetClassName()).compareTo(other.isSetClassName());
+    lastComparison = java.lang.Boolean.compare(isSetClassName(), other.isSetClassName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -328,7 +326,7 @@ public class TSamplerConfiguration implements org.apache.thrift.TBase<TSamplerCo
         return lastComparison;
       }
     }
-    lastComparison = java.lang.Boolean.valueOf(isSetOptions()).compareTo(other.isSetOptions());
+    lastComparison = java.lang.Boolean.compare(isSetOptions(), other.isSetOptions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -528,7 +526,7 @@ public class TSamplerConfiguration implements org.apache.thrift.TBase<TSamplerCo
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TMap _map112 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          org.apache.thrift.protocol.TMap _map112 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
           struct.options = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map112.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key113;
           @org.apache.thrift.annotation.Nullable java.lang.String _val114;
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java
index a01dd2e..395991e 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TUnloadTabletGoal.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
index f678c4e..dc3b23a 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.12.0)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7321,8 +7321,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof startScan_args)
         return this.equals((startScan_args)that);
       return false;
@@ -7550,7 +7548,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7560,7 +7558,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7570,7 +7568,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetExtent()).compareTo(other.isSetExtent());
+      lastComparison = java.lang.Boolean.compare(isSetExtent(), other.isSetExtent());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7580,7 +7578,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetRange()).compareTo(other.isSetRange());
+      lastComparison = java.lang.Boolean.compare(isSetRange(), other.isSetRange());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7590,7 +7588,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
+      lastComparison = java.lang.Boolean.compare(isSetColumns(), other.isSetColumns());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7600,7 +7598,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetBatchSize()).compareTo(other.isSetBatchSize());
+      lastComparison = java.lang.Boolean.compare(isSetBatchSize(), other.isSetBatchSize());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7610,7 +7608,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSsiList()).compareTo(other.isSetSsiList());
+      lastComparison = java.lang.Boolean.compare(isSetSsiList(), other.isSetSsiList());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7620,7 +7618,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSsio()).compareTo(other.isSetSsio());
+      lastComparison = java.lang.Boolean.compare(isSetSsio(), other.isSetSsio());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7630,7 +7628,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
+      lastComparison = java.lang.Boolean.compare(isSetAuthorizations(), other.isSetAuthorizations());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7640,7 +7638,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetWaitForWrites()).compareTo(other.isSetWaitForWrites());
+      lastComparison = java.lang.Boolean.compare(isSetWaitForWrites(), other.isSetWaitForWrites());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7650,7 +7648,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetIsolated()).compareTo(other.isSetIsolated());
+      lastComparison = java.lang.Boolean.compare(isSetIsolated(), other.isSetIsolated());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7660,7 +7658,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetReadaheadThreshold()).compareTo(other.isSetReadaheadThreshold());
+      lastComparison = java.lang.Boolean.compare(isSetReadaheadThreshold(), other.isSetReadaheadThreshold());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7670,7 +7668,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSamplerConfig()).compareTo(other.isSetSamplerConfig());
+      lastComparison = java.lang.Boolean.compare(isSetSamplerConfig(), other.isSetSamplerConfig());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7680,7 +7678,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetBatchTimeOut()).compareTo(other.isSetBatchTimeOut());
+      lastComparison = java.lang.Boolean.compare(isSetBatchTimeOut(), other.isSetBatchTimeOut());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7690,7 +7688,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetClassLoaderContext()).compareTo(other.isSetClassLoaderContext());
+      lastComparison = java.lang.Boolean.compare(isSetClassLoaderContext(), other.isSetClassLoaderContext());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7700,7 +7698,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetExecutionHints()).compareTo(other.isSetExecutionHints());
+      lastComparison = java.lang.Boolean.compare(isSetExecutionHints(), other.isSetExecutionHints());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8411,7 +8409,7 @@ public class TabletClientService {
         }
         if (incoming.get(4)) {
           {
-            org.apache.thrift.protocol.TList _list167 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            org.apache.thrift.protocol.TList _list167 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
             struct.columns = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TColumn>(_list167.size);
             @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TColumn _elem168;
             for (int _i169 = 0; _i169 < _list167.size; ++_i169)
@@ -8429,7 +8427,7 @@ public class TabletClientService {
         }
         if (incoming.get(6)) {
           {
-            org.apache.thrift.protocol.TList _list170 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            org.apache.thrift.protocol.TList _list170 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
             struct.ssiList = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.IterInfo>(_list170.size);
             @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.IterInfo _elem171;
             for (int _i172 = 0; _i172 < _list170.size; ++_i172)
@@ -8443,7 +8441,7 @@ public class TabletClientService {
         }
         if (incoming.get(7)) {
           {
-            org.apache.thrift.protocol.TMap _map173 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+            org.apache.thrift.protocol.TMap _map173 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP); 
             struct.ssio = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(2*_map173.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _key174;
             @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> _val175;
@@ -8451,7 +8449,7 @@ public class TabletClientService {
             {
               _key174 = iprot.readString();
               {
-                org.apache.thrift.protocol.TMap _map177 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+                org.apache.thrift.protocol.TMap _map177 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
                 _val175 = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map177.size);
                 @org.apache.thrift.annotation.Nullable java.lang.String _key178;
                 @org.apache.thrift.annotation.Nullable java.lang.String _val179;
@@ -8469,7 +8467,7 @@ public class TabletClientService {
         }
         if (incoming.get(8)) {
           {
-            org.apache.thrift.protocol.TList _list181 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TList _list181 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
             struct.authorizations = new java.util.ArrayList<java.nio.ByteBuffer>(_list181.size);
             @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem182;
             for (int _i183 = 0; _i183 < _list181.size; ++_i183)
@@ -8507,7 +8505,7 @@ public class TabletClientService {
         }
         if (incoming.get(15)) {
           {
-            org.apache.thrift.protocol.TMap _map184 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TMap _map184 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
             struct.executionHints = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map184.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _key185;
             @org.apache.thrift.annotation.Nullable java.lang.String _val186;
@@ -8903,8 +8901,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof startScan_result)
         return this.equals((startScan_result)that);
       return false;
@@ -8999,7 +8995,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9009,7 +9005,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9019,7 +9015,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNste()).compareTo(other.isSetNste());
+      lastComparison = java.lang.Boolean.compare(isSetNste(), other.isSetNste());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9029,7 +9025,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTmfe()).compareTo(other.isSetTmfe());
+      lastComparison = java.lang.Boolean.compare(isSetTmfe(), other.isSetTmfe());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9039,7 +9035,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTsnpe()).compareTo(other.isSetTsnpe());
+      lastComparison = java.lang.Boolean.compare(isSetTsnpe(), other.isSetTsnpe());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9551,8 +9547,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof continueScan_args)
         return this.equals((continueScan_args)that);
       return false;
@@ -9606,7 +9600,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9616,7 +9610,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
+      lastComparison = java.lang.Boolean.compare(isSetScanID(), other.isSetScanID());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10175,8 +10169,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof continueScan_result)
         return this.equals((continueScan_result)that);
       return false;
@@ -10271,7 +10263,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10281,7 +10273,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNssi()).compareTo(other.isSetNssi());
+      lastComparison = java.lang.Boolean.compare(isSetNssi(), other.isSetNssi());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10291,7 +10283,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNste()).compareTo(other.isSetNste());
+      lastComparison = java.lang.Boolean.compare(isSetNste(), other.isSetNste());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10301,7 +10293,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTmfe()).compareTo(other.isSetTmfe());
+      lastComparison = java.lang.Boolean.compare(isSetTmfe(), other.isSetTmfe());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10311,7 +10303,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTsnpe()).compareTo(other.isSetTsnpe());
+      lastComparison = java.lang.Boolean.compare(isSetTsnpe(), other.isSetTsnpe());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10823,8 +10815,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof closeScan_args)
         return this.equals((closeScan_args)that);
       return false;
@@ -10878,7 +10868,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10888,7 +10878,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
+      lastComparison = java.lang.Boolean.compare(isSetScanID(), other.isSetScanID());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11931,8 +11921,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof startMultiScan_args)
         return this.equals((startMultiScan_args)that);
       return false;
@@ -12114,7 +12102,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12124,7 +12112,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12134,7 +12122,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetBatch()).compareTo(other.isSetBatch());
+      lastComparison = java.lang.Boolean.compare(isSetBatch(), other.isSetBatch());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12144,7 +12132,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
+      lastComparison = java.lang.Boolean.compare(isSetColumns(), other.isSetColumns());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12154,7 +12142,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSsiList()).compareTo(other.isSetSsiList());
+      lastComparison = java.lang.Boolean.compare(isSetSsiList(), other.isSetSsiList());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12164,7 +12152,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSsio()).compareTo(other.isSetSsio());
+      lastComparison = java.lang.Boolean.compare(isSetSsio(), other.isSetSsio());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12174,7 +12162,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
+      lastComparison = java.lang.Boolean.compare(isSetAuthorizations(), other.isSetAuthorizations());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12184,7 +12172,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetWaitForWrites()).compareTo(other.isSetWaitForWrites());
+      lastComparison = java.lang.Boolean.compare(isSetWaitForWrites(), other.isSetWaitForWrites());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12194,7 +12182,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSamplerConfig()).compareTo(other.isSetSamplerConfig());
+      lastComparison = java.lang.Boolean.compare(isSetSamplerConfig(), other.isSetSamplerConfig());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12204,7 +12192,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetBatchTimeOut()).compareTo(other.isSetBatchTimeOut());
+      lastComparison = java.lang.Boolean.compare(isSetBatchTimeOut(), other.isSetBatchTimeOut());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12214,7 +12202,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetClassLoaderContext()).compareTo(other.isSetClassLoaderContext());
+      lastComparison = java.lang.Boolean.compare(isSetClassLoaderContext(), other.isSetClassLoaderContext());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12224,7 +12212,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetExecutionHints()).compareTo(other.isSetExecutionHints());
+      lastComparison = java.lang.Boolean.compare(isSetExecutionHints(), other.isSetExecutionHints());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12879,7 +12867,7 @@ public class TabletClientService {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TMap _map232 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
+            org.apache.thrift.protocol.TMap _map232 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST); 
             struct.batch = new java.util.HashMap<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent,java.util.List<org.apache.accumulo.core.dataImpl.thrift.TRange>>(2*_map232.size);
             @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _key233;
             @org.apache.thrift.annotation.Nullable java.util.List<org.apache.accumulo.core.dataImpl.thrift.TRange> _val234;
@@ -12888,7 +12876,7 @@ public class TabletClientService {
               _key233 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent();
               _key233.read(iprot);
               {
-                org.apache.thrift.protocol.TList _list236 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+                org.apache.thrift.protocol.TList _list236 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
                 _val234 = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TRange>(_list236.size);
                 @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TRange _elem237;
                 for (int _i238 = 0; _i238 < _list236.size; ++_i238)
@@ -12905,7 +12893,7 @@ public class TabletClientService {
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TList _list239 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            org.apache.thrift.protocol.TList _list239 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
             struct.columns = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TColumn>(_list239.size);
             @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TColumn _elem240;
             for (int _i241 = 0; _i241 < _list239.size; ++_i241)
@@ -12919,7 +12907,7 @@ public class TabletClientService {
         }
         if (incoming.get(4)) {
           {
-            org.apache.thrift.protocol.TList _list242 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            org.apache.thrift.protocol.TList _list242 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
             struct.ssiList = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.IterInfo>(_list242.size);
             @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.IterInfo _elem243;
             for (int _i244 = 0; _i244 < _list242.size; ++_i244)
@@ -12933,7 +12921,7 @@ public class TabletClientService {
         }
         if (incoming.get(5)) {
           {
-            org.apache.thrift.protocol.TMap _map245 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+            org.apache.thrift.protocol.TMap _map245 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP); 
             struct.ssio = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(2*_map245.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _key246;
             @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> _val247;
@@ -12941,7 +12929,7 @@ public class TabletClientService {
             {
               _key246 = iprot.readString();
               {
-                org.apache.thrift.protocol.TMap _map249 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+                org.apache.thrift.protocol.TMap _map249 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
                 _val247 = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map249.size);
                 @org.apache.thrift.annotation.Nullable java.lang.String _key250;
                 @org.apache.thrift.annotation.Nullable java.lang.String _val251;
@@ -12959,7 +12947,7 @@ public class TabletClientService {
         }
         if (incoming.get(6)) {
           {
-            org.apache.thrift.protocol.TList _list253 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TList _list253 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
             struct.authorizations = new java.util.ArrayList<java.nio.ByteBuffer>(_list253.size);
             @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem254;
             for (int _i255 = 0; _i255 < _list253.size; ++_i255)
@@ -12989,7 +12977,7 @@ public class TabletClientService {
         }
         if (incoming.get(11)) {
           {
-            org.apache.thrift.protocol.TMap _map256 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TMap _map256 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
             struct.executionHints = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map256.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _key257;
             @org.apache.thrift.annotation.Nullable java.lang.String _val258;
@@ -13283,8 +13271,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof startMultiScan_result)
         return this.equals((startMultiScan_result)that);
       return false;
@@ -13353,7 +13339,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13363,7 +13349,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13373,7 +13359,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTsnpe()).compareTo(other.isSetTsnpe());
+      lastComparison = java.lang.Boolean.compare(isSetTsnpe(), other.isSetTsnpe());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13819,8 +13805,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof continueMultiScan_args)
         return this.equals((continueMultiScan_args)that);
       return false;
@@ -13874,7 +13858,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13884,7 +13868,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
+      lastComparison = java.lang.Boolean.compare(isSetScanID(), other.isSetScanID());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14341,8 +14325,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof continueMultiScan_result)
         return this.equals((continueMultiScan_result)that);
       return false;
@@ -14411,7 +14393,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14421,7 +14403,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNssi()).compareTo(other.isSetNssi());
+      lastComparison = java.lang.Boolean.compare(isSetNssi(), other.isSetNssi());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14431,7 +14413,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTsnpe()).compareTo(other.isSetTsnpe());
+      lastComparison = java.lang.Boolean.compare(isSetTsnpe(), other.isSetTsnpe());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14877,8 +14859,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof closeMultiScan_args)
         return this.equals((closeMultiScan_args)that);
       return false;
@@ -14932,7 +14912,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14942,7 +14922,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
+      lastComparison = java.lang.Boolean.compare(isSetScanID(), other.isSetScanID());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15297,8 +15277,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof closeMultiScan_result)
         return this.equals((closeMultiScan_result)that);
       return false;
@@ -15341,7 +15319,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetNssi()).compareTo(other.isSetNssi());
+      lastComparison = java.lang.Boolean.compare(isSetNssi(), other.isSetNssi());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15784,8 +15762,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof startUpdate_args)
         return this.equals((startUpdate_args)that);
       return false;
@@ -15854,7 +15830,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15864,7 +15840,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15874,7 +15850,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
+      lastComparison = java.lang.Boolean.compare(isSetDurability(), other.isSetDurability());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16321,8 +16297,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof startUpdate_result)
         return this.equals((startUpdate_result)that);
       return false;
@@ -16376,7 +16350,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16386,7 +16360,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16915,8 +16889,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof applyUpdates_args)
         return this.equals((applyUpdates_args)that);
       return false;
@@ -16996,7 +16968,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17006,7 +16978,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetUpdateID()).compareTo(other.isSetUpdateID());
+      lastComparison = java.lang.Boolean.compare(isSetUpdateID(), other.isSetUpdateID());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17016,7 +16988,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetKeyExtent()).compareTo(other.isSetKeyExtent());
+      lastComparison = java.lang.Boolean.compare(isSetKeyExtent(), other.isSetKeyExtent());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17026,7 +16998,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetMutations()).compareTo(other.isSetMutations());
+      lastComparison = java.lang.Boolean.compare(isSetMutations(), other.isSetMutations());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17291,7 +17263,7 @@ public class TabletClientService {
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TList _list265 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            org.apache.thrift.protocol.TList _list265 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
             struct.mutations = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TMutation>(_list265.size);
             @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TMutation _elem266;
             for (int _i267 = 0; _i267 < _list265.size; ++_i267)
@@ -17534,8 +17506,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof closeUpdate_args)
         return this.equals((closeUpdate_args)that);
       return false;
@@ -17589,7 +17559,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17599,7 +17569,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetUpdateID()).compareTo(other.isSetUpdateID());
+      lastComparison = java.lang.Boolean.compare(isSetUpdateID(), other.isSetUpdateID());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18005,8 +17975,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof closeUpdate_result)
         return this.equals((closeUpdate_result)that);
       return false;
@@ -18062,7 +18030,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18072,7 +18040,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNssi()).compareTo(other.isSetNssi());
+      lastComparison = java.lang.Boolean.compare(isSetNssi(), other.isSetNssi());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18653,8 +18621,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof update_args)
         return this.equals((update_args)that);
       return false;
@@ -18749,7 +18715,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18759,7 +18725,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18769,7 +18735,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetKeyExtent()).compareTo(other.isSetKeyExtent());
+      lastComparison = java.lang.Boolean.compare(isSetKeyExtent(), other.isSetKeyExtent());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18779,7 +18745,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetMutation()).compareTo(other.isSetMutation());
+      lastComparison = java.lang.Boolean.compare(isSetMutation(), other.isSetMutation());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18789,7 +18755,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
+      lastComparison = java.lang.Boolean.compare(isSetDurability(), other.isSetDurability());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19358,8 +19324,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof update_result)
         return this.equals((update_result)that);
       return false;
@@ -19428,7 +19392,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19438,7 +19402,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNste()).compareTo(other.isSetNste());
+      lastComparison = java.lang.Boolean.compare(isSetNste(), other.isSetNste());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19448,7 +19412,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCve()).compareTo(other.isSetCve());
+      lastComparison = java.lang.Boolean.compare(isSetCve(), other.isSetCve());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20128,8 +20092,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof startConditionalUpdate_args)
         return this.equals((startConditionalUpdate_args)that);
       return false;
@@ -20237,7 +20199,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20247,7 +20209,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
+      lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20257,7 +20219,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
+      lastComparison = java.lang.Boolean.compare(isSetAuthorizations(), other.isSetAuthorizations());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20267,7 +20229,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetTableID()).compareTo(other.isSetTableID());
+      lastComparison = java.lang.Boolean.compare(isSetTableID(), other.isSetTableID());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20277,7 +20239,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
+      lastComparison = java.lang.Boolean.compare(isSetDurability(), other.isSetDurability());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20287,7 +20249,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetClassLoaderContext()).compareTo(other.isSetClassLoaderContext());
+      lastComparison = java.lang.Boolean.compare(isSetClassLoaderContext(), other.isSetClassLoaderContext());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20605,7 +20567,7 @@ public class TabletClientService {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TList _list273 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TList _list273 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
             struct.authorizations = new java.util.ArrayList<java.nio.ByteBuffer>(_list273.size);
             @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem274;
             for (int _i275 = 0; _i275 < _list273.size; ++_i275)
@@ -20858,8 +20820,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof startConditionalUpdate_result)
         return this.equals((startConditionalUpdate_result)that);
       return false;
@@ -20915,7 +20875,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20925,7 +20885,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSec()).compareTo(other.isSetSec());
+      lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21484,8 +21444,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof conditionalUpdate_args)
         return this.equals((conditionalUpdate_args)that);
       return false;
@@ -21565,7 +21523,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetTinfo()).compareTo(other.isSetTinfo());
+      lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21575,7 +21533,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSessID()).compareTo(other.isSetSessID());
+      lastComparison = java.lang.Boolean.compare(isSetSessID(), other.isSetSessID());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21585,7 +21543,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetMutations()).compareTo(other.isSetMutations());
+      lastComparison = java.lang.Boolean.compare(isSetMutations(), other.isSetMutations());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21595,7 +21553,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetSymbols()).compareTo(other.isSetSymbols());
+      lastComparison = java.lang.Boolean.compare(isSetSymbols(), other.isSetSymbols());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21902,7 +21860,7 @@ public class TabletClientService {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TMap _map292 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
+            org.apache.thrift.protocol.TMap _map292 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST); 
             struct.mutations = new java.util.HashMap<org.apache.accumulo.core.dataImpl.thrift.TKeyExtent,java.util.List<org.apache.accumulo.core.dataImpl.thrift.TConditionalMutation>>(2*_map292.size);
             @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _key293;
             @org.apache.thrift.annotation.Nullable java.util.List<org.apache.accumulo.core.dataImpl.thrift.TConditionalMutation> _val294;
@@ -21911,7 +21869,7 @@ public class TabletClientService {
               _key293 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent();
               _key293.read(iprot);
               {
-                org.apache.thrift.protocol.TList _list296 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+                org.apache.thrift.protocol.TList _list296 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
                 _val294 = new java.util.ArrayList<org.apache.accumulo.core.dataImpl.thrift.TConditionalMutation>(_list296.size);
                 @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TConditionalMutation _elem297;
                 for (int _i298 = 0; _i298 < _list296.size; ++_i298)
@@ -21928,7 +21886,7 @@ public class TabletClientService {
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TList _list299 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            org.apache.thrift.protocol.TList _list299 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
             struct.symbols = new java.util.ArrayList<java.lang.String>(_list299.size);
             @org.apache.thrift.annotation.Nullable java.lang.String _elem300;
             for (int _i301 = 0; _i301 < _list299.size; ++_i301)
@@ -22190,8 +22148,6 @@ public class TabletClientService {
 
     @Override
     public boolean equals(java.lang.Object that) {
-      if (that == null)
-        return false;
       if (that instanceof conditionalUpdate_result)
         return this.equals((conditionalUpdate_result)that);
       return false;
@@ -22247,7 +22203,7 @@ public class TabletClientService {
 
       int lastComparison = 0;
 
-      lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22257,7 +22213,7 @@ public class TabletClientService {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetNssi()).compareTo(other.isSetNssi());
+      lastComparison = java.lang.Boolean.compare(isSetNssi(), other.isSetNssi());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22451,7 +22407,7 @@ public class TabletClientService {
         java.util.BitSet incoming = iprot.readBitSet(2);
... 2316 lines suppressed ...