Fix up test

Author: tdcmeehan

presto-delta/src/test/java/com/facebook/presto/delta/TestDeltaTableHandle.java

@@ -16,6 +16,7 @@
 import com.facebook.airlift.bootstrap.Bootstrap;
 import com.facebook.airlift.json.JsonCodec;
 import com.facebook.airlift.json.JsonModule;
+import com.facebook.drift.codec.guice.ThriftCodecModule;
 import com.facebook.presto.block.BlockJsonSerde;
 import com.facebook.presto.common.block.Block;
 import com.facebook.presto.common.block.BlockEncoding;
@@ -24,9 +25,10 @@
 import com.facebook.presto.common.type.StandardTypes;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeManager;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.metadata.FunctionAndTypeManager;
+import com.facebook.presto.metadata.HandleJsonModule;
 import com.facebook.presto.metadata.HandleResolver;
-import com.facebook.presto.metadata.TestingHandleJsonModule;
 import com.facebook.presto.sql.analyzer.FeaturesConfig;
 import com.facebook.presto.type.TypeDeserializer;
 import com.google.common.collect.ImmutableList;
@@ -91,7 +93,9 @@ private JsonCodec<DeltaTableHandle> getJsonCodec()
     {
         Module module = binder -> {
             binder.install(new JsonModule());
-            binder.install(new TestingHandleJsonModule());
+            binder.install(new HandleJsonModule());
+            binder.bind(ConnectorManager.class).toProvider(() -> null).in(Scopes.SINGLETON);
+            binder.install(new ThriftCodecModule());
             configBinder(binder).bindConfig(FeaturesConfig.class);
             FunctionAndTypeManager functionAndTypeManager = createTestFunctionAndTypeManager();
             binder.bind(TypeManager.class).toInstance(functionAndTypeManager);

presto-main-base/src/test/java/com/facebook/presto/catalogserver/TestCatalogServerResponse.java

@@ -14,11 +14,13 @@
 package com.facebook.presto.catalogserver;
 
 import com.facebook.airlift.json.JsonModule;
+import com.facebook.drift.codec.guice.ThriftCodecModule;
 import com.facebook.presto.common.QualifiedObjectName;
 import com.facebook.presto.common.transaction.TransactionId;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.connector.informationSchema.InformationSchemaTableHandle;
 import com.facebook.presto.connector.informationSchema.InformationSchemaTransactionHandle;
-import com.facebook.presto.metadata.TestingHandleJsonModule;
+import com.facebook.presto.metadata.HandleJsonModule;
 import com.facebook.presto.spi.ConnectorId;
 import com.facebook.presto.spi.ConnectorTableHandle;
 import com.facebook.presto.spi.MaterializedViewDefinition;
@@ -30,6 +32,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import com.google.inject.Scopes;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
@@ -52,7 +55,11 @@ public class TestCatalogServerResponse
     public void setup()
     {
         this.testingCatalogServerClient = new TestingCatalogServerClient();
-        Injector injector = Guice.createInjector(new JsonModule(), new TestingHandleJsonModule());
+        Injector injector = Guice.createInjector(new JsonModule(), binder -> {
+            binder.install(new HandleJsonModule());
+            binder.bind(ConnectorManager.class).toProvider(() -> null).in(Scopes.SINGLETON);
+            binder.install(new ThriftCodecModule());
+        });
         this.objectMapper = injector.getInstance(ObjectMapper.class);
     }
 

presto-main-base/src/test/java/com/facebook/presto/metadata/TestInformationSchemaTableHandle.java

@@ -14,13 +14,16 @@
 package com.facebook.presto.metadata;
 
 import com.facebook.airlift.json.JsonModule;
+import com.facebook.drift.codec.guice.ThriftCodecModule;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.connector.informationSchema.InformationSchemaTableHandle;
 import com.facebook.presto.spi.ConnectorTableHandle;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import com.google.inject.Scopes;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -46,7 +49,11 @@ public void startUp()
     {
         Injector injector = Guice.createInjector(
                 new JsonModule(),
-                new TestingHandleJsonModule());
+                binder -> {
+                    binder.install(new HandleJsonModule());
+                    binder.bind(ConnectorManager.class).toProvider(() -> null).in(Scopes.SINGLETON);
+                    binder.install(new ThriftCodecModule());
+                });
 
         objectMapper = injector.getInstance(ObjectMapper.class);
     }

presto-main-base/src/test/java/com/facebook/presto/metadata/TestSystemTableHandle.java

@@ -14,6 +14,8 @@
 package com.facebook.presto.metadata;
 
 import com.facebook.airlift.json.JsonModule;
+import com.facebook.drift.codec.guice.ThriftCodecModule;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.connector.system.SystemTableHandle;
 import com.facebook.presto.spi.ConnectorId;
 import com.facebook.presto.spi.ConnectorTableHandle;
@@ -23,6 +25,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import com.google.inject.Scopes;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -49,7 +52,11 @@ public void startUp()
     {
         Injector injector = Guice.createInjector(
                 new JsonModule(),
-                new TestingHandleJsonModule());
+                binder -> {
+                    binder.install(new HandleJsonModule());
+                    binder.bind(ConnectorManager.class).toProvider(() -> null).in(Scopes.SINGLETON);
+                    binder.install(new ThriftCodecModule());
+                });
 
         objectMapper = injector.getInstance(ObjectMapper.class);
     }

presto-main-base/src/test/java/com/facebook/presto/metadata/TestingHandleJsonModule.java

@@ -16,11 +16,13 @@
 import com.facebook.airlift.bootstrap.Bootstrap;
 import com.facebook.airlift.json.JsonCodec;
 import com.facebook.airlift.json.JsonModule;
+import com.facebook.drift.codec.guice.ThriftCodecModule;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeManager;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.metadata.FunctionAndTypeManager;
+import com.facebook.presto.metadata.HandleJsonModule;
 import com.facebook.presto.metadata.HandleResolver;
-import com.facebook.presto.metadata.TestingHandleJsonModule;
 import com.facebook.presto.spi.ConnectorId;
 import com.facebook.presto.spi.SourceLocation;
 import com.facebook.presto.spi.TableHandle;
@@ -40,6 +42,7 @@
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
+import com.google.inject.Scopes;
 import org.testng.annotations.Test;
 
 import java.util.Optional;
@@ -127,7 +130,9 @@ private JsonCodec<StatisticsWriterNode> getJsonCodec()
             SqlParser sqlParser = new SqlParser();
             FunctionAndTypeManager functionAndTypeManager = createTestFunctionAndTypeManager();
             binder.install(new JsonModule());
-            binder.install(new TestingHandleJsonModule());
+            binder.install(new HandleJsonModule());
+            binder.bind(ConnectorManager.class).toProvider(() -> null).in(Scopes.SINGLETON);
+            binder.install(new ThriftCodecModule());
             binder.bind(FeaturesConfig.class).toInstance(new FeaturesConfig());
             binder.bind(SqlParser.class).toInstance(sqlParser);
             binder.bind(TypeManager.class).toInstance(functionAndTypeManager);

presto-main-base/src/test/java/com/facebook/presto/sql/planner/plan/TestStatisticsWriterNode.java

@@ -16,18 +16,20 @@
 import com.facebook.airlift.bootstrap.Bootstrap;
 import com.facebook.airlift.json.JsonCodec;
 import com.facebook.airlift.json.JsonModule;
+import com.facebook.drift.codec.guice.ThriftCodecModule;
 import com.facebook.presto.Session;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeManager;
+import com.facebook.presto.connector.ConnectorManager;
 import com.facebook.presto.execution.Location;
 import com.facebook.presto.execution.ScheduledSplit;
 import com.facebook.presto.execution.TaskId;
 import com.facebook.presto.execution.TaskSource;
 import com.facebook.presto.execution.scheduler.TableWriteInfo;
 import com.facebook.presto.metadata.FunctionAndTypeManager;
+import com.facebook.presto.metadata.HandleJsonModule;
 import com.facebook.presto.metadata.RemoteTransactionHandle;
 import com.facebook.presto.metadata.Split;
-import com.facebook.presto.metadata.TestingHandleJsonModule;
 import com.facebook.presto.server.TaskUpdateRequest;
 import com.facebook.presto.spark.execution.http.BatchTaskUpdateRequest;
 import com.facebook.presto.spark.execution.shuffle.PrestoSparkLocalShuffleInfoTranslator;
@@ -36,6 +38,7 @@
 import com.facebook.presto.spi.ConnectorId;
 import com.facebook.presto.spi.plan.PlanNodeId;
 import com.facebook.presto.split.RemoteSplit;
+import com.facebook.presto.sql.analyzer.FeaturesConfig;
 import com.facebook.presto.sql.planner.PlanFragment;
 import com.facebook.presto.testing.TestingSession;
 import com.facebook.presto.type.TypeDeserializer;
@@ -44,12 +47,14 @@
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
+import com.google.inject.Scopes;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+import static com.facebook.airlift.configuration.ConfigBinder.configBinder;
 import static com.facebook.airlift.json.JsonBinder.jsonBinder;
 import static com.facebook.airlift.json.JsonCodecBinder.jsonCodecBinder;
 import static com.facebook.presto.execution.TaskTestUtils.createPlanFragment;
@@ -148,7 +153,10 @@ private JsonCodec<BatchTaskUpdateRequest> getJsonCodec()
     {
         Module module = binder -> {
             binder.install(new JsonModule());
-            binder.install(new TestingHandleJsonModule());
+            binder.install(new HandleJsonModule());
+            binder.bind(ConnectorManager.class).toProvider(() -> null).in(Scopes.SINGLETON);
+            binder.install(new ThriftCodecModule());
+            configBinder(binder).bindConfig(FeaturesConfig.class);
             FunctionAndTypeManager functionAndTypeManager = createTestFunctionAndTypeManager();
             binder.bind(TypeManager.class).toInstance(functionAndTypeManager);
             jsonBinder(binder).addDeserializerBinding(Type.class).to(TypeDeserializer.class);