Remove unnecessary ImmutableMap builder use

trinodb · Jan 18, 2022 · 3e06ac2 · 3e06ac2
1 parent c0276ce
commit 3e06ac2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/...ticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java b/...ticsearch/src/test/java/io/trino/plugin/elasticsearch/BaseElasticsearchConnectorTest.java
@@ -941,7 +941,7 @@ public void testMixedArray()
 
         createIndex(indexName, mapping);
 
-        index(indexName, ImmutableMap.<String, Object>builder().buildOrThrow());
+        index(indexName, ImmutableMap.of());
 
         index(indexName, ImmutableMap.<String, Object>builder()
                 .put("a", "hello")

diff --git a/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/TestKafkaIntegrationSmokeTest.java b/plugin/trino-kafka/src/test/java/io/trino/plugin/kafka/TestKafkaIntegrationSmokeTest.java
@@ -106,9 +106,7 @@ protected QueryRunner createQueryRunner()
 
         QueryRunner queryRunner = KafkaQueryRunner.builder(testingKafka)
                 .setTables(TpchTable.getTables())
-                .setExtraTopicDescription(ImmutableMap.<SchemaTableName, KafkaTopicDescription>builder()
-                        .putAll(extraTopicDescriptions)
-                        .buildOrThrow())
+                .setExtraTopicDescription(extraTopicDescriptions)
                 .build();
 
         return queryRunner;

diff --git a/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusRecordCursor.java b/plugin/trino-prometheus/src/main/java/io/trino/plugin/prometheus/PrometheusRecordCursor.java
@@ -185,21 +185,15 @@ private void checkFieldType(int field, Type expected)
     private List<PrometheusStandardizedRow> prometheusResultsInStandardizedForm(List<PrometheusMetricResult> results)
     {
         return results.stream().map(result ->
-                result.getTimeSeriesValues().getValues().stream().map(prometheusTimeSeriesValue ->
-                        new PrometheusStandardizedRow(
-                                getBlockFromMap(columnHandles.get(0).getColumnType(), metricHeaderToMap(result.getMetricHeader())),
-                                prometheusTimeSeriesValue.getTimestamp(),
-                                Double.parseDouble(prometheusTimeSeriesValue.getValue())))
+                result.getTimeSeriesValues().getValues().stream().map(prometheusTimeSeriesValue -> new PrometheusStandardizedRow(
+                        getBlockFromMap(columnHandles.get(0).getColumnType(), ImmutableMap.copyOf(result.getMetricHeader())),
+                        prometheusTimeSeriesValue.getTimestamp(),
+                        Double.parseDouble(prometheusTimeSeriesValue.getValue())))
                         .collect(Collectors.toList()))
                 .flatMap(List::stream)
                 .collect(Collectors.toList());
     }
 
-    private static Map<String, String> metricHeaderToMap(Map<String, String> mapToConvert)
-    {
-        return ImmutableMap.<String, String>builder().putAll(mapToConvert).buildOrThrow();
-    }
-
     static Block getBlockFromMap(Type mapType, Map<?, ?> map)
     {
         // on functions like COUNT() the Type won't be a MapType