Skip to content

Add imports when possibile in BigQuery functional classes #1244

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
mziccard merged 1 commit into from
Sep 15, 2016
Merged

Add imports when possibile in BigQuery functional classes #1244

Show file tree
Hide file tree
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
15 changes: 9 additions & 6 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.cloud.Page;
import com.google.cloud.bigquery.BigQuery.DatasetOption;
import com.google.cloud.bigquery.BigQuery.TableListOption;
import com.google.cloud.bigquery.BigQuery.TableOption;

import java.io.IOException;
import java.io.ObjectInputStream;
Expand Down Expand Up @@ -145,7 +148,7 @@ public Dataset build() {
* @throws BigQueryException upon failure
*/
public boolean exists() {
return bigquery.getDataset(datasetId(), BigQuery.DatasetOption.fields()) != null;
return bigquery.getDataset(datasetId(), DatasetOption.fields()) != null;
}

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

Expand All @@ -168,7 +171,7 @@ public Dataset reload(BigQuery.DatasetOption... options) {
* @return a {@code Dataset} object with updated information
* @throws BigQueryException upon failure
*/
public Dataset update(BigQuery.DatasetOption... options) {
public Dataset update(DatasetOption... options) {
return bigquery.update(this, options);
}

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

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

Expand All @@ -212,7 +215,7 @@ public Table get(String table, BigQuery.TableOption... options) {
* @return a {@code Table} object for the created table
* @throws BigQueryException upon failure
*/
public Table create(String table, TableDefinition definition, BigQuery.TableOption... options) {
public Table create(String table, TableDefinition definition, TableOption... options) {
TableInfo tableInfo = TableInfo.of(TableId.of(datasetId().dataset(), table), definition);
return bigquery.create(tableInfo, options);
}
Expand Down
7 changes: 4 additions & 3 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.google.cloud.WaitForOption;
import com.google.cloud.WaitForOption.CheckingPeriod;
import com.google.cloud.WaitForOption.Timeout;
import com.google.cloud.bigquery.BigQuery.JobOption;

import java.io.IOException;
import java.io.ObjectInputStream;
Expand Down Expand Up @@ -130,7 +131,7 @@ public Job build() {
* @throws BigQueryException upon failure
*/
public boolean exists() {
return bigquery.getJob(jobId(), BigQuery.JobOption.fields()) != null;
return bigquery.getJob(jobId(), JobOption.fields()) != null;
}

/**
Expand All @@ -146,7 +147,7 @@ public boolean exists() {
* @throws BigQueryException upon failure
*/
public boolean isDone() {
Job job = bigquery.getJob(jobId(), BigQuery.JobOption.fields(BigQuery.JobField.STATUS));
Job job = bigquery.getJob(jobId(), JobOption.fields(BigQuery.JobField.STATUS));
return job == null || job.status().state() == JobStatus.State.DONE;
}

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

Expand Down
23 changes: 13 additions & 10 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
import static com.google.common.base.Preconditions.checkNotNull;

import com.google.cloud.Page;
import com.google.cloud.bigquery.BigQuery.JobOption;
import com.google.cloud.bigquery.BigQuery.TableDataListOption;
import com.google.cloud.bigquery.BigQuery.TableOption;
import com.google.common.collect.ImmutableList;

import java.io.IOException;
Expand Down Expand Up @@ -140,7 +143,7 @@ public Table build() {
* @throws BigQueryException upon failure
*/
public boolean exists() {
return bigquery.getTable(tableId(), BigQuery.TableOption.fields()) != null;
return bigquery.getTable(tableId(), TableOption.fields()) != null;
}

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

Expand All @@ -162,7 +165,7 @@ public Table reload(BigQuery.TableOption... options) {
* @return a {@code Table} object with updated information
* @throws BigQueryException upon failure
*/
public Table update(BigQuery.TableOption... options) {
public Table update(TableOption... options) {
return bigquery.update(this, options);
}

Expand Down Expand Up @@ -213,7 +216,7 @@ public InsertAllResponse insert(Iterable<InsertAllRequest.RowToInsert> rows,
* @param options table data list options
* @throws BigQueryException upon failure
*/
public Page<List<FieldValue>> list(BigQuery.TableDataListOption... options)
public Page<List<FieldValue>> list(TableDataListOption... options)
throws BigQueryException {
return bigquery.listTableData(tableId(), options);
}
Expand All @@ -227,7 +230,7 @@ public Page<List<FieldValue>> list(BigQuery.TableDataListOption... options)
* @param options job options
* @throws BigQueryException upon failure
*/
public Job copy(String destinationDataset, String destinationTable, BigQuery.JobOption... options)
public Job copy(String destinationDataset, String destinationTable, JobOption... options)
throws BigQueryException {
return copy(TableId.of(destinationDataset, destinationTable), options);
}
Expand All @@ -240,7 +243,7 @@ public Job copy(String destinationDataset, String destinationTable, BigQuery.Job
* @param options job options
* @throws BigQueryException upon failure
*/
public Job copy(TableId destinationTable, BigQuery.JobOption... options)
public Job copy(TableId destinationTable, JobOption... options)
throws BigQueryException {
CopyJobConfiguration configuration = CopyJobConfiguration.of(destinationTable, tableId());
return bigquery.create(JobInfo.of(configuration), options);
Expand All @@ -256,7 +259,7 @@ public Job copy(TableId destinationTable, BigQuery.JobOption... options)
* @param options job options
* @throws BigQueryException upon failure
*/
public Job extract(String format, String destinationUri, BigQuery.JobOption... options)
public Job extract(String format, String destinationUri, JobOption... options)
throws BigQueryException {
return extract(format, ImmutableList.of(destinationUri), options);
}
Expand All @@ -271,7 +274,7 @@ public Job extract(String format, String destinationUri, BigQuery.JobOption... o
* @param options job options
* @throws BigQueryException upon failure
*/
public Job extract(String format, List<String> destinationUris, BigQuery.JobOption... options)
public Job extract(String format, List<String> destinationUris, JobOption... options)
throws BigQueryException {
ExtractJobConfiguration extractConfiguration =
ExtractJobConfiguration.of(tableId(), destinationUris, format);
Expand All @@ -288,7 +291,7 @@ public Job extract(String format, List<String> destinationUris, BigQuery.JobOpti
* @param options job options
* @throws BigQueryException upon failure
*/
public Job load(FormatOptions format, String sourceUri, BigQuery.JobOption... options)
public Job load(FormatOptions format, String sourceUri, JobOption... options)
throws BigQueryException {
return load(format, ImmutableList.of(sourceUri), options);
}
Expand All @@ -303,7 +306,7 @@ public Job load(FormatOptions format, String sourceUri, BigQuery.JobOption... op
* @param options job options
* @throws BigQueryException upon failure
*/
public Job load(FormatOptions format, List<String> sourceUris, BigQuery.JobOption... options)
public Job load(FormatOptions format, List<String> sourceUris, JobOption... options)
throws BigQueryException {
LoadJobConfiguration loadConfig = LoadJobConfiguration.of(tableId(), sourceUris, format);
return bigquery.create(JobInfo.of(loadConfig), options);
Expand Down