From 804c347b3518fa2cc5743f6d70a8d2d1ee5b78a2 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Fri, 10 Jun 2022 11:12:27 +0200
Subject: [PATCH] Replace `var` usages with explciit type

Per development guidelines, `var` is discouraged.
---
 .../java/io/trino/server/QueryExecutionFactoryModule.java   | 6 ++++--
 .../hive/azure/TestTrinoAzureConfigurationInitializer.java  | 6 +++---
 .../cache/TestCachingHiveMetastoreWithQueryRunner.java      | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/trino-main/src/main/java/io/trino/server/QueryExecutionFactoryModule.java b/core/trino-main/src/main/java/io/trino/server/QueryExecutionFactoryModule.java
index bc0d3bdf3337..e7c45dd5781a 100644
--- a/core/trino-main/src/main/java/io/trino/server/QueryExecutionFactoryModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/QueryExecutionFactoryModule.java
@@ -115,7 +115,8 @@ public class QueryExecutionFactoryModule
     @Override
     public void configure(Binder binder)
     {
-        var executionBinder = newMapBinder(binder, new TypeLiteral<Class<? extends Statement>>() {}, new TypeLiteral<QueryExecutionFactory<?>>() {});
+        MapBinder<Class<? extends Statement>, QueryExecutionFactory<?>> executionBinder =
+                newMapBinder(binder, new TypeLiteral<Class<? extends Statement>>() {}, new TypeLiteral<QueryExecutionFactory<?>>() {});
 
         binder.bind(SqlQueryExecutionFactory.class).in(Scopes.SINGLETON);
         for (Class<? extends Statement> statement : getNonDataDefinitionStatements()) {
@@ -172,7 +173,8 @@ private static <T extends Statement> void bindDataDefinitionTask(
             Class<? extends DataDefinitionTask<T>> task)
     {
         checkArgument(isDataDefinitionStatement(statement));
-        var taskBinder = newMapBinder(binder, new TypeLiteral<Class<? extends Statement>>() {}, new TypeLiteral<DataDefinitionTask<?>>() {});
+        MapBinder<Class<? extends Statement>, DataDefinitionTask<?>> taskBinder =
+                newMapBinder(binder, new TypeLiteral<Class<? extends Statement>>() {}, new TypeLiteral<DataDefinitionTask<?>>() {});
         taskBinder.addBinding(statement).to(task).in(Scopes.SINGLETON);
         executionBinder.addBinding(statement).to(DataDefinitionExecutionFactory.class).in(Scopes.SINGLETON);
     }
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/azure/TestTrinoAzureConfigurationInitializer.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/azure/TestTrinoAzureConfigurationInitializer.java
index 874f84012d64..164c497f77e1 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/azure/TestTrinoAzureConfigurationInitializer.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/azure/TestTrinoAzureConfigurationInitializer.java
@@ -86,7 +86,7 @@ private static void testPropertyGroup(String expectedErrorMessage, Set<BiConsume
         testProperties(setters);
 
         // Dropping any one property fails
-        for (var setter : setters) {
+        for (BiConsumer<HiveAzureConfig, String> setter : setters) {
             assertThatThrownBy(() -> testProperties(difference(setters, Set.of(setter))))
                     .isInstanceOf(IllegalArgumentException.class)
                     .hasMessage(expectedErrorMessage);
@@ -101,8 +101,8 @@ private static void testProperties(BiConsumer<HiveAzureConfig, String>... setter
 
     private static void testProperties(Set<BiConsumer<HiveAzureConfig, String>> setters)
     {
-        var config = new HiveAzureConfig();
-        for (var setter : setters) {
+        HiveAzureConfig config = new HiveAzureConfig();
+        for (BiConsumer<HiveAzureConfig, String> setter : setters) {
             setter.accept(config, "test value");
         }
         new TrinoAzureConfigurationInitializer(config);
diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreWithQueryRunner.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreWithQueryRunner.java
index 9b9a2114ff32..35c03a451074 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreWithQueryRunner.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/cache/TestCachingHiveMetastoreWithQueryRunner.java
@@ -143,8 +143,8 @@ public void testFlushHiveMetastoreCacheProcedureCallable()
     @Test
     public void testIllegalFlushHiveMetastoreCacheProcedureCalls()
     {
-        var illegalParameterMessage = "Illegal parameter set passed. ";
-        var validUsageExample = "Valid usages:\n - 'flush_metadata_cache()'\n - flush_metadata_cache(schema_name => ..., table_name => ..., partition_column => ARRAY['...'], partition_value => ARRAY['...'])";
+        String illegalParameterMessage = "Illegal parameter set passed. ";
+        String validUsageExample = "Valid usages:\n - 'flush_metadata_cache()'\n - flush_metadata_cache(schema_name => ..., table_name => ..., partition_column => ARRAY['...'], partition_value => ARRAY['...'])";
 
         assertThatThrownBy(() -> getQueryRunner().execute("CALL system.flush_metadata_cache('dummy_schema')"))
                 .hasMessage("Procedure should only be invoked with named parameters. " + validUsageExample);