Skip to content

Commit a335927

Browse files
deps: update dependency com.google.cloud:sdk-platform-java-config to v3.46.0 (#3753)
* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.46.0 * chore: use latest formatter in lint check * chore: use java 17 in linter job * chore: format java source files --------- Co-authored-by: Diego Marquez <[email protected]>
1 parent bb811c0 commit a335927

37 files changed

+166
-177
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- uses: actions/setup-java@v4
105105
with:
106106
distribution: temurin
107-
java-version: 11
107+
java-version: 17
108108
- run: java -version
109109
- run: .kokoro/build.sh
110110
env:

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# repository
1818
.kokoro/build.sh
1919
- name: Unmanaged dependency check
20-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.45.1
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.0
2121
with:
2222
# java-bigquery does not produce a BOM. Fortunately the root pom.xml
2323
# defines google-cloud-bigquery in dependencyManagement section. So

.kokoro/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ test)
5252
RETURN_CODE=$?
5353
;;
5454
lint)
55-
mvn com.coveo:fmt-maven-plugin:check -B -ntp
55+
mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
5656
RETURN_CODE=$?
5757
;;
5858
javadoc)

.kokoro/continuous/graalvm-native-17.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.0"
77
}
88

99
env_vars: {

.kokoro/continuous/graalvm-native.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.0"
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native-17.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1""
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.0""
77
}
88
99
env_vars: {

.kokoro/presubmit/graalvm-native.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.0"
77
}
88

99
env_vars: {

google-cloud-bigquery-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.45.1</version>
11+
<version>3.46.0</version>
1212
<relativePath/>
1313
</parent>
1414

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Acl.java

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ public static Role valueOf(String constant) {
9292
return type.valueOf(constant);
9393
}
9494

95-
/** @return Return the known values for Role. */
95+
/**
96+
* @return Return the known values for Role.
97+
*/
9698
public static Role[] values() {
9799
return type.values();
98100
}
@@ -184,7 +186,9 @@ public DatasetAclEntity(DatasetId id, List<String> targetTypes) {
184186
this.targetTypes = targetTypes;
185187
}
186188

187-
/** @return Returns DatasetAclEntity's identity. */
189+
/**
190+
* @return Returns DatasetAclEntity's identity.
191+
*/
188192
public DatasetId getId() {
189193
return id;
190194
}
@@ -240,7 +244,9 @@ public Domain(String domain) {
240244
this.domain = domain;
241245
}
242246

243-
/** @return Returns the domain name. */
247+
/**
248+
* @return Returns the domain name.
249+
*/
244250
public String getDomain() {
245251
return domain;
246252
}
@@ -348,22 +354,30 @@ Access toPb() {
348354
}
349355
}
350356

351-
/** @return Returns a Group entity representing all project's owners. */
357+
/**
358+
* @return Returns a Group entity representing all project's owners.
359+
*/
352360
public static Group ofProjectOwners() {
353361
return new Group(PROJECT_OWNERS);
354362
}
355363

356-
/** @return Returns a Group entity representing all project's readers. */
364+
/**
365+
* @return Returns a Group entity representing all project's readers.
366+
*/
357367
public static Group ofProjectReaders() {
358368
return new Group(PROJECT_READERS);
359369
}
360370

361-
/** @return Returns a Group entity representing all project's writers. */
371+
/**
372+
* @return Returns a Group entity representing all project's writers.
373+
*/
362374
public static Group ofProjectWriters() {
363375
return new Group(PROJECT_WRITERS);
364376
}
365377

366-
/** @return Returns a Group entity representing all BigQuery authenticated users. */
378+
/**
379+
* @return Returns a Group entity representing all BigQuery authenticated users.
380+
*/
367381
public static Group ofAllAuthenticatedUsers() {
368382
return new Group(ALL_AUTHENTICATED_USERS);
369383
}
@@ -385,7 +399,9 @@ public User(String email) {
385399
this.email = email;
386400
}
387401

388-
/** @return Returns user's email. */
402+
/**
403+
* @return Returns user's email.
404+
*/
389405
public String getEmail() {
390406
return email;
391407
}
@@ -437,7 +453,9 @@ public View(TableId id) {
437453
this.id = id;
438454
}
439455

440-
/** @return Returns table's identity. */
456+
/**
457+
* @return Returns table's identity.
458+
*/
441459
public TableId getId() {
442460
return id;
443461
}
@@ -489,7 +507,9 @@ public Routine(RoutineId id) {
489507
this.id = id;
490508
}
491509

492-
/** @return Returns routine's identity. */
510+
/**
511+
* @return Returns routine's identity.
512+
*/
493513
public RoutineId getId() {
494514
return id;
495515
}
@@ -537,7 +557,9 @@ public IamMember(String iamMember) {
537557
this.iamMember = iamMember;
538558
}
539559

540-
/** @return Returns iamMember. */
560+
/**
561+
* @return Returns iamMember.
562+
*/
541563
public String getIamMember() {
542564
return iamMember;
543565
}
@@ -574,16 +596,19 @@ Access toPb() {
574596
public static final class Expr implements Serializable {
575597
// Textual representation of an expression in Common Expression Language syntax.
576598
private final String expression;
599+
577600
/**
578601
* Optional. Title for the expression, i.e. a short string describing its purpose. This can be
579602
* used e.g. in UIs which allow to enter the expression.
580603
*/
581604
private final String title;
605+
582606
/**
583607
* Optional. Description of the expression. This is a longer text which describes the
584608
* expression, e.g. when hovered over it in a UI.
585609
*/
586610
private final String description;
611+
587612
/**
588613
* Optional. String indicating the location of the expression for error reporting, e.g. a file
589614
* name and a position in the file.
@@ -713,16 +738,23 @@ private Acl(Entity entity, Role role, Expr condition) {
713738
this.condition = condition;
714739
}
715740

716-
/** @return Returns the entity for this ACL. */
741+
/**
742+
* @return Returns the entity for this ACL.
743+
*/
717744
public Entity getEntity() {
718745
return entity;
719746
}
720747

721-
/** @return Returns the role specified by this ACL. */
748+
/**
749+
* @return Returns the role specified by this ACL.
750+
*/
722751
public Role getRole() {
723752
return role;
724753
}
725-
/** @return Returns the condition specified by this ACL. */
754+
755+
/**
756+
* @return Returns the condition specified by this ACL.
757+
*/
726758
public Expr getCondition() {
727759
return condition;
728760
}

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,8 +1409,7 @@ public TableResult query(QueryJobConfiguration configuration, JobOption... optio
14091409

14101410
if (getOptions().isQueryPreviewEnabled()) {
14111411
configuration =
1412-
configuration
1413-
.toBuilder()
1412+
configuration.toBuilder()
14141413
.setJobCreationMode(JobCreationMode.JOB_CREATION_OPTIONAL)
14151414
.build();
14161415
}

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ConnectionImpl.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ private int getBufferSize() {
135135
? 20000
136136
: Math.min(connectionSettings.getNumBufferedRows() * 2, 100000));
137137
}
138+
138139
/**
139140
* Cancel method shutdowns the pageFetcher and producerWorker threads gracefully using interrupt.
140141
* The pageFetcher threat will not request for any subsequent threads after interrupting and
@@ -263,6 +264,7 @@ private BigQueryResult getExecuteSelectResponse(
263264
throw new BigQuerySQLException(e.getMessage(), e, e.getErrors());
264265
}
265266
}
267+
266268
/**
267269
* Execute a SQL statement that returns a single ResultSet and returns a ListenableFuture to
268270
* process the response asynchronously.
@@ -527,6 +529,7 @@ BigQueryResultStats getBigQueryResultSetStats(JobId jobId) {
527529
queryStatistics.getSessionInfo() == null ? null : queryStatistics.getSessionInfo();
528530
return new BigQueryResultStatsImpl(queryStatistics, sessionInfo);
529531
}
532+
530533
/* This method processed the first page of GetQueryResultsResponse and then it uses tabledata.list */
531534
@VisibleForTesting
532535
BigQueryResult tableDataList(GetQueryResultsResponse firstPage, JobId jobId) {
@@ -1109,7 +1112,9 @@ private ArrowRowReader(ArrowSchema arrowSchema, Map<String, Integer> arrowNameTo
11091112
loader = new VectorLoader(root);
11101113
}
11111114

1112-
/** @param batch object returned from the ReadRowsResponse. */
1115+
/**
1116+
* @param batch object returned from the ReadRowsResponse.
1117+
*/
11131118
private void processRows(
11141119
ArrowRecordBatch batch, BlockingQueue<BigQueryResultImpl.Row> buffer, Schema schema)
11151120
throws IOException { // deserialize the values and consume the hash of the values
@@ -1166,6 +1171,7 @@ public void close() {
11661171
allocator.close();
11671172
}
11681173
}
1174+
11691175
/*Returns just the first page of GetQueryResultsResponse using the jobId*/
11701176
@VisibleForTesting
11711177
GetQueryResultsResponse getQueryResultsFirstPage(JobId jobId) {

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ConnectionProperty.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public static final class Builder {
5555
private String key;
5656
private String value;
5757

58-
private Builder() {};
58+
private Builder() {}
59+
;
5960

6061
private Builder(ConnectionProperty properties) {
6162
this.key = properties.key;

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExternalTableDefinition.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ public Builder setFormatOptions(FormatOptions formatOptions) {
167167
/** Sets the table Hive partitioning options. */
168168
public Builder setHivePartitioningOptions(HivePartitioningOptions hivePartitioningOptions) {
169169
return setHivePartitioningOptionsInner(hivePartitioningOptions);
170-
};
170+
}
171+
;
171172

172173
/**
173174
* When creating an external table, the user can provide a reference file with the table schema.
@@ -253,7 +254,8 @@ public Builder setMaxStaleness(String maxStaleness) {
253254
@Nullable
254255
public Boolean ignoreUnknownValues() {
255256
return getIgnoreUnknownValues();
256-
};
257+
}
258+
;
257259

258260
@Nullable
259261
public abstract Boolean getIgnoreUnknownValues();

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobException.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class JobException extends RuntimeException {
3434
public JobId getId() {
3535
return id;
3636
}
37+
3738
/**
3839
* The errors reported by the job.
3940
*

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobStatistics.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,8 @@ public static class Builder {
14001400
private String name;
14011401
private Long slotMs;
14021402

1403-
private Builder() {};
1403+
private Builder() {}
1404+
;
14041405

14051406
Builder setName(String name) {
14061407
this.name = name;
@@ -1486,7 +1487,8 @@ public static class Builder {
14861487

14871488
private String transactionId;
14881489

1489-
private Builder() {};
1490+
private Builder() {}
1491+
;
14901492

14911493
Builder setTransactionId(String transactionId) {
14921494
this.transactionId = transactionId;
@@ -1557,7 +1559,8 @@ public static class Builder {
15571559

15581560
private String sessionId;
15591561

1560-
private Builder() {};
1562+
private Builder() {}
1563+
;
15611564

15621565
Builder setSessionId(String sessionId) {
15631566
this.sessionId = sessionId;

0 commit comments

Comments
 (0)