Skip to content

Commit 851e93c

Browse files
shinfanshinfan
committed
Merge branch 'master' of github.com:GoogleCloudPlatform/google-cloud-java
2 parents 698ea95 + 56d0a30 commit 851e93c

27 files changed

Lines changed: 146 additions & 227 deletions

File tree

‎google-cloud-core/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@
114114
<dependency>
115115
<groupId>com.google.protobuf</groupId>
116116
<artifactId>protobuf-java</artifactId>
117-
<version>3.0.0</version>
117+
<version>3.2.0</version>
118118
</dependency>
119119
<dependency>
120120
<groupId>com.google.protobuf</groupId>
121121
<artifactId>protobuf-java-util</artifactId>
122-
<version>3.0.0</version>
122+
<version>3.2.0</version>
123123
</dependency>
124124
<dependency>
125125
<groupId>io.grpc</groupId>
@@ -140,7 +140,7 @@
140140
<dependency>
141141
<groupId>com.google.api.grpc</groupId>
142142
<artifactId>grpc-google-common-protos</artifactId>
143-
<version>0.1.5</version>
143+
<version>0.1.7</version>
144144
<exclusions>
145145
<exclusion>
146146
<groupId>io.grpc</groupId>
@@ -151,7 +151,7 @@
151151
<dependency>
152152
<groupId>com.google.api.grpc</groupId>
153153
<artifactId>grpc-google-iam-v1</artifactId>
154-
<version>0.1.5</version>
154+
<version>0.1.7</version>
155155
<exclusions>
156156
<exclusion>
157157
<groupId>io.grpc</groupId>

‎google-cloud-errorreporting/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>io.netty</groupId>
2323
<artifactId>netty-tcnative-boringssl-static</artifactId>
24-
<version>1.1.33.Fork19</version>
24+
<version>1.1.33.Fork26</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>${project.groupId}</groupId>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.api.grpc</groupId>
3333
<artifactId>grpc-google-cloud-error-reporting-v1beta1</artifactId>
34-
<version>0.1.5</version>
34+
<version>0.1.7</version>
3535
<exclusions>
3636
<exclusion>
3737
<groupId>io.grpc</groupId>

‎google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ public void run(Tuple<SubscriptionName, Long> params) throws Exception {
502502
@Override
503503
public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
504504
messageCount.incrementAndGet();
505-
consumer.accept(AckReply.ACK);
505+
consumer.ack();
506506
}
507507
};
508508
SubscriptionName subscriptionName = params.x();

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndPullMessages.java renamed to google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java

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

1717
package com.google.cloud.examples.pubsub.snippets;
1818

19-
import com.google.cloud.pubsub.spi.v1.AckReply;
2019
import com.google.cloud.pubsub.spi.v1.AckReplyConsumer;
2120
import com.google.cloud.pubsub.spi.v1.MessageReceiver;
2221
import com.google.cloud.pubsub.spi.v1.Subscriber;
@@ -31,7 +30,7 @@
3130
* A snippet for Google Cloud Pub/Sub showing how to create a Pub/Sub pull subscription and
3231
* asynchronously pull messages from it.
3332
*/
34-
public class CreateSubscriptionAndPullMessages {
33+
public class CreateSubscriptionAndConsumeMessages {
3534

3635
public static void main(String... args) throws Exception {
3736
// [START async_pull_subscription]
@@ -47,7 +46,7 @@ public static void main(String... args) throws Exception {
4746
@Override
4847
public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
4948
System.out.println("got message: " + message.getData().toStringUtf8());
50-
consumer.accept(AckReply.ACK);
49+
consumer.ack();
5150
}
5251
};
5352
Subscriber subscriber = null;

‎google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/MessageReceiverSnippets.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
package com.google.cloud.examples.pubsub.snippets;
2424

25-
import com.google.cloud.pubsub.spi.v1.AckReply;
2625
import com.google.cloud.pubsub.spi.v1.AckReplyConsumer;
2726
import com.google.cloud.pubsub.spi.v1.MessageReceiver;
2827
import com.google.pubsub.v1.PubsubMessage;
@@ -51,9 +50,9 @@ public MessageReceiver messageReceiver() {
5150
MessageReceiver receiver = new MessageReceiver() {
5251
public void receiveMessage(final PubsubMessage message, final AckReplyConsumer consumer) {
5352
if (blockingQueue.offer(message)) {
54-
consumer.accept(AckReply.ACK);
53+
consumer.ack();
5554
} else {
56-
consumer.accept(AckReply.NACK);
55+
consumer.nack();
5756
}
5857
}
5958
};

‎google-cloud-language/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>io.netty</groupId>
2424
<artifactId>netty-tcnative-boringssl-static</artifactId>
25-
<version>1.1.33.Fork19</version>
25+
<version>1.1.33.Fork26</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>${project.groupId}</groupId>
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.google.api.grpc</groupId>
3434
<artifactId>grpc-google-cloud-language-v1</artifactId>
35-
<version>0.1.6</version>
35+
<version>0.1.7</version>
3636
<exclusions>
3737
<exclusion>
3838
<groupId>io.grpc</groupId>
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>com.google.api.grpc</groupId>
4545
<artifactId>grpc-google-cloud-language-v1beta2</artifactId>
46-
<version>0.1.6</version>
46+
<version>0.1.7</version>
4747
<exclusions>
4848
<exclusion>
4949
<groupId>io.grpc</groupId>

‎google-cloud-logging/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>io.netty</groupId>
2424
<artifactId>netty-tcnative-boringssl-static</artifactId>
25-
<version>1.1.33.Fork19</version>
25+
<version>1.1.33.Fork26</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>${project.groupId}</groupId>
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>com.google.api.grpc</groupId>
3434
<artifactId>grpc-google-cloud-logging-v2</artifactId>
35-
<version>0.1.5</version>
35+
<version>0.1.7</version>
3636
<exclusions>
3737
<exclusion>
3838
<groupId>io.grpc</groupId>

‎google-cloud-monitoring/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>io.netty</groupId>
2323
<artifactId>netty-tcnative-boringssl-static</artifactId>
24-
<version>1.1.33.Fork19</version>
24+
<version>1.1.33.Fork26</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>${project.groupId}</groupId>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.api.grpc</groupId>
3333
<artifactId>grpc-google-cloud-monitoring-v3</artifactId>
34-
<version>0.1.5</version>
34+
<version>0.1.7</version>
3535
<exclusions>
3636
<exclusion>
3737
<groupId>io.grpc</groupId>

‎google-cloud-pubsub/README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ With Pub/Sub you can pull messages from a subscription. Add the following import
158158
file:
159159

160160
```java
161-
import com.google.cloud.pubsub.spi.v1.AckReply;
162161
import com.google.cloud.pubsub.spi.v1.AckReplyConsumer;
163162
import com.google.cloud.pubsub.spi.v1.MessageReceiver;
164163
import com.google.cloud.pubsub.spi.v1.Subscriber;
@@ -175,7 +174,7 @@ MessageReceiver receiver =
175174
@Override
176175
public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
177176
System.out.println("got message: " + message.getData().toStringUtf8());
178-
consumer.accept(AckReply.ACK, null);
177+
consumer.ack();
179178
}
180179
};
181180
Subscriber subscriber = null;
@@ -204,7 +203,7 @@ try {
204203
In
205204
[CreateTopicAndPublishMessages.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java)
206205
and
207-
[CreateSubscriptionAndPullMessages.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndPullMessages.java)
206+
[CreateSubscriptionAndConsumeMessages.java](../google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java)
208207
we put together all the code shown above into two programs. The programs assume that you are
209208
running on Compute Engine, App Engine Flexible or from your own desktop.
210209

‎google-cloud-pubsub/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>io.netty</groupId>
2323
<artifactId>netty-tcnative-boringssl-static</artifactId>
24-
<version>1.1.33.Fork19</version>
24+
<version>1.1.33.Fork26</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>${project.groupId}</groupId>
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.api.grpc</groupId>
3333
<artifactId>grpc-google-cloud-pubsub-v1</artifactId>
34-
<version>0.1.6</version>
34+
<version>0.1.7</version>
3535
<exclusions>
3636
<exclusion>
3737
<groupId>io.grpc</groupId>

0 commit comments

Comments
 (0)