Making all new classes package private

13 files changed, 13 insertions, 14 deletions

diff --git a/core/src/main/scala/spark/deploy/JsonProtocol.scala b/core/src/main/scala/spark/deploy/JsonProtocol.scala
index b4365d31e9..335aaeb769 100644
--- a/core/src/main/scala/spark/deploy/JsonProtocol.scala
+++ b/core/src/main/scala/spark/deploy/JsonProtocol.scala
@@ -4,7 +4,7 @@ import master.{ApplicationInfo, WorkerInfo}
 import net.liftweb.json.JsonDSL._
 import worker.ExecutorRunner
 
-object JsonProtocol {
+private[spark] object JsonProtocol {
  def writeWorkerInfo(obj: WorkerInfo) = {
    ("id" -> obj.id) ~
    ("host" -> obj.host) ~
diff --git a/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
index 2a810b71d2..9cb9c94e9f 100644
--- a/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
+++ b/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
@@ -14,7 +14,7 @@ import spark.deploy.{RequestMasterState, JsonProtocol, MasterState}
 import spark.deploy.master.ExecutorInfo
 import spark.ui.UIUtils
 
-class ApplicationPage(parent: MasterWebUI) {
+private[spark] class ApplicationPage(parent: MasterWebUI) {
   val master = parent.master
   implicit val timeout = parent.timeout
 
diff --git a/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala
index f833c59de8..3c3679a4b0 100644
--- a/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala
+++ b/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala
@@ -13,7 +13,7 @@ import spark.Utils
 import spark.ui.UIUtils
 import spark.deploy.master.{ApplicationInfo, WorkerInfo}
 
-class IndexPage(parent: MasterWebUI) {
+private[spark] class IndexPage(parent: MasterWebUI) {
   val master = parent.master
   implicit val timeout = parent.timeout
 
diff --git a/core/src/main/scala/spark/deploy/master/ui/MasterWebUI.scala b/core/src/main/scala/spark/deploy/master/ui/MasterWebUI.scala
index dfefd6571b..0cfe600043 100644
--- a/core/src/main/scala/spark/deploy/master/ui/MasterWebUI.scala
+++ b/core/src/main/scala/spark/deploy/master/ui/MasterWebUI.scala
@@ -53,7 +53,7 @@ class MasterWebUI(val master: ActorRef, requestedPort: Option[Int] = None) exten
   }
 }
 
-object MasterWebUI {
+private[spark] object MasterWebUI {
   val STATIC_RESOURCE_DIR = "spark/webui/static"
   val DEFAULT_PORT = "8080"
 }
\ No newline at end of file
diff --git a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
index 9e7b2bfd92..c1ca09fc97 100644
--- a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
+++ b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
@@ -15,7 +15,7 @@ import spark.deploy.worker.ExecutorRunner
 import spark.Utils
 import spark.ui.UIUtils
 
-class IndexPage(parent: WorkerWebUI) {
+private[spark] class IndexPage(parent: WorkerWebUI) {
   val worker = parent.worker
   val timeout = parent.timeout
 
diff --git a/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala b/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala
index 2615458dee..65bdba4735 100644
--- a/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala
+++ b/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala
@@ -68,7 +68,7 @@ class WorkerWebUI(val worker: ActorRef, val workDir: File, requestedPort: Option
   }
 }
 
-object WorkerWebUI {
+private[spark] object WorkerWebUI {
   val STATIC_RESOURCE_DIR = "spark/webui/static"
   val DEFAULT_PORT="8081"
 }
diff --git a/core/src/main/scala/spark/ui/JettyUtils.scala b/core/src/main/scala/spark/ui/JettyUtils.scala
index 45c0805b22..1f311bb75f 100644
--- a/core/src/main/scala/spark/ui/JettyUtils.scala
+++ b/core/src/main/scala/spark/ui/JettyUtils.scala
@@ -108,7 +108,7 @@ private[spark] object JettyUtils extends Logging {
 }
 
 /** Utility functions for generating XML pages with spark content. */
-object UIUtils {
+private[spark] object UIUtils {
 
   /** Returns a page containing the supplied content and the spark web ui headers */
   def headerSparkPage(content: => Seq[Node], sc: SparkContext, title: String): Seq[Node] = {
diff --git a/core/src/main/scala/spark/ui/SparkUI.scala b/core/src/main/scala/spark/ui/SparkUI.scala
index 487f005615..86b394c09f 100644
--- a/core/src/main/scala/spark/ui/SparkUI.scala
+++ b/core/src/main/scala/spark/ui/SparkUI.scala
@@ -57,7 +57,7 @@ private[spark] class SparkUI(sc: SparkContext) extends Logging {
   private[spark] def appUIAddress = "http://" + host + ":" + boundPort.getOrElse("-1")
 }
 
-object SparkUI {
+private[spark] object SparkUI {
   val DEFAULT_PORT = "33000"
   val STATIC_RESOURCE_DIR = "spark/webui/static"
 }
diff --git a/core/src/main/scala/spark/ui/jobs/IndexPage.scala b/core/src/main/scala/spark/ui/jobs/IndexPage.scala
index c7ee9dc1c1..152e1a79b0 100644
--- a/core/src/main/scala/spark/ui/jobs/IndexPage.scala
+++ b/core/src/main/scala/spark/ui/jobs/IndexPage.scala
@@ -14,7 +14,7 @@ import spark.ui.UIUtils._
 import spark.storage.StorageLevel
 
 /** Page showing list of all ongoing and recently finished stages */
-class IndexPage(parent: JobProgressUI) {
+private[spark] class IndexPage(parent: JobProgressUI) {
   def listener = parent.listener
   val dateFmt = parent.dateFmt
 
diff --git a/core/src/main/scala/spark/ui/jobs/StagePage.scala b/core/src/main/scala/spark/ui/jobs/StagePage.scala
index 65dbd389b1..03200861e0 100644
--- a/core/src/main/scala/spark/ui/jobs/StagePage.scala
+++ b/core/src/main/scala/spark/ui/jobs/StagePage.scala
@@ -13,7 +13,7 @@ import spark.scheduler.cluster.TaskInfo
 import spark.executor.TaskMetrics
 
 /** Page showing statistics and task list for a given stage */
-class StagePage(parent: JobProgressUI) {
+private[spark] class StagePage(parent: JobProgressUI) {
   def listener = parent.listener
   val dateFmt = parent.dateFmt
 
diff --git a/core/src/main/scala/spark/ui/storage/BlockManagerUI.scala b/core/src/main/scala/spark/ui/storage/BlockManagerUI.scala
index 4f1928fac9..3d67888e2c 100644
--- a/core/src/main/scala/spark/ui/storage/BlockManagerUI.scala
+++ b/core/src/main/scala/spark/ui/storage/BlockManagerUI.scala
@@ -10,8 +10,7 @@ import spark.{Logging, SparkContext}
 import spark.ui.JettyUtils._
 
 /** Web UI showing storage status of all RDD's in the given SparkContext. */
-private[spark]
-class BlockManagerUI(val sc: SparkContext) extends Logging {
+private[spark] class BlockManagerUI(val sc: SparkContext) extends Logging {
   implicit val timeout = Duration.create(
     System.getProperty("spark.akka.askTimeout", "10").toLong, "seconds")
 
diff --git a/core/src/main/scala/spark/ui/storage/IndexPage.scala b/core/src/main/scala/spark/ui/storage/IndexPage.scala
index cd7f6bd9f2..772c669a1a 100644
--- a/core/src/main/scala/spark/ui/storage/IndexPage.scala
+++ b/core/src/main/scala/spark/ui/storage/IndexPage.scala
@@ -9,7 +9,7 @@ import spark.Utils
 import spark.ui.UIUtils._
 
 /** Page showing list of RDD's currently stored in the cluster */
-class IndexPage(parent: BlockManagerUI) {
+private[spark] class IndexPage(parent: BlockManagerUI) {
   val sc = parent.sc
 
   def render(request: HttpServletRequest): Seq[Node] = {
diff --git a/core/src/test/scala/spark/ui/UISuite.scala b/core/src/test/scala/spark/ui/UISuite.scala
index 7df7356a6e..6519bf77c6 100644
--- a/core/src/test/scala/spark/ui/UISuite.scala
+++ b/core/src/test/scala/spark/ui/UISuite.scala
@@ -5,7 +5,7 @@ import org.eclipse.jetty.server.Server
 import util.{Try, Success, Failure}
 import java.net.ServerSocket
 
-class UISuite extends FunSuite {
+private[spark] class UISuite extends FunSuite {
   test("jetty port increases under contention") {
     val startPort = 33333
     val server = new Server(startPort)