Merging changes and fixing checkstyle issue

Michael Li · Michael Li · commit a7965d750055 · 2021-08-03T11:39:37.000-04:00
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/batchmanager/BatchingMap.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/batchmanager/BatchingMap.java
@@ -40,7 +40,7 @@ public BatchingMap() {
         this.batchContextMap = new ConcurrentHashMap<>();
     }
 
-    public void put (String batchKey, Supplier<ScheduledFuture<?>> scheduleFlush, RequestT request,
+    public void put(String batchKey, Supplier<ScheduledFuture<?>> scheduleFlush, RequestT request,
                      CompletableFuture<ResponseT> response) {
         batchContextMap.computeIfAbsent(batchKey, k -> new BatchBuffer<>(scheduleFlush.get()))
                        .put(request, response);

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public BatchingMap() {`
`40`	`40`	`this.batchContextMap = new ConcurrentHashMap<>();`
`41`	`41`	`}`
`42`	`42`
`43`		`- public void put (String batchKey, Supplier<ScheduledFuture<?>> scheduleFlush, RequestT request,`
	`43`	`+ public void put(String batchKey, Supplier<ScheduledFuture<?>> scheduleFlush, RequestT request,`
`44`	`44`	`CompletableFuture<ResponseT> response) {`
`45`	`45`	`batchContextMap.computeIfAbsent(batchKey, k -> new BatchBuffer<>(scheduleFlush.get()))`
`46`	`46`	`.put(request, response);`