Remove unused classloader settings (#7288)

playframework · May 3, 2017 · 927fb83 · 927fb83
1 parent ca7cb3b
commit 927fb83
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/framework/src/run-support/src/main/scala/play/runsupport/Reloader.scala b/framework/src/run-support/src/main/scala/play/runsupport/Reloader.scala
@@ -108,10 +108,6 @@ object Reloader {
 
   def urls(cp: Classpath): Array[URL] = cp.map(_.toURI.toURL).toArray
 
-  val createURLClassLoader: ClassLoaderCreator = (name, urls, parent) => new NamedURLClassLoader(name, urls, parent)
-
-  val createDelegatedResourcesClassLoader: ClassLoaderCreator = (name, urls, parent) => new DelegatedResourcesClassLoader(name, urls, parent)
-
   def assetsClassLoader(allAssets: Seq[(String, File)])(parent: ClassLoader): ClassLoader = new AssetsClassLoader(parent, allAssets)
 
   def commonClassLoader(classpath: Classpath) = {
@@ -137,9 +133,8 @@ object Reloader {
    * @return A closeable that can be closed to stop the server
    */
   def startDevMode(runHooks: Seq[RunHook], javaOptions: Seq[String],
-    dependencyClasspath: Classpath, dependencyClassLoader: ClassLoaderCreator,
-    reloadCompile: () => CompileResult, reloaderClassLoader: ClassLoaderCreator,
-    assetsClassLoader: ClassLoader => ClassLoader, commonClassLoader: ClassLoader,
+    commonClassLoader: ClassLoader, dependencyClasspath: Classpath,
+    reloadCompile: () => CompileResult, assetsClassLoader: ClassLoader => ClassLoader,
     monitoredFiles: Seq[File], fileWatchService: FileWatchService,
     generatedSourceHandlers: Map[String, GeneratedSourceMapping],
     defaultHttpPort: Int, defaultHttpAddress: String, projectPath: File,
@@ -207,10 +202,10 @@ object Reloader {
       def get: ClassLoader = { reloader.getClassLoader.orNull }
     })
 
-    lazy val applicationLoader = dependencyClassLoader("PlayDependencyClassLoader", urls(dependencyClasspath), delegatingLoader)
+    lazy val applicationLoader = new NamedURLClassLoader("PlayDependencyClassLoader", urls(dependencyClasspath), delegatingLoader)
     lazy val assetsLoader = assetsClassLoader(applicationLoader)
 
-    lazy val reloader = new Reloader(reloadCompile, reloaderClassLoader, assetsLoader, projectPath, devSettings, monitoredFiles, fileWatchService, generatedSourceHandlers)
+    lazy val reloader = new Reloader(reloadCompile, assetsLoader, projectPath, devSettings, monitoredFiles, fileWatchService, generatedSourceHandlers)
 
     try {
       // Now we're about to start, let's call the hooks:
@@ -271,7 +266,6 @@ import Reloader._
 
 class Reloader(
     reloadCompile: () => CompileResult,
-    createClassLoader: ClassLoaderCreator,
     baseLoader: ClassLoader,
     val projectPath: File,
     devSettings: Seq[(String, String)],
@@ -346,7 +340,7 @@ class Reloader(
                 val version = classLoaderVersion.incrementAndGet
                 val name = "ReloadableClassLoader(v" + version + ")"
                 val urls = Reloader.urls(classpath)
-                val loader = createClassLoader(name, urls, baseLoader)
+                val loader = new DelegatedResourcesClassLoader(name, urls, baseLoader)
                 currentApplicationClassLoader = Some(loader)
                 loader
               } else {

diff --git a/framework/src/sbt-plugin/src/main/scala/play/sbt/PlaySettings.scala b/framework/src/sbt-plugin/src/main/scala/play/sbt/PlaySettings.scala
@@ -125,10 +125,6 @@ object PlaySettings {
 
     playCommonClassloader := PlayCommands.playCommonClassloaderTask.value,
 
-    playDependencyClassLoader := PlayRun.createURLClassLoader,
-
-    playReloaderClassLoader := PlayRun.createDelegatedResourcesClassLoader,
-
     playCompileEverything := PlayCommands.playCompileEverythingTask.value,
 
     playReload := PlayCommands.playReloadTask.value,

diff --git a/framework/src/sbt-plugin/src/main/scala/play/sbt/run/PlayRun.scala b/framework/src/sbt-plugin/src/main/scala/play/sbt/run/PlayRun.scala
@@ -41,15 +41,12 @@ object PlayRun {
    */
   val DocsApplication = config("docs").hide
 
-  val createURLClassLoader: ClassLoaderCreator = Reloader.createURLClassLoader
-  val createDelegatedResourcesClassLoader: ClassLoaderCreator = Reloader.createDelegatedResourcesClassLoader
-
   val twirlSourceHandler = new TwirlSourceMapping()
 
   val generatedSourceHandlers = SbtTwirl.defaultFormats.map{ case (k, v) => ("scala." + k, twirlSourceHandler) }
 
-  val playDefaultRunTask = playRunTask(playRunHooks, playDependencyClasspath, playDependencyClassLoader,
-    playReloaderClasspath, playReloaderClassLoader, playAssetsClassLoader)
+  val playDefaultRunTask = playRunTask(playRunHooks, playDependencyClasspath,
+    playReloaderClasspath, playAssetsClassLoader)
 
   /**
    * This method is public API, used by sbt-echo, which is used by Activator:
@@ -61,8 +58,8 @@ object PlayRun {
    */
   def playRunTask(
     runHooks: TaskKey[Seq[play.sbt.PlayRunHook]],
-    dependencyClasspath: TaskKey[Classpath], dependencyClassLoader: TaskKey[ClassLoaderCreator],
-    reloaderClasspath: TaskKey[Classpath], reloaderClassLoader: TaskKey[ClassLoaderCreator],
+    dependencyClasspath: TaskKey[Classpath],
+    reloaderClasspath: TaskKey[Classpath],
     assetsClassLoader: TaskKey[ClassLoader => ClassLoader]): Def.Initialize[InputTask[Unit]] = Def.inputTask {
 
     val args = Def.spaceDelimited().parsed
@@ -80,12 +77,10 @@ object PlayRun {
     lazy val devModeServer = Reloader.startDevMode(
       runHooks.value,
       (javaOptions in Runtime).value,
+      playCommonClassloader.value,
       dependencyClasspath.value.files,
-      dependencyClassLoader.value,
       reloadCompile,
-      reloaderClassLoader.value,
       assetsClassLoader.value,
-      playCommonClassloader.value,
       playMonitoredFiles.value,
       fileWatchService.value,
       generatedSourceHandlers,