Excavator: Upgrades Baseline to the latest version (#1375)

Author: svc-excavator-bot

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
         classpath 'com.gradle.publish:plugin-publish-plugin:1.3.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.44.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.46.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.36.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.14.0'

eclipse_plugin/src/main/java/com/palantir/javaformat/java/PalantirJavaFormatter.java

@@ -60,29 +60,20 @@ public String createIndentationString(int indentationLevel) {
     }
 
     /** Runs the Google Java formatter on the given source, with only the given ranges specified. */
-    @SuppressWarnings("for-rollout:StatementSwitchToExpressionSwitch")
     @Nullable
     private TextEdit formatInternal(int kind, String source, IRegion[] regions, int initialIndent) {
         try {
             boolean includeComments = (kind & CodeFormatter.F_INCLUDE_COMMENTS) == CodeFormatter.F_INCLUDE_COMMENTS;
             kind &= ~CodeFormatter.F_INCLUDE_COMMENTS;
-            SnippetKind snippetKind;
-            switch (kind) {
-                case ASTParser.K_EXPRESSION:
-                    snippetKind = SnippetKind.EXPRESSION;
-                    break;
-                case ASTParser.K_STATEMENTS:
-                    snippetKind = SnippetKind.STATEMENTS;
-                    break;
-                case ASTParser.K_CLASS_BODY_DECLARATIONS:
-                    snippetKind = SnippetKind.CLASS_BODY_DECLARATIONS;
-                    break;
-                case ASTParser.K_COMPILATION_UNIT:
-                    snippetKind = SnippetKind.COMPILATION_UNIT;
-                    break;
-                default:
-                    throw new IllegalArgumentException(String.format("Unknown snippet kind: %d", kind));
-            }
+
+            SnippetKind snippetKind =
+                    switch (kind) {
+                        case ASTParser.K_EXPRESSION -> SnippetKind.EXPRESSION;
+                        case ASTParser.K_STATEMENTS -> SnippetKind.STATEMENTS;
+                        case ASTParser.K_CLASS_BODY_DECLARATIONS -> SnippetKind.CLASS_BODY_DECLARATIONS;
+                        case ASTParser.K_COMPILATION_UNIT -> SnippetKind.COMPILATION_UNIT;
+                        default -> throw new IllegalArgumentException(String.format("Unknown snippet kind: %d", kind));
+                    };
             List<Replacement> replacements = new SnippetFormatter()
                     .format(snippetKind, source, rangesFromRegions(regions), initialIndent, includeComments);
             if (idempotent(source, regions, replacements)) {

eclipse_plugin/src/main/java/com/palantir/javaformat/java/SnippetFormatter.java

@@ -153,15 +153,14 @@ private static List<Replacement> toReplacements(String source, String replacemen
         return replacements;
     }
 
-    @SuppressWarnings("for-rollout:StatementSwitchToExpressionSwitch")
     private SnippetWrapper snippetWrapper(SnippetKind kind, String source, int initialIndent) {
         /*
          * Synthesize a dummy class around the code snippet provided by Eclipse. The
          * dummy class is correctly formatted -- the blocks use correct indentation,
          * etc.
          */
         switch (kind) {
-            case COMPILATION_UNIT: {
+            case COMPILATION_UNIT -> {
                 SnippetWrapper wrapper = new SnippetWrapper();
                 for (int i = 1; i <= initialIndent; i++) {
                     wrapper.append("class Dummy {\n").append(createIndentationString(i));
@@ -170,7 +169,7 @@ private SnippetWrapper snippetWrapper(SnippetKind kind, String source, int initi
                 wrapper.closeBraces(initialIndent);
                 return wrapper;
             }
-            case CLASS_BODY_DECLARATIONS: {
+            case CLASS_BODY_DECLARATIONS -> {
                 SnippetWrapper wrapper = new SnippetWrapper();
                 for (int i = 1; i <= initialIndent; i++) {
                     wrapper.append("class Dummy {\n").append(createIndentationString(i));
@@ -179,7 +178,7 @@ private SnippetWrapper snippetWrapper(SnippetKind kind, String source, int initi
                 wrapper.closeBraces(initialIndent);
                 return wrapper;
             }
-            case STATEMENTS: {
+            case STATEMENTS -> {
                 SnippetWrapper wrapper = new SnippetWrapper();
                 wrapper.append("class Dummy {\n").append(createIndentationString(1));
                 for (int i = 2; i <= initialIndent; i++) {
@@ -189,7 +188,7 @@ private SnippetWrapper snippetWrapper(SnippetKind kind, String source, int initi
                 wrapper.closeBraces(initialIndent);
                 return wrapper;
             }
-            case EXPRESSION: {
+            case EXPRESSION -> {
                 SnippetWrapper wrapper = new SnippetWrapper();
                 wrapper.append("class Dummy {\n").append(createIndentationString(1));
                 for (int i = 2; i <= initialIndent; i++) {
@@ -201,8 +200,7 @@ private SnippetWrapper snippetWrapper(SnippetKind kind, String source, int initi
                 wrapper.closeBraces(initialIndent);
                 return wrapper;
             }
-            default:
-                throw new IllegalArgumentException("Unknown snippet kind: " + kind);
+            default -> throw new IllegalArgumentException("Unknown snippet kind: " + kind);
         }
     }
 }

idea-plugin/src/main/java/com/palantir/javaformat/intellij/PalantirJavaFormatSettings.java

@@ -180,16 +180,13 @@ public void setEnabled(@Nullable String enabledStr) {
             }
         }
 
-        @SuppressWarnings({"for-rollout:NullAway", "for-rollout:StatementSwitchToExpressionSwitch"})
+        @SuppressWarnings("for-rollout:NullAway")
         public String getEnabled() {
-            switch (enabled) {
-                case ENABLED:
-                    return "true";
-                case DISABLED:
-                    return "false";
-                default:
-                    return null;
-            }
+            return switch (enabled) {
+                case ENABLED -> "true";
+                case DISABLED -> "false";
+                default -> null;
+            };
         }
 
         @Override

palantir-java-format/src/test/java/com/palantir/javaformat/java/FileBasedTests.java

@@ -85,7 +85,6 @@ public static void assumeJavaVersionForTest(String testName) {
                 Formatter.getRuntimeVersion() >= version, String.format("Not running on jdk %d or later", version)));
     }
 
-    @SuppressWarnings("for-rollout:StatementSwitchToExpressionSwitch")
     public List<Object[]> paramsAsNameInputOutput() throws IOException {
         ClassLoader classLoader = testClass.getClassLoader();
         Map<String, String> inputs = new TreeMap<>();
@@ -105,13 +104,9 @@ public List<Object[]> paramsAsNameInputOutput() throws IOException {
                     contents = CharStreams.toString(new InputStreamReader(stream, UTF_8));
                 }
                 switch (extension) {
-                    case "input":
-                        inputs.put(baseName, contents);
-                        break;
-                    case "output":
-                        outputs.put(baseName, contents);
-                        break;
-                    default:
+                    case "input" -> inputs.put(baseName, contents);
+                    case "output" -> outputs.put(baseName, contents);
+                    default -> {}
                 }
             }
         }