Skip to content

Commit 4ead4bb

Browse files
mziccardmziccard
committed
---
yaml --- r: 5105 b: refs/heads/master c: 076a14f h: refs/heads/master i: 5103: af61465
1 parent e50fdfb commit 4ead4bb

5 files changed

Lines changed: 24 additions & 31 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: d504bb63d785920cf63a40f351a43f77d0db7d46
2+
refs/heads/master: 076a14f27bf6978878718398c9f01ce7d89aef29
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: 7406918e071dd2c5677a638ae2a06e7592b6542c
55
refs/heads/pubsub-alpha: d6bbd32eed6cb48cda8d6798ee70ddd6bfc1f07d

‎trunk/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Dataset.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
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;
2522

2623
import java.io.IOException;
2724
import java.io.ObjectInputStream;
@@ -148,7 +145,7 @@ public Dataset build() {
148145
* @throws BigQueryException upon failure
149146
*/
150147
public boolean exists() {
151-
return bigquery.getDataset(datasetId(), DatasetOption.fields()) != null;
148+
return bigquery.getDataset(datasetId(), BigQuery.DatasetOption.fields()) != null;
152149
}
153150

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

@@ -171,7 +168,7 @@ public Dataset reload(DatasetOption... options) {
171168
* @return a {@code Dataset} object with updated information
172169
* @throws BigQueryException upon failure
173170
*/
174-
public Dataset update(DatasetOption... options) {
171+
public Dataset update(BigQuery.DatasetOption... options) {
175172
return bigquery.update(this, options);
176173
}
177174

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

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

@@ -215,7 +212,7 @@ public Table get(String table, TableOption... options) {
215212
* @return a {@code Table} object for the created table
216213
* @throws BigQueryException upon failure
217214
*/
218-
public Table create(String table, TableDefinition definition, TableOption... options) {
215+
public Table create(String table, TableDefinition definition, BigQuery.TableOption... options) {
219216
TableInfo tableInfo = TableInfo.of(TableId.of(datasetId().dataset(), table), definition);
220217
return bigquery.create(tableInfo, options);
221218
}

‎trunk/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
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;
2625

2726
import java.io.IOException;
2827
import java.io.ObjectInputStream;
@@ -131,7 +130,7 @@ public Job build() {
131130
* @throws BigQueryException upon failure
132131
*/
133132
public boolean exists() {
134-
return bigquery.getJob(jobId(), JobOption.fields()) != null;
133+
return bigquery.getJob(jobId(), BigQuery.JobOption.fields()) != null;
135134
}
136135

137136
/**
@@ -147,7 +146,7 @@ public boolean exists() {
147146
* @throws BigQueryException upon failure
148147
*/
149148
public boolean isDone() {
150-
Job job = bigquery.getJob(jobId(), JobOption.fields(BigQuery.JobField.STATUS));
149+
Job job = bigquery.getJob(jobId(), BigQuery.JobOption.fields(BigQuery.JobField.STATUS));
151150
return job == null || job.status().state() == JobStatus.State.DONE;
152151
}
153152

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

‎trunk/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Table.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
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;
2522
import com.google.common.collect.ImmutableList;
2623

2724
import java.io.IOException;
@@ -143,7 +140,7 @@ public Table build() {
143140
* @throws BigQueryException upon failure
144141
*/
145142
public boolean exists() {
146-
return bigquery.getTable(tableId(), TableOption.fields()) != null;
143+
return bigquery.getTable(tableId(), BigQuery.TableOption.fields()) != null;
147144
}
148145

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

@@ -165,7 +162,7 @@ public Table reload(TableOption... options) {
165162
* @return a {@code Table} object with updated information
166163
* @throws BigQueryException upon failure
167164
*/
168-
public Table update(TableOption... options) {
165+
public Table update(BigQuery.TableOption... options) {
169166
return bigquery.update(this, options);
170167
}
171168

@@ -216,7 +213,7 @@ public InsertAllResponse insert(Iterable<InsertAllRequest.RowToInsert> rows,
216213
* @param options table data list options
217214
* @throws BigQueryException upon failure
218215
*/
219-
public Page<List<FieldValue>> list(TableDataListOption... options)
216+
public Page<List<FieldValue>> list(BigQuery.TableDataListOption... options)
220217
throws BigQueryException {
221218
return bigquery.listTableData(tableId(), options);
222219
}
@@ -230,7 +227,7 @@ public Page<List<FieldValue>> list(TableDataListOption... options)
230227
* @param options job options
231228
* @throws BigQueryException upon failure
232229
*/
233-
public Job copy(String destinationDataset, String destinationTable, JobOption... options)
230+
public Job copy(String destinationDataset, String destinationTable, BigQuery.JobOption... options)
234231
throws BigQueryException {
235232
return copy(TableId.of(destinationDataset, destinationTable), options);
236233
}
@@ -243,7 +240,7 @@ public Job copy(String destinationDataset, String destinationTable, JobOption...
243240
* @param options job options
244241
* @throws BigQueryException upon failure
245242
*/
246-
public Job copy(TableId destinationTable, JobOption... options)
243+
public Job copy(TableId destinationTable, BigQuery.JobOption... options)
247244
throws BigQueryException {
248245
CopyJobConfiguration configuration = CopyJobConfiguration.of(destinationTable, tableId());
249246
return bigquery.create(JobInfo.of(configuration), options);
@@ -259,7 +256,7 @@ public Job copy(TableId destinationTable, JobOption... options)
259256
* @param options job options
260257
* @throws BigQueryException upon failure
261258
*/
262-
public Job extract(String format, String destinationUri, JobOption... options)
259+
public Job extract(String format, String destinationUri, BigQuery.JobOption... options)
263260
throws BigQueryException {
264261
return extract(format, ImmutableList.of(destinationUri), options);
265262
}
@@ -274,7 +271,7 @@ public Job extract(String format, String destinationUri, JobOption... options)
274271
* @param options job options
275272
* @throws BigQueryException upon failure
276273
*/
277-
public Job extract(String format, List<String> destinationUris, JobOption... options)
274+
public Job extract(String format, List<String> destinationUris, BigQuery.JobOption... options)
278275
throws BigQueryException {
279276
ExtractJobConfiguration extractConfiguration =
280277
ExtractJobConfiguration.of(tableId(), destinationUris, format);
@@ -291,7 +288,7 @@ public Job extract(String format, List<String> destinationUris, JobOption... opt
291288
* @param options job options
292289
* @throws BigQueryException upon failure
293290
*/
294-
public Job load(FormatOptions format, String sourceUri, JobOption... options)
291+
public Job load(FormatOptions format, String sourceUri, BigQuery.JobOption... options)
295292
throws BigQueryException {
296293
return load(format, ImmutableList.of(sourceUri), options);
297294
}
@@ -306,7 +303,7 @@ public Job load(FormatOptions format, String sourceUri, JobOption... options)
306303
* @param options job options
307304
* @throws BigQueryException upon failure
308305
*/
309-
public Job load(FormatOptions format, List<String> sourceUris, JobOption... options)
306+
public Job load(FormatOptions format, List<String> sourceUris, BigQuery.JobOption... options)
310307
throws BigQueryException {
311308
LoadJobConfiguration loadConfig = LoadJobConfiguration.of(tableId(), sourceUris, format);
312309
return bigquery.create(JobInfo.of(loadConfig), options);

‎trunk/google-cloud-examples/src/main/java/com/google/cloud/examples/logging/snippets/LoggingSnippets.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public Sink updateSinkAsync(String sinkName, String datasetName)
134134
public Sink getSink(String sinkName) {
135135
// [START getSink]
136136
Sink sink = logging.getSink(sinkName);
137-
if (sink != null) {
137+
if (sink == null) {
138138
// sink was not found
139139
}
140140
// [END getSink]
@@ -151,7 +151,7 @@ public Sink getSinkAsync(String sinkName) throws ExecutionException, Interrupted
151151
Future<Sink> future = logging.getSinkAsync(sinkName);
152152
// ...
153153
Sink sink = future.get();
154-
if (sink != null) {
154+
if (sink == null) {
155155
// sink was not found
156156
}
157157
// [END getSinkAsync]
@@ -371,7 +371,7 @@ public Metric updateMetricAsync(String metricName)
371371
public Metric getMetric(String metricName) {
372372
// [START getMetric]
373373
Metric metric = logging.getMetric(metricName);
374-
if (metric != null) {
374+
if (metric == null) {
375375
// metric was not found
376376
}
377377
// [END getMetric]
@@ -388,7 +388,7 @@ public Metric getMetricAsync(String metricName) throws ExecutionException, Inter
388388
Future<Metric> future = logging.getMetricAsync(metricName);
389389
// ...
390390
Metric metric = future.get();
391-
if (metric != null) {
391+
if (metric == null) {
392392
// metric was not found
393393
}
394394
// [END getMetricAsync]

0 commit comments

Comments
 (0)