Enable ErrorProne TraditionalSwitchExpression

trinodb · Oct 4, 2024 · 33f54c9 · 33f54c9
1 parent c9da5cd
commit 33f54c9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 44 deletions.
diff --git a/...trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSourceProvider.java b/...trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSourceProvider.java
@@ -166,12 +166,9 @@ public ConnectorPageSource createPageSource(
                 DeltaLakeColumnMetadata partitionColumn = columnsMetadataByName.get(partitionColumnName);
                 checkState(partitionColumn != null, "Partition column %s not found", partitionColumnName);
                 Optional<String> value = switch (columnMappingMode) {
-                    case NONE:
-                        yield partitionKeys.get(partitionColumn.name());
-                    case ID, NAME:
-                        yield partitionKeys.get(partitionColumn.physicalName());
-                    default:
-                        throw new IllegalStateException("Unknown column mapping mode");
+                    case NONE -> partitionKeys.get(partitionColumn.name());
+                    case ID, NAME -> partitionKeys.get(partitionColumn.physicalName());
+                    default -> throw new IllegalStateException("Unknown column mapping mode");
                 };
                 // Fill partition values in the same order as the partition columns are specified in the table definition
                 partitionValues.get().add(value.orElse(null));

diff --git a/...delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionBuilder.java b/...delta-lake/src/main/java/io/trino/plugin/deltalake/expression/SparkExpressionBuilder.java
@@ -121,20 +121,13 @@ public Object visitColumnReference(SparkExpressionBaseParser.ColumnReferenceCont
     private static ComparisonExpression.Operator getComparisonOperator(Token symbol)
     {
         return switch (symbol.getType()) {
-            case SparkExpressionBaseLexer.EQ:
-                yield ComparisonExpression.Operator.EQUAL;
-            case SparkExpressionBaseLexer.NEQ:
-                yield ComparisonExpression.Operator.NOT_EQUAL;
-            case SparkExpressionBaseLexer.LT:
-                yield ComparisonExpression.Operator.LESS_THAN;
-            case SparkExpressionBaseLexer.LTE:
-                yield ComparisonExpression.Operator.LESS_THAN_OR_EQUAL;
-            case SparkExpressionBaseLexer.GT:
-                yield ComparisonExpression.Operator.GREATER_THAN;
-            case SparkExpressionBaseLexer.GTE:
-                yield ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL;
-            default:
-                throw new IllegalArgumentException("Unsupported operator: " + symbol.getText());
+            case SparkExpressionBaseLexer.EQ -> ComparisonExpression.Operator.EQUAL;
+            case SparkExpressionBaseLexer.NEQ -> ComparisonExpression.Operator.NOT_EQUAL;
+            case SparkExpressionBaseLexer.LT -> ComparisonExpression.Operator.LESS_THAN;
+            case SparkExpressionBaseLexer.LTE -> ComparisonExpression.Operator.LESS_THAN_OR_EQUAL;
+            case SparkExpressionBaseLexer.GT -> ComparisonExpression.Operator.GREATER_THAN;
+            case SparkExpressionBaseLexer.GTE -> ComparisonExpression.Operator.GREATER_THAN_OR_EQUAL;
+            default -> throw new IllegalArgumentException("Unsupported operator: " + symbol.getText());
         };
     }
 

diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/HudiCompactionOperation.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/HudiCompactionOperation.java
@@ -78,22 +78,14 @@ public Schema getSchema()
     public Object get(int field)
     {
         return switch (field) {
-            case 0:
-                yield baseInstantTime;
-            case 1:
-                yield deltaFilePaths;
-            case 2:
-                yield dataFilePath;
-            case 3:
-                yield fileId;
-            case 4:
-                yield partitionPath;
-            case 5:
-                yield metrics;
-            case 6:
-                yield bootstrapFilePath;
-            default:
-                throw new IndexOutOfBoundsException("Invalid index: " + field);
+            case 0 -> baseInstantTime;
+            case 1 -> deltaFilePaths;
+            case 2 -> dataFilePath;
+            case 3 -> fileId;
+            case 4 -> partitionPath;
+            case 5 -> metrics;
+            case 6 -> bootstrapFilePath;
+            default -> throw new IndexOutOfBoundsException("Invalid index: " + field);
         };
     }
 

diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/HudiCompactionPlan.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/compaction/HudiCompactionPlan.java
@@ -76,14 +76,10 @@ public Integer getVersion()
     public Object get(int field)
     {
         return switch (field) {
-            case 0:
-                yield operations;
-            case 1:
-                yield extraMetadata;
-            case 2:
-                yield version;
-            default:
-                throw new IndexOutOfBoundsException("Invalid index: " + field);
+            case 0 -> operations;
+            case 1 -> extraMetadata;
+            case 2 -> version;
+            default -> throw new IndexOutOfBoundsException("Invalid index: " + field);
         };
     }
 

diff --git a/pom.xml b/pom.xml
@@ -2890,6 +2890,7 @@
                                     -Xep:StringCaseLocaleUsage:ERROR \
                                     -Xep:SuppressWarningsDeprecated:ERROR \
                                     -Xep:ThreeLetterTimeZoneID:ERROR \
+                                    -Xep:TraditionalSwitchExpression:ERROR \
                                     -Xep:UnicodeEscape:ERROR \
                                     -Xep:UnnecessaryLongToIntConversion:ERROR \
                                     -Xep:UnnecessaryMethodReference:ERROR \