A couple more changes per PR comments

Signed-off-by: Chris Helma <chelma+github@amazon.com>
chelma · May 27, 2024 · 5105030 · 5105030
1 parent fe266eb
commit 5105030
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/RFS/src/main/java/com/rfs/cms/CmsEntry.java b/RFS/src/main/java/com/rfs/cms/CmsEntry.java
@@ -5,6 +5,7 @@
 public class CmsEntry {
     public abstract static class Base {
         protected Base() {}
+        public abstract String toString();
     }
 
     public static enum SnapshotStatus {
@@ -23,6 +24,14 @@ public Snapshot(String name, SnapshotStatus status) {
             this.name = name;
             this.status = status;
         }
+
+        @Override
+        public String toString() {
+            return "Snapshot("
+                + "name='" + name + ","
+                + "status=" + status +
+                ")";
+        }
     }
 
     public static enum MetadataStatus {
@@ -60,6 +69,15 @@ public Metadata(MetadataStatus status, String leaseExpiry, int numAttempts) {
             this.leaseExpiry = leaseExpiry;
             this.numAttempts = numAttempts;
         }
+
+        @Override
+        public String toString() {
+            return "Metadata("
+                + "status=" + status.toString() + ","
+                + "leaseExpiry=" + leaseExpiry + ","
+                + "numAttempts=" + numAttempts.toString() +
+                ")";
+        }
     }
 
     public static class CouldNotFindNextLeaseDuration extends RfsException {

diff --git a/RFS/src/main/java/com/rfs/worker/MetadataStep.java b/RFS/src/main/java/com/rfs/worker/MetadataStep.java
@@ -40,10 +40,9 @@ public SharedMembers(GlobalState globalState, CmsClient cmsClient, String snapsh
         // A convient way to check if the CMS entry is present before retrieving it.  In some places, it's fine/expected
         // for the CMS entry to be missing, but in others, it's a problem.
         public CmsEntry.Metadata getCmsEntryNotMissing() {
-            if (cmsEntry.isEmpty()) {
-                throw new MissingMigrationEntry("The Metadata Migration CMS entry we expected to be stored in local memory was null");
-            }
-            return cmsEntry.get();
+            return cmsEntry.orElseThrow(
+                () -> new MissingMigrationEntry("The Metadata Migration CMS entry we expected to be stored in local memory was empty")
+            );
         }
     }