Skip to content

Commit 73250ea

Browse files
mziccardmziccard
committed
Fix access-related issues
1 parent 68eed9e commit 73250ea

9 files changed

Lines changed: 40 additions & 42 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.google.gcloud.bigquery;
1818

19-
import com.google.api.client.googleapis.json.GoogleJsonError;
20-
import com.google.api.client.googleapis.json.GoogleJsonResponseException;
2119
import com.google.common.collect.ImmutableSet;
2220
import com.google.gcloud.BaseServiceException;
2321
import com.google.gcloud.RetryHelper.RetryHelperException;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ private Builder() {
5353
}
5454

5555
private Builder(CopyJobConfiguration jobConfiguration) {
56-
super(Type.COPY);
56+
this();
5757
this.sourceTables = jobConfiguration.sourceTables;
5858
this.destinationTable = jobConfiguration.destinationTable;
5959
this.createDisposition = jobConfiguration.createDisposition;
6060
this.writeDisposition = jobConfiguration.writeDisposition;
6161
}
6262

6363
private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
64-
super(Type.COPY);
64+
this();
6565
JobConfigurationTableCopy copyConfigurationPb = configurationPb.getCopy();
6666
this.destinationTable = TableId.fromPb(copyConfigurationPb.getDestinationTable());
6767
if (copyConfigurationPb.getSourceTables() != null) {
@@ -171,7 +171,7 @@ public Builder toBuilder() {
171171
}
172172

173173
@Override
174-
protected ToStringHelper toStringHelper() {
174+
ToStringHelper toStringHelper() {
175175
return super.toStringHelper()
176176
.add("sourceTables", sourceTables)
177177
.add("destinationTable", destinationTable)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private Builder() {
5656
}
5757

5858
private Builder(ExtractJobConfiguration jobInfo) {
59-
super(Type.EXTRACT);
59+
this();
6060
this.sourceTable = jobInfo.sourceTable;
6161
this.destinationUris = jobInfo.destinationUris;
6262
this.printHeader = jobInfo.printHeader;
@@ -66,7 +66,7 @@ private Builder(ExtractJobConfiguration jobInfo) {
6666
}
6767

6868
private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
69-
super(Type.EXTRACT);
69+
this();
7070
JobConfigurationExtract extractConfigurationPb = configurationPb.getExtract();
7171
this.sourceTable = TableId.fromPb(extractConfigurationPb.getSourceTable());
7272
this.destinationUris = extractConfigurationPb.getDestinationUris();
@@ -199,7 +199,7 @@ public Builder toBuilder() {
199199
}
200200

201201
@Override
202-
protected ToStringHelper toStringHelper() {
202+
ToStringHelper toStringHelper() {
203203
return super.toStringHelper()
204204
.add("sourceTable", sourceTable)
205205
.add("destinationUris", destinationUris)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ public abstract static class Builder<T extends JobConfiguration, B extends Build
6969

7070
private Type type;
7171

72-
protected Builder(Type type) {
72+
Builder(Type type) {
7373
this.type = checkNotNull(type);
7474
}
7575

7676
@SuppressWarnings("unchecked")
77-
protected B self() {
77+
B self() {
7878
return (B) this;
7979
}
8080

@@ -89,7 +89,7 @@ B type(Type type) {
8989
public abstract T build();
9090
}
9191

92-
protected JobConfiguration(Builder builder) {
92+
JobConfiguration(Builder builder) {
9393
this.type = builder.type;
9494
}
9595

@@ -105,7 +105,7 @@ public Type type() {
105105
*/
106106
public abstract Builder toBuilder();
107107

108-
protected ToStringHelper toStringHelper() {
108+
ToStringHelper toStringHelper() {
109109
return MoreObjects.toStringHelper(this).add("type", type);
110110
}
111111

@@ -114,11 +114,11 @@ public String toString() {
114114
return toStringHelper().toString();
115115
}
116116

117-
protected final int baseHashCode() {
117+
final int baseHashCode() {
118118
return Objects.hash(type);
119119
}
120120

121-
protected final boolean baseEquals(JobConfiguration jobConfiguration) {
121+
final boolean baseEquals(JobConfiguration jobConfiguration) {
122122
return Objects.equals(toPb(), jobConfiguration.toPb());
123123
}
124124

‎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
@@ -279,7 +279,7 @@ public boolean equals(Object obj) {
279279
}
280280

281281
JobInfo setProjectId(String projectId) {
282-
return toBuilder().configuration(this.configuration().setProjectId(projectId)).build();
282+
return toBuilder().configuration(configuration.setProjectId(projectId)).build();
283283
}
284284

285285
Job toPb() {

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@
3030
* table. Data is provided as URIs that point to objects in Google Cloud Storage. Load job
3131
* configurations have {@link JobConfiguration.Type#LOAD} type.
3232
*/
33-
public class LoadJobConfiguration extends JobConfiguration implements LoadConfiguration {
33+
public final class LoadJobConfiguration extends JobConfiguration implements LoadConfiguration {
3434

3535
private static final long serialVersionUID = -2673554846792429829L;
3636

3737
private final List<String> sourceUris;
38-
protected final TableId destinationTable;
39-
protected final JobInfo.CreateDisposition createDisposition;
40-
protected final JobInfo.WriteDisposition writeDisposition;
41-
protected final FormatOptions formatOptions;
42-
protected final Integer maxBadRecords;
43-
protected final Schema schema;
44-
protected final Boolean ignoreUnknownValues;
45-
protected final List<String> projectionFields;
38+
private final TableId destinationTable;
39+
private final JobInfo.CreateDisposition createDisposition;
40+
private final JobInfo.WriteDisposition writeDisposition;
41+
private final FormatOptions formatOptions;
42+
private final Integer maxBadRecords;
43+
private final Schema schema;
44+
private final Boolean ignoreUnknownValues;
45+
private final List<String> projectionFields;
4646

4747
public static final class Builder
4848
extends JobConfiguration.Builder<LoadJobConfiguration, Builder>
@@ -63,7 +63,7 @@ private Builder() {
6363
}
6464

6565
private Builder(LoadJobConfiguration loadConfiguration) {
66-
super(Type.LOAD);
66+
this();
6767
this.destinationTable = loadConfiguration.destinationTable;
6868
this.createDisposition = loadConfiguration.createDisposition;
6969
this.writeDisposition = loadConfiguration.writeDisposition;
@@ -76,7 +76,7 @@ private Builder(LoadJobConfiguration loadConfiguration) {
7676
}
7777

7878
private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
79-
super(Type.LOAD);
79+
this();
8080
JobConfigurationLoad loadConfigurationPb = configurationPb.getLoad();
8181
this.destinationTable = TableId.fromPb(loadConfigurationPb.getDestinationTable());
8282
if (loadConfigurationPb.getCreateDisposition() != null) {
@@ -254,7 +254,7 @@ public Builder toBuilder() {
254254
}
255255

256256
@Override
257-
protected ToStringHelper toStringHelper() {
257+
ToStringHelper toStringHelper() {
258258
return super.toStringHelper()
259259
.add("destinationTable", destinationTable)
260260
.add("createDisposition", createDisposition)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private Builder() {
9393
}
9494

9595
private Builder(QueryJobConfiguration jobConfiguration) {
96-
super(Type.QUERY);
96+
this();
9797
this.query = jobConfiguration.query;
9898
this.destinationTable = jobConfiguration.destinationTable;
9999
this.tableDefinitions = jobConfiguration.tableDefinitions;
@@ -109,7 +109,7 @@ private Builder(QueryJobConfiguration jobConfiguration) {
109109
}
110110

111111
private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
112-
super(Type.QUERY);
112+
this();
113113
JobConfigurationQuery queryConfigurationPb = configurationPb.getQuery();
114114
this.query = queryConfigurationPb.getQuery();
115115
allowLargeResults = queryConfigurationPb.getAllowLargeResults();
@@ -432,7 +432,7 @@ public Builder toBuilder() {
432432
}
433433

434434
@Override
435-
protected ToStringHelper toStringHelper() {
435+
ToStringHelper toStringHelper() {
436436
return super.toStringHelper()
437437
.add("query", query)
438438
.add("destinationTable", destinationTable)

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ public class WriteChannelConfiguration implements LoadConfiguration, Serializabl
3737

3838
private static final long serialVersionUID = 470267591917413578L;
3939

40-
protected final TableId destinationTable;
41-
protected final CreateDisposition createDisposition;
42-
protected final WriteDisposition writeDisposition;
43-
protected final FormatOptions formatOptions;
44-
protected final Integer maxBadRecords;
45-
protected final Schema schema;
46-
protected final Boolean ignoreUnknownValues;
47-
protected final List<String> projectionFields;
40+
private final TableId destinationTable;
41+
private final CreateDisposition createDisposition;
42+
private final WriteDisposition writeDisposition;
43+
private final FormatOptions formatOptions;
44+
private final Integer maxBadRecords;
45+
private final Schema schema;
46+
private final Boolean ignoreUnknownValues;
47+
private final List<String> projectionFields;
4848

4949
public static final class Builder implements LoadConfiguration.Builder {
5050

@@ -57,9 +57,9 @@ public static final class Builder implements LoadConfiguration.Builder {
5757
private Boolean ignoreUnknownValues;
5858
private List<String> projectionFields;
5959

60-
protected Builder() {}
60+
private Builder() {}
6161

62-
protected Builder(WriteChannelConfiguration writeChannelConfiguration) {
62+
private Builder(WriteChannelConfiguration writeChannelConfiguration) {
6363
this.destinationTable = writeChannelConfiguration.destinationTable;
6464
this.createDisposition = writeChannelConfiguration.createDisposition;
6565
this.writeDisposition = writeChannelConfiguration.writeDisposition;
@@ -70,7 +70,7 @@ protected Builder(WriteChannelConfiguration writeChannelConfiguration) {
7070
this.projectionFields = writeChannelConfiguration.projectionFields;
7171
}
7272

73-
protected Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
73+
private Builder(com.google.api.services.bigquery.model.JobConfiguration configurationPb) {
7474
JobConfigurationLoad loadConfigurationPb = configurationPb.getLoad();
7575
this.destinationTable = TableId.fromPb(loadConfigurationPb.getDestinationTable());
7676
if (loadConfigurationPb.getCreateDisposition() != null) {

‎gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public void testSetProjectId() {
347347
}
348348
ExtractJobConfiguration extractConfiguration = EXTRACT_JOB.setProjectId("p").configuration();
349349
assertEquals("p", extractConfiguration.sourceTable().project());
350-
LoadConfiguration loadConfiguration = LOAD_JOB.setProjectId("p").configuration();
350+
LoadJobConfiguration loadConfiguration = LOAD_JOB.setProjectId("p").configuration();
351351
assertEquals("p", loadConfiguration.destinationTable().project());
352352
QueryJobConfiguration queryConfiguration = QUERY_JOB.setProjectId("p").configuration();
353353
assertEquals("p", queryConfiguration.defaultDataset().project());

0 commit comments

Comments
 (0)