Skip to content

Commit 1e316d3

Browse files
feat: Add universe domain support for Java (googleapis#1904)
* 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>
1 parent 255d8bc commit 1e316d3

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ private Publisher(Builder builder) throws IOException {
185185
.setExecutorProvider(FixedExecutorProvider.create(executor))
186186
.setTransportChannelProvider(builder.channelProvider)
187187
.setEndpoint(builder.endpoint)
188+
.setUniverseDomain(builder.universeDomain)
188189
.setHeaderProvider(builder.headerProvider);
189190
stubSettings
190191
.publishSettings()
@@ -717,7 +718,8 @@ public static final class Builder {
717718
static final long DEFAULT_COMPRESSION_BYTES_THRESHOLD = 240L;
718719

719720
String topicName;
720-
private String endpoint = PublisherStubSettings.getDefaultEndpoint();
721+
private String endpoint = null;
722+
private String universeDomain = null;
721723

722724
// Batching options
723725
BatchingSettings batchingSettings = DEFAULT_BATCHING_SETTINGS;
@@ -857,6 +859,12 @@ public Builder setEndpoint(String endpoint) {
857859
return this;
858860
}
859861

862+
/** Gives the ability to override the universe domain. */
863+
public Builder setUniverseDomain(String universeDomain) {
864+
this.universeDomain = universeDomain;
865+
return this;
866+
}
867+
860868
/** Gives the ability to enable transport compression. */
861869
public Builder setEnableCompression(boolean enableCompression) {
862870
this.enableCompression = enableCompression;

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ private Subscriber(Builder builder) {
192192
.setTransportChannelProvider(channelProvider)
193193
.setHeaderProvider(builder.headerProvider)
194194
.setEndpoint(builder.endpoint)
195+
.setUniverseDomain(builder.universeDomain)
195196
.build();
196197
// TODO(pongad): what about internal header??
197198
} catch (Exception e) {
@@ -491,7 +492,8 @@ public static final class Builder {
491492
SubscriptionAdminSettings.defaultCredentialsProviderBuilder().build();
492493
private Optional<ApiClock> clock = Optional.absent();
493494
private int parallelPullCount = 1;
494-
private String endpoint = SubscriberStubSettings.getDefaultEndpoint();
495+
private String endpoint = null;
496+
private String universeDomain = null;
495497

496498
Builder(String subscription, MessageReceiver receiver) {
497499
this.subscription = subscription;
@@ -670,6 +672,12 @@ public Builder setEndpoint(String endpoint) {
670672
return this;
671673
}
672674

675+
/** Gives the ability to override the universe domain. */
676+
public Builder setUniverseDomain(String universeDomain) {
677+
this.universeDomain = universeDomain;
678+
return this;
679+
}
680+
673681
/** Gives the ability to set a custom clock. */
674682
Builder setClock(ApiClock clock) {
675683
this.clock = Optional.of(clock);

0 commit comments

Comments
 (0)