Dart resource deprecation

extensions-core/multi-stage-query/pom.xml

@@ -196,6 +196,11 @@
             <artifactId>commons-io</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Tests -->
         <dependency>

extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/DartResourcePermissionMapper.java

@@ -20,21 +20,21 @@
 package org.apache.druid.msq.dart;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.msq.dart.controller.http.DartSqlResource;
 import org.apache.druid.msq.dart.worker.http.DartWorkerResource;
 import org.apache.druid.msq.rpc.ResourcePermissionMapper;
 import org.apache.druid.msq.rpc.WorkerResource;
 import org.apache.druid.server.security.Action;
 import org.apache.druid.server.security.Resource;
 import org.apache.druid.server.security.ResourceAction;
+import org.apache.druid.sql.http.SqlResource;
 
 import java.util.List;
 
 public class DartResourcePermissionMapper implements ResourcePermissionMapper
 {
   /**
    * Permissions for admin APIs in {@link DartWorkerResource} and {@link WorkerResource}. Note that queries from
-   * end users go through {@link DartSqlResource}, which wouldn't use these mappings.
+   * end users go through {@link SqlResource}, which wouldn't use these mappings.
    */
   @Override
   public List<ResourceAction> getAdminPermissions()
@@ -47,7 +47,7 @@ public List<ResourceAction> getAdminPermissions()
 
   /**
    * Permissions for per-query APIs in {@link DartWorkerResource} and {@link WorkerResource}. Note that queries from
-   * end users go through {@link DartSqlResource}, which wouldn't use these mappings.
+   * end users go through {@link SqlResource}, which wouldn't use these mappings.
    */
   @Override
   public List<ResourceAction> getQueryPermissions(String queryId)

extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/http/DartQueryInfo.java

@@ -27,14 +27,16 @@
 import org.apache.druid.msq.util.MSQTaskQueryMakerUtils;
 import org.apache.druid.query.QueryContexts;
 import org.apache.druid.server.DruidNode;
+import org.apache.druid.sql.http.GetQueriesResponse;
+import org.apache.druid.sql.http.QueryInfo;
 import org.joda.time.DateTime;
 
 import java.util.Objects;
 
 /**
  * Class included in {@link GetQueriesResponse}.
  */
-public class DartQueryInfo
+public class DartQueryInfo implements QueryInfo
 {
   private final String sqlQueryId;
   private final String dartQueryId;

extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClient.java

@@ -20,13 +20,13 @@
 package org.apache.druid.msq.dart.controller.sql;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.druid.msq.dart.controller.http.DartSqlResource;
-import org.apache.druid.msq.dart.controller.http.GetQueriesResponse;
+import org.apache.druid.sql.http.GetQueriesResponse;
+import org.apache.druid.sql.http.SqlResource;
 
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * Client for the {@link DartSqlResource} resource.
+ * Client for the {@link SqlResource} resource for Dart queries.
  */
 public interface DartSqlClient
 {
@@ -36,7 +36,7 @@ public interface DartSqlClient
    * @param selfOnly true if only queries from this server should be returned; false if queries from all servers
    *                 should be returned
    *
-   * @see DartSqlResource#doGetRunningQueries(String, HttpServletRequest) the server side
+   * @see SqlResource#doGetRunningQueries(String, HttpServletRequest) the server side
    */
   ListenableFuture<GetQueriesResponse> getRunningQueries(boolean selfOnly);
 }

extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientFactoryImpl.java

@@ -24,13 +24,13 @@
 import org.apache.druid.guice.annotations.EscalatedGlobal;
 import org.apache.druid.guice.annotations.Json;
 import org.apache.druid.java.util.common.StringUtils;
-import org.apache.druid.msq.dart.controller.http.DartSqlResource;
 import org.apache.druid.rpc.FixedServiceLocator;
 import org.apache.druid.rpc.ServiceClient;
 import org.apache.druid.rpc.ServiceClientFactory;
 import org.apache.druid.rpc.ServiceLocation;
 import org.apache.druid.rpc.StandardRetryPolicy;
 import org.apache.druid.server.DruidNode;
+import org.apache.druid.sql.http.SqlResource;
 
 /**
  * Production implementation of {@link DartSqlClientFactory}.
@@ -55,7 +55,7 @@ public DartSqlClient makeClient(DruidNode node)
   {
     final ServiceClient client = clientFactory.makeClient(
         StringUtils.format("%s[dart-sql]", node.getHostAndPortToUse()),
-        new FixedServiceLocator(ServiceLocation.fromDruidNode(node).withBasePath(DartSqlResource.PATH)),
+        new FixedServiceLocator(ServiceLocation.fromDruidNode(node).withBasePath(SqlResource.PATH)),
         StandardRetryPolicy.noRetries()
     );