From 7d073cd79e3a3635d80c422f5803b20f9d024d00 Mon Sep 17 00:00:00 2001
From: jiangmichaellll <40044148+jiangmichaellll@users.noreply.github.com>
Date: Thu, 29 Jul 2021 16:36:37 -0400
Subject: [PATCH] deps: update dependency
 com.google.cloud:google-cloud-pubsublite to v0.18.0 (#221)

---
 pom.xml                                           |  2 +-
 samples/snapshot/pom.xml                          |  2 +-
 samples/snippets/pom.xml                          |  2 +-
 .../main/java/pubsublite/spark/AdminUtils.java    |  2 +-
 .../spark/PslReadDataSourceOptions.java           | 15 ++++++++-------
 .../spark/PslWriteDataSourceOptions.java          |  6 +++---
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index c783d52d..521108ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsublite</artifactId>
-      <version>0.16.1</version>
+      <version>0.18.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index f81b6faa..fa8b6135 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsublite</artifactId>
-      <version>0.16.1</version>
+      <version>0.18.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index c6e4d1f9..9fd0c050 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsublite</artifactId>
-      <version>0.16.1</version>
+      <version>0.18.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/samples/snippets/src/main/java/pubsublite/spark/AdminUtils.java b/samples/snippets/src/main/java/pubsublite/spark/AdminUtils.java
index 4c6d0ece..fcaafa6e 100644
--- a/samples/snippets/src/main/java/pubsublite/spark/AdminUtils.java
+++ b/samples/snippets/src/main/java/pubsublite/spark/AdminUtils.java
@@ -23,8 +23,8 @@
 import com.google.cloud.pubsub.v1.AckReplyConsumer;
 import com.google.cloud.pubsub.v1.MessageReceiver;
 import com.google.cloud.pubsublite.AdminClient;
-import com.google.cloud.pubsublite.AdminClient.BacklogLocation;
 import com.google.cloud.pubsublite.AdminClientSettings;
+import com.google.cloud.pubsublite.BacklogLocation;
 import com.google.cloud.pubsublite.CloudRegion;
 import com.google.cloud.pubsublite.CloudZone;
 import com.google.cloud.pubsublite.MessageMetadata;
diff --git a/src/main/java/com/google/cloud/pubsublite/spark/PslReadDataSourceOptions.java b/src/main/java/com/google/cloud/pubsublite/spark/PslReadDataSourceOptions.java
index f3635528..6e867f12 100644
--- a/src/main/java/com/google/cloud/pubsublite/spark/PslReadDataSourceOptions.java
+++ b/src/main/java/com/google/cloud/pubsublite/spark/PslReadDataSourceOptions.java
@@ -148,7 +148,8 @@ PartitionSubscriberFactory getSubscriberFactory() {
       try {
         SubscriberServiceClient serviceClient =
             SubscriberServiceClient.create(
-                addDefaultSettings(this.subscriptionPath().location().region(), settingsBuilder));
+                addDefaultSettings(
+                    this.subscriptionPath().location().extractRegion(), settingsBuilder));
         return SubscriberBuilder.newBuilder()
             .setSubscriptionPath(this.subscriptionPath())
             .setPartition(partition)
@@ -170,7 +171,7 @@ private CursorServiceClient newCursorServiceClient() {
     try {
       return CursorServiceClient.create(
           addDefaultSettings(
-              this.subscriptionPath().location().region(),
+              this.subscriptionPath().location().extractRegion(),
               CursorServiceSettings.newBuilder()
                   .setCredentialsProvider(new PslCredentialsProvider(credentialsKey()))));
     } catch (IOException e) {
@@ -181,7 +182,7 @@ private CursorServiceClient newCursorServiceClient() {
   CursorClient newCursorClient() {
     return CursorClient.create(
         CursorClientSettings.newBuilder()
-            .setRegion(this.subscriptionPath().location().region())
+            .setRegion(this.subscriptionPath().location().extractRegion())
             .setServiceClient(newCursorServiceClient())
             .build());
   }
@@ -190,7 +191,7 @@ private AdminServiceClient newAdminServiceClient() {
     try {
       return AdminServiceClient.create(
           addDefaultSettings(
-              this.subscriptionPath().location().region(),
+              this.subscriptionPath().location().extractRegion(),
               AdminServiceSettings.newBuilder()
                   .setCredentialsProvider(new PslCredentialsProvider(credentialsKey()))));
     } catch (IOException e) {
@@ -201,7 +202,7 @@ private AdminServiceClient newAdminServiceClient() {
   AdminClient newAdminClient() {
     return AdminClient.create(
         AdminClientSettings.newBuilder()
-            .setRegion(this.subscriptionPath().location().region())
+            .setRegion(this.subscriptionPath().location().extractRegion())
             .setServiceClient(newAdminServiceClient())
             .build());
   }
@@ -210,7 +211,7 @@ private TopicStatsServiceClient newTopicStatsServiceClient() {
     try {
       return TopicStatsServiceClient.create(
           addDefaultSettings(
-              this.subscriptionPath().location().region(),
+              this.subscriptionPath().location().extractRegion(),
               TopicStatsServiceSettings.newBuilder()
                   .setCredentialsProvider(new PslCredentialsProvider(credentialsKey()))));
     } catch (IOException e) {
@@ -221,7 +222,7 @@ private TopicStatsServiceClient newTopicStatsServiceClient() {
   TopicStatsClient newTopicStatsClient() {
     return TopicStatsClient.create(
         TopicStatsClientSettings.newBuilder()
-            .setRegion(this.subscriptionPath().location().region())
+            .setRegion(this.subscriptionPath().location().extractRegion())
             .setServiceClient(newTopicStatsServiceClient())
             .build());
   }
diff --git a/src/main/java/com/google/cloud/pubsublite/spark/PslWriteDataSourceOptions.java b/src/main/java/com/google/cloud/pubsublite/spark/PslWriteDataSourceOptions.java
index d36844a0..882640fd 100644
--- a/src/main/java/com/google/cloud/pubsublite/spark/PslWriteDataSourceOptions.java
+++ b/src/main/java/com/google/cloud/pubsublite/spark/PslWriteDataSourceOptions.java
@@ -110,7 +110,7 @@ private PublisherServiceClient newServiceClient(Partition partition) throws ApiE
             settingsBuilder);
     try {
       return PublisherServiceClient.create(
-          addDefaultSettings(topicPath().location().region(), settingsBuilder));
+          addDefaultSettings(topicPath().location().extractRegion(), settingsBuilder));
     } catch (Throwable t) {
       throw toCanonical(t).underlying;
     }
@@ -123,10 +123,10 @@ private AdminClient getAdminClient() throws ApiException {
               .setServiceClient(
                   AdminServiceClient.create(
                       addDefaultSettings(
-                          topicPath().location().region(),
+                          topicPath().location().extractRegion(),
                           AdminServiceSettings.newBuilder()
                               .setCredentialsProvider(getCredentialProvider()))))
-              .setRegion(topicPath().location().region())
+              .setRegion(topicPath().location().extractRegion())
               .build());
     } catch (Throwable t) {
       throw toCanonical(t).underlying;