Skip to content

Commit b1413d4

Browse files
mziccardmziccard
authored
---
yaml --- r: 7583 b: refs/heads/tswast-patch-1 c: b0f734e h: refs/heads/master i: 7581: a34f8c7 7579: ae4d994 7575: 1de4361 7567: 389c554 7551: 7ef2d77
1 parent bcf129e commit b1413d4

4 files changed

Lines changed: 27 additions & 20 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: e0dbb7e7f9d70698d39cdcc4817b1188ff7669a1
60+
refs/heads/tswast-patch-1: b0f734e07dcdb94d843915dd42c41de1762a6876
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

2121
import com.google.cloud.Page;
22+
import com.google.cloud.bigquery.BigQuery.DatasetOption;
23+
import com.google.cloud.bigquery.BigQuery.TableListOption;
24+
import com.google.cloud.bigquery.BigQuery.TableOption;
2225

2326
import java.io.IOException;
2427
import java.io.ObjectInputStream;
@@ -145,7 +148,7 @@ public Dataset build() {
145148
* @throws BigQueryException upon failure
146149
*/
147150
public boolean exists() {
148-
return bigquery.getDataset(datasetId(), BigQuery.DatasetOption.fields()) != null;
151+
return bigquery.getDataset(datasetId(), DatasetOption.fields()) != null;
149152
}
150153

151154
/**
@@ -156,7 +159,7 @@ public boolean exists() {
156159
* @return a {@code Dataset} object with latest information or {@code null} if not found
157160
* @throws BigQueryException upon failure
158161
*/
159-
public Dataset reload(BigQuery.DatasetOption... options) {
162+
public Dataset reload(DatasetOption... options) {
160163
return bigquery.getDataset(datasetId().dataset(), options);
161164
}
162165

@@ -168,7 +171,7 @@ public Dataset reload(BigQuery.DatasetOption... options) {
168171
* @return a {@code Dataset} object with updated information
169172
* @throws BigQueryException upon failure
170173
*/
171-
public Dataset update(BigQuery.DatasetOption... options) {
174+
public Dataset update(DatasetOption... options) {
172175
return bigquery.update(this, options);
173176
}
174177

@@ -188,7 +191,7 @@ public boolean delete() {
188191
* @param options options for listing tables
189192
* @throws BigQueryException upon failure
190193
*/
191-
public Page<Table> list(BigQuery.TableListOption... options) {
194+
public Page<Table> list(TableListOption... options) {
192195
return bigquery.listTables(datasetId(), options);
193196
}
194197

@@ -199,7 +202,7 @@ public Page<Table> list(BigQuery.TableListOption... options) {
199202
* @param options table options
200203
* @throws BigQueryException upon failure
201204
*/
202-
public Table get(String table, BigQuery.TableOption... options) {
205+
public Table get(String table, TableOption... options) {
203206
return bigquery.getTable(TableId.of(datasetId().dataset(), table), options);
204207
}
205208

@@ -212,7 +215,7 @@ public Table get(String table, BigQuery.TableOption... options) {
212215
* @return a {@code Table} object for the created table
213216
* @throws BigQueryException upon failure
214217
*/
215-
public Table create(String table, TableDefinition definition, BigQuery.TableOption... options) {
218+
public Table create(String table, TableDefinition definition, TableOption... options) {
216219
TableInfo tableInfo = TableInfo.of(TableId.of(datasetId().dataset(), table), definition);
217220
return bigquery.create(tableInfo, options);
218221
}

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.google.cloud.WaitForOption;
2323
import com.google.cloud.WaitForOption.CheckingPeriod;
2424
import com.google.cloud.WaitForOption.Timeout;
25+
import com.google.cloud.bigquery.BigQuery.JobOption;
2526

2627
import java.io.IOException;
2728
import java.io.ObjectInputStream;
@@ -130,7 +131,7 @@ public Job build() {
130131
* @throws BigQueryException upon failure
131132
*/
132133
public boolean exists() {
133-
return bigquery.getJob(jobId(), BigQuery.JobOption.fields()) != null;
134+
return bigquery.getJob(jobId(), JobOption.fields()) != null;
134135
}
135136

136137
/**
@@ -146,7 +147,7 @@ public boolean exists() {
146147
* @throws BigQueryException upon failure
147148
*/
148149
public boolean isDone() {
149-
Job job = bigquery.getJob(jobId(), BigQuery.JobOption.fields(BigQuery.JobField.STATUS));
150+
Job job = bigquery.getJob(jobId(), JobOption.fields(BigQuery.JobField.STATUS));
150151
return job == null || job.status().state() == JobStatus.State.DONE;
151152
}
152153

@@ -210,7 +211,7 @@ public Job waitFor(WaitForOption... waitOptions) throws InterruptedException, Ti
210211
* @return a {@code Job} object with latest information or {@code null} if not found
211212
* @throws BigQueryException upon failure
212213
*/
213-
public Job reload(BigQuery.JobOption... options) {
214+
public Job reload(JobOption... options) {
214215
return bigquery.getJob(jobId(), options);
215216
}
216217

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

2121
import com.google.cloud.Page;
22+
import com.google.cloud.bigquery.BigQuery.JobOption;
23+
import com.google.cloud.bigquery.BigQuery.TableDataListOption;
24+
import com.google.cloud.bigquery.BigQuery.TableOption;
2225
import com.google.common.collect.ImmutableList;
2326

2427
import java.io.IOException;
@@ -140,7 +143,7 @@ public Table build() {
140143
* @throws BigQueryException upon failure
141144
*/
142145
public boolean exists() {
143-
return bigquery.getTable(tableId(), BigQuery.TableOption.fields()) != null;
146+
return bigquery.getTable(tableId(), TableOption.fields()) != null;
144147
}
145148

146149
/**
@@ -150,7 +153,7 @@ public boolean exists() {
150153
* @return a {@code Table} object with latest information or {@code null} if not found
151154
* @throws BigQueryException upon failure
152155
*/
153-
public Table reload(BigQuery.TableOption... options) {
156+
public Table reload(TableOption... options) {
154157
return bigquery.getTable(tableId(), options);
155158
}
156159

@@ -162,7 +165,7 @@ public Table reload(BigQuery.TableOption... options) {
162165
* @return a {@code Table} object with updated information
163166
* @throws BigQueryException upon failure
164167
*/
165-
public Table update(BigQuery.TableOption... options) {
168+
public Table update(TableOption... options) {
166169
return bigquery.update(this, options);
167170
}
168171

@@ -213,7 +216,7 @@ public InsertAllResponse insert(Iterable<InsertAllRequest.RowToInsert> rows,
213216
* @param options table data list options
214217
* @throws BigQueryException upon failure
215218
*/
216-
public Page<List<FieldValue>> list(BigQuery.TableDataListOption... options)
219+
public Page<List<FieldValue>> list(TableDataListOption... options)
217220
throws BigQueryException {
218221
return bigquery.listTableData(tableId(), options);
219222
}
@@ -227,7 +230,7 @@ public Page<List<FieldValue>> list(BigQuery.TableDataListOption... options)
227230
* @param options job options
228231
* @throws BigQueryException upon failure
229232
*/
230-
public Job copy(String destinationDataset, String destinationTable, BigQuery.JobOption... options)
233+
public Job copy(String destinationDataset, String destinationTable, JobOption... options)
231234
throws BigQueryException {
232235
return copy(TableId.of(destinationDataset, destinationTable), options);
233236
}
@@ -240,7 +243,7 @@ public Job copy(String destinationDataset, String destinationTable, BigQuery.Job
240243
* @param options job options
241244
* @throws BigQueryException upon failure
242245
*/
243-
public Job copy(TableId destinationTable, BigQuery.JobOption... options)
246+
public Job copy(TableId destinationTable, JobOption... options)
244247
throws BigQueryException {
245248
CopyJobConfiguration configuration = CopyJobConfiguration.of(destinationTable, tableId());
246249
return bigquery.create(JobInfo.of(configuration), options);
@@ -256,7 +259,7 @@ public Job copy(TableId destinationTable, BigQuery.JobOption... options)
256259
* @param options job options
257260
* @throws BigQueryException upon failure
258261
*/
259-
public Job extract(String format, String destinationUri, BigQuery.JobOption... options)
262+
public Job extract(String format, String destinationUri, JobOption... options)
260263
throws BigQueryException {
261264
return extract(format, ImmutableList.of(destinationUri), options);
262265
}
@@ -271,7 +274,7 @@ public Job extract(String format, String destinationUri, BigQuery.JobOption... o
271274
* @param options job options
272275
* @throws BigQueryException upon failure
273276
*/
274-
public Job extract(String format, List<String> destinationUris, BigQuery.JobOption... options)
277+
public Job extract(String format, List<String> destinationUris, JobOption... options)
275278
throws BigQueryException {
276279
ExtractJobConfiguration extractConfiguration =
277280
ExtractJobConfiguration.of(tableId(), destinationUris, format);
@@ -288,7 +291,7 @@ public Job extract(String format, List<String> destinationUris, BigQuery.JobOpti
288291
* @param options job options
289292
* @throws BigQueryException upon failure
290293
*/
291-
public Job load(FormatOptions format, String sourceUri, BigQuery.JobOption... options)
294+
public Job load(FormatOptions format, String sourceUri, JobOption... options)
292295
throws BigQueryException {
293296
return load(format, ImmutableList.of(sourceUri), options);
294297
}
@@ -303,7 +306,7 @@ public Job load(FormatOptions format, String sourceUri, BigQuery.JobOption... op
303306
* @param options job options
304307
* @throws BigQueryException upon failure
305308
*/
306-
public Job load(FormatOptions format, List<String> sourceUris, BigQuery.JobOption... options)
309+
public Job load(FormatOptions format, List<String> sourceUris, JobOption... options)
307310
throws BigQueryException {
308311
LoadJobConfiguration loadConfig = LoadJobConfiguration.of(tableId(), sourceUris, format);
309312
return bigquery.create(JobInfo.of(loadConfig), options);

0 commit comments

Comments
 (0)