From f4fe6a054194f68da1d7a548dec7a1cec68c1a2c Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 12:24:32 -0400
Subject: [PATCH] deps: Update the Java code generator (gapic-generator-java)
 to 2.25.0 (#1902)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

PiperOrigin-RevId: 563824709

Source-Link: https://github.com/googleapis/googleapis/commit/8fe4127b6bd66764c7a854d555d05ff4914b6716

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>
---
 .../main/java/com/google/bigtable/admin/v2/AppProfileName.java  | 2 +-
 .../src/main/java/com/google/bigtable/admin/v2/BackupName.java  | 2 +-
 .../src/main/java/com/google/bigtable/admin/v2/ClusterName.java | 2 +-
 .../main/java/com/google/bigtable/admin/v2/InstanceName.java    | 2 +-
 .../main/java/com/google/bigtable/admin/v2/LocationName.java    | 2 +-
 .../src/main/java/com/google/bigtable/admin/v2/ProjectName.java | 2 +-
 .../main/java/com/google/bigtable/admin/v2/SnapshotName.java    | 2 +-
 .../src/main/java/com/google/bigtable/admin/v2/TableName.java   | 2 +-
 .../src/main/java/com/google/bigtable/v2/InstanceName.java      | 2 +-
 .../src/main/java/com/google/bigtable/v2/TableName.java         | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfileName.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfileName.java
index 75bc3511ad..2339e490b8 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfileName.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfileName.java
@@ -154,7 +154,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       AppProfileName that = ((AppProfileName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.instance, that.instance)
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BackupName.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BackupName.java
index ab2b03c385..b23fd3ff4d 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BackupName.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BackupName.java
@@ -174,7 +174,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       BackupName that = ((BackupName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.instance, that.instance)
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ClusterName.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ClusterName.java
index b37b8c51c7..1392039759 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ClusterName.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ClusterName.java
@@ -154,7 +154,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       ClusterName that = ((ClusterName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.instance, that.instance)
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceName.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceName.java
index 3d4c09bb05..427a8adc94 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceName.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceName.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()) {
       InstanceName that = ((InstanceName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.instance, that.instance);
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/LocationName.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/LocationName.java
index 5e16b4a4a3..9fcb7d2f71 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/LocationName.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ProjectName.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ProjectName.java
index 52548c7bca..ad618981f2 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ProjectName.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotName.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotName.java
index 206fe8c2fb..add6051719 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotName.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotName.java
@@ -174,7 +174,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       SnapshotName that = ((SnapshotName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.instance, that.instance)
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableName.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableName.java
index d4a4868790..0167ebfba8 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableName.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableName.java
@@ -154,7 +154,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       TableName that = ((TableName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.instance, that.instance)
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/InstanceName.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/InstanceName.java
index 00f4c71710..7cf6525b1c 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/InstanceName.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/InstanceName.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()) {
       InstanceName that = ((InstanceName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.instance, that.instance);
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TableName.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TableName.java
index 5e9a778ba4..b154274117 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TableName.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TableName.java
@@ -154,7 +154,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       TableName that = ((TableName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.instance, that.instance)