addressed comments

Author: felicity3786

gateway-ha/src/test/java/io/trino/gateway/ha/persistence/TestJdbcPropertiesProviderFactory.java

@@ -19,6 +19,7 @@
 import io.trino.gateway.ha.config.MySqlConfiguration;
 import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
 
@@ -28,7 +29,7 @@ final class TestJdbcPropertiesProviderFactory
 {
     private static JdbcPropertiesProviderFactory factoryFor()
     {
-        List<JdbcPropertiesProvider> providers = List.of(
+        List<JdbcPropertiesProvider> providers = Arrays.asList(
             new MySqlJdbcPropertiesProvider(),
             new DefaultJdbcPropertiesProvider());
         return new JdbcPropertiesProviderFactory(providers);

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestSpecificDbResourceGroupsManager.java

@@ -13,12 +13,6 @@
  */
 package io.trino.gateway.ha.router;
 
-<<<<<<< HEAD
-=======
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
->>>>>>> c13a8db (address comments)
 import io.trino.gateway.ha.HaGatewayTestUtils;
 import io.trino.gateway.ha.config.DataStoreConfiguration;
 import io.trino.gateway.ha.persistence.DefaultJdbcPropertiesProvider;
@@ -54,26 +48,8 @@ void setUp()
         HaGatewayTestUtils.seedRequiredData(tempH2DbDir.getAbsolutePath());
         DataStoreConfiguration db = new DataStoreConfiguration(jdbcUrl, "sa",
                 "sa", "org.h2.Driver", 4, false);
-<<<<<<< HEAD
         Jdbi jdbi = Jdbi.create(jdbcUrl, "sa", "sa");
         JdbcConnectionManager connectionManager = new JdbcConnectionManager(jdbi, db, new DefaultJdbcPropertiesProvider());
-=======
-        HaGatewayConfiguration configuration = new HaGatewayConfiguration();
-        configuration.setDataStore(db);
-        AbstractModule testConfigModule = new AbstractModule() {
-            @Override
-            protected void configure()
-            {
-                bind(HaGatewayConfiguration.class)
-                        .toInstance(configuration);
-            }
-        };
-        Injector injector = Guice.createInjector(
-                testConfigModule,
-                new RouterBaseModule());
-
-        JdbcConnectionManager connectionManager = injector.getInstance(JdbcConnectionManager.class);
->>>>>>> c13a8db (address comments)
         super.resourceGroupManager = new HaResourceGroupsManager(connectionManager);
     }