Remove defaults for max age/size

loganlinn · loganlinn · commit 9f3955910627 · 2019-04-22T16:06:09.000-07:00
diff --git a/core-event-processor/src/main/java/com/optimizely/ab/processor/BatchBlock.java b/core-event-processor/src/main/java/com/optimizely/ab/processor/BatchBlock.java
@@ -134,12 +134,10 @@ public BatchOptions getOptions() {
     }
 
     protected Supplier<BatchTask<T, ?>> createBatchTaskFactory(BatchOptions opts) {
-        int maxSize = opts.getMaxSize();
-
         // TODO should this live on BatchOptions?
-        final Supplier<Collection<T>> bufferSupplier = (maxSize == BatchOptions.UNBOUNDED_SIZE) ?
-            () -> new ArrayList<>(maxSize) : // bounded
-            ArrayList::new;                  // unbounded
+        final Supplier<Collection<T>> bufferSupplier = BatchOptions.hasMaxSize(opts) ?
+            () -> new ArrayList<>(opts.getMaxSize()) :
+            ArrayList::new;
 
         return () -> new BatchTask<>(
             bufferSupplier,
diff --git a/core-event-processor/src/main/java/com/optimizely/ab/processor/BatchOptions.java b/core-event-processor/src/main/java/com/optimizely/ab/processor/BatchOptions.java
@@ -64,11 +64,8 @@ static <T> Builder<T> builder() {
     }
 
     class Builder<T> implements BatchOptions {
-        static int MAX_SIZE_DEFAULT = 10;
-        static long MAX_AGE_DEFAULT = 250L;
-
-        private int maxBatchSize = MAX_SIZE_DEFAULT;
-        private long maxBatchAge = MAX_AGE_DEFAULT;
+        private int maxBatchSize = UNBOUNDED_SIZE;
+        private long maxBatchAge = UNBOUNDED_AGE;
         private Integer maxBatchInFlight = null;
         private boolean flushOnShutdown = true;
 
