Skip to content

Commit 5fea95f

Browse files
ajkannanajkannan
committed
Merge pull request #832 from mziccard/rename-id
Rename id to generatedId
2 parents 6cbddff + 8df138b commit 5fea95f

40 files changed

Lines changed: 333 additions & 326 deletions

File tree

‎gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQuery.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,10 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
471471
Dataset getDataset(DatasetId datasetId, DatasetOption... options);
472472

473473
/**
474-
* Lists the project's datasets. This method returns partial information on each dataset
475-
* ({@link Dataset#datasetId()}, {@link Dataset#friendlyName()} and {@link Dataset#id()}). To get
476-
* complete information use either {@link #getDataset(String, DatasetOption...)} or
474+
* Lists the project's datasets. This method returns partial information on each dataset:
475+
* ({@link Dataset#datasetId()}, {@link Dataset#friendlyName()} and
476+
* {@link Dataset#generatedId()}). To get complete information use either
477+
* {@link #getDataset(String, DatasetOption...)} or
477478
* {@link #getDataset(DatasetId, DatasetOption...)}.
478479
*
479480
* @throws BigQueryException upon failure
@@ -541,9 +542,9 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
541542
Table getTable(TableId tableId, TableOption... options);
542543

543544
/**
544-
* Lists the tables in the dataset. This method returns partial information on each table
545-
* ({@link Table#tableId()}, {@link Table#friendlyName()}, {@link Table#id()} and type, which
546-
* is part of {@link Table#definition()}). To get complete information use either
545+
* Lists the tables in the dataset. This method returns partial information on each table:
546+
* ({@link Table#tableId()}, {@link Table#friendlyName()}, {@link Table#generatedId()} and type,
547+
* which is part of {@link Table#definition()}). To get complete information use either
547548
* {@link #getTable(TableId, TableOption...)} or
548549
* {@link #getTable(String, String, TableOption...)}.
549550
*
@@ -552,9 +553,9 @@ public static QueryResultsOption maxWaitTime(long maxWaitTime) {
552553
Page<Table> listTables(String datasetId, TableListOption... options);
553554

554555
/**
555-
* Lists the tables in the dataset. This method returns partial information on each table
556-
* ({@link Table#tableId()}, {@link Table#friendlyName()}, {@link Table#id()} and type, which
557-
* is part of {@link Table#definition()}). To get complete information use either
556+
* Lists the tables in the dataset. This method returns partial information on each table:
557+
* ({@link Table#tableId()}, {@link Table#friendlyName()}, {@link Table#generatedId()} and type,
558+
* which is part of {@link Table#definition()}). To get complete information use either
558559
* {@link #getTable(TableId, TableOption...)} or
559560
* {@link #getTable(String, String, TableOption...)}.
560561
*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ public Builder friendlyName(String friendlyName) {
103103
}
104104

105105
@Override
106-
Builder id(String id) {
107-
infoBuilder.id(id);
106+
Builder generatedId(String generatedId) {
107+
infoBuilder.generatedId(generatedId);
108108
return this;
109109
}
110110

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ public Dataset apply(DatasetInfo datasetInfo) {
5555
return datasetInfo.toPb();
5656
}
5757
};
58-
59-
private static final long serialVersionUID = -6615133444520365839L;
58+
private static final long serialVersionUID = 8469473744160758489L;
6059

6160
private final DatasetId datasetId;
6261
private final List<Acl> acl;
@@ -65,7 +64,7 @@ public Dataset apply(DatasetInfo datasetInfo) {
6564
private final String description;
6665
private final String etag;
6766
private final String friendlyName;
68-
private final String id;
67+
private final String generatedId;
6968
private final Long lastModified;
7069
private final String location;
7170
private final String selfLink;
@@ -114,7 +113,7 @@ public abstract static class Builder {
114113
*/
115114
public abstract Builder friendlyName(String friendlyName);
116115

117-
abstract Builder id(String id);
116+
abstract Builder generatedId(String generatedId);
118117

119118
abstract Builder lastModified(Long lastModified);
120119

@@ -144,7 +143,7 @@ static final class BuilderImpl extends Builder {
144143
private String description;
145144
private String etag;
146145
private String friendlyName;
147-
private String id;
146+
private String generatedId;
148147
private Long lastModified;
149148
private String location;
150149
private String selfLink;
@@ -159,7 +158,7 @@ static final class BuilderImpl extends Builder {
159158
this.description = datasetInfo.description;
160159
this.etag = datasetInfo.etag;
161160
this.friendlyName = datasetInfo.friendlyName;
162-
this.id = datasetInfo.id;
161+
this.generatedId = datasetInfo.generatedId;
163162
this.lastModified = datasetInfo.lastModified;
164163
this.location = datasetInfo.location;
165164
this.selfLink = datasetInfo.selfLink;
@@ -182,7 +181,7 @@ public Acl apply(Dataset.Access accessPb) {
182181
this.description = datasetPb.getDescription();
183182
this.etag = datasetPb.getEtag();
184183
this.friendlyName = datasetPb.getFriendlyName();
185-
this.id = datasetPb.getId();
184+
this.generatedId = datasetPb.getId();
186185
this.lastModified = datasetPb.getLastModifiedTime();
187186
this.location = datasetPb.getLocation();
188187
this.selfLink = datasetPb.getSelfLink();
@@ -232,8 +231,8 @@ public Builder friendlyName(String friendlyName) {
232231
}
233232

234233
@Override
235-
Builder id(String id) {
236-
this.id = id;
234+
Builder generatedId(String generatedId) {
235+
this.generatedId = generatedId;
237236
return this;
238237
}
239238

@@ -269,7 +268,7 @@ public DatasetInfo build() {
269268
description = builder.description;
270269
etag = builder.etag;
271270
friendlyName = builder.friendlyName;
272-
id = builder.id;
271+
generatedId = builder.generatedId;
273272
lastModified = builder.lastModified;
274273
location = builder.location;
275274
selfLink = builder.selfLink;
@@ -333,10 +332,10 @@ public String friendlyName() {
333332
}
334333

335334
/**
336-
* Returns an opaque id for the dataset.
335+
* Returns the service-generated id for the dataset.
337336
*/
338-
public String id() {
339-
return id;
337+
public String generatedId() {
338+
return generatedId;
340339
}
341340

342341
/**
@@ -381,7 +380,7 @@ public String toString() {
381380
.add("description", description)
382381
.add("etag", etag)
383382
.add("friendlyName", friendlyName)
384-
.add("id", id)
383+
.add("generatedId", generatedId)
385384
.add("lastModified", lastModified)
386385
.add("location", location)
387386
.add("selfLink", selfLink)
@@ -431,7 +430,7 @@ Dataset toPb() {
431430
datasetPb.setDescription(description);
432431
datasetPb.setEtag(etag);
433432
datasetPb.setFriendlyName(friendlyName);
434-
datasetPb.setId(id);
433+
datasetPb.setId(generatedId);
435434
datasetPb.setLastModifiedTime(lastModified);
436435
datasetPb.setLocation(location);
437436
datasetPb.setSelfLink(selfLink);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ Builder etag(String etag) {
6363
}
6464

6565
@Override
66-
Builder id(String id) {
67-
infoBuilder.id(id);
66+
Builder generatedId(String generatedId) {
67+
infoBuilder.generatedId(generatedId);
6868
return this;
6969
}
7070

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ public JobInfo apply(Job pb) {
4242
}
4343
};
4444

45-
private static final long serialVersionUID = -3272941007234620265L;
45+
private static final long serialVersionUID = 2740548743267670124L;
4646

4747
private final String etag;
48-
private final String id;
48+
private final String generatedId;
4949
private final JobId jobId;
5050
private final String selfLink;
5151
private final JobStatus status;
@@ -95,7 +95,7 @@ public abstract static class Builder {
9595

9696
abstract Builder etag(String etag);
9797

98-
abstract Builder id(String id);
98+
abstract Builder generatedId(String generatedId);
9999

100100
/**
101101
* Sets the job identity.
@@ -128,7 +128,7 @@ public abstract static class Builder {
128128
static final class BuilderImpl extends Builder {
129129

130130
private String etag;
131-
private String id;
131+
private String generatedId;
132132
private JobId jobId;
133133
private String selfLink;
134134
private JobStatus status;
@@ -140,7 +140,7 @@ static final class BuilderImpl extends Builder {
140140

141141
BuilderImpl(JobInfo jobInfo) {
142142
this.etag = jobInfo.etag;
143-
this.id = jobInfo.id;
143+
this.generatedId = jobInfo.generatedId;
144144
this.jobId = jobInfo.jobId;
145145
this.selfLink = jobInfo.selfLink;
146146
this.status = jobInfo.status;
@@ -151,7 +151,7 @@ static final class BuilderImpl extends Builder {
151151

152152
BuilderImpl(Job jobPb) {
153153
this.etag = jobPb.getEtag();
154-
this.id = jobPb.getId();
154+
this.generatedId = jobPb.getId();
155155
if (jobPb.getJobReference() != null) {
156156
this.jobId = JobId.fromPb(jobPb.getJobReference());
157157
}
@@ -173,8 +173,8 @@ Builder etag(String etag) {
173173
}
174174

175175
@Override
176-
Builder id(String id) {
177-
this.id = id;
176+
Builder generatedId(String generatedId) {
177+
this.generatedId = generatedId;
178178
return this;
179179
}
180180

@@ -223,7 +223,7 @@ public JobInfo build() {
223223
JobInfo(BuilderImpl builder) {
224224
this.jobId = builder.jobId;
225225
this.etag = builder.etag;
226-
this.id = builder.id;
226+
this.generatedId = builder.generatedId;
227227
this.selfLink = builder.selfLink;
228228
this.status = builder.status;
229229
this.statistics = builder.statistics;
@@ -239,10 +239,10 @@ public String etag() {
239239
}
240240

241241
/**
242-
* Returns an opaque id for the job.
242+
* Returns the service-generated id for the job.
243243
*/
244-
public String id() {
245-
return id;
244+
public String generatedId() {
245+
return generatedId;
246246
}
247247

248248
/**
@@ -306,7 +306,7 @@ public String toString() {
306306
.add("statistics", statistics)
307307
.add("userEmail", userEmail)
308308
.add("etag", etag)
309-
.add("id", id)
309+
.add("generatedId", generatedId)
310310
.add("selfLink", selfLink)
311311
.add("configuration", configuration)
312312
.toString();
@@ -331,7 +331,7 @@ JobInfo setProjectId(String projectId) {
331331
Job toPb() {
332332
Job jobPb = new Job();
333333
jobPb.setEtag(etag);
334-
jobPb.setId(id);
334+
jobPb.setId(generatedId);
335335
jobPb.setSelfLink(selfLink);
336336
jobPb.setUserEmail(userEmail);
337337
if (jobId != null) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public Builder friendlyName(String friendlyName) {
9292
}
9393

9494
@Override
95-
Builder id(String id) {
96-
infoBuilder.id(id);
95+
Builder generatedId(String generatedId) {
96+
infoBuilder.generatedId(generatedId);
9797
return this;
9898
}
9999

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ public Table apply(TableInfo tableInfo) {
5252
}
5353
};
5454

55-
private static final long serialVersionUID = -7679032506430816205L;
55+
private static final long serialVersionUID = 609769795097719407L;
5656

5757
private final String etag;
58-
private final String id;
58+
private final String generatedId;
5959
private final String selfLink;
6060
private final TableId tableId;
6161
private final String friendlyName;
@@ -90,7 +90,7 @@ public abstract static class Builder {
9090
*/
9191
public abstract Builder friendlyName(String friendlyName);
9292

93-
abstract Builder id(String id);
93+
abstract Builder generatedId(String generatedId);
9494

9595
abstract Builder lastModifiedTime(Long lastModifiedTime);
9696

@@ -117,7 +117,7 @@ public abstract static class Builder {
117117
static class BuilderImpl extends Builder {
118118

119119
private String etag;
120-
private String id;
120+
private String generatedId;
121121
private String selfLink;
122122
private TableId tableId;
123123
private String friendlyName;
@@ -131,7 +131,7 @@ static class BuilderImpl extends Builder {
131131

132132
BuilderImpl(TableInfo tableInfo) {
133133
this.etag = tableInfo.etag;
134-
this.id = tableInfo.id;
134+
this.generatedId = tableInfo.generatedId;
135135
this.selfLink = tableInfo.selfLink;
136136
this.tableId = tableInfo.tableId;
137137
this.friendlyName = tableInfo.friendlyName;
@@ -152,7 +152,7 @@ static class BuilderImpl extends Builder {
152152
this.friendlyName = tablePb.getFriendlyName();
153153
this.creationTime = tablePb.getCreationTime();
154154
this.etag = tablePb.getEtag();
155-
this.id = tablePb.getId();
155+
this.generatedId = tablePb.getId();
156156
this.selfLink = tablePb.getSelfLink();
157157
this.definition = TableDefinition.fromPb(tablePb);
158158
}
@@ -188,8 +188,8 @@ public Builder friendlyName(String friendlyName) {
188188
}
189189

190190
@Override
191-
Builder id(String id) {
192-
this.id = id;
191+
Builder generatedId(String generatedId) {
192+
this.generatedId = generatedId;
193193
return this;
194194
}
195195

@@ -226,7 +226,7 @@ public TableInfo build() {
226226
TableInfo(BuilderImpl builder) {
227227
this.tableId = checkNotNull(builder.tableId);
228228
this.etag = builder.etag;
229-
this.id = builder.id;
229+
this.generatedId = builder.generatedId;
230230
this.selfLink = builder.selfLink;
231231
this.friendlyName = builder.friendlyName;
232232
this.description = builder.description;
@@ -244,10 +244,10 @@ public String etag() {
244244
}
245245

246246
/**
247-
* Returns an opaque id for the table.
247+
* Returns the service-generated id for the table.
248248
*/
249-
public String id() {
250-
return id;
249+
public String generatedId() {
250+
return generatedId;
251251
}
252252

253253
/**
@@ -321,7 +321,7 @@ public String toString() {
321321
return MoreObjects.toStringHelper(this)
322322
.add("tableId", tableId)
323323
.add("etag", etag)
324-
.add("id", id)
324+
.add("generatedId", generatedId)
325325
.add("selfLink", selfLink)
326326
.add("friendlyName", friendlyName)
327327
.add("description", description)
@@ -379,7 +379,7 @@ Table toPb() {
379379
tablePb.setEtag(etag);
380380
tablePb.setExpirationTime(expirationTime);
381381
tablePb.setFriendlyName(friendlyName);
382-
tablePb.setId(id);
382+
tablePb.setId(generatedId);
383383
tablePb.setSelfLink(selfLink);
384384
return tablePb;
385385
}

0 commit comments

Comments
 (0)