Skip to content

Commit b920071

Browse files
pongadpongad
committed
---
yaml --- r: 7815 b: refs/heads/tswast-patch-1 c: 6ba75c1 h: refs/heads/master i: 7813: e726626 7811: 46c36f8 7807: b3805de
1 parent 82af6e5 commit b920071

51 files changed

Lines changed: 152 additions & 169 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 240e9f190a82c03c67a22927155bcd5adb733e5c
60+
refs/heads/tswast-patch-1: 6ba75c10fe8502bbef4eeb5fbcab57f56df5e8a0
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@
1919
import com.google.cloud.Identity;
2020
import com.google.cloud.Policy;
2121
import com.google.cloud.Role;
22-
import com.google.cloud.pubsub.Message;
23-
import com.google.cloud.pubsub.PubSub;
24-
import com.google.cloud.pubsub.PubSub.MessageProcessor;
25-
import com.google.cloud.pubsub.PubSubOptions;
26-
import com.google.cloud.pubsub.PushConfig;
27-
import com.google.cloud.pubsub.ReceivedMessage;
28-
import com.google.cloud.pubsub.Subscription;
29-
import com.google.cloud.pubsub.SubscriptionId;
30-
import com.google.cloud.pubsub.SubscriptionInfo;
31-
import com.google.cloud.pubsub.Topic;
32-
import com.google.cloud.pubsub.TopicInfo;
22+
import com.google.cloud.pubsub.deprecated.Message;
23+
import com.google.cloud.pubsub.deprecated.PubSub;
24+
import com.google.cloud.pubsub.deprecated.PubSub.MessageProcessor;
25+
import com.google.cloud.pubsub.deprecated.PubSubOptions;
26+
import com.google.cloud.pubsub.deprecated.PushConfig;
27+
import com.google.cloud.pubsub.deprecated.ReceivedMessage;
28+
import com.google.cloud.pubsub.deprecated.Subscription;
29+
import com.google.cloud.pubsub.deprecated.SubscriptionId;
30+
import com.google.cloud.pubsub.deprecated.SubscriptionInfo;
31+
import com.google.cloud.pubsub.deprecated.Topic;
32+
import com.google.cloud.pubsub.deprecated.TopicInfo;
3333
import com.google.common.collect.ImmutableMap;
34-
3534
import java.util.ArrayList;
3635
import java.util.Arrays;
3736
import java.util.HashMap;

‎branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PubSubSnippets.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,17 @@
2727
import com.google.cloud.Page;
2828
import com.google.cloud.Policy;
2929
import com.google.cloud.Role;
30-
import com.google.cloud.pubsub.Message;
31-
import com.google.cloud.pubsub.PubSub;
32-
import com.google.cloud.pubsub.PubSub.ListOption;
33-
import com.google.cloud.pubsub.PubSub.MessageProcessor;
34-
import com.google.cloud.pubsub.PushConfig;
35-
import com.google.cloud.pubsub.ReceivedMessage;
36-
import com.google.cloud.pubsub.Subscription;
37-
import com.google.cloud.pubsub.SubscriptionId;
38-
import com.google.cloud.pubsub.SubscriptionInfo;
39-
import com.google.cloud.pubsub.Topic;
40-
import com.google.cloud.pubsub.TopicInfo;
41-
30+
import com.google.cloud.pubsub.deprecated.Message;
31+
import com.google.cloud.pubsub.deprecated.PubSub;
32+
import com.google.cloud.pubsub.deprecated.PubSub.ListOption;
33+
import com.google.cloud.pubsub.deprecated.PubSub.MessageProcessor;
34+
import com.google.cloud.pubsub.deprecated.PushConfig;
35+
import com.google.cloud.pubsub.deprecated.ReceivedMessage;
36+
import com.google.cloud.pubsub.deprecated.Subscription;
37+
import com.google.cloud.pubsub.deprecated.SubscriptionId;
38+
import com.google.cloud.pubsub.deprecated.SubscriptionInfo;
39+
import com.google.cloud.pubsub.deprecated.Topic;
40+
import com.google.cloud.pubsub.deprecated.TopicInfo;
4241
import java.util.Iterator;
4342
import java.util.LinkedList;
4443
import java.util.List;

‎branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionSnippets.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@
2525
import com.google.cloud.Identity;
2626
import com.google.cloud.Policy;
2727
import com.google.cloud.Role;
28-
import com.google.cloud.pubsub.Message;
29-
import com.google.cloud.pubsub.PubSub.MessageConsumer;
30-
import com.google.cloud.pubsub.PubSub.MessageProcessor;
31-
import com.google.cloud.pubsub.PushConfig;
32-
import com.google.cloud.pubsub.ReceivedMessage;
33-
import com.google.cloud.pubsub.Subscription;
34-
28+
import com.google.cloud.pubsub.deprecated.Message;
29+
import com.google.cloud.pubsub.deprecated.PubSub.MessageConsumer;
30+
import com.google.cloud.pubsub.deprecated.PubSub.MessageProcessor;
31+
import com.google.cloud.pubsub.deprecated.PushConfig;
32+
import com.google.cloud.pubsub.deprecated.ReceivedMessage;
33+
import com.google.cloud.pubsub.deprecated.Subscription;
3534
import java.util.Iterator;
3635
import java.util.LinkedList;
3736
import java.util.List;

‎branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/TopicSnippets.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@
2727
import com.google.cloud.Page;
2828
import com.google.cloud.Policy;
2929
import com.google.cloud.Role;
30-
import com.google.cloud.pubsub.Message;
31-
import com.google.cloud.pubsub.PubSub.ListOption;
32-
import com.google.cloud.pubsub.SubscriptionId;
33-
import com.google.cloud.pubsub.Topic;
34-
30+
import com.google.cloud.pubsub.deprecated.Message;
31+
import com.google.cloud.pubsub.deprecated.PubSub.ListOption;
32+
import com.google.cloud.pubsub.deprecated.SubscriptionId;
33+
import com.google.cloud.pubsub.deprecated.Topic;
3534
import java.util.Iterator;
3635
import java.util.LinkedList;
3736
import java.util.List;

‎branches/tswast-patch-1/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,27 @@
2525
import com.google.cloud.Page;
2626
import com.google.cloud.Policy;
2727
import com.google.cloud.Role;
28-
import com.google.cloud.pubsub.PubSub;
29-
import com.google.cloud.pubsub.PubSubOptions;
30-
import com.google.cloud.pubsub.ReceivedMessage;
31-
import com.google.cloud.pubsub.Subscription;
32-
import com.google.cloud.pubsub.SubscriptionId;
33-
import com.google.cloud.pubsub.SubscriptionInfo;
34-
import com.google.cloud.pubsub.Topic;
35-
import com.google.cloud.pubsub.TopicInfo;
28+
import com.google.cloud.pubsub.deprecated.PubSub;
29+
import com.google.cloud.pubsub.deprecated.PubSubOptions;
30+
import com.google.cloud.pubsub.deprecated.ReceivedMessage;
31+
import com.google.cloud.pubsub.deprecated.Subscription;
32+
import com.google.cloud.pubsub.deprecated.SubscriptionId;
33+
import com.google.cloud.pubsub.deprecated.SubscriptionInfo;
34+
import com.google.cloud.pubsub.deprecated.Topic;
35+
import com.google.cloud.pubsub.deprecated.TopicInfo;
3636
import com.google.common.collect.Iterators;
3737
import com.google.common.collect.Sets;
38-
39-
import org.junit.AfterClass;
40-
import org.junit.BeforeClass;
41-
import org.junit.Rule;
42-
import org.junit.Test;
43-
import org.junit.rules.Timeout;
44-
4538
import java.util.HashSet;
4639
import java.util.Iterator;
4740
import java.util.List;
4841
import java.util.Set;
4942
import java.util.UUID;
5043
import java.util.concurrent.ExecutionException;
44+
import org.junit.AfterClass;
45+
import org.junit.BeforeClass;
46+
import org.junit.Rule;
47+
import org.junit.Test;
48+
import org.junit.rules.Timeout;
5149

5250
public class ITPubSubSnippets {
5351

‎branches/tswast-patch-1/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionSnippets.java‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,20 @@
2525
import com.google.cloud.Identity;
2626
import com.google.cloud.Policy;
2727
import com.google.cloud.Role;
28-
import com.google.cloud.pubsub.Message;
29-
import com.google.cloud.pubsub.PubSub;
30-
import com.google.cloud.pubsub.PubSubOptions;
31-
import com.google.cloud.pubsub.ReceivedMessage;
32-
import com.google.cloud.pubsub.Subscription;
33-
import com.google.cloud.pubsub.SubscriptionInfo;
34-
import com.google.cloud.pubsub.Topic;
35-
import com.google.cloud.pubsub.TopicInfo;
36-
37-
import org.junit.AfterClass;
38-
import org.junit.BeforeClass;
39-
import org.junit.Test;
40-
28+
import com.google.cloud.pubsub.deprecated.Message;
29+
import com.google.cloud.pubsub.deprecated.PubSub;
30+
import com.google.cloud.pubsub.deprecated.PubSubOptions;
31+
import com.google.cloud.pubsub.deprecated.ReceivedMessage;
32+
import com.google.cloud.pubsub.deprecated.Subscription;
33+
import com.google.cloud.pubsub.deprecated.SubscriptionInfo;
34+
import com.google.cloud.pubsub.deprecated.Topic;
35+
import com.google.cloud.pubsub.deprecated.TopicInfo;
4136
import java.util.Iterator;
4237
import java.util.UUID;
4338
import java.util.concurrent.ExecutionException;
39+
import org.junit.AfterClass;
40+
import org.junit.BeforeClass;
41+
import org.junit.Test;
4442

4543
public class ITSubscriptionSnippets {
4644

‎branches/tswast-patch-1/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicSnippets.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,19 @@
2525
import com.google.cloud.Page;
2626
import com.google.cloud.Policy;
2727
import com.google.cloud.Role;
28-
import com.google.cloud.pubsub.PubSub;
29-
import com.google.cloud.pubsub.PubSubOptions;
30-
import com.google.cloud.pubsub.SubscriptionId;
31-
import com.google.cloud.pubsub.SubscriptionInfo;
32-
import com.google.cloud.pubsub.Topic;
33-
import com.google.cloud.pubsub.TopicInfo;
28+
import com.google.cloud.pubsub.deprecated.PubSub;
29+
import com.google.cloud.pubsub.deprecated.PubSubOptions;
30+
import com.google.cloud.pubsub.deprecated.SubscriptionId;
31+
import com.google.cloud.pubsub.deprecated.SubscriptionInfo;
32+
import com.google.cloud.pubsub.deprecated.Topic;
33+
import com.google.cloud.pubsub.deprecated.TopicInfo;
3434
import com.google.common.collect.Iterators;
35-
35+
import java.util.UUID;
36+
import java.util.concurrent.ExecutionException;
3637
import org.junit.AfterClass;
3738
import org.junit.BeforeClass;
3839
import org.junit.Test;
3940

40-
import java.util.UUID;
41-
import java.util.concurrent.ExecutionException;
42-
4341
public class ITTopicSnippets {
4442

4543
private static final String TOPIC = "it-topic-snippets-topic-" + UUID.randomUUID().toString();

branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/AckDeadlineRenewer.java renamed to branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/deprecated/AckDeadlineRenewer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub;
17+
package com.google.cloud.pubsub.deprecated;
1818

1919
import com.google.cloud.Clock;
2020
import com.google.cloud.GrpcServiceOptions.ExecutorFactory;

branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/Message.java renamed to branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/deprecated/Message.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.pubsub;
17+
package com.google.cloud.pubsub.deprecated;
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

0 commit comments

Comments
 (0)