Remove reflections

trinodb · Apr 8, 2024 · 780645b · 780645b
1 parent eb913b8
commit 780645b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 55 deletions.
diff --git a/gateway-ha/pom.xml b/gateway-ha/pom.xml
@@ -347,18 +347,6 @@
             <version>${dep.jeasy.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.9.10</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/gateway-ha/src/main/java/io/trino/gateway/baseapp/BaseApp.java b/gateway-ha/src/main/java/io/trino/gateway/baseapp/BaseApp.java
@@ -14,6 +14,7 @@
 package io.trino.gateway.baseapp;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.MoreCollectors;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -30,15 +31,16 @@
 import io.trino.gateway.ha.log.GatewayRequestLogFactory;
 import io.trino.gateway.ha.module.RouterBaseModule;
 import io.trino.gateway.ha.module.StochasticRoutingManagerProvider;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.ext.Provider;
+import io.trino.gateway.ha.resource.EntityEditorResource;
+import io.trino.gateway.ha.resource.GatewayResource;
+import io.trino.gateway.ha.resource.GatewayViewResource;
+import io.trino.gateway.ha.resource.GatewayWebAppResource;
+import io.trino.gateway.ha.resource.HaGatewayResource;
+import io.trino.gateway.ha.resource.LoginResource;
+import io.trino.gateway.ha.resource.PublicResource;
+import io.trino.gateway.ha.resource.TrinoResource;
+import io.trino.gateway.ha.security.AuthorizedExceptionMapper;
 import org.glassfish.jersey.server.filter.RolesAllowedDynamicFeature;
-import org.reflections.Reflections;
-import org.reflections.scanners.SubTypesScanner;
-import org.reflections.scanners.TypeAnnotationsScanner;
-import org.reflections.util.ClasspathHelper;
-import org.reflections.util.ConfigurationBuilder;
-import org.reflections.util.FilterBuilder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,8 +63,6 @@ public abstract class BaseApp<T extends AppConfiguration>
         extends Application<T>
 {
     private static final Logger logger = Logger.get(BaseApp.class);
-
-    private final Reflections reflections;
     private final ImmutableList.Builder<Module> appModules = ImmutableList.builder();
 
     private AppModule newModule(String clazz, T configuration, Environment environment)
@@ -94,29 +94,6 @@ private void validateModules(List<AppModule> modules, T configuration, Environme
         }
     }
 
-    protected BaseApp(String... basePackages)
-    {
-        final ConfigurationBuilder confBuilder = new ConfigurationBuilder();
-        final FilterBuilder filterBuilder = new FilterBuilder();
-
-        if (basePackages.length == 0) {
-            basePackages = new String[] {};
-        }
-
-        logger.info("op=create auto_scan_packages=%s", basePackages);
-
-        for (String basePkg : basePackages) {
-            confBuilder.addUrls(ClasspathHelper.forPackage(basePkg));
-            filterBuilder.include(FilterBuilder.prefix(basePkg));
-        }
-
-        confBuilder
-                .filterInputsBy(filterBuilder)
-                .setScanners(new SubTypesScanner(), new TypeAnnotationsScanner());
-
-        this.reflections = new Reflections(confBuilder);
-    }
-
     @Override // Using Airlift logger
     protected void bootstrapLogging() {}
 
@@ -206,7 +183,7 @@ protected List<Managed> addManagedApps(
 
     private void registerProviders(Environment environment, Injector injector)
     {
-        final Set<Class<?>> classes = reflections.getTypesAnnotatedWith(Provider.class);
+        final Set<Class<?>> classes = ImmutableSet.of(AuthorizedExceptionMapper.class);
         classes.forEach(
                 c -> {
                     environment.jersey().register(injector.getInstance(c));
@@ -216,7 +193,15 @@ private void registerProviders(Environment environment, Injector injector)
 
     private void registerResources(Environment environment, Injector injector)
     {
-        final Set<Class<?>> classes = reflections.getTypesAnnotatedWith(Path.class);
+        final Set<Class<?>> classes = ImmutableSet.of(
+                EntityEditorResource.class,
+                GatewayResource.class,
+                GatewayViewResource.class,
+                GatewayWebAppResource.class,
+                HaGatewayResource.class,
+                LoginResource.class,
+                PublicResource.class,
+                TrinoResource.class);
         classes.forEach(
                 c -> {
                     environment.jersey().register(injector.getInstance(c));

diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/HaGatewayLauncher.java b/gateway-ha/src/main/java/io/trino/gateway/ha/HaGatewayLauncher.java
@@ -28,11 +28,6 @@
 public class HaGatewayLauncher
         extends BaseApp<HaGatewayConfiguration>
 {
-    public HaGatewayLauncher(String... basePackages)
-    {
-        super(basePackages);
-    }
-
     @Override
     public void initialize(Bootstrap<HaGatewayConfiguration> bootstrap)
     {
@@ -51,8 +46,6 @@ public static void main(String[] args)
         Logging logging = Logging.initialize();
         logging.configure(configuration);
 
-        /* base package is scanned for any Resource class to be loaded by default. */
-        String basePackage = "io.trino";
-        new HaGatewayLauncher(basePackage).run(args);
+        new HaGatewayLauncher().run(args);
     }
 }