[XEN-3146] clarify progress tracker logic, swap to unboxed types and add override annotation

Author: NotAPenguin0

solr-backup/src/main/java/eu/xenit/solr/backup/s3/S3BackupRepositoryConfig.java

@@ -53,11 +53,11 @@ public class S3BackupRepositoryConfig {
 
     private final String endpoint;
 
-    private final Boolean pathStyleAccessEnabled;
+    private final boolean pathStyleAccessEnabled;
 
-    private final Boolean checksumValidationEnabled;
+    private final boolean checksumValidationEnabled;
 
-    private final Integer progressLogByteInterval;
+    private final int progressLogByteInterval;
 
 
     public S3BackupRepositoryConfig(NamedList<?> config) {

solr-backup/src/main/java/eu/xenit/solr/backup/s3/S3OutputStream.java

@@ -221,14 +221,13 @@ void uploadPart(ByteArrayInputStream inputStream, int partSize) {
              * - Wrap the input stream into a progress listening input stream.
              */
             Consumer<Long> progressListener = new Consumer<>() {
-                private Long bytesSinceLastCheckpoint = 0L;
-
-                public void accept(Long bytesTransferred) {
-                    // Only log every interval of bytes, instead of each event
-                    bytesSinceLastCheckpoint += bytesTransferred;
-                    if (bytesSinceLastCheckpoint > configuration.getProgressLogByteInterval()) {
-                        log.debug("Progress: {} bytes", bytesTransferred);
-                        bytesSinceLastCheckpoint = 0L;
+                private Long lastCheckpointBytes = 0L;
+
+                @Override
+                public void accept(Long totalBytesTransferred) {
+                    if (totalBytesTransferred - lastCheckpointBytes >= configuration.getProgressLogByteInterval()) {
+                        log.debug("Progress: {} bytes", totalBytesTransferred);
+                        lastCheckpointBytes = totalBytesTransferred;
                     }
                 }
             };