fix: use && in equals check to avoid possible NPE (#1927)

* fix: use && in equals check to avoid possible NPE

* chore: update goldens

Author: burkedavison

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java

@@ -1349,8 +1349,8 @@ private static MethodDefinition createEqualsMethod(
         RelationalOperationExpr.equalToWithExprs(
             getClassMethodInvocationExpr,
             getClassMethodInvocationExpr.toBuilder().setExprReferenceExpr(argVarExpr).build());
-    LogicalOperationExpr orLogicalExpr =
-        LogicalOperationExpr.logicalOrWithExprs(oNotEqualsNullExpr, getClassEqualsExpr);
+    LogicalOperationExpr andLogicalExpr =
+        LogicalOperationExpr.logicalAndWithExprs(oNotEqualsNullExpr, getClassEqualsExpr);
 
     // Create second if statement's body assignment expression.
     Variable thatVariable = Variable.builder().setName("that").setType(thisClassType).build();
@@ -1399,11 +1399,11 @@ private static MethodDefinition createEqualsMethod(
             .setConditionExpr(oEqualsThisExpr)
             .setBody(Arrays.asList(ExprStatement.withExpr(returnTrueExpr)))
             .build();
-    // Code: if (o != null || getClass() == o.getClass()) { FoobarName that = ((FoobarName) o);
+    // Code: if (o != null && getClass() == o.getClass()) { FoobarName that = ((FoobarName) o);
     // return ..}
     IfStatement secondIfStatement =
         IfStatement.builder()
-            .setConditionExpr(orLogicalExpr)
+            .setConditionExpr(andLogicalExpr)
             .setBody(
                 Arrays.asList(
                     ExprStatement.withExpr(thatAssignmentExpr),

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden

@@ -168,7 +168,7 @@ public class AgentName implements ResourceName {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       AgentName that = ((AgentName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.location, that.location);

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/BillingAccountLocationName.golden

@@ -124,7 +124,7 @@ public class BillingAccountLocationName implements ResourceName {
     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);

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/CollisionResourceName.golden

@@ -181,7 +181,7 @@ public class ResourceName implements com.google.api.resourcenames.ResourceName {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       ResourceName that = ((ResourceName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.location, that.location)

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden

@@ -262,7 +262,7 @@ public class FoobarName implements ResourceName {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       FoobarName that = ((FoobarName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.foobar, that.foobar)

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/SessionName.golden

@@ -111,7 +111,7 @@ public class SessionName implements ResourceName {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       SessionName that = ((SessionName) o);
       return Objects.equals(this.session, that.session);
     }

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/TestName.golden

@@ -137,7 +137,7 @@ public class TestName implements ResourceName {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       TestName that = ((TestName) o);
       return Objects.equals(this.session, that.session)
           && Objects.equals(this.shardId, that.shardId)

showcase/gapic-showcase/proto/src/main/java/com/google/showcase/v1beta1/BlurbName.java

@@ -290,7 +290,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       BlurbName that = ((BlurbName) o);
       return Objects.equals(this.user, that.user)
           && Objects.equals(this.legacyUser, that.legacyUser)

showcase/gapic-showcase/proto/src/main/java/com/google/showcase/v1beta1/ProfileName.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()) {
       ProfileName that = ((ProfileName) o);
       return Objects.equals(this.user, that.user);
     }

showcase/gapic-showcase/proto/src/main/java/com/google/showcase/v1beta1/RoomName.java

@@ -125,7 +125,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       RoomName that = ((RoomName) o);
       return Objects.equals(this.room, that.room);
     }

showcase/gapic-showcase/proto/src/main/java/com/google/showcase/v1beta1/SequenceName.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()) {
       SequenceName that = ((SequenceName) o);
       return Objects.equals(this.sequence, that.sequence);
     }

showcase/gapic-showcase/proto/src/main/java/com/google/showcase/v1beta1/SequenceReportName.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()) {
       SequenceReportName that = ((SequenceReportName) o);
       return Objects.equals(this.sequence, that.sequence);
     }

showcase/gapic-showcase/proto/src/main/java/com/google/showcase/v1beta1/SessionName.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()) {
       SessionName that = ((SessionName) o);
       return Objects.equals(this.session, that.session);
     }

showcase/gapic-showcase/proto/src/main/java/com/google/showcase/v1beta1/StreamingSequenceName.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()) {
       StreamingSequenceName that = ((StreamingSequenceName) o);
       return Objects.equals(this.streamingSequence, that.streamingSequence);
     }

showcase/gapic-showcase/proto/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReportName.java

@@ -129,7 +129,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       StreamingSequenceReportName that = ((StreamingSequenceReportName) o);
       return Objects.equals(this.streamingSequence, that.streamingSequence);
     }

showcase/gapic-showcase/proto/src/main/java/com/google/showcase/v1beta1/TestName.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()) {
       TestName that = ((TestName) o);
       return Objects.equals(this.session, that.session) && Objects.equals(this.test, that.test);
     }

showcase/gapic-showcase/proto/src/main/java/com/google/showcase/v1beta1/UserName.java

@@ -125,7 +125,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       UserName that = ((UserName) o);
       return Objects.equals(this.user, that.user);
     }

showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java

@@ -290,7 +290,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       BlurbName that = ((BlurbName) o);
       return Objects.equals(this.user, that.user)
           && Objects.equals(this.legacyUser, that.legacyUser)

showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/ProfileName.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()) {
       ProfileName that = ((ProfileName) o);
       return Objects.equals(this.user, that.user);
     }

showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/RoomName.java

@@ -125,7 +125,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       RoomName that = ((RoomName) o);
       return Objects.equals(this.room, that.room);
     }

showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceName.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()) {
       SequenceName that = ((SequenceName) o);
       return Objects.equals(this.sequence, that.sequence);
     }

showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SequenceReportName.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()) {
       SequenceReportName that = ((SequenceReportName) o);
       return Objects.equals(this.sequence, that.sequence);
     }

showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/SessionName.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()) {
       SessionName that = ((SessionName) o);
       return Objects.equals(this.session, that.session);
     }

showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceName.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()) {
       StreamingSequenceName that = ((StreamingSequenceName) o);
       return Objects.equals(this.streamingSequence, that.streamingSequence);
     }

showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/StreamingSequenceReportName.java

@@ -129,7 +129,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       StreamingSequenceReportName that = ((StreamingSequenceReportName) o);
       return Objects.equals(this.streamingSequence, that.streamingSequence);
     }

showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/TestName.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()) {
       TestName that = ((TestName) o);
       return Objects.equals(this.session, that.session) && Objects.equals(this.test, that.test);
     }

showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/UserName.java

@@ -125,7 +125,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       UserName that = ((UserName) o);
       return Objects.equals(this.user, that.user);
     }

test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/EndpointName.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()) {
       EndpointName that = ((EndpointName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.endpoint, that.endpoint);

test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java

@@ -240,7 +240,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       FeedName that = ((FeedName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.feed, that.feed)

test/integration/goldens/asset/src/com/google/cloud/asset/v1/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);
     }

test/integration/goldens/asset/src/com/google/cloud/asset/v1/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);
     }

test/integration/goldens/asset/src/com/google/cloud/asset/v1/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);
     }

test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java

@@ -250,7 +250,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       SavedQueryName that = ((SavedQueryName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.savedQuery, that.savedQuery)

test/integration/goldens/bigtable/src/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);

test/integration/goldens/bigtable/src/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)

test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/ServiceAccountName.java

@@ -138,7 +138,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       ServiceAccountName that = ((ServiceAccountName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.serviceAccount, that.serviceAccount);

test/integration/goldens/kms/src/com/google/cloud/kms/v1/CryptoKeyName.java

@@ -175,7 +175,7 @@ public boolean equals(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)

test/integration/goldens/kms/src/com/google/cloud/kms/v1/CryptoKeyVersionName.java

@@ -198,7 +198,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       CryptoKeyVersionName that = ((CryptoKeyVersionName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.location, that.location)

test/integration/goldens/kms/src/com/google/cloud/kms/v1/ImportJobName.java

@@ -175,7 +175,7 @@ public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o != null || getClass() == o.getClass()) {
+    if (o != null && getClass() == o.getClass()) {
       ImportJobName that = ((ImportJobName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.location, that.location)

test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyRingName.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()) {
       KeyRingName that = ((KeyRingName) o);
       return Objects.equals(this.project, that.project)
           && Objects.equals(this.location, that.location)

test/integration/goldens/kms/src/com/google/cloud/kms/v1/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);

test/integration/goldens/library/src/com/google/example/library/v1/BookName.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()) {
       BookName that = ((BookName) o);
       return Objects.equals(this.shelf, that.shelf) && Objects.equals(this.book, that.book);
     }