Skip to content

Commit e9e2f3a

Browse files
yoshi-automationandrey-qlogic
yoshi-automation
authored and
andrey-qlogic
committed
---
yaml --- r: 27353 b: refs/heads/mrschmidt-collectiongroup c: 8ec22d8 h: refs/heads/master i: 27351: 9ac9400
1 parent 1ea9992 commit e9e2f3a

17 files changed

Lines changed: 241 additions & 467 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ refs/heads/autosynth-securitycenter: f2f2feb8f3949c986d37e55cd23cdb0ce774f287
173173
refs/heads/autosynth-talent: 4ca901879f86aab61091cea52e8a9b653639df24
174174
refs/heads/cscc-samples: 620d105e6b574cfeeee04e413a157b7bd34ebc8b
175175
refs/heads/igorbernstein2-patch-1: f62464ee14df1e44a3b173cdc3976563d1b3078b
176-
refs/heads/mrschmidt-collectiongroup: a6d948bf3731a7e1ce1fcd3db8ab733a3c9b17de
176+
refs/heads/mrschmidt-collectiongroup: 8ec22d8221978381e443c9a58ef47467290d5a04
177177
refs/heads/release-google-cloud-java-v0.83.0: 4b55ec1b81b3886ede61ae868391a3cdf7eed90e
178178
refs/heads/release-google-cloud-java-v0.83.1-SNAPSHOT: 8d6db7ee534d12b1df38d8cf314871df76f87577
179179
refs/heads/v4support: aa837fd70877f5a0628d8036e88952db035b792c

‎branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/ClusterControllerClient.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.google.api.gax.rpc.UnaryCallable;
3030
import com.google.cloud.dataproc.v1.stub.ClusterControllerStub;
3131
import com.google.cloud.dataproc.v1.stub.ClusterControllerStubSettings;
32+
import com.google.common.util.concurrent.MoreExecutors;
3233
import com.google.longrunning.Operation;
3334
import com.google.longrunning.OperationsClient;
3435
import com.google.protobuf.Empty;
@@ -987,7 +988,8 @@ public static ApiFuture<ListClustersPagedResponse> createAsync(
987988
public ListClustersPagedResponse apply(ListClustersPage input) {
988989
return new ListClustersPagedResponse(input);
989990
}
990-
});
991+
},
992+
MoreExecutors.directExecutor());
991993
}
992994

993995
private ListClustersPagedResponse(ListClustersPage page) {

‎branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/JobControllerClient.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.google.api.gax.rpc.UnaryCallable;
2828
import com.google.cloud.dataproc.v1.stub.JobControllerStub;
2929
import com.google.cloud.dataproc.v1.stub.JobControllerStubSettings;
30+
import com.google.common.util.concurrent.MoreExecutors;
3031
import com.google.protobuf.Empty;
3132
import java.io.IOException;
3233
import java.util.List;
@@ -755,7 +756,8 @@ public static ApiFuture<ListJobsPagedResponse> createAsync(
755756
public ListJobsPagedResponse apply(ListJobsPage input) {
756757
return new ListJobsPagedResponse(input);
757758
}
758-
});
759+
},
760+
MoreExecutors.directExecutor());
759761
}
760762

761763
private ListJobsPagedResponse(ListJobsPage page) {

‎branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/WorkflowTemplateServiceClient.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.google.api.gax.rpc.UnaryCallable;
3030
import com.google.cloud.dataproc.v1.stub.WorkflowTemplateServiceStub;
3131
import com.google.cloud.dataproc.v1.stub.WorkflowTemplateServiceStubSettings;
32+
import com.google.common.util.concurrent.MoreExecutors;
3233
import com.google.longrunning.Operation;
3334
import com.google.longrunning.OperationsClient;
3435
import com.google.protobuf.Empty;
@@ -1232,7 +1233,8 @@ public static ApiFuture<ListWorkflowTemplatesPagedResponse> createAsync(
12321233
public ListWorkflowTemplatesPagedResponse apply(ListWorkflowTemplatesPage input) {
12331234
return new ListWorkflowTemplatesPagedResponse(input);
12341235
}
1235-
});
1236+
},
1237+
MoreExecutors.directExecutor());
12361238
}
12371239

12381240
private ListWorkflowTemplatesPagedResponse(ListWorkflowTemplatesPage page) {

‎branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterControllerClient.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.google.api.gax.rpc.UnaryCallable;
3030
import com.google.cloud.dataproc.v1beta2.stub.ClusterControllerStub;
3131
import com.google.cloud.dataproc.v1beta2.stub.ClusterControllerStubSettings;
32+
import com.google.common.util.concurrent.MoreExecutors;
3233
import com.google.longrunning.Operation;
3334
import com.google.longrunning.OperationsClient;
3435
import com.google.protobuf.Empty;
@@ -991,7 +992,8 @@ public static ApiFuture<ListClustersPagedResponse> createAsync(
991992
public ListClustersPagedResponse apply(ListClustersPage input) {
992993
return new ListClustersPagedResponse(input);
993994
}
994-
});
995+
},
996+
MoreExecutors.directExecutor());
995997
}
996998

997999
private ListClustersPagedResponse(ListClustersPage page) {

‎branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/JobControllerClient.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.google.api.gax.rpc.UnaryCallable;
2828
import com.google.cloud.dataproc.v1beta2.stub.JobControllerStub;
2929
import com.google.cloud.dataproc.v1beta2.stub.JobControllerStubSettings;
30+
import com.google.common.util.concurrent.MoreExecutors;
3031
import com.google.protobuf.Empty;
3132
import java.io.IOException;
3233
import java.util.List;
@@ -758,7 +759,8 @@ public static ApiFuture<ListJobsPagedResponse> createAsync(
758759
public ListJobsPagedResponse apply(ListJobsPage input) {
759760
return new ListJobsPagedResponse(input);
760761
}
761-
});
762+
},
763+
MoreExecutors.directExecutor());
762764
}
763765

764766
private ListJobsPagedResponse(ListJobsPage page) {

‎branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplateServiceClient.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.google.api.gax.rpc.UnaryCallable;
3030
import com.google.cloud.dataproc.v1beta2.stub.WorkflowTemplateServiceStub;
3131
import com.google.cloud.dataproc.v1beta2.stub.WorkflowTemplateServiceStubSettings;
32+
import com.google.common.util.concurrent.MoreExecutors;
3233
import com.google.longrunning.Operation;
3334
import com.google.longrunning.OperationsClient;
3435
import com.google.protobuf.Empty;
@@ -1177,7 +1178,8 @@ public static ApiFuture<ListWorkflowTemplatesPagedResponse> createAsync(
11771178
public ListWorkflowTemplatesPagedResponse apply(ListWorkflowTemplatesPage input) {
11781179
return new ListWorkflowTemplatesPagedResponse(input);
11791180
}
1180-
});
1181+
},
1182+
MoreExecutors.directExecutor());
11811183
}
11821184

11831185
private ListWorkflowTemplatesPagedResponse(ListWorkflowTemplatesPage page) {

‎branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-dataproc/synth.metadata‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"updateTime": "2019-03-01T08:40:02.252998Z",
2+
"updateTime": "2019-03-06T08:39:37.112446Z",
33
"sources": [
44
{
55
"generator": {
66
"name": "artman",
7-
"version": "0.16.14",
8-
"dockerImage": "googleapis/artman@sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7"
7+
"version": "0.16.15",
8+
"dockerImage": "googleapis/artman@sha256:9caadfa59d48224cba5f3217eb9d61a155b78ccf31e628abef385bc5b7ed3bd2"
99
}
1010
},
1111
{
1212
"git": {
1313
"name": "googleapis",
1414
"remote": "https://github.com/googleapis/googleapis.git",
15-
"sha": "41d72d444fbe445f4da89e13be02078734fb7875",
16-
"internalRef": "236230004"
15+
"sha": "856117505ff9075b3e9c0b5674113667b6cf9e00",
16+
"internalRef": "236931378"
1717
}
1818
}
1919
],

‎branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class CollectionReference extends Query {
5959
*/
6060
@Nonnull
6161
public String getId() {
62-
return options.getCollectionId();
62+
return path.getId();
6363
}
6464

6565
/**
@@ -69,7 +69,7 @@ public String getId() {
6969
*/
7070
@Nullable
7171
public DocumentReference getParent() {
72-
ResourcePath parent = options.getParentPath();
72+
ResourcePath parent = path.getParent();
7373
return parent.isDocument() ? new DocumentReference(firestore, parent) : null;
7474
}
7575

@@ -81,7 +81,7 @@ public DocumentReference getParent() {
8181
*/
8282
@Nonnull
8383
public String getPath() {
84-
return getResourcePath().getPath();
84+
return path.getPath();
8585
}
8686

8787
/**
@@ -104,10 +104,10 @@ public DocumentReference document() {
104104
*/
105105
@Nonnull
106106
public DocumentReference document(@Nonnull String childPath) {
107-
ResourcePath documentPath = getResourcePath().append(childPath);
107+
ResourcePath documentPath = path.append(childPath);
108108
Preconditions.checkArgument(
109109
documentPath.isDocument(),
110-
String.format("Path should point to a Document Reference: %s", getPath()));
110+
String.format("Path should point to a Document Reference: %s", path));
111111
return new DocumentReference(firestore, documentPath);
112112
}
113113

@@ -124,8 +124,8 @@ public DocumentReference document(@Nonnull String childPath) {
124124
@Nonnull
125125
public Iterable<DocumentReference> listDocuments() {
126126
ListDocumentsRequest.Builder request = ListDocumentsRequest.newBuilder();
127-
request.setParent(options.getParentPath().toString());
128-
request.setCollectionId(options.getCollectionId());
127+
request.setParent(path.getParent().toString());
128+
request.setCollectionId(this.getId());
129129
request.setMask(DocumentMask.getDefaultInstance());
130130
request.setShowMissing(true);
131131

@@ -206,9 +206,4 @@ public ApiFuture<DocumentReference> add(Object pojo) {
206206
}
207207
return add((Map<String, Object>) converted);
208208
}
209-
210-
/** Returns a resource path pointing to this collection. */
211-
ResourcePath getResourcePath() {
212-
return options.getParentPath().append(options.getCollectionId());
213-
}
214209
}

‎branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Firestore.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ public interface Firestore extends Service<FirestoreOptions>, AutoCloseable {
6262
@Nonnull
6363
Iterable<CollectionReference> getCollections();
6464

65-
/**
66-
* Creates and returns a new @link{Query} that includes all documents in the database that are
67-
* contained in a collection or subcollection with the given @code{collectionId}.
68-
*
69-
* @param collectionId Identifies the collections to query over. Every collection or subcollection
70-
* with this ID as the last segment of its path will be included. Cannot contain a slash.
71-
* @return The created Query.
72-
*/
73-
Query collectionGroup(@Nonnull String collectionId);
74-
7565
/**
7666
* Executes the given updateFunction and then attempts to commit the changes applied within the
7767
* transaction. If any document read within the transaction has changed, the updateFunction will

0 commit comments

Comments
 (0)