Rename bundling to batching (#1775)

googleapis · Mar 21, 2017 · 6c76a82 · 6c76a82
1 parent a2ca992
commit 6c76a82
Show file tree

Hide file tree

Showing 8 changed files with 206 additions and 206 deletions.
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java
@@ -20,15 +20,15 @@
 import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse;
 
 import com.google.api.MonitoredResourceDescriptor;
-import com.google.api.gax.bundling.BundlingSettings;
-import com.google.api.gax.bundling.RequestBuilder;
+import com.google.api.gax.batching.BatchingSettings;
+import com.google.api.gax.batching.RequestBuilder;
 import com.google.api.gax.core.FlowControlSettings;
 import com.google.api.gax.core.FlowController.LimitExceededBehavior;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.RetrySettings;
-import com.google.api.gax.grpc.BundledRequestIssuer;
-import com.google.api.gax.grpc.BundlingCallSettings;
-import com.google.api.gax.grpc.BundlingDescriptor;
+import com.google.api.gax.grpc.BatchedRequestIssuer;
+import com.google.api.gax.grpc.BatchingCallSettings;
+import com.google.api.gax.grpc.BatchingDescriptor;
 import com.google.api.gax.grpc.CallContext;
 import com.google.api.gax.grpc.ChannelProvider;
 import com.google.api.gax.grpc.ClientSettings;
@@ -114,7 +114,7 @@ public class LoggingSettings extends ClientSettings {
   private static final String DEFAULT_GAPIC_VERSION = "";
 
   private final SimpleCallSettings<DeleteLogRequest, Empty> deleteLogSettings;
-  private final BundlingCallSettings<WriteLogEntriesRequest, WriteLogEntriesResponse>
+  private final BatchingCallSettings<WriteLogEntriesRequest, WriteLogEntriesResponse>
       writeLogEntriesSettings;
   private final PagedCallSettings<
           ListLogEntriesRequest, ListLogEntriesResponse, ListLogEntriesPagedResponse>
@@ -132,7 +132,7 @@ public SimpleCallSettings<DeleteLogRequest, Empty> deleteLogSettings() {
   }
 
   /** Returns the object with the settings used for calls to writeLogEntries. */
-  public BundlingCallSettings<WriteLogEntriesRequest, WriteLogEntriesResponse>
+  public BatchingCallSettings<WriteLogEntriesRequest, WriteLogEntriesResponse>
       writeLogEntriesSettings() {
     return writeLogEntriesSettings;
   }
@@ -385,11 +385,11 @@ public ListLogsPagedResponse createPagedListResponse(
             }
           };
 
-  private static final BundlingDescriptor<WriteLogEntriesRequest, WriteLogEntriesResponse>
-      WRITE_LOG_ENTRIES_BUNDLING_DESC =
-          new BundlingDescriptor<WriteLogEntriesRequest, WriteLogEntriesResponse>() {
+  private static final BatchingDescriptor<WriteLogEntriesRequest, WriteLogEntriesResponse>
+      WRITE_LOG_ENTRIES_BATCHING_DESC =
+          new BatchingDescriptor<WriteLogEntriesRequest, WriteLogEntriesResponse>() {
             @Override
-            public String getBundlePartitionKey(WriteLogEntriesRequest request) {
+            public String getBatchPartitionKey(WriteLogEntriesRequest request) {
               return request.getLogName()
                   + "|"
                   + request.getResource()
@@ -421,10 +421,10 @@ public WriteLogEntriesRequest build() {
 
             @Override
             public void splitResponse(
-                WriteLogEntriesResponse bundleResponse,
-                Collection<? extends BundledRequestIssuer<WriteLogEntriesResponse>> bundle) {
-              int bundleMessageIndex = 0;
-              for (BundledRequestIssuer<WriteLogEntriesResponse> responder : bundle) {
+                WriteLogEntriesResponse batchResponse,
+                Collection<? extends BatchedRequestIssuer<WriteLogEntriesResponse>> batch) {
+              int batchMessageIndex = 0;
+              for (BatchedRequestIssuer<WriteLogEntriesResponse> responder : batch) {
                 WriteLogEntriesResponse response = WriteLogEntriesResponse.newBuilder().build();
                 responder.setResponse(response);
               }
@@ -433,8 +433,8 @@ public void splitResponse(
             @Override
             public void splitException(
                 Throwable throwable,
-                Collection<? extends BundledRequestIssuer<WriteLogEntriesResponse>> bundle) {
-              for (BundledRequestIssuer<WriteLogEntriesResponse> responder : bundle) {
+                Collection<? extends BatchedRequestIssuer<WriteLogEntriesResponse>> batch) {
+              for (BatchedRequestIssuer<WriteLogEntriesResponse> responder : batch) {
                 responder.setException(throwable);
               }
             }
@@ -455,7 +455,7 @@ public static class Builder extends ClientSettings.Builder {
     private final ImmutableList<UnaryCallSettings.Builder> unaryMethodSettingsBuilders;
 
     private final SimpleCallSettings.Builder<DeleteLogRequest, Empty> deleteLogSettings;
-    private final BundlingCallSettings.Builder<WriteLogEntriesRequest, WriteLogEntriesResponse>
+    private final BatchingCallSettings.Builder<WriteLogEntriesRequest, WriteLogEntriesResponse>
         writeLogEntriesSettings;
     private final PagedCallSettings.Builder<
             ListLogEntriesRequest, ListLogEntriesResponse, ListLogEntriesPagedResponse>
@@ -517,9 +517,9 @@ private Builder() {
       deleteLogSettings = SimpleCallSettings.newBuilder(LoggingServiceV2Grpc.METHOD_DELETE_LOG);
 
       writeLogEntriesSettings =
-          BundlingCallSettings.newBuilder(
-                  LoggingServiceV2Grpc.METHOD_WRITE_LOG_ENTRIES, WRITE_LOG_ENTRIES_BUNDLING_DESC)
-              .setBundlingSettingsBuilder(BundlingSettings.newBuilder());
+          BatchingCallSettings.newBuilder(
+                  LoggingServiceV2Grpc.METHOD_WRITE_LOG_ENTRIES, WRITE_LOG_ENTRIES_BATCHING_DESC)
+              .setBatchingSettingsBuilder(BatchingSettings.newBuilder());
 
       listLogEntriesSettings =
           PagedCallSettings.newBuilder(
@@ -553,7 +553,7 @@ private static Builder createDefault() {
 
       builder
           .writeLogEntriesSettings()
-          .getBundlingSettingsBuilder()
+          .getBatchingSettingsBuilder()
           .setElementCountThreshold(1000)
           .setRequestByteThreshold(1048576)
           .setDelayThreshold(Duration.millis(50))
@@ -635,7 +635,7 @@ public SimpleCallSettings.Builder<DeleteLogRequest, Empty> deleteLogSettings() {
     }
 
     /** Returns the builder for the settings used for calls to writeLogEntries. */
-    public BundlingCallSettings.Builder<WriteLogEntriesRequest, WriteLogEntriesResponse>
+    public BatchingCallSettings.Builder<WriteLogEntriesRequest, WriteLogEntriesResponse>
         writeLogEntriesSettings() {
       return writeLogEntriesSettings;
     }

diff --git a/...loud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java b/...loud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java
@@ -199,7 +199,7 @@ private boolean isAlive() {
   @Override
   public void sendAckOperations(
       List<String> acksToSend, List<PendingModifyAckDeadline> ackDeadlineExtensions) {
-    // Send the modify ack deadlines in bundles as not to exceed the max request
+    // Send the modify ack deadlines in batches as not to exceed the max request
     // size.
     for (PendingModifyAckDeadline modifyAckDeadline : ackDeadlineExtensions) {
       for (List<String> ackIdChunk :