From 301c87d6b17a23609d44caa44429fbd64c368e43 Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Sun, 31 Dec 2023 15:09:27 +0900 Subject: [PATCH] Enforce modernizer --- baseapp/src/main/java/io/trino/gateway/baseapp/BaseApp.java | 5 ++--- .../java/io/trino/gateway/ha/resource/PublicResource.java | 4 ++-- .../io/trino/gateway/ha/router/HaQueryHistoryManager.java | 2 +- .../ha/router/RuleReloadingRoutingGroupSelector.java | 6 ++++-- .../java/io/trino/gateway/ha/security/LbKeyProvider.java | 6 ++++-- .../test/java/io/trino/gateway/ha/HaGatewayTestUtils.java | 3 ++- .../trino/gateway/ha/router/TestRoutingGroupSelector.java | 5 +++-- .../io/trino/gateway/ha/security/TestLbAuthenticator.java | 2 +- .../java/io/trino/gateway/ha/security/TestLbFilter.java | 6 +++--- pom.xml | 1 - 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/baseapp/src/main/java/io/trino/gateway/baseapp/BaseApp.java b/baseapp/src/main/java/io/trino/gateway/baseapp/BaseApp.java index 9f3702b98..1da40581d 100644 --- a/baseapp/src/main/java/io/trino/gateway/baseapp/BaseApp.java +++ b/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 private static final Logger logger = LoggerFactory.getLogger(BaseApp.class); private final Reflections reflections; - private final List appModules = Lists.newArrayList(); + private final ImmutableList.Builder 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; diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/resource/PublicResource.java b/gateway-ha/src/main/java/io/trino/gateway/ha/resource/PublicResource.java index 107c59c68..1d7e905c6 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/resource/PublicResource.java +++ b/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) { diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaQueryHistoryManager.java b/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaQueryHistoryManager.java index a7fd9987b..31cd316a6 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaQueryHistoryManager.java +++ b/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaQueryHistoryManager.java @@ -49,7 +49,7 @@ public List fetchQueryHistory(Optional 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, diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/router/RuleReloadingRoutingGroupSelector.java b/gateway-ha/src/main/java/io/trino/gateway/ha/router/RuleReloadingRoutingGroupSelector.java index 2b169203c..eb30537d8 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/router/RuleReloadingRoutingGroupSelector.java +++ b/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(); } } diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/security/LbKeyProvider.java b/gateway-ha/src/main/java/io/trino/gateway/ha/security/LbKeyProvider.java index 0c67e4c10..a4c2582bc 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/security/LbKeyProvider.java +++ b/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(); diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/HaGatewayTestUtils.java b/gateway-ha/src/test/java/io/trino/gateway/ha/HaGatewayTestUtils.java index ff7a88d93..45c64e92d 100644 --- a/gateway-ha/src/test/java/io/trino/gateway/ha/HaGatewayTestUtils.java +++ b/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); diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingGroupSelector.java b/gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingGroupSelector.java index 405b3601b..991274def 100644 --- a/gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingGroupSelector.java +++ b/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" diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbAuthenticator.java b/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbAuthenticator.java index 1595f89c4..c05fd885f 100644 --- a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbAuthenticator.java +++ b/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 diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java b/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java index 551a9b2a7..9f4bb96de 100644 --- a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java +++ b/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 headers = new MultivaluedHashMap<>(); headers.addFirst(HttpHeaders.AUTHORIZATION, String.format("Bearer %s", ID_TOKEN)); diff --git a/pom.xml b/pom.xml index aca0a33ec..715a75760 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,6 @@ true true true - true false true