Adding .close() to Firestore Service by schmidt-sebastian · Pull Request #2807 · googleapis/google-cloud-java · GitHub
Skip to content

Adding .close() to Firestore Service #2807

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
schmidt-sebastian merged 3 commits into from
Jan 25, 2018
Merged

Adding .close() to Firestore Service #2807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
726cc6a
Adding .close() to Firestore Service
schmidt-sebastian Jan 25, 2018
07e7aae
Marking closed only when firestoreClient.close() didn't throw.
schmidt-sebastian Jan 25, 2018
236878c
Lint errors.
schmidt-sebastian Jan 25, 2018
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
10 changes: 9 additions & 1 deletion google-cloud-firestore/src/main/java/com/google/cloud/firestore/Firestore.java
View file
Open in desktop
31 changes: 21 additions & 10 deletions google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,12 @@ class FirestoreImpl implements Firestore {
private static final String AUTO_ID_ALPHABET =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";

/** Creates a pseudo-random 20-character ID that can be used for Firestore documents. */
static String autoId() {
StringBuilder builder = new StringBuilder();
int maxRandom = AUTO_ID_ALPHABET.length();
for (int i = 0; i < AUTO_ID_LENGTH; i++) {
builder.append(AUTO_ID_ALPHABET.charAt(RANDOM.nextInt(maxRandom)));
}
return builder.toString();
}

private final FirestoreRpc firestoreClient;
private final FirestoreOptions firestoreOptions;
private final ResourcePath databasePath;

private boolean closed;

FirestoreImpl(FirestoreOptions options) {
this(options, options.getFirestoreRpc());
}
Expand All @@ -81,6 +73,16 @@ static String autoId() {
ResourcePath.create(DatabaseRootName.of(options.getProjectId(), options.getDatabaseId()));
}

/** Creates a pseudo-random 20-character ID that can be used for Firestore documents. */
static String autoId() {
StringBuilder builder = new StringBuilder();
int maxRandom = AUTO_ID_ALPHABET.length();
for (int i = 0; i < AUTO_ID_LENGTH; i++) {
builder.append(AUTO_ID_ALPHABET.charAt(RANDOM.nextInt(maxRandom)));
}
return builder.toString();
}

@Nonnull
@Override
public WriteBatch batch() {
Expand Down Expand Up @@ -324,6 +326,7 @@ FirestoreRpc getClient() {
/** Request funnel for all read/write requests. */
<RequestT, ResponseT> ApiFuture<ResponseT> sendRequest(
RequestT requestT, UnaryCallable<RequestT, ResponseT> callable) {
Preconditions.checkState(!closed, "Firestore client has already been closed");
return callable.futureCall(requestT);
}

Expand All @@ -332,18 +335,26 @@ <RequestT, ResponseT> void streamRequest(
RequestT requestT,
ApiStreamObserver<ResponseT> responseObserverT,
ServerStreamingCallable<RequestT, ResponseT> callable) {
Preconditions.checkState(!closed, "Firestore client has already been closed");
callable.serverStreamingCall(requestT, responseObserverT);
}

/** Request funnel for all bidirectional streaming requests. */
<RequestT, ResponseT> ApiStreamObserver<RequestT> streamRequest(
ApiStreamObserver<ResponseT> responseObserverT,
BidiStreamingCallable<RequestT, ResponseT> callable) {
Preconditions.checkState(!closed, "Firestore client has already been closed");
return callable.bidiStreamingCall(responseObserverT);
}

@Override
public FirestoreOptions getOptions() {
return firestoreOptions;
}

@Override
public void close() throws Exception {
firestoreClient.close();
closed = true;
}
}
6 changes: 6 additions & 0 deletions google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
View file
Open in desktop