From 509ac91684c42226f7aedf777ce409ee53a87e07 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski Date: Mon, 21 Feb 2022 17:13:56 +0100 Subject: [PATCH] Replace Immutable(Map|Table).Builder.build() with buildOrThrow() See also: c0276cea688da155f7f5bf0cb0b53169ece43e6e, but this time with Enforcer rules to prevent us from adding more. --- .mvn/modernizer/violations.xml | 11 +++++++ .../java/io/trino/jdbc/TypeConversions.java | 2 +- .../scheduler/SqlQueryScheduler.java | 2 +- .../scheduler/StageTaskSourceFactory.java | 2 +- ...TestDeduplicatingDirectExchangeBuffer.java | 30 +++++++++---------- .../server/security/TestResourceSecurity.java | 4 +-- .../io/trino/sql/query/TestRowFilter.java | 2 +- .../plugin/clickhouse/ClickHouseClient.java | 2 +- .../BaseElasticsearchConnectorTest.java | 22 +++++++------- .../plugin/exchange/FileSystemExchange.java | 2 +- .../TestFileSystemExchangeConfig.java | 2 +- .../exchange/containers/MinioStorage.java | 4 +-- .../exchange/s3/TestExchangeS3Config.java | 2 +- .../TestHiveQueryFailureRecoveryTest.java | 2 +- .../hive/TestHiveTaskFailureRecoveryTest.java | 4 +-- .../cache/TestImpersonationCachingConfig.java | 2 +- .../plugin/iceberg/IcebergQueryRunner.java | 2 +- .../TestIcebergTaskFailureRecoveryTest.java | 2 +- .../trino/plugin/kafka/KafkaQueryRunner.java | 2 +- .../TestPinotAuthenticationTypeConfig.java | 2 +- ...notPasswordBrokerAuthenticationConfig.java | 2 +- ...asswordControllerAuthenticationConfig.java | 2 +- ...tTolerantExecutionConnectorTestHelper.java | 2 +- 23 files changed, 60 insertions(+), 49 deletions(-) diff --git a/.mvn/modernizer/violations.xml b/.mvn/modernizer/violations.xml index 5a545161dba3..39db726ba8ab 100644 --- a/.mvn/modernizer/violations.xml +++ b/.mvn/modernizer/violations.xml @@ -43,6 +43,17 @@ Prefer Math.toIntExact(long) + + com/google/common/collect/ImmutableMap$Builder.build:()Lcom/google/common/collect/ImmutableMap; + 1.8 + Use buildOrThrow() instead, as it makes it clear that it will throw on duplicated values + + + com/google/common/collect/ImmutableTable$Builder.build:()Lcom/google/common/collect/ImmutableTable; + 1.8 + Use buildOrThrow() instead, as it makes it clear that it will throw on duplicated values + + com/google/common/cache/CacheBuilder.build:()Lcom/google/common/cache/Cache; 1.8 diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/TypeConversions.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/TypeConversions.java index ffc10087b832..6ea4ee004107 100644 --- a/client/trino-jdbc/src/main/java/io/trino/jdbc/TypeConversions.java +++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/TypeConversions.java @@ -85,7 +85,7 @@ public Builder add(String sourceRawType, Class sourceClass, Class t public TypeConversions build() { - return new TypeConversions(conversions.build()); + return new TypeConversions(conversions.buildOrThrow()); } } diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/SqlQueryScheduler.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/SqlQueryScheduler.java index 4a1ce6890fc0..115c9dd835c9 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/SqlQueryScheduler.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/SqlQueryScheduler.java @@ -1780,7 +1780,7 @@ public static FaultTolerantDistributedStagesScheduler create( taskLifecycleListener, exchange, bucketToPartitionCache.apply(fragment.getPartitioningScheme().getPartitioning().getHandle()).getBucketToPartitionMap(), - sourceExchanges.build(), + sourceExchanges.buildOrThrow(), inputBucketToPartition.getBucketToPartitionMap(), inputBucketToPartition.getBucketNodeMap(), retryAttempts); diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/StageTaskSourceFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/StageTaskSourceFactory.java index 3244df11df35..477ae948dde7 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/StageTaskSourceFactory.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/StageTaskSourceFactory.java @@ -730,7 +730,7 @@ private static Map getSourceFragmentToRemoteSourceNo result.put(sourceFragmentId, node.getId()); } } - return result.build(); + return result.buildOrThrow(); } private static ListMultimap getInputsForRemoteSources( diff --git a/core/trino-main/src/test/java/io/trino/operator/TestDeduplicatingDirectExchangeBuffer.java b/core/trino-main/src/test/java/io/trino/operator/TestDeduplicatingDirectExchangeBuffer.java index 6f78619449d2..e0ace1cac40d 100644 --- a/core/trino-main/src/test/java/io/trino/operator/TestDeduplicatingDirectExchangeBuffer.java +++ b/core/trino-main/src/test/java/io/trino/operator/TestDeduplicatingDirectExchangeBuffer.java @@ -217,7 +217,7 @@ public void testPollPagesQueryLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(0, 0), new RuntimeException("error")) - .build(), + .buildOrThrow(), DataSize.of(5, KILOBYTE), 0, ImmutableList.of( @@ -246,7 +246,7 @@ public void testPollPagesQueryLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(0, 0), new RuntimeException("error")) - .build(), + .buildOrThrow(), DataSize.of(5, KILOBYTE), 2, ImmutableList.of( @@ -262,7 +262,7 @@ public void testPollPagesQueryLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(0, 0), new RuntimeException("error")) - .build(), + .buildOrThrow(), DataSize.of(5, KILOBYTE), 2, ImmutableList.of( @@ -279,7 +279,7 @@ public void testPollPagesQueryLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(2, 0), new RuntimeException("error")) - .build(), + .buildOrThrow(), DataSize.of(5, KILOBYTE), 0, ImmutableList.of( @@ -295,7 +295,7 @@ public void testPollPagesQueryLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(2, 0), new RuntimeException("error")) - .build(), + .buildOrThrow(), DataSize.of(4, KILOBYTE), 3, ImmutableList.of( @@ -313,7 +313,7 @@ public void testPollPagesQueryLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(2, 2), error) - .build(), + .buildOrThrow(), DataSize.of(4, KILOBYTE), 0, error); @@ -328,7 +328,7 @@ public void testPollPagesQueryLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(0, 1), error) - .build(), + .buildOrThrow(), DataSize.of(4, KILOBYTE), 0, error); @@ -343,7 +343,7 @@ public void testPollPagesQueryLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(2, 2), error) - .build(), + .buildOrThrow(), DataSize.of(3, KILOBYTE), 3, error); @@ -358,7 +358,7 @@ public void testPollPagesQueryLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(0, 1), error) - .build(), + .buildOrThrow(), DataSize.of(3, KILOBYTE), 3, error); @@ -464,7 +464,7 @@ public void testPollPagesTaskLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(1, 0), new RuntimeException("error")) - .build(), + .buildOrThrow(), DataSize.of(10, KILOBYTE), 0, ImmutableList.of( @@ -481,7 +481,7 @@ public void testPollPagesTaskLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(1, 0), new RuntimeException("error")) - .build(), + .buildOrThrow(), DataSize.of(2, KILOBYTE), 3, ImmutableList.of( @@ -500,7 +500,7 @@ public void testPollPagesTaskLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(2, 2), error) - .build(), + .buildOrThrow(), DataSize.of(5, KILOBYTE), 0, error); @@ -514,7 +514,7 @@ public void testPollPagesTaskLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(0, 1), error) - .build(), + .buildOrThrow(), DataSize.of(5, KILOBYTE), 0, error); @@ -529,7 +529,7 @@ public void testPollPagesTaskLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(2, 2), error) - .build(), + .buildOrThrow(), DataSize.of(2, KILOBYTE), 3, error); @@ -543,7 +543,7 @@ public void testPollPagesTaskLevelRetry() .build(), ImmutableMap.builder() .put(createTaskId(0, 1), error) - .build(), + .buildOrThrow(), DataSize.of(1, KILOBYTE), 2, error); diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java b/core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java index fde1f1d95180..78ffcb23cca3 100644 --- a/core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java +++ b/core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java @@ -677,7 +677,7 @@ public void testOAuth2Groups(Optional> groups) .put("http-server.authentication.type", "oauth2") .putAll(getOAuth2Properties(tokenServer)) .put("http-server.authentication.oauth2.groups-field", GROUPS_CLAIM) - .build()) + .buildOrThrow()) .setAdditionalModule(oauth2Module(tokenServer)) .build()) { server.getInstance(Key.get(AccessControlManager.class)).addSystemAccessControl(TestSystemAccessControl.NO_IMPERSONATION); @@ -813,7 +813,7 @@ private static Map getOAuth2Properties(TokenServer tokenServer) .put("http-server.authentication.oauth2.token-url", tokenServer.getIssuer()) .put("http-server.authentication.oauth2.client-id", tokenServer.getClientId()) .put("http-server.authentication.oauth2.client-secret", tokenServer.getClientSecret()) - .build(); + .buildOrThrow(); } private static String getOauthToken(OkHttpClient client, String url) diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestRowFilter.java b/core/trino-main/src/test/java/io/trino/sql/query/TestRowFilter.java index 3f37872c0d9e..c8b2f70dcec9 100644 --- a/core/trino-main/src/test/java/io/trino/sql/query/TestRowFilter.java +++ b/core/trino-main/src/test/java/io/trino/sql/query/TestRowFilter.java @@ -121,7 +121,7 @@ public void init() .withName("mockmissingcolumns") .withGetViews((s, prefix) -> ImmutableMap.builder() .put(new SchemaTableName("default", "nation_view"), view) - .build()) + .buildOrThrow()) .withGetColumns(schemaTableName -> { if (schemaTableName.equals(new SchemaTableName("tiny", "nation_with_optional_column"))) { return TPCH_NATION_WITH_OPTIONAL_COLUMN; diff --git a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java index 43c7abfdc822..7d8cdac0844e 100644 --- a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java +++ b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java @@ -291,7 +291,7 @@ public Map getTableProperties(ConnectorSession session, JdbcTabl properties.put(SAMPLE_BY_PROPERTY, samplingKey); } } - return properties.build(); + return properties.buildOrThrow(); } } catch (SQLException e) { diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java index 1169a1007cbf..7b21d3f5455d 100644 --- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java +++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java @@ -430,8 +430,8 @@ public void testArrayFields() .add("hello") .add("world") .build()) - .build()) - .build()) + .buildOrThrow()) + .buildOrThrow()) .put("c", ImmutableMap.builder() .put("d", "foo") .put("e", "bar") @@ -442,16 +442,16 @@ public void testArrayFields() .add(20) .build()) .put("h", 100) - .build()) + .buildOrThrow()) .add(ImmutableMap.builder() .put("g", ImmutableList.builder() .add(30) .add(40) .build()) .put("h", 200) - .build()) + .buildOrThrow()) .build()) - .build()) + .buildOrThrow()) .put("j", ImmutableList.builder() .add(50L) .add(60L) @@ -571,7 +571,7 @@ public void testAsRawJson() .add(345) .build()) .build()) - .build()) + .buildOrThrow()) .put("es_array_object", ImmutableMap.builder() .put("array_of_string_arrays", ImmutableList.>builder() .add(ImmutableList.builder() @@ -586,7 +586,7 @@ public void testAsRawJson() .add(345) .build()) .build()) - .build()) + .buildOrThrow()) .put("es_raw_object", ImmutableMap.builder() .put("array_of_string_arrays", ImmutableList.>builder() .add(ImmutableList.builder() @@ -601,7 +601,7 @@ public void testAsRawJson() .add(345) .build()) .build()) - .build()) + .buildOrThrow()) .put("array_of_string_arrays", ImmutableList.>builder() .add(ImmutableList.builder() .add("abc") @@ -622,15 +622,15 @@ public void testAsRawJson() .put("es_object", ImmutableMap.builder() .put("array_of_string_arrays", "Join the Trino Slack: https://trino.io/slack.html") .put("arrayOfIntArrays", 867) - .build()) + .buildOrThrow()) .put("es_array_object", ImmutableMap.builder() .put("array_of_string_arrays", "If you like Presto, you'll love Trino: https://trino.io/slack.html") .put("arrayOfIntArrays", 321) - .build()) + .buildOrThrow()) .put("es_raw_object", ImmutableMap.builder() .put("array_of_string_arrays", "The founders and core contributors of Presto, and are now working on Trino: https://trino.io/blog/2020/12/27/announcing-trino.html") .put("arrayOfIntArrays", 654) - .build()) + .buildOrThrow()) .put("array_of_string_arrays", "Check out the bi-weekly Trino Community Broadcast https://trino.io/broadcast/") .put("array_of_long_arrays", 5309L) .put("order_field", 2) diff --git a/plugin/trino-exchange/src/main/java/io/trino/plugin/exchange/FileSystemExchange.java b/plugin/trino-exchange/src/main/java/io/trino/plugin/exchange/FileSystemExchange.java index ed9dc500673f..d9f555a91fdb 100644 --- a/plugin/trino-exchange/src/main/java/io/trino/plugin/exchange/FileSystemExchange.java +++ b/plugin/trino-exchange/src/main/java/io/trino/plugin/exchange/FileSystemExchange.java @@ -236,7 +236,7 @@ private Map getCommittedPartitions(URI committedAttemptPath int partitionId = Integer.parseInt(matcher.group(1)); result.put(partitionId, partitionFile); } - return result.build(); + return result.buildOrThrow(); } catch (IOException e) { throw new UncheckedIOException(e); diff --git a/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/TestFileSystemExchangeConfig.java b/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/TestFileSystemExchangeConfig.java index 3ce8a3a51029..684d9e30fe58 100644 --- a/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/TestFileSystemExchangeConfig.java +++ b/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/TestFileSystemExchangeConfig.java @@ -40,7 +40,7 @@ public void testExplicitPropertyMappings() .put("exchange.base-directory", "s3n://exchange-spooling-test/") .put("exchange.encryption-enabled", "true") .put("exchange.sink-buffer-pool-min-size", "10") - .build(); + .buildOrThrow(); FileSystemExchangeConfig expected = new FileSystemExchangeConfig() .setBaseDirectory("s3n://exchange-spooling-test/") diff --git a/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/containers/MinioStorage.java b/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/containers/MinioStorage.java index 8b8a31597e07..79f77eda43d8 100644 --- a/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/containers/MinioStorage.java +++ b/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/containers/MinioStorage.java @@ -47,7 +47,7 @@ public MinioStorage(String bucketName) .withEnvVars(ImmutableMap.builder() .put("MINIO_ACCESS_KEY", ACCESS_KEY) .put("MINIO_SECRET_KEY", SECRET_KEY) - .build()) + .buildOrThrow()) .build(); } @@ -92,6 +92,6 @@ public static Map getExchangeManagerProperties(MinioStorage mini .put("exchange.s3.region", "us-east-1") // TODO: enable exchange encryption after https is supported for Trino MinIO .put("exchange.s3.endpoint", "http://" + minioStorage.getMinio().getMinioApiEndpoint()) - .build(); + .buildOrThrow(); } } diff --git a/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/s3/TestExchangeS3Config.java b/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/s3/TestExchangeS3Config.java index 58464a4c42af..72d58d4bb5cd 100644 --- a/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/s3/TestExchangeS3Config.java +++ b/plugin/trino-exchange/src/test/java/io/trino/plugin/exchange/s3/TestExchangeS3Config.java @@ -48,7 +48,7 @@ public void testExplicitPropertyMappings() .put("exchange.s3.endpoint", "https://s3.us-east-1.amazonaws.com") .put("exchange.s3.max-error-retries", "8") .put("exchange.s3.upload.part-size", "10MB") - .build(); + .buildOrThrow(); ExchangeS3Config expected = new ExchangeS3Config() .setS3AwsAccessKey("access") diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveQueryFailureRecoveryTest.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveQueryFailureRecoveryTest.java index dbd6541af030..2a5d2ca9d4f9 100644 --- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveQueryFailureRecoveryTest.java +++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveQueryFailureRecoveryTest.java @@ -63,7 +63,7 @@ protected QueryRunner createQueryRunner( // When streaming upload is enabled insert into a table with high number of buckets / partitions may cause // the tests to run out of memory as the buffer space is eagerly allocated for each output file. .put("hive.s3.streaming.enabled", "false") - .build()) + .buildOrThrow()) .setExchangeManagerProperties(getExchangeManagerProperties(minioStorage)) .build(); } diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveTaskFailureRecoveryTest.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveTaskFailureRecoveryTest.java index 22c34db647c3..590113a5e3f0 100644 --- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveTaskFailureRecoveryTest.java +++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/TestHiveTaskFailureRecoveryTest.java @@ -61,14 +61,14 @@ protected QueryRunner createQueryRunner( .putAll(configProperties) // currently not supported for fault tolerant execution mode .put("enable-dynamic-filtering", "false") - .build()) + .buildOrThrow()) .setCoordinatorProperties(coordinatorProperties) .setHiveProperties(ImmutableMap.builder() // Streaming upload allocates non trivial amount of memory for buffering (16MB per output file by default). // When streaming upload is enabled insert into a table with high number of buckets / partitions may cause // the tests to run out of memory as the buffer space is eagerly allocated for each output file. .put("hive.s3.streaming.enabled", "false") - .build()) + .buildOrThrow()) .setExchangeManagerProperties(getExchangeManagerProperties(minioStorage)) .build(); } diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestImpersonationCachingConfig.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestImpersonationCachingConfig.java index 487cd3d83a20..3180a1a474c3 100644 --- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestImpersonationCachingConfig.java +++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestImpersonationCachingConfig.java @@ -40,7 +40,7 @@ public void testExplicitPropertyMappings() Map properties = ImmutableMap.builder() .put("hive.user-metastore-cache-ttl", "2h") .put("hive.user-metastore-cache-maximum-size", "5") - .build(); + .buildOrThrow(); ImpersonationCachingConfig expected = new ImpersonationCachingConfig() .setUserMetastoreCacheTtl(new Duration(2, TimeUnit.HOURS)) diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java index 41804f4f3a78..060219161c79 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/IcebergQueryRunner.java @@ -153,7 +153,7 @@ public DistributedQueryRunner build() Map icebergProperties = new HashMap<>(); icebergProperties.put("iceberg.catalog.type", "TESTING_FILE_METASTORE"); icebergProperties.put("hive.metastore.catalog.dir", dataDir.toString()); - icebergProperties.putAll(this.icebergProperties.build()); + icebergProperties.putAll(this.icebergProperties.buildOrThrow()); queryRunner.createCatalog(ICEBERG_CATALOG, "iceberg", icebergProperties); diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTaskFailureRecoveryTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTaskFailureRecoveryTest.java index 797695e08bd4..ee0fadfff427 100644 --- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTaskFailureRecoveryTest.java +++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergTaskFailureRecoveryTest.java @@ -54,7 +54,7 @@ protected QueryRunner createQueryRunner( .putAll(configProperties) // currently not supported for fault tolerant execution mode .put("enable-dynamic-filtering", "false") - .build()) + .buildOrThrow()) .setExchangeManagerProperties(getExchangeManagerProperties(minioStorage)) .build(); } diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunner.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunner.java index 940f8f8de1b2..5003568d4c22 100644 --- a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunner.java +++ b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/KafkaQueryRunner.java @@ -119,7 +119,7 @@ public void preInit(DistributedQueryRunner queryRunner) Map topicDescriptions = ImmutableMap.builder() .putAll(extraTopicDescription) .putAll(tpchTopicDescriptions) - .putAll(testTopicDescriptions.build()) + .putAll(testTopicDescriptions.buildOrThrow()) .buildOrThrow(); setExtension(combine( extension, diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/TestPinotAuthenticationTypeConfig.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/TestPinotAuthenticationTypeConfig.java index 01820e6b60d5..e9f2ce2d39cb 100644 --- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/TestPinotAuthenticationTypeConfig.java +++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/TestPinotAuthenticationTypeConfig.java @@ -41,7 +41,7 @@ public void testExplicitPropertyMappings() Map properties = new ImmutableMap.Builder() .put("pinot.controller.authentication.type", "password") .put("pinot.broker.authentication.type", "password") - .build(); + .buildOrThrow(); PinotAuthenticationTypeConfig expected = new PinotAuthenticationTypeConfig() .setControllerAuthenticationType(PASSWORD) diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/password/inline/TestPinotPasswordBrokerAuthenticationConfig.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/password/inline/TestPinotPasswordBrokerAuthenticationConfig.java index ba9afbc1459b..855794d319f8 100644 --- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/password/inline/TestPinotPasswordBrokerAuthenticationConfig.java +++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/password/inline/TestPinotPasswordBrokerAuthenticationConfig.java @@ -28,7 +28,7 @@ public void testExplicitPropertyMappings() Map properties = new ImmutableMap.Builder() .put("pinot.broker.authentication.user", "query") .put("pinot.broker.authentication.password", "secret") - .build(); + .buildOrThrow(); PinotPasswordBrokerAuthenticationConfig expected = new PinotPasswordBrokerAuthenticationConfig() .setUser("query") diff --git a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/password/inline/TestPinotPasswordControllerAuthenticationConfig.java b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/password/inline/TestPinotPasswordControllerAuthenticationConfig.java index 4c68698ec587..e428ccf13117 100644 --- a/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/password/inline/TestPinotPasswordControllerAuthenticationConfig.java +++ b/plugin/trino-pinot/src/test/java/io/trino/plugin/pinot/auth/password/inline/TestPinotPasswordControllerAuthenticationConfig.java @@ -28,7 +28,7 @@ public void testExplicitPropertyMappings() Map properties = new ImmutableMap.Builder() .put("pinot.controller.authentication.user", "admin") .put("pinot.controller.authentication.password", "verysecret") - .build(); + .buildOrThrow(); PinotPasswordControllerAuthenticationConfig expected = new PinotPasswordControllerAuthenticationConfig() .setUser("admin") diff --git a/testing/trino-testing/src/main/java/io/trino/testing/FaultTolerantExecutionConnectorTestHelper.java b/testing/trino-testing/src/main/java/io/trino/testing/FaultTolerantExecutionConnectorTestHelper.java index b25f17996336..1ac2a00c559d 100644 --- a/testing/trino-testing/src/main/java/io/trino/testing/FaultTolerantExecutionConnectorTestHelper.java +++ b/testing/trino-testing/src/main/java/io/trino/testing/FaultTolerantExecutionConnectorTestHelper.java @@ -33,6 +33,6 @@ public static Map getExtraProperties() // TODO: re-enable once failure recover supported for this functionality .put("enable-dynamic-filtering", "false") .put("distributed-sort", "false") - .build(); + .buildOrThrow(); } }