Skip to content

Commit 6535040

Browse files
mziccardmziccard
committed
---
yaml --- r: 1641 b: refs/heads/master c: b6ad451 h: refs/heads/master i: 1639: b91e1a3
1 parent 830e313 commit 6535040

10 files changed

Lines changed: 27 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: 5829d81533472cd81d946e493e9f7ac136d24235
2+
refs/heads/master: b6ad4512fe838c4197192e178d3eed438f49832f
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,21 @@ public final class Dataset extends DatasetInfo {
4141
private final BigQueryOptions options;
4242
private transient BigQuery bigquery;
4343

44+
/**
45+
* A builder for {@code Dataset} objects.
46+
*/
4447
public static final class Builder extends DatasetInfo.Builder {
4548

4649
private final BigQuery bigquery;
4750
private final DatasetInfo.BuilderImpl infoBuilder;
4851

49-
private Builder(BigQuery bigquery) {
52+
Builder(BigQuery bigquery, DatasetId datasetId) {
5053
this.bigquery = bigquery;
5154
this.infoBuilder = new DatasetInfo.BuilderImpl();
55+
this.infoBuilder.datasetId(datasetId);
5256
}
5357

54-
private Builder(Dataset dataset) {
58+
Builder(Dataset dataset) {
5559
this.bigquery = dataset.bigquery;
5660
this.infoBuilder = new DatasetInfo.BuilderImpl(dataset);
5761
}
@@ -220,14 +224,6 @@ public BigQuery bigquery() {
220224
return bigquery;
221225
}
222226

223-
static Builder builder(BigQuery bigquery, DatasetId datasetId) {
224-
return new Builder(bigquery).datasetId(datasetId);
225-
}
226-
227-
static Builder builder(BigQuery bigquery, String datasetId) {
228-
return builder(bigquery, DatasetId.of(datasetId));
229-
}
230-
231227
@Override
232228
public Builder toBuilder() {
233229
return new Builder(this);

‎trunk/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ public Dataset apply(DatasetInfo datasetInfo) {
7070
private final String location;
7171
private final String selfLink;
7272

73+
/**
74+
* A builder for {@code DatasetInfo} objects.
75+
*/
7376
public abstract static class Builder {
7477

7578
/**
@@ -132,9 +135,6 @@ public abstract static class Builder {
132135
public abstract DatasetInfo build();
133136
}
134137

135-
/**
136-
* Base class for a {@code DatasetInfo} builder.
137-
*/
138138
static final class BuilderImpl extends Builder {
139139

140140
private DatasetId datasetId;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,21 @@ public final class Job extends JobInfo {
3737
private final BigQueryOptions options;
3838
private transient BigQuery bigquery;
3939

40+
/**
41+
* A builder for {@code Job} objects.
42+
*/
4043
public static final class Builder extends JobInfo.Builder {
4144

4245
private final BigQuery bigquery;
4346
private final JobInfo.BuilderImpl infoBuilder;
4447

45-
private Builder(BigQuery bigquery) {
48+
Builder(BigQuery bigquery, JobConfiguration configuration) {
4649
this.bigquery = bigquery;
4750
this.infoBuilder = new JobInfo.BuilderImpl();
51+
this.infoBuilder.configuration(configuration);
4852
}
4953

50-
private Builder(Job job) {
54+
Builder(Job job) {
5155
this.bigquery = job.bigquery;
5256
this.infoBuilder = new JobInfo.BuilderImpl(job);
5357
}
@@ -171,10 +175,6 @@ public BigQuery bigquery() {
171175
return bigquery;
172176
}
173177

174-
static Builder builder(BigQuery bigquery, JobConfiguration configuration) {
175-
return new Builder(bigquery).configuration(configuration);
176-
}
177-
178178
@Override
179179
public Builder toBuilder() {
180180
return new Builder(this);

‎trunk/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public enum WriteDisposition {
8989
}
9090

9191
/**
92-
* Base class for a {@code JobInfo} builder.
92+
* A builder for {@code JobInfo} objects.
9393
*/
9494
public abstract static class Builder {
9595

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,18 @@ public final class Table extends TableInfo {
4242
private final BigQueryOptions options;
4343
private transient BigQuery bigquery;
4444

45+
/**
46+
* A builder for {@code Table} objects.
47+
*/
4548
public static class Builder extends TableInfo.Builder {
4649

4750
private final BigQuery bigquery;
4851
private final TableInfo.BuilderImpl infoBuilder;
4952

50-
Builder(BigQuery bigquery) {
53+
Builder(BigQuery bigquery, TableId tableId, TableDefinition defintion) {
5154
this.bigquery = bigquery;
5255
this.infoBuilder = new TableInfo.BuilderImpl();
56+
this.infoBuilder.tableId(tableId).definition(defintion);
5357
}
5458

5559
Builder(Table table) {
@@ -228,7 +232,7 @@ Job copy(String destinationDataset, String destinationTable, BigQuery.JobOption.
228232

229233
/**
230234
* Starts a BigQuery Job to copy the current table to the provided destination table. Returns the
231-
* started {@link Job} object. ddd
235+
* started {@link Job} object.
232236
*
233237
* @param destinationTable the destination table of the copy job
234238
* @param options job options
@@ -309,10 +313,6 @@ public BigQuery bigquery() {
309313
return bigquery;
310314
}
311315

312-
static Builder builder(BigQuery bigquery, TableId tableId, TableDefinition definition) {
313-
return new Builder(bigquery).tableId(tableId).definition(definition);
314-
}
315-
316316
@Override
317317
public Builder toBuilder() {
318318
return new Builder(this);

‎trunk/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public Table apply(TableInfo tableInfo) {
6666
private final TableDefinition definition;
6767

6868
/**
69-
* Base class for a {@code JobInfo} builder.
69+
* A builder for {@code TableInfo} objects.
7070
*/
7171
public abstract static class Builder {
7272

‎trunk/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/DatasetTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void tearDown() throws Exception {
9595
public void testBuilder() {
9696
initializeExpectedDataset(2);
9797
replay(bigquery);
98-
Dataset builtDataset = Dataset.builder(serviceMockReturnsOptions, DATASET_ID)
98+
Dataset builtDataset = new Dataset.Builder(serviceMockReturnsOptions, DATASET_ID)
9999
.acl(ACCESS_RULES)
100100
.creationTime(CREATION_TIME)
101101
.defaultTableLifetime(DEFAULT_TABLE_EXPIRATION)

‎trunk/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void tearDown() throws Exception {
8484
public void testBuilder() {
8585
initializeExpectedJob(2);
8686
replay(bigquery);
87-
Job builtJob = Job.builder(serviceMockReturnsOptions, COPY_CONFIGURATION)
87+
Job builtJob = new Job.Builder(serviceMockReturnsOptions, COPY_CONFIGURATION)
8888
.jobId(JOB_ID)
8989
.statistics(COPY_JOB_STATISTICS)
9090
.jobId(JOB_ID)

‎trunk/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/TableTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void tearDown() throws Exception {
109109
public void testBuilder() {
110110
initializeExpectedTable(2);
111111
replay(bigquery);
112-
Table builtTable = Table.builder(serviceMockReturnsOptions, TABLE_ID1, TABLE_DEFINITION)
112+
Table builtTable = new Table.Builder(serviceMockReturnsOptions, TABLE_ID1, TABLE_DEFINITION)
113113
.creationTime(CREATION_TIME)
114114
.description(DESCRIPTION)
115115
.etag(ETAG)

0 commit comments

Comments
 (0)