From de64bb7e3fec5d0e5a4adf773d9a67cec2561f8c Mon Sep 17 00:00:00 2001 From: QlikFrederic Date: Thu, 14 Nov 2024 14:50:33 +0100 Subject: [PATCH] fixing scala issues --- .../artifact/SparkConnectArtifactManager.scala | 2 +- .../sql/connect/ui/SparkConnectServerPage.scala | 3 ++- .../connect/ui/SparkConnectServerSessionPage.scala | 3 ++- .../main/scala/org/apache/spark/SparkContext.scala | 2 +- .../scala/org/apache/spark/deploy/SparkSubmit.scala | 2 +- .../spark/deploy/history/ApplicationCache.scala | 4 ++-- .../apache/spark/deploy/history/HistoryPage.scala | 3 ++- .../apache/spark/deploy/history/HistoryServer.scala | 2 +- .../spark/deploy/master/ui/ApplicationPage.scala | 2 +- .../apache/spark/deploy/master/ui/MasterPage.scala | 2 +- .../apache/spark/deploy/master/ui/MasterWebUI.scala | 1 + .../spark/deploy/rest/RestSubmissionClient.scala | 2 +- .../spark/deploy/rest/RestSubmissionServer.scala | 3 +-- .../spark/deploy/rest/StandaloneRestServer.scala | 1 + .../org/apache/spark/deploy/worker/ui/LogPage.scala | 4 +++- .../apache/spark/deploy/worker/ui/WorkerPage.scala | 2 +- .../apache/spark/deploy/worker/ui/WorkerWebUI.scala | 2 ++ .../scala/org/apache/spark/executor/Executor.scala | 2 +- .../apache/spark/metrics/sink/MetricsServlet.scala | 3 ++- .../spark/metrics/sink/PrometheusServlet.scala | 3 ++- .../spark/status/api/v1/ApiRootResource.scala | 3 ++- .../status/api/v1/ApplicationListResource.scala | 1 + .../spark/status/api/v1/JacksonMessageWriter.scala | 6 +++--- .../status/api/v1/OneApplicationResource.scala | 5 +++-- .../spark/status/api/v1/PrometheusResource.scala | 1 - .../spark/status/api/v1/SimpleDateParam.scala | 1 + .../apache/spark/status/api/v1/StagesResource.scala | 5 +++-- .../org/apache/spark/ui/HttpSecurityFilter.scala | 4 ++-- .../main/scala/org/apache/spark/ui/JettyUtils.scala | 4 ++-- .../main/scala/org/apache/spark/ui/PagedTable.scala | 3 ++- .../main/scala/org/apache/spark/ui/SparkUI.scala | 2 +- .../main/scala/org/apache/spark/ui/UIUtils.scala | 4 ++-- core/src/main/scala/org/apache/spark/ui/WebUI.scala | 4 ++-- .../org/apache/spark/ui/env/EnvironmentPage.scala | 3 ++- .../spark/ui/exec/ExecutorHeapHistogramPage.scala | 3 ++- .../spark/ui/exec/ExecutorThreadDumpPage.scala | 3 ++- .../org/apache/spark/ui/exec/ExecutorsTab.scala | 3 ++- .../org/apache/spark/ui/jobs/AllJobsPage.scala | 3 ++- .../org/apache/spark/ui/jobs/AllStagesPage.scala | 3 ++- .../scala/org/apache/spark/ui/jobs/JobPage.scala | 3 ++- .../scala/org/apache/spark/ui/jobs/JobsTab.scala | 1 + .../scala/org/apache/spark/ui/jobs/PoolPage.scala | 3 ++- .../scala/org/apache/spark/ui/jobs/PoolTable.scala | 4 +++- .../scala/org/apache/spark/ui/jobs/StagePage.scala | 3 ++- .../scala/org/apache/spark/ui/jobs/StageTable.scala | 4 +++- .../scala/org/apache/spark/ui/jobs/StagesTab.scala | 1 + .../scala/org/apache/spark/ui/storage/RDDPage.scala | 4 +++- .../org/apache/spark/ui/storage/StoragePage.scala | 3 ++- pom.xml | 2 +- sql/core/pom.xml | 13 +++++++++++++ .../apache/spark/sql/execution/SparkSqlParser.scala | 2 +- .../spark/sql/execution/ui/AllExecutionsPage.scala | 4 +++- .../spark/sql/execution/ui/ExecutionPage.scala | 2 +- .../spark/sql/streaming/ui/StreamingQueryPage.scala | 3 ++- .../streaming/ui/StreamingQueryStatisticsPage.scala | 4 +++- .../spark/status/api/v1/sql/SqlResource.scala | 5 +++-- .../api/v1/streaming/ApiStreamingRootResource.scala | 1 + .../apache/spark/streaming/ui/AllBatchesTable.scala | 4 +++- .../org/apache/spark/streaming/ui/BatchPage.scala | 2 +- .../apache/spark/streaming/ui/StreamingPage.scala | 4 +++- 60 files changed, 119 insertions(+), 62 deletions(-) diff --git a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/artifact/SparkConnectArtifactManager.scala b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/artifact/SparkConnectArtifactManager.scala index f33bb54965356..184c2d7bc3379 100644 --- a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/artifact/SparkConnectArtifactManager.scala +++ b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/artifact/SparkConnectArtifactManager.scala @@ -21,11 +21,11 @@ import java.io.File import java.net.{URI, URL, URLClassLoader} import java.nio.file.{Files, Path, Paths, StandardCopyOption} import java.util.concurrent.CopyOnWriteArrayList -import jakarta.ws.rs.core.UriBuilder import scala.collection.JavaConverters._ import scala.reflect.ClassTag +import jakarta.ws.rs.core.UriBuilder import org.apache.commons.io.{FilenameUtils, FileUtils} import org.apache.hadoop.fs.{LocalFileSystem, Path => FSPath} diff --git a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPage.scala b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPage.scala index 74ca68b91eabc..72b44e3d08580 100644 --- a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPage.scala +++ b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPage.scala @@ -19,9 +19,10 @@ package org.apache.spark.sql.connect.ui import java.net.URLEncoder import java.nio.charset.StandardCharsets.UTF_8 -import jakarta.servlet.http.HttpServletRequest + import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest import org.apache.commons.text.StringEscapeUtils import org.apache.spark.internal.Logging diff --git a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerSessionPage.scala b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerSessionPage.scala index 4f48ca2f2bfc9..c35eb58edfbe7 100644 --- a/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerSessionPage.scala +++ b/connector/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerSessionPage.scala @@ -17,9 +17,10 @@ package org.apache.spark.sql.connect.ui -import jakarta.servlet.http.HttpServletRequest import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.internal.Logging import org.apache.spark.ui._ import org.apache.spark.ui.UIUtils._ diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index e67225ed50bc0..762d76812653b 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -22,7 +22,6 @@ import java.net.URI import java.util.{Arrays, Locale, Properties, ServiceLoader, UUID} import java.util.concurrent.{ConcurrentHashMap, ConcurrentMap} import java.util.concurrent.atomic.{AtomicBoolean, AtomicInteger, AtomicReference} -import jakarta.ws.rs.core.UriBuilder import scala.collection.JavaConverters._ import scala.collection.Map @@ -34,6 +33,7 @@ import scala.reflect.{classTag, ClassTag} import scala.util.control.NonFatal import com.google.common.collect.MapMaker +import jakarta.ws.rs.core.UriBuilder import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileSystem, Path} import org.apache.hadoop.io.{ArrayWritable, BooleanWritable, BytesWritable, DoubleWritable, FloatWritable, IntWritable, LongWritable, NullWritable, Text, Writable} diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala index 01986a84fc188..731d19f48f74e 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala @@ -25,13 +25,13 @@ import java.security.PrivilegedExceptionAction import java.text.ParseException import java.util.{ServiceLoader, UUID} import java.util.jar.JarInputStream -import jakarta.ws.rs.core.UriBuilder import scala.annotation.tailrec import scala.collection.JavaConverters._ import scala.collection.mutable.ArrayBuffer import scala.util.{Properties, Try} +import jakarta.ws.rs.core.UriBuilder import org.apache.commons.lang3.StringUtils import org.apache.hadoop.conf.{Configuration => HadoopConfiguration} import org.apache.hadoop.fs.{FileSystem, Path} diff --git a/core/src/main/scala/org/apache/spark/deploy/history/ApplicationCache.scala b/core/src/main/scala/org/apache/spark/deploy/history/ApplicationCache.scala index 7a6f2cff88791..aa5cabb1e3ffb 100644 --- a/core/src/main/scala/org/apache/spark/deploy/history/ApplicationCache.scala +++ b/core/src/main/scala/org/apache/spark/deploy/history/ApplicationCache.scala @@ -18,14 +18,14 @@ package org.apache.spark.deploy.history import java.util.concurrent.ExecutionException -import jakarta.servlet.{DispatcherType, Filter, FilterChain, FilterConfig, ServletException, ServletRequest, ServletResponse} -import jakarta.servlet.http.{HttpServletRequest, HttpServletResponse} import scala.collection.JavaConverters._ import com.codahale.metrics.{Counter, MetricRegistry, Timer} import com.google.common.cache.{CacheBuilder, CacheLoader, LoadingCache, RemovalListener, RemovalNotification} import com.google.common.util.concurrent.UncheckedExecutionException +import jakarta.servlet.{DispatcherType, Filter, FilterChain, FilterConfig, ServletException, ServletRequest, ServletResponse} +import jakarta.servlet.http.{HttpServletRequest, HttpServletResponse} import org.eclipse.jetty.servlet.FilterHolder import org.apache.spark.internal.Logging diff --git a/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala b/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala index f00aa51ca47b7..1848c02dd309b 100644 --- a/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala @@ -17,9 +17,10 @@ package org.apache.spark.deploy.history -import jakarta.servlet.http.HttpServletRequest import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.status.api.v1.ApplicationInfo import org.apache.spark.ui.{UIUtils, WebUIPage} diff --git a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala index ac289b584b2f1..2c9a3d0a3c49d 100644 --- a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala +++ b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala @@ -19,11 +19,11 @@ package org.apache.spark.deploy.history import java.util.NoSuchElementException import java.util.zip.ZipOutputStream -import jakarta.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse} import scala.util.control.NonFatal import scala.xml.Node +import jakarta.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse} import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder} import org.apache.spark.{SecurityManager, SparkConf} diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala index aaed3d1f74dfc..75b6e2a3419b8 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala @@ -17,9 +17,9 @@ package org.apache.spark.deploy.master.ui -import jakarta.servlet.http.HttpServletRequest import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest import org.apache.commons.lang3.StringUtils import org.apache.spark.deploy.DeployMessages.{MasterStateResponse, RequestMasterState} diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala index 500f508a67c44..8e8705226d61c 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala @@ -17,9 +17,9 @@ package org.apache.spark.deploy.master.ui -import jakarta.servlet.http.HttpServletRequest import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest import org.apache.commons.lang3.StringUtils import org.json4s.JValue diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterWebUI.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterWebUI.scala index 734f1c1a0fbe5..6cd86073f147a 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterWebUI.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterWebUI.scala @@ -18,6 +18,7 @@ package org.apache.spark.deploy.master.ui import java.net.{InetAddress, NetworkInterface, SocketException} + import jakarta.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse} import org.apache.spark.deploy.DeployMessages.{DecommissionWorkersOnHosts, MasterStateResponse, RequestMasterState} diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionClient.scala b/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionClient.scala index 31d7fad6ddafe..5851831e22be8 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionClient.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionClient.scala @@ -21,7 +21,6 @@ import java.io.{DataOutputStream, FileNotFoundException} import java.net.{ConnectException, HttpURLConnection, SocketException, URL} import java.nio.charset.StandardCharsets import java.util.concurrent.TimeoutException -import jakarta.servlet.http.HttpServletResponse import scala.collection.mutable import scala.concurrent.{Await, Future} @@ -30,6 +29,7 @@ import scala.io.Source import scala.util.control.NonFatal import com.fasterxml.jackson.core.JsonProcessingException +import jakarta.servlet.http.HttpServletResponse import org.apache.spark.{SPARK_VERSION => sparkVersion, SparkConf, SparkException} import org.apache.spark.deploy.SparkApplication diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala b/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala index 4de76dbe995b5..0f75cd1aaee2b 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala @@ -17,11 +17,10 @@ package org.apache.spark.deploy.rest -import jakarta.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse} - import scala.io.Source import com.fasterxml.jackson.core.JsonProcessingException +import jakarta.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse} import org.eclipse.jetty.server.{HttpConnectionFactory, Server, ServerConnector} import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder} import org.eclipse.jetty.util.thread.{QueuedThreadPool, ScheduledExecutorScheduler} diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala b/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala index fcbf234ed50d7..0433e63d4444c 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/StandaloneRestServer.scala @@ -18,6 +18,7 @@ package org.apache.spark.deploy.rest import java.io.File + import jakarta.servlet.http.HttpServletResponse import org.apache.spark.{SPARK_VERSION => sparkVersion, SparkConf} diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala index c7d690fdd11ed..29ecbaa13a123 100644 --- a/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala @@ -18,9 +18,11 @@ package org.apache.spark.deploy.worker.ui import java.io.File -import jakarta.servlet.http.HttpServletRequest + import scala.xml.{Node, Unparsed} +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.internal.Logging import org.apache.spark.ui.{UIUtils, WebUIPage} import org.apache.spark.util.Utils diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala index dd8cc4a4ee60d..3a6345d96396c 100644 --- a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala @@ -17,9 +17,9 @@ package org.apache.spark.deploy.worker.ui -import jakarta.servlet.http.HttpServletRequest import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest import org.json4s.JValue import org.apache.spark.deploy.{ExecutorState, JsonProtocol} diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala index 08a79c1aaa3d8..4fd50378ffc2a 100644 --- a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala @@ -18,7 +18,9 @@ package org.apache.spark.deploy.worker.ui import java.io.File + import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.deploy.worker.Worker import org.apache.spark.internal.Logging import org.apache.spark.ui.{SparkUI, WebUI} diff --git a/core/src/main/scala/org/apache/spark/executor/Executor.scala b/core/src/main/scala/org/apache/spark/executor/Executor.scala index 9f31f3db58a12..110ab73d8e2df 100644 --- a/core/src/main/scala/org/apache/spark/executor/Executor.scala +++ b/core/src/main/scala/org/apache/spark/executor/Executor.scala @@ -27,7 +27,6 @@ import java.util.concurrent._ import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.locks.ReentrantLock import javax.annotation.concurrent.GuardedBy -import jakarta.ws.rs.core.UriBuilder import scala.collection.JavaConverters._ import scala.collection.immutable @@ -37,6 +36,7 @@ import scala.util.control.NonFatal import com.google.common.cache.{Cache, CacheBuilder, RemovalListener, RemovalNotification} import com.google.common.util.concurrent.ThreadFactoryBuilder +import jakarta.ws.rs.core.UriBuilder import org.slf4j.MDC import org.apache.spark._ diff --git a/core/src/main/scala/org/apache/spark/metrics/sink/MetricsServlet.scala b/core/src/main/scala/org/apache/spark/metrics/sink/MetricsServlet.scala index 8b0c86eb702cf..7d676cd2c27b9 100644 --- a/core/src/main/scala/org/apache/spark/metrics/sink/MetricsServlet.scala +++ b/core/src/main/scala/org/apache/spark/metrics/sink/MetricsServlet.scala @@ -19,10 +19,11 @@ package org.apache.spark.metrics.sink import java.util.Properties import java.util.concurrent.TimeUnit -import jakarta.servlet.http.HttpServletRequest + import com.codahale.metrics.MetricRegistry import com.codahale.metrics.json.MetricsModule import com.fasterxml.jackson.databind.ObjectMapper +import jakarta.servlet.http.HttpServletRequest import org.eclipse.jetty.servlet.ServletContextHandler import org.apache.spark.SparkConf diff --git a/core/src/main/scala/org/apache/spark/metrics/sink/PrometheusServlet.scala b/core/src/main/scala/org/apache/spark/metrics/sink/PrometheusServlet.scala index e7ae4d64b0b1d..cedec98dc5e40 100644 --- a/core/src/main/scala/org/apache/spark/metrics/sink/PrometheusServlet.scala +++ b/core/src/main/scala/org/apache/spark/metrics/sink/PrometheusServlet.scala @@ -18,8 +18,9 @@ package org.apache.spark.metrics.sink import java.util.Properties -import jakarta.servlet.http.HttpServletRequest + import com.codahale.metrics.MetricRegistry +import jakarta.servlet.http.HttpServletRequest import org.eclipse.jetty.servlet.ServletContextHandler import org.apache.spark.SparkConf diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala index 21d7e39818245..66fac8a9d105a 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala @@ -16,11 +16,12 @@ */ package org.apache.spark.status.api.v1 +import java.util.zip.ZipOutputStream + import jakarta.servlet.ServletContext import jakarta.servlet.http.HttpServletRequest import jakarta.ws.rs._ import jakarta.ws.rs.core.{Context, Response} - import org.eclipse.jetty.server.handler.ContextHandler import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder} import org.glassfish.jersey.server.ServerProperties diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/ApplicationListResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/ApplicationListResource.scala index 46598cf27ea14..2d5dd97b501f1 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/ApplicationListResource.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/ApplicationListResource.scala @@ -17,6 +17,7 @@ package org.apache.spark.status.api.v1 import java.util.{List => JList} + import jakarta.ws.rs.{DefaultValue, GET, Produces, QueryParam} import jakarta.ws.rs.core.MediaType diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala b/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala index 94f134dfc8057..259d0aacc5755 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala @@ -21,12 +21,12 @@ import java.lang.annotation.Annotation import java.lang.reflect.Type import java.text.SimpleDateFormat import java.util.{Calendar, Locale, SimpleTimeZone} -import jakarta.ws.rs.Produces -import jakarta.ws.rs.core.{MediaType, MultivaluedMap} -import jakarta.ws.rs.ext.{MessageBodyWriter, Provider} import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.databind.{ObjectMapper, SerializationFeature} +import jakarta.ws.rs.Produces +import jakarta.ws.rs.core.{MediaType, MultivaluedMap} +import jakarta.ws.rs.ext.{MessageBodyWriter, Provider} /** * This class converts the POJO metric responses into json, using jackson. diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/OneApplicationResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/OneApplicationResource.scala index 11ea6e623f56e..dd4651804c00b 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/OneApplicationResource.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/OneApplicationResource.scala @@ -19,11 +19,12 @@ package org.apache.spark.status.api.v1 import java.io.OutputStream import java.util.{List => JList} import java.util.zip.ZipOutputStream -import jakarta.ws.rs.{NotFoundException => _, _} -import jakarta.ws.rs.core.{MediaType, Response, StreamingOutput} import scala.util.control.NonFatal +import jakarta.ws.rs.{NotFoundException => _, _} +import jakarta.ws.rs.core.{MediaType, Response, StreamingOutput} + import org.apache.spark.{JobExecutionStatus, SparkContext} import org.apache.spark.status.api.v1 import org.apache.spark.util.Utils diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/PrometheusResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/PrometheusResource.scala index 034339286805e..16a46409f6f83 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/PrometheusResource.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/PrometheusResource.scala @@ -18,7 +18,6 @@ package org.apache.spark.status.api.v1 import jakarta.ws.rs._ import jakarta.ws.rs.core.MediaType - import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder} import org.glassfish.jersey.server.ServerProperties import org.glassfish.jersey.servlet.ServletContainer diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/SimpleDateParam.scala b/core/src/main/scala/org/apache/spark/status/api/v1/SimpleDateParam.scala index e364f86084c31..e947fbf281df8 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/SimpleDateParam.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/SimpleDateParam.scala @@ -18,6 +18,7 @@ package org.apache.spark.status.api.v1 import java.text.{ParseException, SimpleDateFormat} import java.util.{Locale, TimeZone} + import jakarta.ws.rs.WebApplicationException import jakarta.ws.rs.core.Response import jakarta.ws.rs.core.Response.Status diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/StagesResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/StagesResource.scala index eeff2b7c06659..907c53130764e 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/StagesResource.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/StagesResource.scala @@ -17,11 +17,12 @@ package org.apache.spark.status.api.v1 import java.util.{HashMap, List => JList, Locale} -import jakarta.ws.rs.{NotFoundException => _, _} -import jakarta.ws.rs.core.{Context, MediaType, MultivaluedMap, UriInfo} import scala.collection.JavaConverters._ +import jakarta.ws.rs.{NotFoundException => _, _} +import jakarta.ws.rs.core.{Context, MediaType, MultivaluedMap, UriInfo} + import org.apache.spark.status.api.v1.TaskStatus._ import org.apache.spark.ui.UIUtils import org.apache.spark.ui.jobs.ApiHelper._ diff --git a/core/src/main/scala/org/apache/spark/ui/HttpSecurityFilter.scala b/core/src/main/scala/org/apache/spark/ui/HttpSecurityFilter.scala index d040d0a6befaa..9d57083243b00 100644 --- a/core/src/main/scala/org/apache/spark/ui/HttpSecurityFilter.scala +++ b/core/src/main/scala/org/apache/spark/ui/HttpSecurityFilter.scala @@ -18,11 +18,11 @@ package org.apache.spark.ui import java.util.{Enumeration, Map => JMap} -import jakarta.servlet._ -import jakarta.servlet.http.{HttpServletRequest, HttpServletRequestWrapper, HttpServletResponse} import scala.collection.JavaConverters._ +import jakarta.servlet._ +import jakarta.servlet.http.{HttpServletRequest, HttpServletRequestWrapper, HttpServletResponse} import org.apache.commons.text.StringEscapeUtils import org.apache.spark.{SecurityManager, SparkConf} diff --git a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala index b13bb96ea5c70..cb543ba958410 100644 --- a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala +++ b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala @@ -19,13 +19,13 @@ package org.apache.spark.ui import java.net.{URI, URL, URLDecoder} import java.util.EnumSet -import jakarta.servlet.DispatcherType -import jakarta.servlet.http._ import scala.language.implicitConversions import scala.util.Try import scala.xml.Node +import jakarta.servlet.DispatcherType +import jakarta.servlet.http._ import org.eclipse.jetty.client.HttpClient import org.eclipse.jetty.client.api.Response import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP diff --git a/core/src/main/scala/org/apache/spark/ui/PagedTable.scala b/core/src/main/scala/org/apache/spark/ui/PagedTable.scala index db3dccff19742..53b02996e0dbf 100644 --- a/core/src/main/scala/org/apache/spark/ui/PagedTable.scala +++ b/core/src/main/scala/org/apache/spark/ui/PagedTable.scala @@ -19,11 +19,12 @@ package org.apache.spark.ui import java.net.{URLDecoder, URLEncoder} import java.nio.charset.StandardCharsets.UTF_8 -import jakarta.servlet.http.HttpServletRequest + import scala.collection.JavaConverters._ import scala.xml.{Node, Unparsed} import com.google.common.base.Splitter +import jakarta.servlet.http.HttpServletRequest import org.apache.spark.util.Utils diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala index 910fecc640a90..3e085d1d7a5f8 100644 --- a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala +++ b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala @@ -18,8 +18,8 @@ package org.apache.spark.ui import java.util.Date -import jakarta.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse} +import jakarta.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse} import org.eclipse.jetty.servlet.ServletContextHandler import org.apache.spark.{SecurityManager, SparkConf, SparkContext} diff --git a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala index fb11fccf1643a..a929df40fbece 100644 --- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala +++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala @@ -23,14 +23,14 @@ import java.net.URLDecoder import java.nio.charset.StandardCharsets.UTF_8 import java.text.SimpleDateFormat import java.util.{Date, Locale, TimeZone} -import jakarta.servlet.http.HttpServletRequest -import jakarta.ws.rs.core.{MediaType, MultivaluedMap, Response} import scala.collection.JavaConverters._ import scala.util.control.NonFatal import scala.xml._ import scala.xml.transform.{RewriteRule, RuleTransformer} +import jakarta.servlet.http.HttpServletRequest +import jakarta.ws.rs.core.{MediaType, MultivaluedMap, Response} import org.apache.commons.text.StringEscapeUtils import org.glassfish.jersey.internal.util.collection.MultivaluedStringMap diff --git a/core/src/main/scala/org/apache/spark/ui/WebUI.scala b/core/src/main/scala/org/apache/spark/ui/WebUI.scala index d9a18bcdb137d..2c937e71f64b9 100644 --- a/core/src/main/scala/org/apache/spark/ui/WebUI.scala +++ b/core/src/main/scala/org/apache/spark/ui/WebUI.scala @@ -18,13 +18,13 @@ package org.apache.spark.ui import java.util.EnumSet -import jakarta.servlet.DispatcherType -import jakarta.servlet.http.{HttpServlet, HttpServletRequest} import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.HashMap import scala.xml.Node +import jakarta.servlet.DispatcherType +import jakarta.servlet.http.{HttpServlet, HttpServletRequest} import org.eclipse.jetty.servlet.{FilterHolder, FilterMapping, ServletContextHandler, ServletHolder} import org.json4s.JsonAST.{JNothing, JValue} diff --git a/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala b/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala index 6673278f89c51..f2718c6bf8d77 100644 --- a/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala @@ -17,10 +17,11 @@ package org.apache.spark.ui.env -import jakarta.servlet.http.HttpServletRequest import scala.collection.mutable.StringBuilder import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.SparkConf import org.apache.spark.resource.{ExecutorResourceRequest, TaskResourceRequest} import org.apache.spark.status.AppStatusStore diff --git a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorHeapHistogramPage.scala b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorHeapHistogramPage.scala index 7873758201878..2c9467300bd37 100644 --- a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorHeapHistogramPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorHeapHistogramPage.scala @@ -17,9 +17,10 @@ package org.apache.spark.ui.exec -import jakarta.servlet.http.HttpServletRequest import scala.xml.{Node, Text} +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.SparkContext import org.apache.spark.ui.{SparkUITab, UIUtils, WebUIPage} diff --git a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorThreadDumpPage.scala b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorThreadDumpPage.scala index c08351fd3c0eb..838705714cad7 100644 --- a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorThreadDumpPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorThreadDumpPage.scala @@ -17,9 +17,10 @@ package org.apache.spark.ui.exec -import jakarta.servlet.http.HttpServletRequest import scala.xml.{Node, Text} +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.SparkContext import org.apache.spark.ui.{SparkUITab, UIUtils, WebUIPage} diff --git a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsTab.scala b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsTab.scala index 294f13b8329ce..94c880af0eefd 100644 --- a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsTab.scala +++ b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsTab.scala @@ -17,9 +17,10 @@ package org.apache.spark.ui.exec -import jakarta.servlet.http.HttpServletRequest import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.internal.config.UI._ import org.apache.spark.ui.{SparkUI, SparkUITab, UIUtils, WebUIPage} diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala index 1dacf9044c2af..ac705aa81636d 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala @@ -20,10 +20,11 @@ package org.apache.spark.ui.jobs import java.net.URLEncoder import java.nio.charset.StandardCharsets.UTF_8 import java.util.{Date, Locale} -import jakarta.servlet.http.HttpServletRequest + import scala.collection.mutable.ListBuffer import scala.xml._ +import jakarta.servlet.http.HttpServletRequest import org.apache.commons.text.StringEscapeUtils import org.apache.spark.JobExecutionStatus diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala index 8f13e485dc827..ae83371796275 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala @@ -17,9 +17,10 @@ package org.apache.spark.ui.jobs -import jakarta.servlet.http.HttpServletRequest import scala.xml.{Attribute, Elem, Node, NodeSeq, Null, Text} +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.scheduler.Schedulable import org.apache.spark.status.{AppSummary, PoolData} import org.apache.spark.status.api.v1.{StageData, StageStatus} diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala index 867c770140ce4..793e65f44ba90 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala @@ -18,10 +18,11 @@ package org.apache.spark.ui.jobs import java.util.Locale -import jakarta.servlet.http.HttpServletRequest + import scala.collection.mutable.{Buffer, ListBuffer} import scala.xml.{Node, NodeSeq, Unparsed, Utility} +import jakarta.servlet.http.HttpServletRequest import org.apache.commons.text.StringEscapeUtils import org.apache.spark.JobExecutionStatus diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobsTab.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobsTab.scala index ee2efda241e7a..ce7698a59ae91 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/JobsTab.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/JobsTab.scala @@ -18,6 +18,7 @@ package org.apache.spark.ui.jobs import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.JobExecutionStatus import org.apache.spark.internal.config.SCHEDULER_MODE import org.apache.spark.scheduler.SchedulingMode diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala index 23d74ad8c35e6..15592adc57cea 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala @@ -17,9 +17,10 @@ package org.apache.spark.ui.jobs -import jakarta.servlet.http.HttpServletRequest import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.status.PoolData import org.apache.spark.ui.{UIUtils, WebUIPage} diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/PoolTable.scala b/core/src/main/scala/org/apache/spark/ui/jobs/PoolTable.scala index bb4d0a6fc63ff..a6b2a029f71ef 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/PoolTable.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/PoolTable.scala @@ -19,9 +19,11 @@ package org.apache.spark.ui.jobs import java.net.URLEncoder import java.nio.charset.StandardCharsets -import jakarta.servlet.http.HttpServletRequest + import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.scheduler.Schedulable import org.apache.spark.status.PoolData import org.apache.spark.ui.UIUtils diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala index 52508403dfdb5..7682381311277 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala @@ -21,10 +21,11 @@ import java.net.URLEncoder import java.nio.charset.StandardCharsets.UTF_8 import java.util.Date import java.util.concurrent.TimeUnit -import jakarta.servlet.http.HttpServletRequest + import scala.collection.mutable.{HashMap, HashSet} import scala.xml.{Node, Unparsed} +import jakarta.servlet.http.HttpServletRequest import org.apache.commons.text.StringEscapeUtils import org.apache.spark.internal.config.UI._ diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala index 66bb68e1e83d6..743323f165b33 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala @@ -20,9 +20,11 @@ package org.apache.spark.ui.jobs import java.net.URLEncoder import java.nio.charset.StandardCharsets.UTF_8 import java.util.Date -import jakarta.servlet.http.HttpServletRequest + import scala.xml._ +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.status.AppStatusStore import org.apache.spark.status.api.v1 import org.apache.spark.ui._ diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagesTab.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagesTab.scala index dd8788658d5d5..78e378e7f0fd1 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/StagesTab.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/StagesTab.scala @@ -18,6 +18,7 @@ package org.apache.spark.ui.jobs import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.internal.config.SCHEDULER_MODE import org.apache.spark.scheduler.SchedulingMode import org.apache.spark.status.AppStatusStore diff --git a/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala b/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala index 2ef77c2f0afb2..d21ea3732f3b9 100644 --- a/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala @@ -19,9 +19,11 @@ package org.apache.spark.ui.storage import java.net.URLEncoder import java.nio.charset.StandardCharsets.UTF_8 -import jakarta.servlet.http.HttpServletRequest + import scala.xml.{Node, Unparsed} +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.status.AppStatusStore import org.apache.spark.status.api.v1.{ExecutorSummary, RDDDataDistribution, RDDPartitionInfo} import org.apache.spark.ui._ diff --git a/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala b/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala index 6623f4cca840e..23d95560243d8 100644 --- a/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala +++ b/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala @@ -17,10 +17,11 @@ package org.apache.spark.ui.storage -import jakarta.servlet.http.HttpServletRequest import scala.collection.SortedMap import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.status.{AppStatusStore, StreamBlockData} import org.apache.spark.status.api.v1 import org.apache.spark.ui._ diff --git a/pom.xml b/pom.xml index 3401284d33e44..8605578d2c36a 100644 --- a/pom.xml +++ b/pom.xml @@ -1121,7 +1121,7 @@ org.scala-lang.modules scala-xml_${scala.binary.version} - 2.1.0 + 2.3.0 org.scala-lang.modules diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 0bad41ce3d565..679bb200d751a 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -73,6 +73,19 @@ test-jar test + + org.apache.spark + spark-sql-api_${scala.binary.version} + ${project.version} + test-jar + test + + + org.apache.spark + spark-connect-shims_${scala.binary.version} + + + org.apache.spark spark-tags_${scala.binary.version} diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala index 6b70051f7c859..ac4540a0d721d 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala @@ -19,10 +19,10 @@ package org.apache.spark.sql.execution import java.time.ZoneOffset import java.util.{Locale, TimeZone} -import jakarta.ws.rs.core.UriBuilder import scala.collection.JavaConverters._ +import jakarta.ws.rs.core.UriBuilder import org.antlr.v4.runtime.{ParserRuleContext, Token} import org.antlr.v4.runtime.tree.TerminalNode diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala index 4dff3482c8d46..ec09f0f79390a 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala @@ -19,10 +19,12 @@ package org.apache.spark.sql.execution.ui import java.net.URLEncoder import java.nio.charset.StandardCharsets.UTF_8 -import jakarta.servlet.http.HttpServletRequest + import scala.collection.mutable import scala.xml.{Node, NodeSeq} +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.JobExecutionStatus import org.apache.spark.internal.Logging import org.apache.spark.internal.config.UI.UI_SQL_GROUP_SUB_EXECUTION_ENABLED diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala index b13c29c10f2d0..6a7d3ebc3ec85 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala @@ -17,9 +17,9 @@ package org.apache.spark.sql.execution.ui -import jakarta.servlet.http.HttpServletRequest import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest import org.json4s.JNull import org.json4s.JsonAST.{JBool, JString} import org.json4s.jackson.JsonMethods.parse diff --git a/sql/core/src/main/scala/org/apache/spark/sql/streaming/ui/StreamingQueryPage.scala b/sql/core/src/main/scala/org/apache/spark/sql/streaming/ui/StreamingQueryPage.scala index f5abe1226bc1b..86a1f770a3faf 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/streaming/ui/StreamingQueryPage.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/streaming/ui/StreamingQueryPage.scala @@ -19,10 +19,11 @@ package org.apache.spark.sql.streaming.ui import java.net.URLEncoder import java.nio.charset.StandardCharsets.UTF_8 -import jakarta.servlet.http.HttpServletRequest + import scala.collection.mutable import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest import org.apache.commons.text.StringEscapeUtils import org.apache.spark.internal.Logging diff --git a/sql/core/src/main/scala/org/apache/spark/sql/streaming/ui/StreamingQueryStatisticsPage.scala b/sql/core/src/main/scala/org/apache/spark/sql/streaming/ui/StreamingQueryStatisticsPage.scala index 422119cdad012..99d9daff50aae 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/streaming/ui/StreamingQueryStatisticsPage.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/streaming/ui/StreamingQueryStatisticsPage.scala @@ -20,10 +20,12 @@ package org.apache.spark.sql.streaming.ui import java.{util => ju} import java.lang.{Long => JLong} import java.util.Locale -import jakarta.servlet.http.HttpServletRequest + import scala.collection.JavaConverters._ import scala.xml.{Node, NodeBuffer, Unparsed} +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.internal.Logging import org.apache.spark.sql.execution.streaming.state.StateStoreProvider import org.apache.spark.sql.internal.SQLConf.STATE_STORE_PROVIDER_CLASS diff --git a/sql/core/src/main/scala/org/apache/spark/status/api/v1/sql/SqlResource.scala b/sql/core/src/main/scala/org/apache/spark/status/api/v1/sql/SqlResource.scala index 683173eeaf392..eb74d7e7131dc 100644 --- a/sql/core/src/main/scala/org/apache/spark/status/api/v1/sql/SqlResource.scala +++ b/sql/core/src/main/scala/org/apache/spark/status/api/v1/sql/SqlResource.scala @@ -18,11 +18,12 @@ package org.apache.spark.status.api.v1.sql import java.util.Date -import jakarta.ws.rs._ -import jakarta.ws.rs.core.MediaType import scala.util.{Failure, Success, Try} +import jakarta.ws.rs._ +import jakarta.ws.rs.core.MediaType + import org.apache.spark.JobExecutionStatus import org.apache.spark.sql.execution.ui.{SparkPlanGraph, SparkPlanGraphCluster, SparkPlanGraphNode, SQLAppStatusStore, SQLExecutionUIData} import org.apache.spark.status.api.v1.{BaseAppResource, NotFoundException} diff --git a/streaming/src/main/scala/org/apache/spark/status/api/v1/streaming/ApiStreamingRootResource.scala b/streaming/src/main/scala/org/apache/spark/status/api/v1/streaming/ApiStreamingRootResource.scala index b8737d715c4b2..d1dad1ae2570a 100644 --- a/streaming/src/main/scala/org/apache/spark/status/api/v1/streaming/ApiStreamingRootResource.scala +++ b/streaming/src/main/scala/org/apache/spark/status/api/v1/streaming/ApiStreamingRootResource.scala @@ -18,6 +18,7 @@ package org.apache.spark.status.api.v1.streaming import java.util.{Arrays => JArrays, Collections, Date, List => JList} + import jakarta.ws.rs.{GET, Path, PathParam, Produces, QueryParam} import jakarta.ws.rs.core.MediaType diff --git a/streaming/src/main/scala/org/apache/spark/streaming/ui/AllBatchesTable.scala b/streaming/src/main/scala/org/apache/spark/streaming/ui/AllBatchesTable.scala index 7ae7df310ecf1..8fda57e5b2897 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/ui/AllBatchesTable.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/ui/AllBatchesTable.scala @@ -19,9 +19,11 @@ package org.apache.spark.streaming.ui import java.net.URLEncoder import java.nio.charset.StandardCharsets.UTF_8 -import jakarta.servlet.http.HttpServletRequest + import scala.xml.Node +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.ui.{PagedDataSource, PagedTable, UIUtils => SparkUIUtils} private[ui] class StreamingPagedTable( diff --git a/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala b/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala index 73b112ad5052f..d1cbd802c56d2 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala @@ -17,9 +17,9 @@ package org.apache.spark.streaming.ui -import jakarta.servlet.http.HttpServletRequest import scala.xml._ +import jakarta.servlet.http.HttpServletRequest import org.apache.commons.text.StringEscapeUtils import org.apache.spark.status.api.v1.{JobData, StageData} diff --git a/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala b/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala index 54d5b162ba6b1..b777e0b1990b2 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala @@ -18,10 +18,12 @@ package org.apache.spark.streaming.ui import java.util.concurrent.TimeUnit -import jakarta.servlet.http.HttpServletRequest + import scala.collection.mutable import scala.xml.{Node, Unparsed} +import jakarta.servlet.http.HttpServletRequest + import org.apache.spark.internal.Logging import org.apache.spark.ui.{GraphUIData, JsCollector, UIUtils => SparkUIUtils, WebUIPage} import org.apache.spark.util.Utils