deps: Update the Java code generator (gapic-generator-java) to 2.25.0 (#1902)

gcf-owl-bot[bot] · web-flow · commit f4fe6a054194 · 2023-09-11T12:24:32.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-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public boolean equals(Object o) {`
`154`	`154`	`if (o == this) {`
`155`	`155`	`return true;`
`156`	`156`	`}`
`157`		`- if (o != null \|\| getClass() == o.getClass()) {`
	`157`	`+ if (o != null && getClass() == o.getClass()) {`
`158`	`158`	`AppProfileName that = ((AppProfileName) o);`
`159`	`159`	`return Objects.equals(this.project, that.project)`
`160`	`160`	`&& Objects.equals(this.instance, that.instance)`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public boolean equals(Object o) {`
`174`	`174`	`if (o == this) {`
`175`	`175`	`return true;`
`176`	`176`	`}`
`177`		`- if (o != null \|\| getClass() == o.getClass()) {`
	`177`	`+ if (o != null && getClass() == o.getClass()) {`
`178`	`178`	`BackupName that = ((BackupName) o);`
`179`	`179`	`return Objects.equals(this.project, that.project)`
`180`	`180`	`&& Objects.equals(this.instance, that.instance)`
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`	`InstanceName that = ((InstanceName) o);`
`142`	`142`	`return Objects.equals(this.project, that.project)`
`143`	`143`	`&& Objects.equals(this.instance, that.instance);`
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`	`ProjectName that = ((ProjectName) o);`
`132`	`132`	`return Objects.equals(this.project, that.project);`
`133`	`133`	`}`