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

#2198) * 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>
googleapis · Sep 12, 2023 · 5e76f19 · 5e76f19
1 parent 26552f4
commit 5e76f19
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BucketName.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BucketName.java
@@ -137,7 +137,7 @@ public boolean equals(java.lang.Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       BucketName that = ((BucketName) o);
       return Objects.equals(this.project, that.project) && Objects.equals(this.bucket, that.bucket);
     }

diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CryptoKeyName.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CryptoKeyName.java
@@ -175,7 +175,7 @@ public boolean equals(java.lang.Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       CryptoKeyName that = ((CryptoKeyName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.location, that.location)

diff --git a/...o-google-cloud-storage-v2/src/main/java/com/google/storage/v2/NotificationConfigName.java b/...o-google-cloud-storage-v2/src/main/java/com/google/storage/v2/NotificationConfigName.java
@@ -159,7 +159,7 @@ public boolean equals(java.lang.Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       NotificationConfigName that = ((NotificationConfigName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.bucket, that.bucket)

diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ProjectName.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/ProjectName.java
@@ -127,7 +127,7 @@ public boolean equals(java.lang.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);
     }