From d22986a0a3f440b9dcbde0fb9a14f1f8eebdc999 Mon Sep 17 00:00:00 2001
From: mcilwain <mcilwain@google.com>
Date: Wed, 25 Oct 2017 14:39:36 -0700
Subject: [PATCH] Use compound return statements for greater readability

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173451653
---
 java/google/registry/gcs/GcsUtils.java                 |  5 +----
 .../registry/model/smd/SignedMarkRevocationList.java   |  5 +----
 .../dns/writer/clouddns/CloudDnsWriterTest.java        | 10 ++--------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/java/google/registry/gcs/GcsUtils.java b/java/google/registry/gcs/GcsUtils.java
index fc0200ab6..826aac163 100644
--- a/java/google/registry/gcs/GcsUtils.java
+++ b/java/google/registry/gcs/GcsUtils.java
@@ -81,10 +81,7 @@ public class GcsUtils {
       logger.warning(e, "Failed to check if GCS file exists");
       return false;
     }
-    if (metadata == null) {
-      return false;
-    }
-    return metadata.getLength() > 0;
+    return metadata != null && metadata.getLength() > 0;
   }
 
   /** Determines most appropriate {@link GcsFileOptions} based on filename extension. */
diff --git a/java/google/registry/model/smd/SignedMarkRevocationList.java b/java/google/registry/model/smd/SignedMarkRevocationList.java
index 05cc80af9..c4000c3ee 100644
--- a/java/google/registry/model/smd/SignedMarkRevocationList.java
+++ b/java/google/registry/model/smd/SignedMarkRevocationList.java
@@ -140,10 +140,7 @@ public class SignedMarkRevocationList extends ImmutableObject {
   /** Returns {@code true} if the SMD ID has been revoked at the given point in time. */
   public boolean isSmdRevoked(String smdId, DateTime now) {
     DateTime revoked = revokes.get(checkNotNull(smdId, "smdId"));
-    if (revoked == null) {
-      return false;
-    }
-    return isBeforeOrAt(revoked, now);
+    return revoked != null && isBeforeOrAt(revoked, now);
   }
 
   /** Returns the creation timestamp specified at the top of the SMDRL CSV file. */
diff --git a/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java b/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java
index c89fa3c6f..8792e2c52 100644
--- a/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java
+++ b/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java
@@ -130,14 +130,8 @@ public class CloudDnsWriterTest {
                         stubZone
                             .stream()
                             .filter(
-                                resourceRecordSet -> {
-                                  if (resourceRecordSet == null) {
-                                    return false;
-                                  }
-                                  return resourceRecordSet
-                                      .getName()
-                                      .equals(recordNameCaptor.getValue());
-                                })
+                                rs ->
+                                    rs != null && rs.getName().equals(recordNameCaptor.getValue()))
                             .collect(toImmutableList()));
               }
             });