chore: Update the Java code generator (gapic-generator-java) to 2.25.0 (#1425)

gcf-owl-bot[bot] · web-flow · commit d8305f16e829 · 2023-09-11T11:02:13.000-04:00
* chore: Update the Java code generator (gapic-generator-java) to 2.25.0 PiperOrigin-RevId: 563824709 Source-Link: googleapis/googleapis@8fe4127 Source-Link: https://github.com/googleapis/googleapis-gen/commit/c8c0112151b19d890bb49b747b0ab28b816d47b1 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzhjMDExMjE1MWIxOWQ4OTBiYjQ5Yjc0N2IwYWIyOGI4MTZkNDdiMSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountLocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountLocationName.java
@@ -140,7 +140,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       BillingAccountLocationName that = ((BillingAccountLocationName) o);
       return Objects.equals(this.billingAccount, that.billingAccount)
           && Objects.equals(this.location, that.location);
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountName.java
@@ -127,7 +127,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       BillingAccountName that = ((BillingAccountName) o);
       return Objects.equals(this.billingAccount, that.billingAccount);
     }
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java
@@ -325,7 +325,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       CmekSettingsName that = ((CmekSettingsName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.organization, that.organization)
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLocationName.java
@@ -137,7 +137,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       FolderLocationName that = ((FolderLocationName) o);
       return Objects.equals(this.folder, that.folder)
           && Objects.equals(this.location, that.location);
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java
@@ -127,7 +127,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       FolderName that = ((FolderName) o);
       return Objects.equals(this.folder, that.folder);
     }
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LinkName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LinkName.java
@@ -388,7 +388,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       LinkName that = ((LinkName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.location, that.location)
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LocationName.java
@@ -137,7 +137,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       LocationName that = ((LocationName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.location, that.location);
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketName.java
@@ -344,7 +344,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       LogBucketName that = ((LogBucketName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.location, that.location)
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionName.java
@@ -296,7 +296,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       LogExclusionName that = ((LogExclusionName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.exclusion, that.exclusion)
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricName.java
@@ -137,7 +137,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       LogMetricName that = ((LogMetricName) o);
       return Objects.equals(this.project, that.project) && Objects.equals(this.metric, that.metric);
     }
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogName.java
@@ -282,7 +282,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       LogName that = ((LogName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.log, that.log)
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkName.java
@@ -286,7 +286,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       LogSinkName that = ((LogSinkName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.sink, that.sink)
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewName.java
@@ -388,7 +388,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       LogViewName that = ((LogViewName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.location, that.location)
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLocationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLocationName.java
@@ -137,7 +137,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       OrganizationLocationName that = ((OrganizationLocationName) o);
       return Objects.equals(this.organization, that.organization)
           && Objects.equals(this.location, that.location);
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java
@@ -127,7 +127,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       OrganizationName that = ((OrganizationName) o);
       return Objects.equals(this.organization, that.organization);
     }
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java
@@ -127,7 +127,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       ProjectName that = ((ProjectName) o);
       return Objects.equals(this.project, that.project);
     }
diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/SettingsName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/SettingsName.java
@@ -265,7 +265,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       SettingsName that = ((SettingsName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.organization, that.organization)

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public boolean equals(Object o) {`
`140`	`140`	`if (o == this) {`
`141`	`141`	`return true;`
`142`	`142`	`}`
`143`		`- if (o != null \|\| getClass() == o.getClass()) {`
	`143`	`+ if (o != null && getClass() == o.getClass()) {`
`144`	`144`	`BillingAccountLocationName that = ((BillingAccountLocationName) o);`
`145`	`145`	`return Objects.equals(this.billingAccount, that.billingAccount)`
`146`	`146`	`&& Objects.equals(this.location, that.location);`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public boolean equals(Object o) {`
`127`	`127`	`if (o == this) {`
`128`	`128`	`return true;`
`129`	`129`	`}`
`130`		`- if (o != null \|\| getClass() == o.getClass()) {`
	`130`	`+ if (o != null && getClass() == o.getClass()) {`
`131`	`131`	`BillingAccountName that = ((BillingAccountName) o);`
`132`	`132`	`return Objects.equals(this.billingAccount, that.billingAccount);`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public boolean equals(Object o) {`
`325`	`325`	`if (o == this) {`
`326`	`326`	`return true;`
`327`	`327`	`}`
`328`		`- if (o != null \|\| getClass() == o.getClass()) {`
	`328`	`+ if (o != null && getClass() == o.getClass()) {`
`329`	`329`	`CmekSettingsName that = ((CmekSettingsName) o);`
`330`	`330`	`return Objects.equals(this.project, that.project)`
`331`	`331`	`&& Objects.equals(this.organization, that.organization)`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public boolean equals(Object o) {`
`137`	`137`	`if (o == this) {`
`138`	`138`	`return true;`
`139`	`139`	`}`
`140`		`- if (o != null \|\| getClass() == o.getClass()) {`
	`140`	`+ if (o != null && getClass() == o.getClass()) {`
`141`	`141`	`FolderLocationName that = ((FolderLocationName) o);`
`142`	`142`	`return Objects.equals(this.folder, that.folder)`
`143`	`143`	`&& Objects.equals(this.location, that.location);`
Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ public boolean equals(Object o) {`
`388`	`388`	`if (o == this) {`
`389`	`389`	`return true;`
`390`	`390`	`}`
`391`		`- if (o != null \|\| getClass() == o.getClass()) {`
	`391`	`+ if (o != null && getClass() == o.getClass()) {`
`392`	`392`	`LinkName that = ((LinkName) o);`
`393`	`393`	`return Objects.equals(this.project, that.project)`
`394`	`394`	`&& Objects.equals(this.location, that.location)`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ public boolean equals(Object o) {`
`344`	`344`	`if (o == this) {`
`345`	`345`	`return true;`
`346`	`346`	`}`
`347`		`- if (o != null \|\| getClass() == o.getClass()) {`
	`347`	`+ if (o != null && getClass() == o.getClass()) {`
`348`	`348`	`LogBucketName that = ((LogBucketName) o);`
`349`	`349`	`return Objects.equals(this.project, that.project)`
`350`	`350`	`&& Objects.equals(this.location, that.location)`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ public boolean equals(Object o) {`
`296`	`296`	`if (o == this) {`
`297`	`297`	`return true;`
`298`	`298`	`}`
`299`		`- if (o != null \|\| getClass() == o.getClass()) {`
	`299`	`+ if (o != null && getClass() == o.getClass()) {`
`300`	`300`	`LogExclusionName that = ((LogExclusionName) o);`
`301`	`301`	`return Objects.equals(this.project, that.project)`
`302`	`302`	`&& Objects.equals(this.exclusion, that.exclusion)`