feat: Add universe domain support for Java (#1904)

michaelpri10 · gcf-owl-bot[bot] · web-flow · commit a31f145ae9e6 · 2024-02-28T13:26:35.000-05:00
* chore: change assignees for issues and PRs to michaelpri10 * feat: Add setUniverseDomain option for Publisher and Subscriber * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Set default endpoint as null for Subscribers and Publishers * chore: Remove unneeded sample snippet --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -185,6 +185,7 @@ private Publisher(Builder builder) throws IOException {
             .setExecutorProvider(FixedExecutorProvider.create(executor))
             .setTransportChannelProvider(builder.channelProvider)
             .setEndpoint(builder.endpoint)
+            .setUniverseDomain(builder.universeDomain)
             .setHeaderProvider(builder.headerProvider);
     stubSettings
         .publishSettings()
@@ -717,7 +718,8 @@ public static final class Builder {
     static final long DEFAULT_COMPRESSION_BYTES_THRESHOLD = 240L;
 
     String topicName;
-    private String endpoint = PublisherStubSettings.getDefaultEndpoint();
+    private String endpoint = null;
+    private String universeDomain = null;
 
     // Batching options
     BatchingSettings batchingSettings = DEFAULT_BATCHING_SETTINGS;
@@ -857,6 +859,12 @@ public Builder setEndpoint(String endpoint) {
       return this;
     }
 
+    /** Gives the ability to override the universe domain. */
+    public Builder setUniverseDomain(String universeDomain) {
+      this.universeDomain = universeDomain;
+      return this;
+    }
+
     /** Gives the ability to enable transport compression. */
     public Builder setEnableCompression(boolean enableCompression) {
       this.enableCompression = enableCompression;
diff --git a/java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java b/java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
@@ -192,6 +192,7 @@ private Subscriber(Builder builder) {
               .setTransportChannelProvider(channelProvider)
               .setHeaderProvider(builder.headerProvider)
               .setEndpoint(builder.endpoint)
+              .setUniverseDomain(builder.universeDomain)
               .build();
       // TODO(pongad): what about internal header??
     } catch (Exception e) {
@@ -491,7 +492,8 @@ public static final class Builder {
         SubscriptionAdminSettings.defaultCredentialsProviderBuilder().build();
     private Optional<ApiClock> clock = Optional.absent();
     private int parallelPullCount = 1;
-    private String endpoint = SubscriberStubSettings.getDefaultEndpoint();
+    private String endpoint = null;
+    private String universeDomain = null;
 
     Builder(String subscription, MessageReceiver receiver) {
       this.subscription = subscription;
@@ -670,6 +672,12 @@ public Builder setEndpoint(String endpoint) {
       return this;
     }
 
+    /** Gives the ability to override the universe domain. */
+    public Builder setUniverseDomain(String universeDomain) {
+      this.universeDomain = universeDomain;
+      return this;
+    }
+
     /** Gives the ability to set a custom clock. */
     Builder setClock(ApiClock clock) {
       this.clock = Optional.of(clock);
