Skip to content

Commit 4206e6e

Browse files
fix: suppress warnings in generated projects for non-idiomatic durations (googleapis#4119)
Removes compiler warnings like ``` [CanonicalDuration] Duration can be expressed more clearly with different units (see https://errorprone.info/bugpattern/CanonicalDuration) Did you mean '.setMaxRetryDelayDuration(Duration.ofSeconds(45))'? ``` from generated clients --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
1 parent d250637 commit 4206e6e

File tree

37 files changed

+45
-1
lines changed

37 files changed

+45
-1
lines changed

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,13 @@ private List<AnnotationNode> createClassAnnotations(Service service) {
424424
.setType(FIXED_TYPESTORE.get("Generated"))
425425
.setDescription("by gapic-generator-java")
426426
.build());
427+
428+
// Suppress the error-prone CanonicalDuration warning in generated code.
429+
annotations.add(
430+
AnnotationNode.builder()
431+
.setType(FIXED_TYPESTORE.get("SuppressWarnings"))
432+
.setDescription("CanonicalDuration")
433+
.build());
427434
return annotations;
428435
}
429436

@@ -2188,6 +2195,7 @@ private static TypeStore createStaticTypes() {
21882195
StatusCode.class,
21892196
StreamingCallSettings.class,
21902197
StubSettings.class,
2198+
SuppressWarnings.class,
21912199
TransportChannelProvider.class,
21922200
UnaryCallSettings.class,
21932201
UnaryCallable.class);

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/ApiVersionTestingStubSettings.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ import javax.annotation.Generated;
7777
* retries.
7878
*/
7979
@Generated("by gapic-generator-java")
80+
@SuppressWarnings("CanonicalDuration")
8081
public class EchoWithVersionStubSettings extends StubSettings<EchoWithVersionStubSettings> {
8182
/** The default scopes of the service. */
8283
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ import javax.annotation.Generated;
8282
*/
8383
@Deprecated
8484
@Generated("by gapic-generator-java")
85+
@SuppressWarnings("CanonicalDuration")
8586
public class DeprecatedServiceStubSettings extends StubSettings<DeprecatedServiceStubSettings> {
8687
/** The default scopes of the service. */
8788
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoServiceSelectiveGapicStubSettings.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ import javax.annotation.Generated;
8484
*/
8585
@BetaApi
8686
@Generated("by gapic-generator-java")
87+
@SuppressWarnings("CanonicalDuration")
8788
public class EchoServiceShouldGeneratePartialUsualStubSettings
8889
extends StubSettings<EchoServiceShouldGeneratePartialUsualStubSettings> {
8990
/** The default scopes of the service. */

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ import javax.annotation.Generated;
131131
*/
132132
@BetaApi
133133
@Generated("by gapic-generator-java")
134+
@SuppressWarnings("CanonicalDuration")
134135
public class EchoStubSettings extends StubSettings<EchoStubSettings> {
135136
/** The default scopes of the service. */
136137
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/JobServiceStubSettings.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ import javax.annotation.Generated;
8787
* retries.
8888
*/
8989
@Generated("by gapic-generator-java")
90+
@SuppressWarnings("CanonicalDuration")
9091
public class JobServiceStubSettings extends StubSettings<JobServiceStubSettings> {
9192
/** The default scopes of the service. */
9293
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ import javax.annotation.Generated;
111111
* retries.
112112
*/
113113
@Generated("by gapic-generator-java")
114+
@SuppressWarnings("CanonicalDuration")
114115
public class LoggingServiceV2StubSettings extends StubSettings<LoggingServiceV2StubSettings> {
115116
/** The default scopes of the service. */
116117
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ import javax.annotation.Generated;
111111
* retries.
112112
*/
113113
@Generated("by gapic-generator-java")
114+
@SuppressWarnings("CanonicalDuration")
114115
public class PublisherStubSettings extends StubSettings<PublisherStubSettings> {
115116
/** The default scopes of the service. */
116117
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ import javax.annotation.Generated;
135135
*/
136136
@BetaApi
137137
@Generated("by gapic-generator-java")
138+
@SuppressWarnings("CanonicalDuration")
138139
public class EchoStubSettings extends StubSettings<EchoStubSettings> {
139140
/** The default scopes of the service. */
140141
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import javax.annotation.Generated;
7979
*/
8080
@BetaApi
8181
@Generated("by gapic-generator-java")
82+
@SuppressWarnings("CanonicalDuration")
8283
public class WickedStubSettings extends StubSettings<WickedStubSettings> {
8384
/** The default scopes of the service. */
8485
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =

0 commit comments

Comments
 (0)