set visibility on a lot of classes

squito · squito · commit a066055441f3 · 2015-03-23T12:16:21.000-05:00
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
@@ -26,7 +26,7 @@ import org.apache.spark.ui.jobs.JobProgressListener
 import org.apache.spark.ui.jobs.UIData.JobUIData
 
 @Produces(Array(MediaType.APPLICATION_JSON))
-class AllJobsResource(uiRoot: UIRoot) {
+private[v1] class AllJobsResource(uiRoot: UIRoot) {
 
   @GET
   def jobsList(
@@ -56,7 +56,7 @@ class AllJobsResource(uiRoot: UIRoot) {
 
 }
 
-object AllJobsResource {
+private[v1] object AllJobsResource {
 
   def getStatusToJobs(ui: SparkUI): Seq[(JobStatus, Seq[JobUIData])] = {
     val statusToJobs = ui.jobProgressListener.synchronized {
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/AllRDDResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/AllRDDResource.scala
@@ -23,7 +23,7 @@ import org.apache.spark.storage.{RDDInfo, StorageStatus, StorageUtils}
 import org.apache.spark.ui.storage.StorageListener
 
 @Produces(Array(MediaType.APPLICATION_JSON))
-class AllRDDResource(uiRoot: UIRoot) {
+private[v1] class AllRDDResource(uiRoot: UIRoot) {
 
   @GET
   def jobsList(
@@ -43,7 +43,7 @@ class AllRDDResource(uiRoot: UIRoot) {
 
 }
 
-object AllRDDResource {
+private[spark] object AllRDDResource {
 
   def getRDDStorageInfo(
       rddId: Int,
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
@@ -24,7 +24,7 @@ import org.apache.spark.deploy.history.ApplicationHistoryInfo
 import org.apache.spark.deploy.master.{ApplicationInfo => InternalApplicationInfo}
 
 @Produces(Array(MediaType.APPLICATION_JSON))
-class ApplicationListResource(uiRoot: UIRoot) {
+private[v1] class ApplicationListResource(uiRoot: UIRoot) {
 
   @GET
   def appList(
@@ -52,7 +52,7 @@ class ApplicationListResource(uiRoot: UIRoot) {
   }
 }
 
-object ApplicationsListResource {
+private[spark] object ApplicationsListResource {
   def appHistoryInfoToPublicAppInfo(app: ApplicationHistoryInfo): ApplicationInfo = {
     new ApplicationInfo(
       id = app.id,
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/CustomObjectMapper.scala b/core/src/main/scala/org/apache/spark/status/api/v1/CustomObjectMapper.scala
@@ -31,7 +31,7 @@ import org.apache.spark.util.SparkEnum
 
 @Provider
 @Produces(Array(MediaType.APPLICATION_JSON))
-class CustomObjectMapper extends ContextResolver[ObjectMapper]{
+private[v1] class CustomObjectMapper extends ContextResolver[ObjectMapper]{
   val mapper = new ObjectMapper() {
     override def writeValueAsString(t: Any): String = {
       super.writeValueAsString(t)
@@ -51,16 +51,16 @@ class CustomObjectMapper extends ContextResolver[ObjectMapper]{
   }
 }
 
-object CustomObjectMapper {
+private[spark] object CustomObjectMapper {
   def makeISODateFormat: SimpleDateFormat = {
-    val iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'GMT'");
-    val cal = Calendar.getInstance(new SimpleTimeZone(0, "GMT"));
-    iso8601.setCalendar(cal);
-    iso8601;
+    val iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'GMT'")
+    val cal = Calendar.getInstance(new SimpleTimeZone(0, "GMT"))
+    iso8601.setCalendar(cal)
+    iso8601
   }
 }
 
-class SparkEnumSerializer extends JsonSerializer[SparkEnum] {
+private[v1] class SparkEnumSerializer extends JsonSerializer[SparkEnum] {
   def serialize(se: SparkEnum, jgen: JsonGenerator, provider: SerializerProvider): Unit = {
     jgen.writeString(se.toString)
   }
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/ExecutorListResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/ExecutorListResource.scala
@@ -22,7 +22,7 @@ import javax.ws.rs.core.MediaType
 import org.apache.spark.ui.exec.ExecutorsPage
 
 @Produces(Array(MediaType.APPLICATION_JSON))
-class ExecutorListResource(uiRoot: UIRoot) {
+private[v1] class ExecutorListResource(uiRoot: UIRoot) {
 
   @GET
   def jobsList(
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/JsonRootResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/JsonRootResource.scala
@@ -29,7 +29,7 @@ import org.apache.spark.SecurityManager
 import org.apache.spark.ui.SparkUI
 
 @Path("/v1")
-class JsonRootResource extends UIRootFromServletContext {
+private[v1] class JsonRootResource extends UIRootFromServletContext {
 
   @Path("applications")
   def getApplicationList(): ApplicationListResource = {
@@ -85,7 +85,7 @@ class JsonRootResource extends UIRootFromServletContext {
 
 }
 
-object JsonRootResource {
+private[spark] object JsonRootResource {
 
   def getJsonServlet(uiRoot: UIRoot): ServletContextHandler = {
     val jerseyContext = new ServletContextHandler(ServletContextHandler.NO_SESSIONS)
@@ -122,7 +122,7 @@ private[spark] trait UIRoot {
   def securityManager: SecurityManager
 }
 
-object UIRootFromServletContext {
+private[v1] object UIRootFromServletContext {
   private val attribute = getClass.getCanonicalName
   def setUiRoot(contextHandler: ContextHandler, uiRoot: UIRoot): Unit = {
     contextHandler.setAttribute(attribute, uiRoot)
@@ -132,14 +132,14 @@ object UIRootFromServletContext {
   }
 }
 
-trait UIRootFromServletContext {
+private[v1] trait UIRootFromServletContext {
   @Context
   var servletContext: ServletContext = _
 
   def uiRoot: UIRoot = UIRootFromServletContext.getUiRoot(servletContext)
 }
 
-class NotFoundException(msg: String) extends WebApplicationException(
+private[v1] class NotFoundException(msg: String) extends WebApplicationException(
   new IllegalArgumentException(msg),
     Response
       .status(Response.Status.NOT_FOUND)
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
@@ -20,7 +20,7 @@ import javax.ws.rs.core.MediaType
 import javax.ws.rs.{Produces, PathParam, GET}
 
 @Produces(Array(MediaType.APPLICATION_JSON))
-class OneApplicationResource(uiRoot: UIRoot) {
+private[v1] class OneApplicationResource(uiRoot: UIRoot) {
 
   @GET
   def getApp(@PathParam("appId") appId: String): ApplicationInfo = {
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/OneJobResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/OneJobResource.scala
@@ -19,11 +19,10 @@ package org.apache.spark.status.api.v1
 import javax.ws.rs.{PathParam, GET, Produces}
 import javax.ws.rs.core.MediaType
 
-import org.apache.spark.JobExecutionStatus
 import org.apache.spark.ui.jobs.UIData.JobUIData
 
 @Produces(Array(MediaType.APPLICATION_JSON))
-class OneJobResource(uiRoot: UIRoot) {
+private[v1] class OneJobResource(uiRoot: UIRoot) {
 
   @GET
   def jobsList(
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/OneRDDResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/OneRDDResource.scala
@@ -20,7 +20,7 @@ import javax.ws.rs.{PathParam, GET, Produces}
 import javax.ws.rs.core.MediaType
 
 @Produces(Array(MediaType.APPLICATION_JSON))
-class OneRDDResource(uiRoot: UIRoot) {
+private[v1] class OneRDDResource(uiRoot: UIRoot) {
 
     @GET
     def rddData(
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/OneStageAttemptResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/OneStageAttemptResource.scala
@@ -22,7 +22,7 @@ import javax.ws.rs.{GET, PathParam, Produces}
 import org.apache.spark.SparkException
 
 @Produces(Array(MediaType.APPLICATION_JSON))
-class OneStageAttemptResource(uiRoot: UIRoot) {
+private[v1] class OneStageAttemptResource(uiRoot: UIRoot) {
 
   @GET
   def stageData(
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/SecurityFilter.scala b/core/src/main/scala/org/apache/spark/status/api/v1/SecurityFilter.scala
@@ -21,7 +21,7 @@ import javax.ws.rs.core.Response
 
 import com.sun.jersey.spi.container.{ContainerRequest, ContainerRequestFilter}
 
-class SecurityFilter extends ContainerRequestFilter with UIRootFromServletContext {
+private[v1] class SecurityFilter extends ContainerRequestFilter with UIRootFromServletContext {
   def filter(req: ContainerRequest): ContainerRequest = {
     val user = Option(req.getUserPrincipal).map { _.getName }.orNull
     if (uiRoot.securityManager.checkUIViewPermissions(user)) {
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
@@ -23,7 +23,7 @@ import javax.ws.rs.core.Response.Status
 
 import scala.util.Try
 
-private[api] class SimpleDateParam(val originalValue: String) {
+private[v1] class SimpleDateParam(val originalValue: String) {
   val timestamp: Long = {
     SimpleDateParam.formats.collectFirst {
       case fmt if Try{ fmt.parse(originalValue) }.isSuccess =>
@@ -39,7 +39,7 @@ private[api] class SimpleDateParam(val originalValue: String) {
   }
 }
 
-private[api] object SimpleDateParam {
+private[v1] object SimpleDateParam {
   val formats = Seq(
     "yyyy-MM-dd'T'HH:mm:ss.SSSz",
     "yyyy-MM-dd"

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import org.apache.spark.deploy.history.ApplicationHistoryInfo`
`24`	`24`	`import org.apache.spark.deploy.master.{ApplicationInfo => InternalApplicationInfo}`
`25`	`25`
`26`	`26`	`@Produces(Array(MediaType.APPLICATION_JSON))`
`27`		`-class ApplicationListResource(uiRoot: UIRoot) {`
	`27`	`+private[v1] class ApplicationListResource(uiRoot: UIRoot) {`
`28`	`28`
`29`	`29`	`@GET`
`30`	`30`	`def appList(`
`@@ -52,7 +52,7 @@ class ApplicationListResource(uiRoot: UIRoot) {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`-object ApplicationsListResource {`
	`55`	`+private[spark] object ApplicationsListResource {`
`56`	`56`	`def appHistoryInfoToPublicAppInfo(app: ApplicationHistoryInfo): ApplicationInfo = {`
`57`	`57`	`new ApplicationInfo(`
`58`	`58`	`id = app.id,`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import org.apache.spark.util.SparkEnum`
`31`	`31`
`32`	`32`	`@Provider`
`33`	`33`	`@Produces(Array(MediaType.APPLICATION_JSON))`
`34`		`-class CustomObjectMapper extends ContextResolver[ObjectMapper]{`
	`34`	`+private[v1] class CustomObjectMapper extends ContextResolver[ObjectMapper]{`
`35`	`35`	`val mapper = new ObjectMapper() {`
`36`	`36`	`override def writeValueAsString(t: Any): String = {`
`37`	`37`	`super.writeValueAsString(t)`
`@@ -51,16 +51,16 @@ class CustomObjectMapper extends ContextResolver[ObjectMapper]{`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`-object CustomObjectMapper {`
	`54`	`+private[spark] object CustomObjectMapper {`
`55`	`55`	`def makeISODateFormat: SimpleDateFormat = {`
`56`		`- val iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'GMT'");`
`57`		`- val cal = Calendar.getInstance(new SimpleTimeZone(0, "GMT"));`
`58`		`- iso8601.setCalendar(cal);`
`59`		`- iso8601;`
	`56`	`+ val iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'GMT'")`
	`57`	`+ val cal = Calendar.getInstance(new SimpleTimeZone(0, "GMT"))`
	`58`	`+ iso8601.setCalendar(cal)`
	`59`	`+ iso8601`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`-class SparkEnumSerializer extends JsonSerializer[SparkEnum] {`
	`63`	`+private[v1] class SparkEnumSerializer extends JsonSerializer[SparkEnum] {`
`64`	`64`	`def serialize(se: SparkEnum, jgen: JsonGenerator, provider: SerializerProvider): Unit = {`
`65`	`65`	`jgen.writeString(se.toString)`
`66`	`66`	`}`