Merge branch '3.1'

core/src/main/java/org/apache/accumulo/core/clientImpl/bulk/Bulk.java

@@ -42,6 +42,7 @@ public static class Mapping {
     private Collection<FileInfo> files;
 
     // Gson requires a default constructor when JDK Unsafe usage is disabled
+    @SuppressWarnings("unused")
     private Mapping() {}
 
     public Mapping(KeyExtent tablet, Files files) {
@@ -71,6 +72,7 @@ public static class Tablet {
     private byte[] prevEndRow;
 
     // Gson requires a default constructor when JDK Unsafe usage is disabled
+    @SuppressWarnings("unused")
     private Tablet() {}
 
     public Tablet(Text endRow, Text prevEndRow) {
@@ -111,6 +113,7 @@ public static class FileInfo {
     long estEntries;
 
     // Gson requires a default constructor when JDK Unsafe usage is disabled
+    @SuppressWarnings("unused")
     private FileInfo() {}
 
     public FileInfo(String fileName, long estFileSize, long estNumEntries) {

core/src/main/java/org/apache/accumulo/core/lock/ServiceLockData.java

@@ -228,6 +228,7 @@ private static class ServiceDescriptorGson {
     private String group;
 
     // default constructor required for Gson
+    @SuppressWarnings("unused")
     public ServiceDescriptorGson() {}
 
     public ServiceDescriptorGson(UUID uuid, ThriftService service, String address, String group) {

server/base/src/main/java/org/apache/accumulo/server/metadata/RootGcCandidates.java

@@ -53,6 +53,7 @@ private static class Data {
     private SortedMap<String,SortedSet<String>> candidates;
 
     // Gson requires a default constructor when JDK Unsafe usage is disabled
+    @SuppressWarnings("unused")
     private Data() {}
 
     public Data(int version, SortedMap<String,SortedSet<String>> candidates) {

server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateSummaryReport.java

@@ -60,6 +60,7 @@ public class FateSummaryReport {
   private transient Map<String,String> idsToNameMap;
 
   // Gson requires a default constructor when JDK Unsafe usage is disabled
+  @SuppressWarnings("unused")
   private FateSummaryReport() {}
 
   public FateSummaryReport(Map<String,String> idsToNameMap, Set<FateId> fateIdFilter,

server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateTxnDetails.java

@@ -40,6 +40,7 @@ public class FateTxnDetails implements Comparable<FateTxnDetails> {
   private List<String> locksWaiting = List.of();
 
   // Default constructor for Gson
+  @SuppressWarnings("unused")
   private FateTxnDetails() {}
 
   /**

server/base/src/main/java/org/apache/accumulo/server/util/serviceStatus/ServiceStatusReport.java

@@ -53,6 +53,7 @@ public class ServiceStatusReport {
   private Map<ReportKey,StatusSummary> summaries;
 
   // Gson requires a default constructor when JDK Unsafe usage is disabled
+  @SuppressWarnings("unused")
   private ServiceStatusReport() {}
 
   public ServiceStatusReport(final Map<ReportKey,StatusSummary> summaries, final boolean noHosts) {

server/base/src/main/java/org/apache/accumulo/server/util/serviceStatus/StatusSummary.java

@@ -31,6 +31,7 @@ public class StatusSummary {
   private int errorCount;
 
   // Default constructor required for Gson
+  @SuppressWarnings("unused")
   private StatusSummary() {}
 
   public StatusSummary(ServiceStatusReport.ReportKey serviceType, final Set<String> resourceGroups,

server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java

@@ -776,7 +776,7 @@ ScanReservation reserveFilesInstrumented(long scanId) throws NoSuchScanIDExcepti
   }
 
   protected ScanReservation reserveFiles(long scanId) throws NoSuchScanIDException {
-    var session = (ScanSession) sessionManager.getSession(scanId);
+    var session = (ScanSession<?>) sessionManager.getSession(scanId);
     if (session == null) {
       throw new NoSuchScanIDException();
     }

server/tserver/src/main/java/org/apache/accumulo/tserver/log/ResolvedSortedLog.java

@@ -32,8 +32,6 @@
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Write ahead logs have two paths in DFS. There is the path of the original unsorted walog and the
@@ -42,8 +40,6 @@
  */
 public class ResolvedSortedLog {
 
-  private static final Logger log = LoggerFactory.getLogger(ResolvedSortedLog.class);
-
   private final SortedSet<UnreferencedTabletFile> children;
   private final LogEntry origin;
   private final Path sortedLogDir;

server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java

@@ -340,7 +340,7 @@ private long countZombieScans(long reportTimeMillis) {
     return Stream.concat(deferredCleanupQueue.stream(), sessions.values().stream())
         .filter(session -> {
           if (session instanceof ScanSession) {
-            var scanSession = (ScanSession) session;
+            var scanSession = (ScanSession<?>) session;
             synchronized (scanSession) {
               var scanTask = scanSession.getScanTask();
               if (scanTask != null && scanSession.getState() == State.REMOVED

server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/SnapshotTablet.java

@@ -35,8 +35,6 @@
 import org.apache.accumulo.tserver.TabletHostingServer;
 import org.apache.accumulo.tserver.TabletServerResourceManager;
 import org.apache.accumulo.tserver.metrics.TabletServerScanMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A tablet that can not be written to and operates off of a snapshot of tablet metadata for its
@@ -45,8 +43,6 @@
  */
 public class SnapshotTablet extends TabletBase {
 
-  private static final Logger log = LoggerFactory.getLogger(SnapshotTablet.class);
-
   private final TabletHostingServer server;
   private final SortedMap<StoredTabletFile,DataFileValue> files;
   private final TabletServerResourceManager.TabletResourceManager tabletResources;