New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add ClassValueCompat
to support systems without java.lang.ClassValue
(such as Android)
#9752
Merged
+112
−56
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* Scala (https://www.scala-lang.org) | ||
* | ||
* Copyright EPFL and Lightbend, Inc. | ||
* | ||
* Licensed under Apache License 2.0 | ||
* (http://www.apache.org/licenses/LICENSE-2.0). | ||
* | ||
* See the NOTICE file distributed with this work for | ||
* additional information regarding copyright ownership. | ||
*/ | ||
|
||
package scala.runtime | ||
|
||
|
||
import scala.runtime.ClassValueCompat._ | ||
|
||
private[scala] abstract class ClassValueCompat[T] extends ClassValueInterface[T] { self => | ||
private val instance: ClassValueInterface[T] = | ||
if (classValueAvailable) new JavaClassValue() | ||
else new FallbackClassValue() | ||
|
||
private class JavaClassValue extends ClassValue[T] with ClassValueInterface[T] { | ||
override def computeValue(cls: Class[_]): T = self.computeValue(cls) | ||
} | ||
|
||
private class FallbackClassValue extends ClassValueInterface[T] { | ||
override def get(cls: Class[_]): T = self.computeValue(cls) | ||
|
||
override def remove(cls: Class[_]): Unit = {} | ||
} | ||
|
||
def get(cls: Class[_]): T = instance.get(cls) | ||
|
||
def remove(cls: Class[_]): Unit = instance.remove(cls) | ||
|
||
protected def computeValue(cls: Class[_]): T | ||
} | ||
|
||
private[scala] object ClassValueCompat { | ||
trait ClassValueInterface[T] { | ||
def get(cls: Class[_]): T | ||
|
||
def remove(cls: Class[_]): Unit | ||
} | ||
|
||
private val classValueAvailable: Boolean = try { | ||
Class.forName("java.lang.ClassValue", false, classOf[Object].getClassLoader) | ||
true | ||
} catch { | ||
case _: ClassNotFoundException => false | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Scala (https://www.scala-lang.org) | ||
* | ||
* Copyright EPFL and Lightbend, Inc. | ||
* | ||
* Licensed under Apache License 2.0 | ||
* (http://www.apache.org/licenses/LICENSE-2.0). | ||
* | ||
* See the NOTICE file distributed with this work for | ||
* additional information regarding copyright ownership. | ||
*/ | ||
|
||
package scala.runtime | ||
|
||
import java.io.Serializable | ||
import java.security.PrivilegedActionException | ||
import java.security.PrivilegedExceptionAction | ||
|
||
private[runtime] object ModuleSerializationProxy { | ||
private val instances = new ClassValueCompat[Object] { | ||
override protected def computeValue(cls: Class[_]): Object = { | ||
try { | ||
java.security.AccessController.doPrivileged((() => cls.getField("MODULE$").get(null)): PrivilegedExceptionAction[Object]) | ||
} catch { | ||
case e: PrivilegedActionException => | ||
rethrowRuntime(e.getCause) | ||
} | ||
} | ||
} | ||
|
||
private def rethrowRuntime(e: Throwable): Object = { | ||
val cause = e.getCause | ||
cause match { | ||
case exception: RuntimeException => throw exception | ||
case _ => throw new RuntimeException(cause) | ||
} | ||
} | ||
} | ||
|
||
@SerialVersionUID(1L) | ||
final class ModuleSerializationProxy(moduleClass: Class[_]) extends Serializable { | ||
private def readResolve = ModuleSerializationProxy.instances.get(moduleClass) | ||
} |
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it in any way be beneficial to make it
lazy val
? 🤔There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think so, the field is only initialized when the enclosing object is first accessed.