Skip to content

Commit dd288c7

Browse files
author
Tony Cui
committed
Fix lint
1 parent e87c26f commit dd288c7

4 files changed

Lines changed: 6 additions & 13 deletions

File tree

java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/OpenTelemetryPubsubTracer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ void endPublishBatchingSpan(PubsubMessageWrapper message) {
178178
* Creates, starts, and returns a publish RPC span for the given message batch. Bi-directional
179179
* links with the publisher parent span are created for sampled messages in the batch.
180180
*/
181-
Span startPublishRpcSpan(
182-
TopicName topicName, List<PubsubMessageWrapper> messages) {
181+
Span startPublishRpcSpan(TopicName topicName, List<PubsubMessageWrapper> messages) {
183182
return startPublishRpcSpan(topicName, messages, 0);
184183
}
185184

java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import com.google.cloud.pubsub.v1.stub.PublisherStub;
4949
import com.google.cloud.pubsub.v1.stub.PublisherStubSettings;
5050
import com.google.common.base.Preconditions;
51-
import com.google.common.collect.ImmutableList;
5251
import com.google.common.collect.ImmutableMap;
5352
import com.google.common.collect.ImmutableSet;
5453
import com.google.protobuf.CodedOutputStream;
@@ -733,8 +732,7 @@ public void run() {
733732
ApiFuture<PublishResponse> firstAttemptFuture = publishCall(outstandingBatch);
734733
coordinator.addAttempt(0, firstAttemptFuture);
735734
long delayMs = hedgeSettings.getHedgeDelay().toMillis();
736-
HedgedRequest item =
737-
new HedgedRequest(coordinator, 1, clock.millisTime() + delayMs);
735+
HedgedRequest item = new HedgedRequest(coordinator, 1, clock.millisTime() + delayMs);
738736
hedgingQueue.add(item);
739737
coordinator.isInQueue.set(true);
740738
scheduleQueueProcessing();

java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -672,13 +672,11 @@ public void testHedgedPublishSpanEvents() {
672672
tracer.startPublisherSpan(messageWrapper);
673673

674674
// Original Attempt 0
675-
Span publishRpcSpan1 =
676-
tracer.startPublishRpcSpan(FULL_TOPIC_NAME, messageWrappers, 0);
675+
Span publishRpcSpan1 = tracer.startPublishRpcSpan(FULL_TOPIC_NAME, messageWrappers, 0);
677676
tracer.endPublishRpcSpan(publishRpcSpan1);
678677

679678
// Hedged Attempt 1
680-
Span publishRpcSpan2 =
681-
tracer.startPublishRpcSpan(FULL_TOPIC_NAME, messageWrappers, 1);
679+
Span publishRpcSpan2 = tracer.startPublishRpcSpan(FULL_TOPIC_NAME, messageWrappers, 1);
682680
tracer.endPublishRpcSpan(publishRpcSpan2);
683681

684682
// End Publisher span

java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,8 +1533,7 @@ public void testHedgingTriggeredIfSlow() throws Exception {
15331533
List<Metadata> capturedHeaders = testPublisherServiceImpl.getCapturedHeaders();
15341534
assertThat(capturedHeaders).hasSize(2);
15351535
Metadata.Key<String> hedgedHeaderKey =
1536-
Metadata.Key.of(
1537-
"x-goog-pubsub-hedged-count", Metadata.ASCII_STRING_MARSHALLER);
1536+
Metadata.Key.of("x-goog-pubsub-hedged-count", Metadata.ASCII_STRING_MARSHALLER);
15381537
// Original request should NOT have the header
15391538
assertThat(capturedHeaders.get(0).get(hedgedHeaderKey)).isNull();
15401539
// First hedged request should have value "1"
@@ -1577,8 +1576,7 @@ public void testMultipleHedging() throws Exception {
15771576
List<Metadata> capturedHeaders = testPublisherServiceImpl.getCapturedHeaders();
15781577
assertThat(capturedHeaders).hasSize(3);
15791578
Metadata.Key<String> hedgedHeaderKey =
1580-
Metadata.Key.of(
1581-
"x-goog-pubsub-hedged-count", Metadata.ASCII_STRING_MARSHALLER);
1579+
Metadata.Key.of("x-goog-pubsub-hedged-count", Metadata.ASCII_STRING_MARSHALLER);
15821580
assertThat(capturedHeaders.get(0).get(hedgedHeaderKey)).isNull();
15831581
assertThat(capturedHeaders.get(1).get(hedgedHeaderKey)).isEqualTo("1");
15841582
assertThat(capturedHeaders.get(2).get(hedgedHeaderKey)).isEqualTo("2");

0 commit comments

Comments
 (0)