Cleanup and add LoadSpecHolder

Author: abhishekrb19

server/src/main/java/org/apache/druid/query/lookup/LookupListeningAnnouncerConfig.java

@@ -31,7 +31,7 @@
 class LookupListeningAnnouncerConfig
 {
   public static final String DEFAULT_TIER = "__default";
-  private final TaskHolder taskPropsHolder;
+  private final TaskHolder taskHolder;
   private final LoadSpecHolder loadSpecHolder;
 
   @JsonProperty("lookupTier")
@@ -41,11 +41,11 @@ class LookupListeningAnnouncerConfig
 
   @JsonCreator
   public LookupListeningAnnouncerConfig(
-      @JacksonInject TaskHolder taskPropsHolder,
+      @JacksonInject TaskHolder taskHolder,
       @JacksonInject LoadSpecHolder loadSpecHolder
   )
   {
-    this.taskPropsHolder = taskPropsHolder;
+    this.taskHolder = taskHolder;
     this.loadSpecHolder = loadSpecHolder;
   }
 
@@ -55,7 +55,7 @@ public String getLookupTier()
         !(lookupTierIsDatasource && null != lookupTier),
         "Cannot specify both `lookupTier` and `lookupTierIsDatasource`"
     );
-    final String lookupTier = lookupTierIsDatasource ? taskPropsHolder.getDataSource() : this.lookupTier;
+    final String lookupTier = lookupTierIsDatasource ? taskHolder.getDataSource() : this.lookupTier;
 
     return Preconditions.checkNotNull(
         lookupTier == null ? DEFAULT_TIER : StringUtils.emptyToNullNonDruidDataString(lookupTier),

server/src/main/java/org/apache/druid/server/metrics/LoadSpecHolder.java

@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.server.metrics;
+
+import org.apache.druid.server.coordination.BroadcastDatasourceLoadingSpec;
+import org.apache.druid.server.lookup.cache.LookupLoadingSpec;
+
+/**
+ * Provides loading specifications for a task or server.
+ */
+public interface LoadSpecHolder
+{
+  /**
+   * @return the lookup loading specification.
+   */
+  LookupLoadingSpec getLookupLoadingSpec();
+
+  /**
+   * @return the broadcast datasource loading specification.
+   */
+  BroadcastDatasourceLoadingSpec getBroadcastDatasourceLoadingSpec();
+}

services/src/main/java/org/apache/druid/cli/CliBroker.java

@@ -82,8 +82,8 @@
 import org.apache.druid.server.http.SegmentListerResource;
 import org.apache.druid.server.http.SelfDiscoveryResource;
 import org.apache.druid.server.initialization.jetty.JettyServerInitializer;
-import org.apache.druid.server.metrics.LoadSpecHolder;
 import org.apache.druid.server.metrics.DefaultLoadSpecHolder;
+import org.apache.druid.server.metrics.LoadSpecHolder;
 import org.apache.druid.server.metrics.NoopTaskHolder;
 import org.apache.druid.server.metrics.QueryCountStatsProvider;
 import org.apache.druid.server.metrics.SubqueryCountStatsProvider;