Remove unused classloader settings #7288
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
benmccann
force-pushed
the
rm-unused-classloader-settings
branch
from
863f1b4
to
2f29835
Compare
|
So if I'm reading this correctly, the functions have been inlined and the parameters have been removed, but there are no actual changes and no external API that would hook in here. |
wsargent
reviewed
May 2, 2017
| @@ -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) | |||
| @@ -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) | |||
| @@ -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) | |||
| @@ -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) | |||
|
Correct. Just trying to simplify the interface to |
wsargent
approved these changes
May 3, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As far as I can tell these settings have never been used and just add extra complication. These are not present in the Lagom reloader, which is a little cleaner
I also reordered to parameters to
startDevModeto match the ordering in Lagom, which I think was nicer, as it makes it easier for me to follow the logic across the twoAfter this is merged, I have just one or maybe two changes left to the reload functionality and we will then be able to use the same reloader for Play and Lagom. After the cleanup is done it may make sense to have this be a separate project with its own lifecycle