From bcfd6a715367bdaa9c3cd5fcf1edacb9ebeb9ba4 Mon Sep 17 00:00:00 2001 From: arithmetic1728 Date: Mon, 15 Mar 2021 12:02:32 -0700 Subject: [PATCH] feat: jwt --- google-cloud-pubsub/.factorypath | 3 ++ google-cloud-pubsub/pom.xml | 11 +++-- .../pubsub/v1/stub/PublisherStubSettings.java | 2 +- .../v1/stub/SchemaServiceStubSettings.java | 2 +- .../v1/stub/SubscriberStubSettings.java | 2 +- .../google/cloud/pubsub/v1/SampleTest.java | 43 +++++++++++++++++++ 6 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 google-cloud-pubsub/.factorypath create mode 100644 google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SampleTest.java diff --git a/google-cloud-pubsub/.factorypath b/google-cloud-pubsub/.factorypath new file mode 100644 index 000000000..27b6d1c5a --- /dev/null +++ b/google-cloud-pubsub/.factorypath @@ -0,0 +1,3 @@ + + + diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml index df03465bb..461d935e4 100644 --- a/google-cloud-pubsub/pom.xml +++ b/google-cloud-pubsub/pom.xml @@ -17,6 +17,11 @@ google-cloud-pubsub + + com.google.auth + google-auth-library-oauth2-http + 0.24.2-SNAPSHOT + io.grpc grpc-api @@ -57,10 +62,12 @@ com.google.api gax + 1.62.1-SNAPSHOT com.google.api gax-grpc + 1.62.1-SNAPSHOT org.threeten @@ -86,10 +93,6 @@ com.google.auto.value auto-value-annotations - - com.google.http-client - google-http-client - diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java index 696671660..db05871b8 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java @@ -240,7 +240,7 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder().setDefaultScopes(DEFAULT_SERVICE_SCOPES); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java index c78c64fc2..c712b1910 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java @@ -170,7 +170,7 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder().setDefaultScopes(DEFAULT_SERVICE_SCOPES); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java index d061959f1..4aed371dc 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java @@ -274,7 +274,7 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder().setDefaultScopes(DEFAULT_SERVICE_SCOPES); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SampleTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SampleTest.java new file mode 100644 index 000000000..79d518e62 --- /dev/null +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SampleTest.java @@ -0,0 +1,43 @@ +/* + * Copyright 2016 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.pubsub.v1; + +import com.google.pubsub.v1.ProjectName; +import com.google.pubsub.v1.Topic; +import java.io.IOException; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +public class SampleTest { + + @Test + public void testListTopics() throws Exception { + String projectId = "dcatest-281318"; + + //TopicAdminClient topicAdminClient = TopicAdminClient.create(TopicAdminSettings.newBuilder().setEndpoint("us-east1-pubsub.googleapis.com:443").build()); + //TopicAdminClient topicAdminClient = TopicAdminClient.create(); + //TopicAdminSettings settings = TopicAdminSettings.newBuilder().setEndpoint("us-east1-pubsub.googleapis.com:443").build(); + TopicAdminSettings settings = TopicAdminSettings.newBuilder().setEndpoint("pubsub.googleapis.com:443").build(); + TopicAdminClient topicAdminClient = TopicAdminClient.create(settings); + + ProjectName projectName = ProjectName.of(projectId); + for (Topic topic : topicAdminClient.listTopics(projectName).iterateAll()) { + System.out.println(topic.getName()); + } + System.out.println("Listed all topics."); + } +}