Use Java 17 switch statements (#221)

wpilibsuite · Oct 6, 2024 · 2342fe1 · 2342fe1
1 parent d08557a
commit 2342fe1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 38 deletions.
diff --git a/src/main/java/edu/wpi/first/nativeutils/dependencies/FastDownloadDependencySet.java b/src/main/java/edu/wpi/first/nativeutils/dependencies/FastDownloadDependencySet.java
@@ -18,21 +18,10 @@ public class FastDownloadDependencySet implements NativeDependencySet, SourceCon
 
     public void addConfiguration(ArtifactType type, Configuration configuration) {
         switch (type) {
-        case SOURCES:
-            sourcesConfiguration.extendsFrom(configuration);
-            break;
-        case HEADERS:
-            headerConfiguration.extendsFrom(configuration);
-            break;
-        case LINK:
-            linkConfiguration.extendsFrom(configuration);
-            break;
-        case RUNTIME:
-            runtimeConfiguration.extendsFrom(configuration);
-            break;
-
-        default:
-            break;
+        case SOURCES -> sourcesConfiguration.extendsFrom(configuration);
+        case HEADERS -> headerConfiguration.extendsFrom(configuration);
+        case LINK -> linkConfiguration.extendsFrom(configuration);
+        case RUNTIME -> runtimeConfiguration.extendsFrom(configuration);
         }
     }
 

diff --git a/src/main/java/edu/wpi/first/nativeutils/vendordeps/VendorParsingException.java b/src/main/java/edu/wpi/first/nativeutils/vendordeps/VendorParsingException.java
@@ -5,43 +5,36 @@
 public class VendorParsingException extends Exception {
     public VendorParsingException(String file, VendorParsingError error) {
         switch (error) {
-            case NoMavenUrl:
+            case NoMavenUrl -> {
                 System.err.println("The vendordep " + file + " is missing the required maven url.");
-                break;
-
-            case MissingCppDeps:
+            }
+            case MissingCppDeps -> {
                 System.err.println("The vendordep " + file + " is missing the required C++ dependencies key.");
                 System.err.println("If you would not like to declare any Cpp deps use an empty list.");
-                break;
-
-            case MissingJniDeps:
+            }
+            case MissingJniDeps -> {
                 System.err.println("The vendordep " + file + " is missing the required Jni dependencies key.");
                 System.err.println("If you would not like to declare any Jni deps use an empty list.");
-                break;
-
-            case MissingJavaDeps:
+            }
+            case MissingJavaDeps -> {
                 System.err.println("The vendordep " + file + " is missing the required Java dependencies key.");
                 System.err.println("If you would not like to declare any Java deps use an empty list.");
-                break;
-
-            default:
-                throw new BuildException(
-                        "Unhandled case in VendorParsingException. This is a bug and should be reported",
-                        new Exception());
+            }
+            default -> throw new BuildException(
+                         "Unhandled case in VendorParsingException. This is a bug and should be reported",
+                         new Exception());
         }
     }
 
     // should only be called if we don't have access to a name yet
     public VendorParsingException(VendorParsingError error) {
         switch (error) {
-            case MissingName:
+            case MissingName -> {
                 System.err.println("One of the vendordep files does not have a name");
-                break;
-
-            default:
-                throw new BuildException(
-                        "Unhandled case in VendorParsingException. This is a bug and should be reported",
-                        new Exception());
+            }
+            default -> throw new BuildException(
+                         "Unhandled case in VendorParsingException. This is a bug and should be reported",
+                         new Exception());
         }
     }
 }