diff --git a/.github/.OwlBot-hermetic.yaml b/.github/.OwlBot-hermetic.yaml index 219163820..d426d10ea 100644 --- a/.github/.OwlBot-hermetic.yaml +++ b/.github/.OwlBot-hermetic.yaml @@ -41,6 +41,7 @@ deep-preserve-regex: - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SequentialExecutorServiceTest.java" - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java" - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java" +- "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettingsTest.java" - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java" - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java" - "/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java" @@ -64,6 +65,7 @@ deep-preserve-regex: - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java" - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java" - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberInterface.java" +- "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettings.java" - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java" - "/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Waiter.java" diff --git a/.github/workflows/update_generation_config.yaml b/.github/workflows/update_generation_config.yaml index 59e39834d..a7e14bb48 100644 --- a/.github/workflows/update_generation_config.yaml +++ b/.github/workflows/update_generation_config.yaml @@ -26,7 +26,7 @@ jobs: # the branch into which the pull request is merged base_branch: main steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java index 1a6dab2b2..5ed36b9cd 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java @@ -318,7 +318,8 @@ void stop() { case WAIT_FOR_PROCESSING: logger.log( Level.FINE, - "WAIT_FOR_PROCESSING shutdown mode: Waiting for outstanding messages to complete processing."); + "WAIT_FOR_PROCESSING shutdown mode: Waiting for outstanding messages to complete" + + " processing."); java.time.Duration timeout = subscriberShutdownSettings.getTimeout(); if (timeout.isNegative()) { // Indefinite wait use existing blocking wait @@ -330,7 +331,8 @@ void stop() { if (!completedWait) { logger.log( Level.WARNING, - "Grace period expired for WAIT_FOR_PROCESSING shutdown. Nacking remaining messages."); + "Grace period expired for WAIT_FOR_PROCESSING shutdown. Nacking remaining" + + " messages."); // Switch to NACK_IMMEDIATELY behavior for remaining messages nackAllOutstandingMessages(); } diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java index 28ba62d8e..c0779ff29 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java @@ -796,7 +796,8 @@ public Builder setOpenTelemetry(OpenTelemetry openTelemetry) { * SubscriberShutdownSettings#newBuilder() default settings}. */ @BetaApi( - "The surface for SubscriberShutdownSettings is not stable yet and may be changed in the future.") + "The surface for SubscriberShutdownSettings is not stable yet and may be changed in the" + + " future.") public Builder setSubscriberShutdownSettings( SubscriberShutdownSettings subscriberShutdownSettings) { this.subscriberShutdownSettings = Preconditions.checkNotNull(subscriberShutdownSettings);