Skip to content

Commit

Permalink
feat: Add universe domain support for Java (googleapis#1904)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
michaelpri10 and gcf-owl-bot[bot] authored Feb 28, 2024
1 parent 255d8bc commit 1e316d3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 1e316d3

Please sign in to comment.