raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #17608 from akka/wip-17606-ActorPath-bin-compat-patriknw

Browse source 
=act #17606 Revert abstract class change of ActorPath
This commit is contained in:
Konrad Malawski 2015-06-01 13:13:37 +02:00
commit 757b277e54
3 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-actor-tests/src/test/java/akka/actor/JavaAPI.java
View file

@ -41,6 +41,8 @@ public class JavaAPI {
final GetRoutees r = GetRoutees.getInstance();
final NoRouter nr = NoRouter.getInstance();
final FromConfig fc = FromConfig.getInstance();
final ActorPath p = ActorPaths.fromString("akka.tcp://Sys@localhost:1234/user/abc");
}
@Test

43
akka-actor/src/main/scala/akka/actor/ActorPath.scala
View file

@ -8,6 +8,47 @@ import akka.japi.Util.immutableSeq
import java.net.MalformedURLException
import java.lang.{ StringBuilder ⇒ JStringBuilder }
/**
* Java API
*/
object ActorPaths {
// static forwarders to `object ActorPath`, since `trait ActorPath`
// could not be changed to `abstract ActorPath` in a binary compatible way
/**
* Parse string as actor path; throws java.net.MalformedURLException if unable to do so.
*/
def fromString(s: String): ActorPath = ActorPath.fromString(s)
/**
* Validates the given actor path element and throws an [[InvalidActorNameException]] if invalid.
* See [[#isValidPathElement]] for a non-throwing version.
*
* @param element actor path element to be validated
*/
final def validatePathElement(element: String): Unit = ActorPath.validatePathElement(element)
/**
* Validates the given actor path element and throws an [[InvalidActorNameException]] if invalid.
* See [[#isValidPathElement]] for a non-throwing version.
*
* @param element actor path element to be validated
* @param fullPath optional fullPath element that may be included for better error messages; null if not given
*/
final def validatePathElement(element: String, fullPath: String): Unit =
ActorPath.validatePathElement(element, fullPath)
/**
* This method is used to validate a path element (Actor Name).
* Since Actors form a tree, it is addressable using an URL, therefore an Actor Name has to conform to:
* <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC-2396</a>.
*
* User defined Actor names may not start from a `$` sign - these are reserved for system names.
*/
final def isValidPathElement(s: String): Boolean = ActorPath.isValidPathElement(s)
}
object ActorPath {
/**
* Parse string as actor path; throws java.net.MalformedURLException if unable to do so.
@ -108,7 +149,7 @@ object ActorPath {
* when comparing actor paths.
*/
@SerialVersionUID(1L)
sealed abstract class ActorPath extends Comparable[ActorPath] with Serializable {
sealed trait ActorPath extends Comparable[ActorPath] with Serializable {
/**
* The Address under which this path can be reached; walks up the tree to
* the RootActorPath.

6
project/MiMa.scala
View file

@ -486,12 +486,6 @@ object MiMa extends AutoPlugin {
ProblemFilters.exclude[MissingMethodProblem]("akka.actor.ActorSystem.terminate"),
ProblemFilters.exclude[MissingMethodProblem]("akka.actor.ActorSystem.whenTerminated"),
ProblemFilters.exclude[MissingMethodProblem]("akka.actor.ExtendedActorSystem.logFilter"),
// the type hierarchy of class akka.actor.ChildActorPath has changed in new version. Missing types {akka.actor.ActorPath}
ProblemFilters.exclude[MissingTypesProblem]("akka.actor.ChildActorPath"),
// the type hierarchy of class akka.actor.RootActorPath has changed in new version. Missing types {akka.actor.ActorPath}
ProblemFilters.exclude[MissingTypesProblem]("akka.actor.RootActorPath"),
// declaration of trait akka.actor.ActorPath has changed to class akka.actor.ActorPath in new version; changing trait to class breaks client code
ProblemFilters.exclude[IncompatibleTemplateDefProblem]("akka.actor.ActorPath"),
ProblemFilters.exclude[MissingMethodProblem]("akka.actor.ActorPath.ValidSymbols"),
ProblemFilters.exclude[MissingMethodProblem]("akka.actor.LocalActorRefProvider.terminationPromise"),
ProblemFilters.exclude[MissingClassProblem]("akka.actor.UntypedActorFactoryConsumer"),