Cleanup CliPeonTest

Author: abhishekrb19

services/src/test/java/org/apache/druid/cli/CliPeonTest.java

@@ -41,7 +41,6 @@
 import org.apache.druid.indexing.common.task.CompactionIntervalSpec;
 import org.apache.druid.indexing.common.task.CompactionTask;
 import org.apache.druid.indexing.common.task.NoopTask;
-import org.apache.druid.indexing.common.task.Task;
 import org.apache.druid.indexing.common.task.TaskResource;
 import org.apache.druid.indexing.common.task.batch.parallel.ShuffleClient;
 import org.apache.druid.indexing.overlord.TaskRunner;
@@ -59,7 +58,6 @@
 import org.apache.druid.java.util.common.granularity.AllGranularity;
 import org.apache.druid.query.DruidMetrics;
 import org.apache.druid.query.QuerySegmentWalker;
-import org.apache.druid.query.filter.SelectorDimFilter;
 import org.apache.druid.query.policy.PolicyEnforcer;
 import org.apache.druid.query.policy.RestrictAllTablesPolicyEnforcer;
 import org.apache.druid.segment.TestHelper;
@@ -69,7 +67,6 @@
 import org.apache.druid.segment.indexing.DataSchema;
 import org.apache.druid.segment.realtime.ChatHandlerProvider;
 import org.apache.druid.segment.realtime.appenderator.AppenderatorsManager;
-import org.apache.druid.segment.transform.CompactionTransformSpec;
 import org.apache.druid.server.coordination.BroadcastDatasourceLoadingSpec;
 import org.apache.druid.server.lookup.cache.LookupLoadingSpec;
 import org.apache.druid.server.metrics.LoadSpecHolder;
@@ -125,17 +122,6 @@ public void testCliPeonNonK8sMode() throws IOException
     Assert.assertNotNull(runnable.makeInjector());
   }
 
-  @Test
-  public void testCliPeonNonK8sMode3() throws IOException
-  {
-    File file = temporaryFolder.newFile("task.json");
-    FileUtils.write(file, "{\"type\":\"noop\"}", StandardCharsets.UTF_8);
-    GuiceRunnable runnable = new FakeCliPeon(file.getParent(), "httpRemote");
-    final Injector injector = GuiceInjectors.makeStartupInjector();
-    injector.injectMembers(runnable);
-    Assert.assertNotNull(runnable.makeInjector());
-  }
-
   @Test
   public void testCliPeonK8sANdWorkerIsK8sMode() throws IOException
   {
@@ -209,39 +195,6 @@ public void testCliPeonHeartbeatDimensions()
     );
   }
 
-  @Test
-  public void testCliPeonAllBindingsUp() throws IOException
-  {
-    File file = temporaryFolder.newFile("task.json");
-    FileUtils.write(file, "{\"type\":\"noop\"}", StandardCharsets.UTF_8);
-
-    CliPeon runnable = new CliPeon();
-    runnable.taskAndStatusFile = ImmutableList.of(file.getParent(), "1");
-    Properties properties = new Properties();
-    runnable.configure(properties);
-    runnable.configure(properties, GuiceInjectors.makeStartupInjector());
-    Injector injector = runnable.makeInjector();
-
-    Assert.assertNotNull(injector.getInstance(ExecutorLifecycle.class));
-    Assert.assertNotNull(injector.getInstance(TaskRunner.class));
-    Assert.assertNotNull(injector.getInstance(QuerySegmentWalker.class));
-    Assert.assertNotNull(injector.getInstance(AppenderatorsManager.class));
-    Assert.assertNotNull(injector.getInstance(ServerTypeConfig.class));
-    Assert.assertNotNull(injector.getInstance(RowIngestionMetersFactory.class));
-    Assert.assertNotNull(injector.getInstance(ChatHandlerProvider.class));
-    Assert.assertNotNull(injector.getInstance(IntermediaryDataManager.class));
-    Assert.assertNotNull(injector.getInstance(ShuffleClient.class));
-    Assert.assertNotNull(injector.getInstance(SegmentHandoffNotifierFactory.class));
-    Assert.assertNotNull(injector.getInstance(TaskReportFileWriter.class));
-
-
-    Supplier<Map<String, Object>> hb = injector.getInstance(
-        Key.get(new TypeLiteral<Supplier<Map<String, Object>>>() {}, Names.named(ServiceStatusMonitor.HEARTBEAT_TAGS_BINDING))
-    );
-    Assert.assertNotNull(hb);
-    Assert.assertNotNull(hb.get());
-  }
-
   @Test
   public void testCliPeonLocalTmpStorage() throws IOException
   {
@@ -261,56 +214,7 @@ public void testCliPeonLocalTmpStorage() throws IOException
   }
 
   @Test
-  public void testCliPeonAllBindingsUp2() throws IOException
-  {
-    File file = temporaryFolder.newFile("task.json");
-    Task noopTask = new NoopTask("noopId", null, "noopDs", 0, 0, Map.of());
-
-    FileUtils.write(file, mapper.writeValueAsString(noopTask), StandardCharsets.UTF_8);
-
-    CliPeon runnable = new CliPeon();
-    runnable.taskAndStatusFile = ImmutableList.of(file.getParent(), "1");
-    Properties properties = new Properties();
-    runnable.configure(properties);
-    runnable.configure(properties, GuiceInjectors.makeStartupInjector());
-    Injector injector = runnable.makeInjector();
-
-    LoadSpecHolder instance = injector.getInstance(LoadSpecHolder.class);
-    Assert.assertEquals(LookupLoadingSpec.ALL, instance.getLookupLoadingSpec());
-    Assert.assertEquals(BroadcastDatasourceLoadingSpec.ALL, instance.getBroadcastDatasourceLoadingSpec());
-
-    TaskHolder instance1 = injector.getInstance(TaskHolder.class);
-    Assert.assertEquals("noopDs", instance1.getDataSource());
-    Assert.assertEquals("noopId", instance1.getTaskId());
-
-    Supplier<Map<String, Object>> hb = injector.getInstance(
-        Key.get(new TypeLiteral<Supplier<Map<String, Object>>>() {}, Names.named(ServiceStatusMonitor.HEARTBEAT_TAGS_BINDING))
-    );
-    Assert.assertNotNull(hb);
-    Assert.assertNotNull(hb.get());
-  }
-
-  @Test
-  public void testCliPeonLookupAndExpressionModulesDoNotCycle() throws IOException
-  {
-    File file = temporaryFolder.newFile("task.json");
-    FileUtils.write(file, "{\"type\":\"noop\"}", StandardCharsets.UTF_8);
-
-    CliPeon runnable = new CliPeon();
-    runnable.taskAndStatusFile = ImmutableList.of(file.getParent(), "1");
-    Properties properties = new Properties();
-    runnable.configure(properties);
-    runnable.configure(properties, GuiceInjectors.makeStartupInjector());
-    Injector injector = runnable.makeInjector();
-
-    // Also ensure LoadSpecHolder is accessible and returns non-null specs.
-    LoadSpecHolder loadSpecHolder = injector.getInstance(LoadSpecHolder.class);
-    Assert.assertNotNull(loadSpecHolder.getLookupLoadingSpec());
-    Assert.assertNotNull(loadSpecHolder.getBroadcastDatasourceLoadingSpec());
-  }
-
-  @Test
-  public void testCliPeonLookupAndExpressionModulesDoNotCycleDefaultsFinal() throws IOException
+  public void testCliPeonDefaultHolders() throws IOException
   {
     File file = temporaryFolder.newFile("task.json");
 
@@ -345,7 +249,7 @@ public void testCliPeonLookupAndExpressionModulesDoNotCycleDefaultsFinal() throw
   }
 
   @Test
-  public void testCliPeonLookupAndExpressionModulesDoNotCycleContextOverrides() throws IOException
+  public void testCliPeonWithTaskContextOverrides() throws IOException
   {
     File file = temporaryFolder.newFile("task.json");
 
@@ -383,46 +287,6 @@ public void testCliPeonLookupAndExpressionModulesDoNotCycleContextOverrides() th
     Assert.assertEquals("test_ds", taskHolder.getDataSource());
   }
 
-  @Test
-  public void testCliPeonLookupAndExpressionModulesDoNotCycleContextOverrides3() throws IOException
-  {
-    File file = temporaryFolder.newFile("task.json");
-
-    final CompactionTask.Builder builder = new CompactionTask.Builder(
-        "test_ds",
-        new SegmentCacheManagerFactory(TestIndex.INDEX_IO, mapper)
-    );
-    final CompactionTask compactionTask = builder
-        .id("compact_test_taskid")
-        .inputSpec(new CompactionIntervalSpec(Intervals.of("2020/2021"), null))
-        .transformSpec(new CompactionTransformSpec(new SelectorDimFilter("dim1", "foo", null)))
-        .context(Map.of(
-            "lookupLoadingMode", LookupLoadingSpec.Mode.NONE,
-            "broadcastDatasourceLoadingMode", BroadcastDatasourceLoadingSpec.Mode.NONE
-        ))
-        .build();
-
-    FileUtils.write(file, mapper.writeValueAsString(compactionTask), StandardCharsets.UTF_8);
-
-    CliPeon runnable = new CliPeon();
-    runnable.taskAndStatusFile = ImmutableList.of(file.getParent(), "1");
-    Properties properties = new Properties();
-    runnable.configure(properties);
-    runnable.configure(properties, GuiceInjectors.makeStartupInjector());
-    Injector injector = runnable.makeInjector();
-    runnable.configure(properties, injector);
-
-    LoadSpecHolder loadSpecHolder = injector.getInstance(LoadSpecHolder.class);
-    Assert.assertTrue(loadSpecHolder instanceof CliPeonLoadSpecHolder);
-    Assert.assertEquals(LookupLoadingSpec.NONE, loadSpecHolder.getLookupLoadingSpec());
-    Assert.assertEquals(BroadcastDatasourceLoadingSpec.NONE, loadSpecHolder.getBroadcastDatasourceLoadingSpec());
-
-    TaskHolder taskHolder = injector.getInstance(TaskHolder.class);
-    Assert.assertTrue(taskHolder instanceof CliPeonTaskHolder);
-    Assert.assertEquals("compact_test_taskid", taskHolder.getTaskId());
-    Assert.assertEquals("test_ds", taskHolder.getDataSource());
-  }
-
   private static class FakeCliPeon extends CliPeon
   {
     List<String> taskAndStatusFile = new ArrayList<>();
@@ -468,27 +332,6 @@ private static class TestStreamingTask extends SeekableStreamIndexTask<String, S
     static final String TYPE = "testStreaming";
     static final String STATUS = SeekableStreamIndexTaskRunner.Status.PAUSED.toString();
 
-    public TestStreamingTask(
-        String id,
-        @Nullable String supervisorId,
-        String datasource,
-        @Nullable Map context,
-        @Nullable String groupId,
-        DataSchema dataSchema
-    )
-    {
-      this(
-          id,
-          supervisorId,
-          null,
-          dataSchema,
-          mock(SeekableStreamIndexTaskTuningConfig.class),
-          new TestSeekableStreamIndexTaskIOConfig(),
-          context,
-          groupId
-      );
-    }
-
     public TestStreamingTask(
         String id,
         @Nullable String supervisorId,
@@ -514,7 +357,7 @@ public TestStreamingTask(
       );
     }
 
-    public TestStreamingTask(
+    private TestStreamingTask(
         String id,
         @Nullable String supervisorId,
         @Nullable TaskResource taskResource,
@@ -525,6 +368,7 @@ public TestStreamingTask(
         @Nullable String groupId
     )
     {
+
       super(id, supervisorId, taskResource, dataSchema, tuningConfig, ioConfig, context, groupId);
     }