Skip to content

Commit cc44d4b

Browse files
sduskissduskis
committed
Merge branch 'master' into pubsub-ordering-keys
2 parents e026c5c + b1ebd2d commit cc44d4b

19 files changed

Lines changed: 1661 additions & 118 deletions

File tree

‎google-cloud-clients/google-cloud-kms/src/main/java/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -778,12 +778,12 @@ private static Builder initDefaults(Builder builder) {
778778

779779
builder
780780
.encryptSettings()
781-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
781+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
782782
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
783783

784784
builder
785785
.decryptSettings()
786-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
786+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
787787
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
788788

789789
builder
@@ -808,12 +808,12 @@ private static Builder initDefaults(Builder builder) {
808808

809809
builder
810810
.asymmetricDecryptSettings()
811-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
811+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
812812
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
813813

814814
builder
815815
.asymmetricSignSettings()
816-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
816+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
817817
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
818818

819819
builder

‎google-cloud-clients/google-cloud-kms/synth.metadata‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"updateTime": "2019-04-02T07:47:59.755419Z",
2+
"updateTime": "2019-04-16T07:47:27.651382Z",
33
"sources": [
44
{
55
"generator": {
66
"name": "artman",
7-
"version": "0.16.22",
8-
"dockerImage": "googleapis/artman@sha256:e7f9554322a8aa1416c122c918fdc4cdec8cfe816f027fc948dec0be7edef320"
7+
"version": "0.16.25",
8+
"dockerImage": "googleapis/artman@sha256:d9597f983d1d4e61272c63cb97b7d8f8234da9999526c35d357de3d781f0ec1b"
99
}
1010
},
1111
{
1212
"git": {
1313
"name": "googleapis",
1414
"remote": "https://github.com/googleapis/googleapis.git",
15-
"sha": "6c48ab5aef47dc14e02e2dc718d232a28067129d",
16-
"internalRef": "241437588"
15+
"sha": "b7f88d8827df8a78e1bb1d56b0f56a1bc23c6359",
16+
"internalRef": "243675277"
1717
}
1818
}
1919
],

‎google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,7 @@ public void run() {
383383
/** Compute the ideal deadline, set subsequent modacks to this deadline, and return it. */
384384
@InternalApi
385385
int computeDeadlineSeconds() {
386-
long secLong = ackLatencyDistribution.getNthPercentile(PERCENTILE_FOR_ACK_DEADLINE_UPDATES);
387-
int sec = Ints.saturatedCast(secLong);
386+
int sec = ackLatencyDistribution.getPercentile(PERCENTILE_FOR_ACK_DEADLINE_UPDATES);
388387

389388
// Use Ints.constrainToRange when we get guava 21.
390389
if (sec < Subscriber.MIN_ACK_DEADLINE_SECONDS) {

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package com.google.cloud.pubsub.v1;
1818

19+
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
20+
1921
import com.google.api.core.ApiFunction;
2022
import com.google.api.core.ApiFuture;
2123
import com.google.api.core.ApiFutureCallback;
@@ -91,6 +93,7 @@ public class Publisher {
9193

9294
private final Lock messagesBatchLock;
9395
private final Map<String, MessagesBatch> messagesBatches;
96+
9497
private final AtomicBoolean activeAlarm;
9598

9699
private final PublisherStub publisherStub;
@@ -388,7 +391,7 @@ public void onFailure(Throwable t) {
388391
Runnable task =
389392
new Runnable() {
390393
public void run() {
391-
ApiFutures.addCallback(publishCall(outstandingBatch), futureCallback);
394+
ApiFutures.addCallback(publishCall(outstandingBatch), futureCallback, directExecutor());
392395
}
393396
};
394397
executor.execute(task);
@@ -714,21 +717,21 @@ private void reset() {
714717
batchedBytes = 0;
715718
}
716719

717-
public boolean isEmpty() {
720+
private boolean isEmpty() {
718721
return messages.isEmpty();
719722
}
720723

721-
public int getBatchedBytes() {
724+
private int getBatchedBytes() {
722725
return batchedBytes;
723726
}
724727

725-
public void addMessage(OutstandingPublish message, int messageSize) {
728+
private void addMessage(OutstandingPublish message, int messageSize) {
726729
messages.add(message);
727730
batchedBytes += messageSize;
728731
}
729732

730-
public int getMessagesCount() {
733+
private int getMessagesCount() {
731734
return messages.size();
732735
}
733-
};
736+
}
734737
}

‎google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherStats.java‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ private StatusUtil() {
2525
// Static class, not instantiable.
2626
}
2727

28-
public static boolean isRetryable(Throwable error) {
28+
static boolean isRetryable(Throwable error) {
2929
if (!(error instanceof ApiException)) {
3030
return true;
3131
}

‎google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package com.google.cloud.pubsub.v1;
1818

19+
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
20+
1921
import com.google.api.core.AbstractApiService;
2022
import com.google.api.core.ApiClock;
2123
import com.google.api.core.ApiFuture;
@@ -291,7 +293,7 @@ public void onFailure(Throwable t) {
291293
.addAllAckIds(idChunk)
292294
.setAckDeadlineSeconds(modack.deadlineExtensionSeconds)
293295
.build());
294-
ApiFutures.addCallback(future, loggingCallback);
296+
ApiFutures.addCallback(future, loggingCallback, directExecutor());
295297
}
296298
}
297299

@@ -303,7 +305,7 @@ public void onFailure(Throwable t) {
303305
.setSubscription(subscription)
304306
.addAllAckIds(idChunk)
305307
.build());
306-
ApiFutures.addCallback(future, loggingCallback);
308+
ApiFutures.addCallback(future, loggingCallback, directExecutor());
307309
}
308310
}
309311
}

‎google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,52 +27,52 @@ abstract class SubscriberStats {
2727

2828
@AutoValue
2929
// TODO: Finish implementation.
30-
public abstract static class Stats {}
30+
abstract static class Stats {}
3131

3232
/** Number of successfully published messages. */
33-
public abstract long getReceivedMessages();
33+
abstract long getReceivedMessages();
3434

3535
/** Number of successfully published messages. */
36-
public abstract long getAckedMessages();
36+
abstract long getAckedMessages();
3737

3838
/** Number of received messages. */
39-
public abstract long getTotalReceivedMessages();
39+
abstract long getTotalReceivedMessages();
4040

4141
/** Number messages acked. */
42-
public abstract long getTotalAckedMessages();
42+
abstract long getTotalAckedMessages();
4343

4444
/** End to end latency. */
45-
public abstract Stats getEndToEndLatency();
45+
abstract Stats getEndToEndLatency();
4646

4747
/**
4848
* Acknowledgement latency; time in between the message has been received and then acknowledged or
4949
* rejected.
5050
*/
51-
public abstract Stats getAckLatency();
51+
abstract Stats getAckLatency();
5252

5353
/** Number of messages for which we have auto extended its acknowledgement deadline. */
54-
public abstract long getNumberOfAutoExtendedAckDeadlines();
54+
abstract long getNumberOfAutoExtendedAckDeadlines();
5555

56-
public static Builder newBuilder() {
56+
static Builder newBuilder() {
5757
return new AutoValue_SubscriberStats.Builder();
5858
}
5959

6060
@AutoValue.Builder
61-
public abstract static class Builder {
62-
public abstract Builder setReceivedMessages(long value);
61+
abstract static class Builder {
62+
abstract Builder setReceivedMessages(long value);
6363

64-
public abstract Builder setAckedMessages(long value);
64+
abstract Builder setAckedMessages(long value);
6565

66-
public abstract Builder setTotalReceivedMessages(long value);
66+
abstract Builder setTotalReceivedMessages(long value);
6767

68-
public abstract Builder setTotalAckedMessages(long value);
68+
abstract Builder setTotalAckedMessages(long value);
6969

70-
public abstract Builder setEndToEndLatency(Stats value);
70+
abstract Builder setEndToEndLatency(Stats value);
7171

72-
public abstract Builder setAckLatency(Stats value);
72+
abstract Builder setAckLatency(Stats value);
7373

74-
public abstract Builder setNumberOfAutoExtendedAckDeadlines(long value);
74+
abstract Builder setNumberOfAutoExtendedAckDeadlines(long value);
7575

76-
public abstract SubscriberStats build();
76+
abstract SubscriberStats build();
7777
}
7878
}

‎google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
import java.util.concurrent.BlockingQueue;
4343
import java.util.concurrent.LinkedBlockingQueue;
4444
import java.util.concurrent.TimeUnit;
45-
import junit.framework.Assert;
4645
import org.junit.AfterClass;
46+
import org.junit.Assert;
4747
import org.junit.BeforeClass;
4848
import org.junit.Rule;
4949
import org.junit.Test;

0 commit comments

Comments
 (0)