Revert "Fix auto formatting of throwing blocks"

This reverts commit fd048d0.
trinodb · Jan 11, 2024 · e529cd7 · e529cd7
1 parent 87ea350
commit e529cd7
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 84 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/metadata/FunctionManager.java b/core/trino-main/src/main/java/io/trino/metadata/FunctionManager.java
@@ -325,15 +325,9 @@ public static FunctionManager createTestingFunctionManager()
     {
         TypeOperators typeOperators = new TypeOperators();
         GlobalFunctionCatalog functionCatalog = new GlobalFunctionCatalog(
-                () -> {
-                    throw new UnsupportedOperationException();
-                },
-                () -> {
-                    throw new UnsupportedOperationException();
-                },
-                () -> {
-                    throw new UnsupportedOperationException();
-                });
+                () -> { throw new UnsupportedOperationException(); },
+                () -> { throw new UnsupportedOperationException(); },
+                () -> { throw new UnsupportedOperationException(); });
         functionCatalog.addFunctions(SystemFunctionBundle.create(new FeaturesConfig(), typeOperators, new BlockTypeOperators(typeOperators), UNKNOWN));
         functionCatalog.addFunctions(new InternalFunctionBundle(new LiteralFunction(new InternalBlockEncodingSerde(new BlockEncodingManager(), TESTING_TYPE_MANAGER))));
         return new FunctionManager(CatalogServiceProvider.fail(), functionCatalog, LanguageFunctionProvider.DISABLED);

diff --git a/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java b/core/trino-main/src/main/java/io/trino/metadata/MetadataManager.java
@@ -2044,9 +2044,7 @@ private void verifyProjection(TableHandle table, List<ConnectorExpression> proje
                 .map(Variable::getName)
                 .filter(variableName -> !assignedVariables.contains(variableName))
                 .findAny()
-                .ifPresent(variableName -> {
-                    throw new IllegalStateException("Unbound variable: " + variableName);
-                });
+                .ifPresent(variableName -> { throw new IllegalStateException("Unbound variable: " + variableName); });
     }
 
     @Override
@@ -2764,15 +2762,9 @@ public MetadataManager build()
             GlobalFunctionCatalog globalFunctionCatalog = this.globalFunctionCatalog;
             if (globalFunctionCatalog == null) {
                 globalFunctionCatalog = new GlobalFunctionCatalog(
-                        () -> {
-                            throw new UnsupportedOperationException();
-                        },
-                        () -> {
-                            throw new UnsupportedOperationException();
-                        },
-                        () -> {
-                            throw new UnsupportedOperationException();
-                        });
+                        () -> { throw new UnsupportedOperationException(); },
+                        () -> { throw new UnsupportedOperationException(); },
+                        () -> { throw new UnsupportedOperationException(); });
                 TypeOperators typeOperators = new TypeOperators();
                 globalFunctionCatalog.addFunctions(SystemFunctionBundle.create(new FeaturesConfig(), typeOperators, new BlockTypeOperators(typeOperators), UNKNOWN));
                 globalFunctionCatalog.addFunctions(new InternalFunctionBundle(new LiteralFunction(new InternalBlockEncodingSerde(new BlockEncodingManager(), typeManager))));

diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java
@@ -2532,9 +2532,7 @@ private Scope createScopeForView(
             analysis.unregisterTableForView();
 
             checkViewStaleness(columns, descriptor.getVisibleFields(), name, table)
-                    .ifPresent(explanation -> {
-                        throw semanticException(VIEW_IS_STALE, table, "View '%s' is stale or in invalid state: %s", name, explanation);
-                    });
+                    .ifPresent(explanation -> { throw semanticException(VIEW_IS_STALE, table, "View '%s' is stale or in invalid state: %s", name, explanation); });
 
             // Derive the type of the view from the stored definition, not from the analysis of the underlying query.
             // This is needed in case the underlying table(s) changed and the query in the view now produces types that

diff --git a/core/trino-main/src/test/java/io/trino/dispatcher/TestLocalDispatchQuery.java b/core/trino-main/src/test/java/io/trino/dispatcher/TestLocalDispatchQuery.java
@@ -134,15 +134,9 @@ public void testSubmittedForDispatchedQuery()
                 new FunctionManager(
                         new ConnectorCatalogServiceProvider<>("function provider", new NoConnectorServicesProvider(), ConnectorServices::getFunctionProvider),
                         new GlobalFunctionCatalog(
-                                () -> {
-                                    throw new UnsupportedOperationException();
-                                },
-                                () -> {
-                                    throw new UnsupportedOperationException();
-                                },
-                                () -> {
-                                    throw new UnsupportedOperationException();
-                                }),
+                                () -> { throw new UnsupportedOperationException(); },
+                                () -> { throw new UnsupportedOperationException(); },
+                                () -> { throw new UnsupportedOperationException(); }),
                         LanguageFunctionProvider.DISABLED),
                 new QueryMonitorConfig());
         CreateTable createTable = new CreateTable(QualifiedName.of("table"), ImmutableList.of(), FAIL, ImmutableList.of(), Optional.empty());

diff --git a/core/trino-main/src/test/java/io/trino/metadata/TestGlobalFunctionCatalog.java b/core/trino-main/src/test/java/io/trino/metadata/TestGlobalFunctionCatalog.java
@@ -101,15 +101,9 @@ public void testDuplicateFunctions()
 
         TypeOperators typeOperators = new TypeOperators();
         GlobalFunctionCatalog globalFunctionCatalog = new GlobalFunctionCatalog(
-                () -> {
-                    throw new UnsupportedOperationException();
-                },
-                () -> {
-                    throw new UnsupportedOperationException();
-                },
-                () -> {
-                    throw new UnsupportedOperationException();
-                });
+                () -> { throw new UnsupportedOperationException(); },
+                () -> { throw new UnsupportedOperationException(); },
+                () -> { throw new UnsupportedOperationException(); });
         globalFunctionCatalog.addFunctions(SystemFunctionBundle.create(new FeaturesConfig(), typeOperators, new BlockTypeOperators(typeOperators), NodeVersion.UNKNOWN));
         globalFunctionCatalog.addFunctions(functionBundle);
         assertThatThrownBy(() -> globalFunctionCatalog.addFunctions(functionBundle))
@@ -124,15 +118,9 @@ public void testConflictingScalarAggregation()
 
         TypeOperators typeOperators = new TypeOperators();
         GlobalFunctionCatalog globalFunctionCatalog = new GlobalFunctionCatalog(
-                () -> {
-                    throw new UnsupportedOperationException();
-                },
-                () -> {
-                    throw new UnsupportedOperationException();
-                },
-                () -> {
-                    throw new UnsupportedOperationException();
-                });
+                () -> { throw new UnsupportedOperationException(); },
+                () -> { throw new UnsupportedOperationException(); },
+                () -> { throw new UnsupportedOperationException(); });
         globalFunctionCatalog.addFunctions(SystemFunctionBundle.create(new FeaturesConfig(), typeOperators, new BlockTypeOperators(typeOperators), NodeVersion.UNKNOWN));
         assertThatThrownBy(() -> globalFunctionCatalog.addFunctions(functions))
                 .isInstanceOf(IllegalStateException.class)

diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/TestingPlannerContext.java b/core/trino-main/src/test/java/io/trino/sql/planner/TestingPlannerContext.java
@@ -120,15 +120,9 @@ public PlannerContext build()
             parametricTypes.forEach(typeRegistry::addParametricType);
 
             GlobalFunctionCatalog globalFunctionCatalog = new GlobalFunctionCatalog(
-                    () -> {
-                        throw new UnsupportedOperationException();
-                    },
-                    () -> {
-                        throw new UnsupportedOperationException();
-                    },
-                    () -> {
-                        throw new UnsupportedOperationException();
-                    });
+                    () -> { throw new UnsupportedOperationException(); },
+                    () -> { throw new UnsupportedOperationException(); },
+                    () -> { throw new UnsupportedOperationException(); });
             globalFunctionCatalog.addFunctions(SystemFunctionBundle.create(featuresConfig, typeOperators, new BlockTypeOperators(typeOperators), UNKNOWN));
             functionBundles.forEach(globalFunctionCatalog::addFunctions);
 

diff --git a/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSourceOutputSelector.java b/core/trino-spi/src/main/java/io/trino/spi/exchange/ExchangeSourceOutputSelector.java
@@ -173,9 +173,7 @@ public String toString()
                         .collect(toMap(
                                 Entry::getKey,
                                 Entry::getValue,
-                                (a, b) -> {
-                                    throw new IllegalArgumentException("got duplicate key " + a + ", " + b);
-                                },
+                                (a, b) -> { throw new IllegalArgumentException("got duplicate key " + a + ", " + b); },
                                 TreeMap::new)))
                 .add("finalSelector=" + finalSelector)
                 .toString();

diff --git a/core/trino-spi/src/main/java/io/trino/spi/predicate/TupleDomain.java b/core/trino-spi/src/main/java/io/trino/spi/predicate/TupleDomain.java
@@ -640,9 +640,7 @@ public Domain getDomain()
         return toMap(
                 keyMapper,
                 valueMapper,
-                (u, v) -> {
-                    throw new IllegalStateException(format("Duplicate values for a key: %s and %s", u, v));
-                },
+                (u, v) -> { throw new IllegalStateException(format("Duplicate values for a key: %s and %s", u, v)); },
                 LinkedHashMap::new);
     }
 

diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultQueryBuilder.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/DefaultQueryBuilder.java
@@ -86,9 +86,7 @@ public PreparedQuery prepareSelectQuery(
                     .filter(domains::containsKey)
                     .filter(column -> columnExpressions.containsKey(column.getColumnName()))
                     .findFirst()
-                    .ifPresent(column -> {
-                        throw new IllegalArgumentException(format("Column %s has an expression and a constraint attached at the same time", column));
-                    });
+                    .ifPresent(column -> { throw new IllegalArgumentException(format("Column %s has an expression and a constraint attached at the same time", column)); });
         }
 
         ImmutableList.Builder<String> conjuncts = ImmutableList.builder();

diff --git a/.../trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSessionProperties.java b/.../trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSessionProperties.java
@@ -167,9 +167,7 @@ public DeltaLakeSessionProperties(
                         "Internal Delta Lake connector property",
                         HiveTimestampPrecision.class,
                         MILLISECONDS,
-                        value -> {
-                            throw new IllegalStateException("The property cannot be set");
-                        },
+                        value -> { throw new IllegalStateException("The property cannot be set"); },
                         true),
                 durationProperty(
                         DYNAMIC_FILTERING_WAIT_TIMEOUT,

diff --git a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteClient.java b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteClient.java
@@ -79,9 +79,7 @@ public class TestIgniteClient
 
     public static final JdbcClient JDBC_CLIENT = new IgniteClient(
             new BaseJdbcConfig(),
-            session -> {
-                throw new UnsupportedOperationException();
-            },
+            session -> { throw new UnsupportedOperationException(); },
             new DefaultQueryBuilder(RemoteQueryModifier.NONE),
             new DefaultIdentifierMapping(),
             RemoteQueryModifier.NONE);

diff --git a/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlClient.java b/plugin/trino-postgresql/src/main/java/io/trino/plugin/postgresql/PostgreSqlClient.java
@@ -1426,9 +1426,7 @@ private ColumnMapping arrayAsJsonColumnMapping(ConnectorSession session, ColumnM
         return ColumnMapping.sliceMapping(
                 jsonType,
                 arrayAsJsonReadFunction(session, baseElementMapping),
-                (statement, index, block) -> {
-                    throw new UnsupportedOperationException();
-                },
+                (statement, index, block) -> { throw new UnsupportedOperationException(); },
                 DISABLE_PUSHDOWN);
     }
 
@@ -1556,9 +1554,7 @@ public Slice readSlice(ResultSet resultSet, int columnIndex)
                         return utf8Slice(resultSet.getString(columnIndex));
                     }
                 },
-                (statement, index, value) -> {
-                    throw new TrinoException(NOT_SUPPORTED, "Money type is not supported for INSERT");
-                },
+                (statement, index, value) -> { throw new TrinoException(NOT_SUPPORTED, "Money type is not supported for INSERT"); },
                 DISABLE_PUSHDOWN);
     }
 

diff --git a/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlClient.java b/plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlClient.java
@@ -110,9 +110,7 @@ public class TestPostgreSqlClient
             new BaseJdbcConfig(),
             new PostgreSqlConfig(),
             new JdbcStatisticsConfig(),
-            session -> {
-                throw new UnsupportedOperationException();
-            },
+            session -> { throw new UnsupportedOperationException(); },
             new DefaultQueryBuilder(RemoteQueryModifier.NONE),
             TESTING_TYPE_MANAGER,
             new DefaultIdentifierMapping(),