Skip to content
This repository has been archived by the owner on Sep 18, 2023. It is now read-only.

Commit

Permalink
chore: fix java 17 checks (#243)
Browse files Browse the repository at this point in the history 
This PR was generated using Autosynth. 🌈

Synth log will be available here:
https://source.cloud.google.com/results/invocations/4f32d3ba-e72a-4533-98ea-d1c10029ad8d/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

PiperOrigin-RevId: 401879979
Source-Link: googleapis/googleapis@177c62a
PiperOrigin-RevId: 399862673
Source-Link: googleapis/googleapis@de98811
PiperOrigin-RevId: 399105877
Source-Link: googleapis/googleapis@161fdb4
  • Loading branch information
@yoshi-automation
yoshi-automation committed Nov 3, 2021
1 parent c2fa55a commit a561b16
Show file tree
Hide file tree
Showing 73 changed files with 382 additions and 377 deletions.
10 changes: 4 additions & 6 deletions .kokoro/dependencies.sh
View file
Expand Up @@ -38,15 +38,13 @@ function determineMavenOpts() {
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
)

case $javaVersion in
"17")
if [[ $javaVersion == 17* ]]
then
# MaxPermSize is no longer supported as of jdk 17
echo -n "-Xmx1024m"
;;
*)
else
echo -n "-Xmx1024m -XX:MaxPermSize=128m"
;;
esac
fi
}

export MAVEN_OPTS=$(determineMavenOpts)
Expand Down
4 changes: 2 additions & 2 deletions proto-google-common-protos/src/main/java/com/google/api/Advice.java
View file
Expand Up @@ -174,7 +174,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getDescriptionBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, description_);
}
unknownFields.writeTo(output);
Expand All @@ -186,7 +186,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getDescriptionBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, description_);
}
size += unknownFields.getSerializedSize();
Expand Down
20 changes: 10 additions & 10 deletions proto-google-common-protos/src/main/java/com/google/api/AuthProvider.java
View file
Expand Up @@ -612,19 +612,19 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getIdBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
}
if (!getIssuerBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(issuer_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, issuer_);
}
if (!getJwksUriBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jwksUri_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, jwksUri_);
}
if (!getAudiencesBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(audiences_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, audiences_);
}
if (!getAuthorizationUrlBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authorizationUrl_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 5, authorizationUrl_);
}
for (int i = 0; i < jwtLocations_.size(); i++) {
Expand All @@ -639,19 +639,19 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getIdBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(id_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
}
if (!getIssuerBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(issuer_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, issuer_);
}
if (!getJwksUriBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jwksUri_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, jwksUri_);
}
if (!getAudiencesBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(audiences_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, audiences_);
}
if (!getAuthorizationUrlBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authorizationUrl_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, authorizationUrl_);
}
for (int i = 0; i < jwtLocations_.size(); i++) {
Expand Down
8 changes: 4 additions & 4 deletions proto-google-common-protos/src/main/java/com/google/api/AuthRequirement.java
View file
Expand Up @@ -258,10 +258,10 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getProviderIdBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(providerId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, providerId_);
}
if (!getAudiencesBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(audiences_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, audiences_);
}
unknownFields.writeTo(output);
Expand All @@ -273,10 +273,10 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getProviderIdBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(providerId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, providerId_);
}
if (!getAudiencesBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(audiences_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, audiences_);
}
size += unknownFields.getSerializedSize();
Expand Down
4 changes: 2 additions & 2 deletions proto-google-common-protos/src/main/java/com/google/api/AuthenticationRule.java
View file
Expand Up @@ -349,7 +349,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getSelectorBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, selector_);
}
if (oauth_ != null) {
Expand All @@ -370,7 +370,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getSelectorBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, selector_);
}
if (oauth_ != null) {
Expand Down
12 changes: 6 additions & 6 deletions proto-google-common-protos/src/main/java/com/google/api/BackendRule.java
View file
Expand Up @@ -830,10 +830,10 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getSelectorBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, selector_);
}
if (!getAddressBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(address_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, address_);
}
if (deadline_ != 0D) {
Expand All @@ -855,7 +855,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (authenticationCase_ == 8) {
output.writeBool(8, (boolean) ((java.lang.Boolean) authentication_));
}
if (!getProtocolBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protocol_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 9, protocol_);
}
unknownFields.writeTo(output);
Expand All @@ -867,10 +867,10 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getSelectorBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, selector_);
}
if (!getAddressBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(address_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, address_);
}
if (deadline_ != 0D) {
Expand All @@ -894,7 +894,7 @@ public int getSerializedSize() {
com.google.protobuf.CodedOutputStream.computeBoolSize(
8, (boolean) ((java.lang.Boolean) authentication_));
}
if (!getProtocolBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protocol_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, protocol_);
}
size += unknownFields.getSerializedSize();
Expand Down
4 changes: 2 additions & 2 deletions proto-google-common-protos/src/main/java/com/google/api/Billing.java
View file
Expand Up @@ -471,7 +471,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getMonitoredResourceBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(monitoredResource_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, monitoredResource_);
}
for (int i = 0; i < metrics_.size(); i++) {
Expand All @@ -486,7 +486,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getMonitoredResourceBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(monitoredResource_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, monitoredResource_);
}
{
Expand Down
12 changes: 6 additions & 6 deletions proto-google-common-protos/src/main/java/com/google/api/ConfigChange.java
View file
Expand Up @@ -440,13 +440,13 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getElementBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(element_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, element_);
}
if (!getOldValueBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oldValue_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, oldValue_);
}
if (!getNewValueBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(newValue_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, newValue_);
}
if (changeType_ != com.google.api.ChangeType.CHANGE_TYPE_UNSPECIFIED.getNumber()) {
Expand All @@ -464,13 +464,13 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getElementBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(element_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, element_);
}
if (!getOldValueBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oldValue_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, oldValue_);
}
if (!getNewValueBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(newValue_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, newValue_);
}
if (changeType_ != com.google.api.ChangeType.CHANGE_TYPE_UNSPECIFIED.getNumber()) {
Expand Down
4 changes: 2 additions & 2 deletions proto-google-common-protos/src/main/java/com/google/api/ContextRule.java
View file
Expand Up @@ -483,7 +483,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getSelectorBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, selector_);
}
for (int i = 0; i < requested_.size(); i++) {
Expand All @@ -509,7 +509,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getSelectorBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, selector_);
}
{
Expand Down
4 changes: 2 additions & 2 deletions proto-google-common-protos/src/main/java/com/google/api/Control.java
View file
Expand Up @@ -175,7 +175,7 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getEnvironmentBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(environment_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, environment_);
}
unknownFields.writeTo(output);
Expand All @@ -187,7 +187,7 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getEnvironmentBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(environment_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, environment_);
}
size += unknownFields.getSerializedSize();
Expand Down
8 changes: 4 additions & 4 deletions proto-google-common-protos/src/main/java/com/google/api/CustomHttpPattern.java
View file
Expand Up @@ -228,10 +228,10 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getKindBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, kind_);
}
if (!getPathBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(path_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, path_);
}
unknownFields.writeTo(output);
Expand All @@ -243,10 +243,10 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getKindBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kind_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, kind_);
}
if (!getPathBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(path_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, path_);
}
size += unknownFields.getSerializedSize();
Expand Down
16 changes: 8 additions & 8 deletions proto-google-common-protos/src/main/java/com/google/api/Documentation.java
View file
Expand Up @@ -594,22 +594,22 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getSummaryBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(summary_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, summary_);
}
if (!getOverviewBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(overview_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, overview_);
}
for (int i = 0; i < rules_.size(); i++) {
output.writeMessage(3, rules_.get(i));
}
if (!getDocumentationRootUrlBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(documentationRootUrl_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, documentationRootUrl_);
}
for (int i = 0; i < pages_.size(); i++) {
output.writeMessage(5, pages_.get(i));
}
if (!getServiceRootUrlBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceRootUrl_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 6, serviceRootUrl_);
}
unknownFields.writeTo(output);
Expand All @@ -621,22 +621,22 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getSummaryBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(summary_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, summary_);
}
if (!getOverviewBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(overview_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, overview_);
}
for (int i = 0; i < rules_.size(); i++) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, rules_.get(i));
}
if (!getDocumentationRootUrlBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(documentationRootUrl_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, documentationRootUrl_);
}
for (int i = 0; i < pages_.size(); i++) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, pages_.get(i));
}
if (!getServiceRootUrlBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceRootUrl_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, serviceRootUrl_);
}
size += unknownFields.getSerializedSize();
Expand Down
12 changes: 6 additions & 6 deletions proto-google-common-protos/src/main/java/com/google/api/DocumentationRule.java
View file
Expand Up @@ -299,13 +299,13 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!getSelectorBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, selector_);
}
if (!getDescriptionBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, description_);
}
if (!getDeprecationDescriptionBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deprecationDescription_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, deprecationDescription_);
}
unknownFields.writeTo(output);
Expand All @@ -317,13 +317,13 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!getSelectorBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(selector_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, selector_);
}
if (!getDescriptionBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, description_);
}
if (!getDeprecationDescriptionBytes().isEmpty()) {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deprecationDescription_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, deprecationDescription_);
}
size += unknownFields.getSerializedSize();
Expand Down

0 comments on commit a561b16

Please sign in to comment.