Enforce modernizer

baseapp/src/main/java/io/trino/gateway/baseapp/BaseApp.java

@@ -15,7 +15,6 @@
 
 import com.codahale.metrics.health.HealthCheck;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
@@ -64,7 +63,7 @@ public abstract class BaseApp<T extends AppConfiguration>
     private static final Logger logger = LoggerFactory.getLogger(BaseApp.class);
 
     private final Reflections reflections;
-    private final List<Module> appModules = Lists.newArrayList();
+    private final ImmutableList.Builder<Module> appModules = ImmutableList.builder();
     private Injector injector;
 
     protected BaseApp(String... basePackages)
@@ -140,7 +139,7 @@ private Injector configureGuice(T configuration, Environment environment)
     {
         appModules.add(new MetricRegistryModule(environment.metrics()));
         appModules.addAll(addModules(configuration, environment));
-        Injector injector = Guice.createInjector(ImmutableList.copyOf(appModules));
+        Injector injector = Guice.createInjector(appModules.build());
         injector.injectMembers(this);
         registerWithInjector(configuration, environment, injector);
         return injector;

gateway-ha/src/main/java/io/trino/gateway/ha/resource/PublicResource.java

@@ -49,7 +49,7 @@ public Response getBackend(@PathParam("name") String name)
         try {
             ProxyBackendConfiguration backend = gatewayBackendManager
                     .getBackendByName(name)
-                    .get();
+                    .orElseThrow();
             return Response.ok(backend).build();
         }
         catch (NoSuchElementException e) {
@@ -65,7 +65,7 @@ public Response getBackendState(@PathParam("name") String name)
             BackendStateManager.BackendState state = gatewayBackendManager
                     .getBackendByName(name)
                     .map(backendStateManager::getBackendState)
-                    .get();
+                    .orElseThrow();
             return Response.ok(state.getState()).build();
         }
         catch (NoSuchElementException e) {

gateway-ha/src/main/java/io/trino/gateway/ha/router/HaQueryHistoryManager.java

@@ -49,7 +49,7 @@ public List<QueryDetail> fetchQueryHistory(Optional<String> user)
             connectionManager.open();
             String sql = "select * from query_history";
             if (user.isPresent()) {
-                sql += " where user_name = '" + user.get() + "'";
+                sql += " where user_name = '" + user.orElseThrow() + "'";
             }
             return QueryHistory.upcast(QueryHistory.findBySQL(String.join(" ",
                     sql,

gateway-ha/src/main/java/io/trino/gateway/ha/router/RuleReloadingRoutingGroupSelector.java

@@ -31,6 +31,8 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 public class RuleReloadingRoutingGroupSelector
         implements RoutingGroupSelector
 {
@@ -47,7 +49,7 @@ public class RuleReloadingRoutingGroupSelector
         this.rulesConfigPath = rulesConfigPath;
         try {
             rules = ruleFactory.createRules(
-                    new FileReader(rulesConfigPath));
+                    new FileReader(rulesConfigPath, UTF_8));
             BasicFileAttributes attr = Files.readAttributes(Path.of(rulesConfigPath),
                     BasicFileAttributes.class);
             lastUpdatedTime = attr.lastModifiedTime().toMillis();
@@ -75,7 +77,7 @@ public String findRoutingGroup(HttpServletRequest request)
                         log.info(String.format("Updating rules to file modified at %s",
                                 attr.lastModifiedTime()));
                         rules = ruleFactory.createRules(
-                                new FileReader(rulesConfigPath));
+                                new FileReader(rulesConfigPath, UTF_8));
                         lastUpdatedTime = attr.lastModifiedTime().toMillis();
                     }
                 }

gateway-ha/src/main/java/io/trino/gateway/ha/security/LbKeyProvider.java

@@ -28,6 +28,8 @@
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 public class LbKeyProvider
 {
     private final PrivateKey privateKey;
@@ -47,7 +49,7 @@ public LbKeyProvider(SelfSignKeyPairConfiguration keypairConfig)
 
         try {
             String publicKeyRsa = keypairConfig.getPublicKeyRsa();
-            try (FileReader keyReader = new FileReader(publicKeyRsa);
+            try (FileReader keyReader = new FileReader(publicKeyRsa, UTF_8);
                     PemReader pemReader = new PemReader(keyReader)) {
                 PemObject pemObject = pemReader.readPemObject();
                 byte[] content = pemObject.getContent();
@@ -56,7 +58,7 @@ public LbKeyProvider(SelfSignKeyPairConfiguration keypairConfig)
             }
 
             String privateKeyRsa = keypairConfig.getPrivateKeyRsa();
-            try (FileReader keyReader = new FileReader(privateKeyRsa);
+            try (FileReader keyReader = new FileReader(privateKeyRsa, UTF_8);
                     PemReader pemReader = new PemReader(keyReader)) {
                 PemObject pemObject = pemReader.readPemObject();
                 byte[] content = pemObject.getContent();

gateway-ha/src/test/java/io/trino/gateway/ha/HaGatewayTestUtils.java

@@ -36,6 +36,7 @@
 import java.util.Random;
 import java.util.Scanner;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @TestInstance(Lifecycle.PER_CLASS)
@@ -89,7 +90,7 @@ public static TestConfig buildGatewayConfigAndSeedDb(int routerPort, String conf
 
         File target = File.createTempFile("config-" + System.currentTimeMillis(), "config.yaml");
 
-        FileWriter fw = new FileWriter(target);
+        FileWriter fw = new FileWriter(target, UTF_8);
         fw.append(configStr);
         fw.flush();
         log.info("Test Gateway Config \n[{}]", configStr);

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

@@ -25,6 +25,7 @@
 import java.util.stream.Stream;
 
 import static io.trino.gateway.ha.router.RoutingGroupSelector.ROUTING_GROUP_HEADER;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.Mockito.mock;
@@ -113,7 +114,7 @@ public void testByRoutingRulesEngineFileChange()
     {
         File file = File.createTempFile("routing_rules", ".yml");
 
-        FileWriter fw = new FileWriter(file);
+        FileWriter fw = new FileWriter(file, UTF_8);
         fw.write(
                 "---\n"
                         + "name: \"airflow1\"\n"
@@ -137,7 +138,7 @@ public void testByRoutingRulesEngineFileChange()
         // half of this test runs in <1ms, the gateway may not recognize that the file
         // has changed.
 
-        fw = new FileWriter(file);
+        fw = new FileWriter(file, UTF_8);
         fw.write(
                 "---\n"
                         + "name: \"airflow2\"\n"

gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbAuthenticator.java

@@ -81,7 +81,7 @@ public void testAuthenticatorGetsPrincipal()
         LbAuthenticator lbAuth = new LbAuthenticator(authentication, authorization);
 
         assertTrue(lbAuth.authenticate(ID_TOKEN).isPresent());
-        assertEquals(principal, lbAuth.authenticate(ID_TOKEN).get());
+        assertEquals(principal, lbAuth.authenticate(ID_TOKEN).orElseThrow());
     }
 
     @Test

gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java

@@ -79,7 +79,7 @@ public void testSuccessfulCookieAuthentication()
     {
         AuthorizationConfiguration configuration = new AuthorizationConfiguration();
         configuration.setAdmin("NO_MEMBER");
-        configuration.setUser(MEMBER_OF.get());
+        configuration.setUser(MEMBER_OF.orElseThrow());
 
         Mockito
                 .when(requestContext.getCookies())
@@ -120,8 +120,8 @@ public void testSuccessfulHeaderAuthentication()
             throws Exception
     {
         AuthorizationConfiguration configuration = new AuthorizationConfiguration();
-        configuration.setAdmin(MEMBER_OF.get());
-        configuration.setUser(MEMBER_OF.get());
+        configuration.setAdmin(MEMBER_OF.orElseThrow());
+        configuration.setUser(MEMBER_OF.orElseThrow());
 
         MultivaluedHashMap<String, String> headers = new MultivaluedHashMap<>();
         headers.addFirst(HttpHeaders.AUTHORIZATION, String.format("Bearer %s", ID_TOKEN));

pom.xml

@@ -47,7 +47,6 @@
         <air.check.skip-enforcer>true</air.check.skip-enforcer>
         <air.check.skip-dependency>true</air.check.skip-dependency>
         <air.check.skip-duplicate-finder>true</air.check.skip-duplicate-finder>
-        <air.check.skip-modernizer>true</air.check.skip-modernizer>
         <air.check.fail-spotbugs>false</air.check.fail-spotbugs>
         <air.check.skip-pmd>true</air.check.skip-pmd>