Skip to content

Commit 8e9c486

Browse files
mziccardmziccard
committed
---
yaml --- r: 3691 b: refs/heads/pubsub-alpha c: fd7d84d h: refs/heads/master i: 3689: 99907ca 3687: 90b25fc
1 parent 6a9733e commit 8e9c486

13 files changed

Lines changed: 102 additions & 78 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 36a62ef856d199f8efd09501b5ba65c422c01f23
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: 7406918e071dd2c5677a638ae2a06e7592b6542c
5-
refs/heads/pubsub-alpha: 407c43604ea02902a94c4e26397ddd8e6ab4705a
5+
refs/heads/pubsub-alpha: fd7d84d59c7dbff375268d07570dd46a45d4b2a0
66
refs/heads/update-datastore: 47aae517c2cb33f1dccd909adaced73ec9d0f4df
77
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
88
refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd

‎branches/pubsub-alpha/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/spi/DefaultBigQueryRpc.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@
1414

1515
package com.google.gcloud.bigquery.spi;
1616

17+
import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.ALL_DATASETS;
18+
import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.ALL_USERS;
1719
import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.DELETE_CONTENTS;
1820
import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.FIELDS;
1921
import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.MAX_RESULTS;
2022
import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.PAGE_TOKEN;
2123
import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.START_INDEX;
24+
import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.STATE_FILTER;
2225
import static com.google.gcloud.bigquery.spi.BigQueryRpc.Option.TIMEOUT;
2326
import static java.net.HttpURLConnection.HTTP_CREATED;
2427
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
@@ -110,9 +113,10 @@ public Tuple<String, Iterable<Dataset>> listDatasets(Map<Option, ?> options) {
110113
try {
111114
DatasetList datasetsList = bigquery.datasets()
112115
.list(this.options.projectId())
113-
.setAll(Option.ALL_DATASETS.getBoolean(options))
116+
.setAll(ALL_DATASETS.getBoolean(options))
114117
.setMaxResults(MAX_RESULTS.getLong(options))
115118
.setPageToken(PAGE_TOKEN.getString(options))
119+
.setPageToken(PAGE_TOKEN.getString(options))
116120
.execute();
117121
Iterable<DatasetList.Datasets> datasets = datasetsList.getDatasets();
118122
return Tuple.of(datasetsList.getNextPageToken(),
@@ -322,9 +326,9 @@ public Tuple<String, Iterable<Job>> listJobs(Map<Option, ?> options) {
322326
try {
323327
JobList jobsList = bigquery.jobs()
324328
.list(this.options.projectId())
325-
.setAllUsers(Option.ALL_USERS.getBoolean(options))
326-
.setFields(Option.FIELDS.getString(options))
327-
.setStateFilter(Option.STATE_FILTER.<List<String>>get(options))
329+
.setAllUsers(ALL_USERS.getBoolean(options))
330+
.setFields(FIELDS.getString(options))
331+
.setStateFilter(STATE_FILTER.<List<String>>get(options))
328332
.setMaxResults(MAX_RESULTS.getLong(options))
329333
.setPageToken(PAGE_TOKEN.getString(options))
330334
.setProjection(DEFAULT_PROJECTION)

‎branches/pubsub-alpha/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreOptionsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import static org.junit.Assert.assertSame;
2323
import static org.junit.Assert.assertTrue;
2424

25-
import com.google.gcloud.datastore.testing.LocalGcdHelper;
2625
import com.google.gcloud.datastore.spi.DatastoreRpc;
2726
import com.google.gcloud.datastore.spi.DatastoreRpcFactory;
27+
import com.google.gcloud.datastore.testing.LocalGcdHelper;
2828

2929
import org.easymock.EasyMock;
3030
import org.junit.Before;

‎branches/pubsub-alpha/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
import com.google.gcloud.datastore.StructuredQuery.OrderBy;
3939
import com.google.gcloud.datastore.StructuredQuery.Projection;
4040
import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
41-
import com.google.gcloud.datastore.testing.LocalGcdHelper;
4241
import com.google.gcloud.datastore.spi.DatastoreRpc;
4342
import com.google.gcloud.datastore.spi.DatastoreRpcFactory;
43+
import com.google.gcloud.datastore.testing.LocalGcdHelper;
4444
import com.google.protobuf.ByteString;
4545

4646
import org.easymock.EasyMock;

‎branches/pubsub-alpha/gcloud-java-examples/src/main/java/com/google/gcloud/examples/storage/StorageExample.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.google.gcloud.AuthCredentials.ServiceAccountAuthCredentials;
2121
import com.google.gcloud.ReadChannel;
2222
import com.google.gcloud.WriteChannel;
23-
import com.google.gcloud.storage.spi.StorageRpc.Tuple;
2423
import com.google.gcloud.storage.Blob;
2524
import com.google.gcloud.storage.BlobId;
2625
import com.google.gcloud.storage.BlobInfo;
@@ -31,6 +30,7 @@
3130
import com.google.gcloud.storage.Storage.CopyRequest;
3231
import com.google.gcloud.storage.Storage.SignUrlOption;
3332
import com.google.gcloud.storage.StorageOptions;
33+
import com.google.gcloud.storage.spi.StorageRpc.Tuple;
3434

3535
import java.io.FileOutputStream;
3636
import java.io.IOException;

‎branches/pubsub-alpha/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/DefaultResourceManagerRpc.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package com.google.gcloud.resourcemanager.spi;
22

3+
import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.FIELDS;
4+
import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.FILTER;
5+
import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.PAGE_SIZE;
6+
import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.PAGE_TOKEN;
37
import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
48
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
59

@@ -56,7 +60,7 @@ public Project get(String projectId, Map<Option, ?> options) {
5660
try {
5761
return resourceManager.projects()
5862
.get(projectId)
59-
.setFields(Option.FIELDS.getString(options))
63+
.setFields(FIELDS.getString(options))
6064
.execute();
6165
} catch (IOException ex) {
6266
ResourceManagerException translated = translate(ex);
@@ -74,10 +78,10 @@ public Tuple<String, Iterable<Project>> list(Map<Option, ?> options) {
7478
try {
7579
ListProjectsResponse response = resourceManager.projects()
7680
.list()
77-
.setFields(Option.FIELDS.getString(options))
78-
.setFilter(Option.FILTER.getString(options))
79-
.setPageSize(Option.PAGE_SIZE.getInt(options))
80-
.setPageToken(Option.PAGE_TOKEN.getString(options))
81+
.setFields(FIELDS.getString(options))
82+
.setFilter(FILTER.getString(options))
83+
.setPageSize(PAGE_SIZE.getInt(options))
84+
.setPageToken(PAGE_TOKEN.getString(options))
8185
.execute();
8286
return Tuple.<String, Iterable<Project>>of(
8387
response.getNextPageToken(), response.getProjects());

‎branches/pubsub-alpha/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import static org.junit.Assert.fail;
99

1010
import com.google.common.collect.ImmutableMap;
11-
import com.google.gcloud.resourcemanager.testing.LocalResourceManagerHelper;
1211
import com.google.gcloud.resourcemanager.spi.DefaultResourceManagerRpc;
1312
import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc;
1413
import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Tuple;
14+
import com.google.gcloud.resourcemanager.testing.LocalResourceManagerHelper;
1515

1616
import org.junit.AfterClass;
1717
import org.junit.Before;

‎branches/pubsub-alpha/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import com.google.gcloud.resourcemanager.ResourceManager.ProjectField;
3131
import com.google.gcloud.resourcemanager.ResourceManager.ProjectGetOption;
3232
import com.google.gcloud.resourcemanager.ResourceManager.ProjectListOption;
33-
import com.google.gcloud.resourcemanager.testing.LocalResourceManagerHelper;
3433
import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc;
3534
import com.google.gcloud.resourcemanager.spi.ResourceManagerRpcFactory;
35+
import com.google.gcloud.resourcemanager.testing.LocalResourceManagerHelper;
3636

3737
import org.easymock.EasyMock;
3838
import org.junit.AfterClass;

‎branches/pubsub-alpha/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import com.google.common.base.Function;
2525
import com.google.gcloud.ReadChannel;
2626
import com.google.gcloud.WriteChannel;
27-
import com.google.gcloud.storage.spi.StorageRpc;
28-
import com.google.gcloud.storage.spi.StorageRpc.Tuple;
2927
import com.google.gcloud.storage.Storage.BlobTargetOption;
3028
import com.google.gcloud.storage.Storage.BlobWriteOption;
3129
import com.google.gcloud.storage.Storage.CopyRequest;
3230
import com.google.gcloud.storage.Storage.SignUrlOption;
31+
import com.google.gcloud.storage.spi.StorageRpc;
32+
import com.google.gcloud.storage.spi.StorageRpc.Tuple;
3333

3434
import java.io.IOException;
3535
import java.io.ObjectInputStream;

‎branches/pubsub-alpha/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import com.google.common.collect.Lists;
2727
import com.google.common.collect.Sets;
2828
import com.google.gcloud.Page;
29-
import com.google.gcloud.storage.spi.StorageRpc;
3029
import com.google.gcloud.storage.Storage.BlobGetOption;
3130
import com.google.gcloud.storage.Storage.BucketTargetOption;
31+
import com.google.gcloud.storage.spi.StorageRpc;
3232

3333
import java.io.IOException;
3434
import java.io.InputStream;

0 commit comments

Comments
 (0)