Merge branch 'master' into backtrace-data-models-refactor

Author: BartoszLitwiniuk

backtrace-library/src/main/java/backtraceio/library/services/BacktraceDatabaseContext.java

@@ -93,7 +93,7 @@ private BacktraceDatabaseContext(String path, int retryNumber, RetryOrder retryO
      * Setup cache
      */
     private void setupBatch() {
-        if (this._retryNumber == 0) {
+        if (this._retryNumber <= 0) {
             throw new IllegalArgumentException("Retry number must be greater than 0!");
         }
 
@@ -136,7 +136,7 @@ public BacktraceDatabaseRecord add(BacktraceDatabaseRecord backtraceDatabaseReco
         }
         backtraceDatabaseRecord.locked = true;
         this.totalSize += backtraceDatabaseRecord.getSize();
-        this.batchRetry.get(0).add(backtraceDatabaseRecord); // TODO: null
+        this.addToFirstBatch(backtraceDatabaseRecord);
         this.totalRecords++;
         return backtraceDatabaseRecord;
     }
@@ -314,7 +314,7 @@ public boolean removeOldestRecord() {
     private void incrementBatches() {
         for (int i = this._retryNumber - 2; i >= 0; i--) {
             List<BacktraceDatabaseRecord> currentBatch = this.batchRetry.get(i);
-            batchRetry.put(i, new ArrayList<BacktraceDatabaseRecord>());
+            batchRetry.put(i, new ArrayList<>());
             batchRetry.put(i + 1, currentBatch);
         }
     }
@@ -354,7 +354,6 @@ private BacktraceDatabaseRecord getLastRecord() {
         return getRecordFromCache(true);
     }
 
-
     /**
      * Get record in in-cache BacktraceDatabase
      *
@@ -382,4 +381,21 @@ private BacktraceDatabaseRecord getRecordFromCache(boolean reverse) {
         }
         return null;
     }
+
+    private void addToFirstBatch(BacktraceDatabaseRecord backtraceDatabaseRecord) {
+        final int firstBatch = 0;
+
+        if (this.batchRetry.isEmpty()) {
+            this.batchRetry.put(firstBatch, new ArrayList<>());
+        }
+
+        List<BacktraceDatabaseRecord> batch = this.batchRetry.get(firstBatch);
+
+        if (batch == null) {
+            batch = new ArrayList<>();
+            this.batchRetry.put(firstBatch, batch);
+        }
+
+        batch.add(backtraceDatabaseRecord);
+    }
 }