Day 2 - simplify switch statements

l0s · l0s · commit d2f3c99dff39 · 2022-12-01T22:29:30.000-08:00
diff --git a/src/test/java/com/macasaet/Day02.java b/src/test/java/com/macasaet/Day02.java
@@ -83,18 +83,19 @@ public Shape beats() {
         };
 
         public static Shape forChar(final int c) {
-            switch (c) {
+            return switch (c) {
                 case 'X':
                 case 'A':
-                    return Shape.Rock;
+                    yield Shape.Rock;
                 case 'Y':
                 case 'B':
-                    return Shape.Paper;
+                    yield Shape.Paper;
                 case 'Z':
                 case 'C':
-                    return Shape.Scissors;
-            }
-            throw new IllegalArgumentException();
+                    yield Shape.Scissors;
+                default:
+                    throw new IllegalArgumentException("Invalid shape: " + c);
+            };
         }
 
         /**
@@ -134,15 +135,12 @@ public Shape respond(Shape opponent) {
         };
 
         public static ResponseStrategy forChar(final char c) {
-            switch (c) {
-                case 'X':
-                    return Lose;
-                case 'Y':
-                    return Draw;
-                case 'Z':
-                    return Win;
-            }
-            throw new IllegalArgumentException();
+            return switch (c) {
+                case 'X' -> Lose;
+                case 'Y' -> Draw;
+                case 'Z' -> Win;
+                default -> throw new IllegalArgumentException("Invalid strategy: " + c);
+            };
         }
 
         public abstract Shape respond(final Shape opponent);
