Skip to content

Using custom credential and channel provider by default #3472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pongad merged 1 commit into from
Jul 16, 2018
Merged

Using custom credential and channel provider by default #3472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 25 additions & 24 deletions ...nts/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import java.util.Objects;
import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;

/** A Factory class to create new Firestore instances. */
public final class FirestoreOptions extends ServiceOptions<Firestore, FirestoreOptions> {
Expand Down Expand Up @@ -107,12 +108,10 @@ public TransportChannelProvider getTransportChannelProvider() {

public static class Builder extends ServiceOptions.Builder<Firestore, FirestoreOptions, Builder> {

private String databaseId = FirestoreDefaults.INSTANCE.getDatabaseId();
private boolean timestampsInSnapshotsEnabled = DEFAULT_TIMESTAMPS_IN_SNAPSHOTS_ENABLED;
private TransportChannelProvider channelProvider =
FirestoreDefaults.INSTANCE.getDefaultTransportChannelProvider();
private CredentialsProvider credentialsProvider =
FirestoreDefaults.INSTANCE.getDefaultCredentialsProvider();
@Nullable private String databaseId = null;
@Nullable private Boolean timestampsInSnapshotsEnabled = null;
@Nullable private TransportChannelProvider channelProvider = null;
@Nullable private CredentialsProvider credentialsProvider = null;

private Builder() {}

Expand Down Expand Up @@ -217,10 +216,26 @@ public FirestoreOptions build() {
protected FirestoreOptions(Builder builder) {
super(FirestoreFactory.class, FirestoreRpcFactory.class, builder, new FirestoreDefaults());

this.databaseId = builder.databaseId;
this.channelProvider = builder.channelProvider;
this.credentialsProvider = builder.credentialsProvider;
this.timestampsInSnapshotsEnabled = builder.timestampsInSnapshotsEnabled;
this.databaseId =
builder.databaseId != null
? builder.databaseId
: FirestoreDefaults.INSTANCE.getDatabaseId();

this.timestampsInSnapshotsEnabled =
builder.timestampsInSnapshotsEnabled != null
? builder.timestampsInSnapshotsEnabled
: DEFAULT_TIMESTAMPS_IN_SNAPSHOTS_ENABLED;

this.channelProvider =
builder.channelProvider != null
? builder.channelProvider
: GrpcTransportOptions.setUpChannelProvider(
FirestoreSettings.defaultGrpcTransportProviderBuilder(), this);

this.credentialsProvider =
builder.credentialsProvider != null
? builder.credentialsProvider
: GrpcTransportOptions.setUpCredentialsProvider(this);
}

private static class FirestoreDefaults implements ServiceDefaults<Firestore, FirestoreOptions> {
Expand All @@ -229,10 +244,6 @@ private static class FirestoreDefaults implements ServiceDefaults<Firestore, Fir
private final String HOST = FirestoreSettings.getDefaultEndpoint();
private final String DATABASE_ID = "(default)";
private final TransportOptions TRANSPORT_OPTIONS = getDefaultTransportOptionsBuilder().build();
private final TransportChannelProvider CHANNEL_PROVIDER =
getDefaultTransportChannelProviderBuilder().build();
private final CredentialsProvider CREDENTIALS_PROVIDER =
getDefaultCredentialsProviderBuilder().build();

@Nonnull
String getHost() {
Expand Down Expand Up @@ -261,16 +272,6 @@ public FirestoreRpcFactory getDefaultRpcFactory() {
public TransportOptions getDefaultTransportOptions() {
return TRANSPORT_OPTIONS;
}

@Nonnull
TransportChannelProvider getDefaultTransportChannelProvider() {
return CHANNEL_PROVIDER;
}

@Nonnull
CredentialsProvider getDefaultCredentialsProvider() {
return CREDENTIALS_PROVIDER;
}
}

@Nonnull
Expand Down