diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala index 800b7b642c..b445c09e1c 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala @@ -292,11 +292,7 @@ class ActorRefSpec extends AkkaSpec { val inetAddress = app.defaultAddress - val expectedSerializedRepresentation = SerializedActorRef( - a.uuid, - a.address, - inetAddress.getAddress.getHostAddress, - inetAddress.getPort) + val expectedSerializedRepresentation = new SerializedActorRef(a.address, inetAddress) import java.io._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala index 9f43c0232f..cb3758081a 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala @@ -6,65 +6,26 @@ package akka.actor import akka.testkit._ import akka.util.duration._ -import akka.testkit.Testing.sleepFor - -import java.util.concurrent.{ TimeUnit, CountDownLatch } - -object LocalActorRefProviderSpec { - - class NewActor extends Actor { - def receive = { - case _ ⇒ {} - } - } -} +import akka.dispatch.Future @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class LocalActorRefProviderSpec extends AkkaSpec { - import akka.actor.LocalActorRefProviderSpec._ - "An LocalActorRefProvider" must { "only create one instance of an actor with a specific address in a concurrent environment" in { val provider = app.provider - for (i ← 0 until 100) { // 100 concurrent runs - val latch = new CountDownLatch(4) + provider.isInstanceOf[LocalActorRefProvider] must be(true) - var a1: Option[ActorRef] = None - var a2: Option[ActorRef] = None - var a3: Option[ActorRef] = None - var a4: Option[ActorRef] = None + implicit val timeout = Timeout(30 seconds) - val address = "new-actor" + i - - spawn { - a1 = Some(provider.actorOf(Props(creator = () ⇒ new NewActor), app.guardian, address)) - latch.countDown() - } - spawn { - a2 = Some(provider.actorOf(Props(creator = () ⇒ new NewActor), app.guardian, address)) - latch.countDown() - } - spawn { - a3 = Some(provider.actorOf(Props(creator = () ⇒ new NewActor), app.guardian, address)) - latch.countDown() - } - spawn { - a4 = Some(provider.actorOf(Props(creator = () ⇒ new NewActor), app.guardian, address)) - latch.countDown() + val actors: Seq[Future[ActorRef]] = + (0 until 100) flatMap { i ⇒ // 100 concurrent runs + val address = "new-actor" + i + (1 to 4) map { _ ⇒ Future { provider.actorOf(Props(c ⇒ { case _ ⇒ }), app.guardian, address) } } } - latch.await(5, TimeUnit.SECONDS) must be === true - - a1.isDefined must be(true) - a2.isDefined must be(true) - a3.isDefined must be(true) - a4.isDefined must be(true) - (a1 == a2) must be(true) - (a1 == a3) must be(true) - (a1 == a4) must be(true) - } + actors.map(_.get).distinct.size must be(100) } } } diff --git a/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala index b871a1c087..604032e978 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala @@ -234,7 +234,7 @@ class ActorPoolSpec extends AkkaSpec { def instance(p: Props): ActorRef = actorOf(p.withCreator(new Actor { def receive = { case _ ⇒ - delegates put (self.uuid.toString, "") + delegates put (self.address, "") latch1.countDown() } })) @@ -262,7 +262,7 @@ class ActorPoolSpec extends AkkaSpec { def instance(p: Props) = actorOf(p.withCreator(new Actor { def receive = { case _ ⇒ - delegates put (self.uuid.toString, "") + delegates put (self.address, "") latch2.countDown() } })) diff --git a/akka-actor/src/main/scala/akka/AkkaApplication.scala b/akka-actor/src/main/scala/akka/AkkaApplication.scala index cd74495a5a..3e7ac72cda 100644 --- a/akka-actor/src/main/scala/akka/AkkaApplication.scala +++ b/akka-actor/src/main/scala/akka/AkkaApplication.scala @@ -146,17 +146,17 @@ class AkkaApplication(val name: String, val config: Configuration) extends Actor case value ⇒ value } - val hostname: String = System.getProperty("akka.remote.hostname") match { - case null | "" ⇒ InetAddress.getLocalHost.getHostName + val defaultAddress = new InetSocketAddress(System.getProperty("akka.remote.hostname") match { + case null | "" ⇒ InetAddress.getLocalHost.getHostAddress case value ⇒ value - } - - val port: Int = System.getProperty("akka.remote.port") match { + }, System.getProperty("akka.remote.port") match { case null | "" ⇒ AkkaConfig.RemoteServerPort case value ⇒ value.toInt - } + }) - val defaultAddress = new InetSocketAddress(hostname, port) + def hostname: String = defaultAddress.getAddress.getHostAddress + + def port: Int = defaultAddress.getPort // TODO correctly pull its config from the config val dispatcherFactory = new Dispatchers(this) diff --git a/akka-actor/src/main/scala/akka/AkkaException.scala b/akka-actor/src/main/scala/akka/AkkaException.scala index 4ef880d29f..0dc3a81728 100644 --- a/akka-actor/src/main/scala/akka/AkkaException.scala +++ b/akka-actor/src/main/scala/akka/AkkaException.scala @@ -39,7 +39,7 @@ class AkkaException(message: String = "", cause: Throwable = null) extends Runti object AkkaException { val hostname = try { - InetAddress.getLocalHost.getHostName + InetAddress.getLocalHost.getHostAddress } catch { case e: UnknownHostException ⇒ "unknown" } diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala index 7a9cf75d1c..fe8a8cec5f 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala @@ -10,7 +10,6 @@ import scala.annotation.tailrec import scala.collection.immutable.{ Stack, TreeMap } import scala.collection.JavaConverters import java.util.concurrent.{ ScheduledFuture, TimeUnit } -import java.util.{ Collection ⇒ JCollection, Collections ⇒ JCollections } import akka.AkkaApplication /** @@ -82,8 +81,6 @@ private[akka] class ActorCell( var actor: Actor = _ - def uuid: Uuid = self.uuid - @inline final def dispatcher: MessageDispatcher = if (props.dispatcher == Props.defaultDispatcher) app.dispatcher else props.dispatcher @@ -363,12 +360,4 @@ private[akka] class ActorCell( if (a ne null) lookupAndSetSelfFields(a.getClass, a, newContext) } - - override final def hashCode: Int = HashCode.hash(HashCode.SEED, uuid) - - override final def equals(that: Any): Boolean = { - that.isInstanceOf[ActorCell] && that.asInstanceOf[ActorCell].uuid == uuid - } - - override final def toString = "ActorCell[%s]".format(uuid) } diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index 4ea551cce1..8ac11ffbae 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -12,6 +12,7 @@ import akka.AkkaApplication import akka.event.ActorEventBus import akka.serialization.Serialization import akka.actor.DeadLetterActorRef.SerializedDeadLetterActorRef +import java.net.InetSocketAddress /** * ActorRef is an immutable and serializable handle to an Actor. @@ -276,18 +277,17 @@ trait ScalaActorRef { ref: ActorRef ⇒ protected[akka] def postMessageToMailbox(message: Any, sender: ActorRef): Unit protected[akka] def restart(cause: Throwable): Unit - - private[akka] def uuid: Uuid //TODO FIXME REMOVE THIS } /** * Memento pattern for serializing ActorRefs transparently */ -case class SerializedActorRef(uuid: Uuid, address: String, hostname: String, port: Int) { - +case class SerializedActorRef(address: String, hostname: String, port: Int) { import akka.serialization.Serialization.app + def this(address: String, inet: InetSocketAddress) = this(address, inet.getAddress.getHostAddress, inet.getPort) + @throws(classOf[java.io.ObjectStreamException]) def readResolve(): AnyRef = { if (app.value eq null) throw new IllegalStateException( @@ -366,7 +366,8 @@ class DeadLetterActorRef(val app: AkkaApplication) extends MinimalActorRef { override def isShutdown(): Boolean = true - protected[akka] override def postMessageToMailbox(message: Any, sender: ActorRef): Unit = app.eventHandler.notify(DeadLetter(message, sender)) + protected[akka] override def postMessageToMailbox(message: Any, sender: ActorRef): Unit = + app.eventHandler.notify(DeadLetter(message, sender)) def ?(message: Any)(implicit timeout: Timeout): Future[Any] = { app.eventHandler.notify(DeadLetter(message, this)) diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala index 0d72f9fd09..5c05fd867b 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala @@ -31,7 +31,7 @@ trait ActorRefProvider { private[akka] def deserialize(actor: SerializedActorRef): Option[ActorRef] - private[akka] def serialize(actor: ActorRef): AnyRef + private[akka] def serialize(actor: ActorRef): SerializedActorRef private[akka] def createDeathWatch(): DeathWatch @@ -177,7 +177,7 @@ class LocalActorRefProvider(val app: AkkaApplication) extends ActorRefProvider { actorOf(RoutedProps(routerFactory = routerFactory, connectionManager = new LocalConnectionManager(connections)), supervisor, address) - case _ ⇒ throw new Exception("Don't know how to create this actor ref! Why?") + case unknown ⇒ throw new Exception("Don't know how to create this actor ref! Why? Got: " + unknown) } } catch { case e: Exception ⇒ @@ -218,8 +218,7 @@ class LocalActorRefProvider(val app: AkkaApplication) extends ActorRefProvider { } private[akka] def deserialize(actor: SerializedActorRef): Option[ActorRef] = actorFor(actor.address) - private[akka] def serialize(actor: ActorRef): AnyRef = - SerializedActorRef(actor.uuid, actor.address, app.hostname, app.port) + private[akka] def serialize(actor: ActorRef): SerializedActorRef = new SerializedActorRef(actor.address, app.defaultAddress) private[akka] def createDeathWatch(): DeathWatch = new LocalDeathWatch diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/akka/actor/Deployer.scala index 82af1d9c56..bee5027839 100644 --- a/akka-actor/src/main/scala/akka/actor/Deployer.scala +++ b/akka-actor/src/main/scala/akka/actor/Deployer.scala @@ -13,6 +13,7 @@ import akka.actor.DeploymentConfig._ import akka.{ AkkaException, AkkaApplication } import akka.config.{ Configuration, ConfigurationException } import akka.util.Duration +import java.net.InetSocketAddress trait ActorDeployer { private[akka] def init(deployments: Seq[Deploy]): Unit @@ -248,7 +249,8 @@ class Deployer(val app: AkkaApplication) extends ActorDeployer { case e: Exception ⇒ raiseRemoteNodeParsingError() } if (port == 0) raiseRemoteNodeParsingError() - RemoteAddress(hostname, port) + val inet = new InetSocketAddress(hostname, port) //FIXME switch to non-ip-tied + RemoteAddress(Option(inet.getAddress).map(_.getHostAddress).getOrElse(hostname), inet.getPort) } } diff --git a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala index 93e7c99e7b..133795cb4d 100644 --- a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala @@ -37,7 +37,7 @@ class BalancingDispatcher( _timeoutMs: Long) extends Dispatcher(_app, _name, throughput, throughputDeadlineTime, mailboxType, config, _timeoutMs) { - private val buddies = new ConcurrentSkipListSet[ActorCell](new Comparator[ActorCell] { def compare(a: ActorCell, b: ActorCell) = a.uuid.compareTo(b.uuid) }) //new ConcurrentLinkedQueue[ActorCell]() + private val buddies = new ConcurrentSkipListSet[ActorCell](new Comparator[ActorCell] { def compare(a: ActorCell, b: ActorCell) = System.identityHashCode(a) - System.identityHashCode(b) }) //new ConcurrentLinkedQueue[ActorCell]() protected val messageQueue: MessageQueue = mailboxType match { case u: UnboundedMailbox ⇒ new QueueBasedMessageQueue with UnboundedMessageQueueSemantics { diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala index f8141925fe..2f9f5b44f4 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala @@ -61,7 +61,7 @@ class Dispatchers(val app: AkkaApplication) { */ def newPinnedDispatcher(actor: LocalActorRef) = actor match { case null ⇒ new PinnedDispatcher(app, null, "anon", MailboxType, DispatcherShutdownMillis) - case some ⇒ new PinnedDispatcher(app, some.underlying, some.underlying.uuid.toString, MailboxType, DispatcherShutdownMillis) + case some ⇒ new PinnedDispatcher(app, some.underlying, some.address, MailboxType, DispatcherShutdownMillis) } /** @@ -72,7 +72,7 @@ class Dispatchers(val app: AkkaApplication) { */ def newPinnedDispatcher(actor: LocalActorRef, mailboxType: MailboxType) = actor match { case null ⇒ new PinnedDispatcher(app, null, "anon", mailboxType, DispatcherShutdownMillis) - case some ⇒ new PinnedDispatcher(app, some.underlying, some.underlying.uuid.toString, mailboxType, DispatcherShutdownMillis) + case some ⇒ new PinnedDispatcher(app, some.underlying, some.address, mailboxType, DispatcherShutdownMillis) } /** diff --git a/akka-actor/src/main/scala/akka/remote/RemoteInterface.scala b/akka-actor/src/main/scala/akka/remote/RemoteInterface.scala index c0e4a3a730..e32421e989 100644 --- a/akka-actor/src/main/scala/akka/remote/RemoteInterface.scala +++ b/akka-actor/src/main/scala/akka/remote/RemoteInterface.scala @@ -23,31 +23,10 @@ class RemoteException(message: String) extends AkkaException(message) trait RemoteService { def server: RemoteSupport - def address: InetSocketAddress } trait RemoteModule { - val UUID_PREFIX = "uuid:".intern - - def optimizeLocalScoped_?(): Boolean //Apply optimizations for remote operations in local scope protected[akka] def notifyListeners(message: ⇒ Any): Unit - - private[akka] def actors: ConcurrentHashMap[String, ActorRef] // FIXME need to invalidate this cache on replication - private[akka] def actorsByUuid: ConcurrentHashMap[String, ActorRef] // FIXME remove actorsByUuid map? - private[akka] def actorsFactories: ConcurrentHashMap[String, () ⇒ ActorRef] // FIXME what to do wit actorsFactories map? - - private[akka] def findActorByAddress(address: String): ActorRef = actors.get(address) - - private[akka] def findActorByUuid(uuid: String): ActorRef = actorsByUuid.get(uuid) - - private[akka] def findActorFactory(address: String): () ⇒ ActorRef = actorsFactories.get(address) - - private[akka] def findActorByAddressOrUuid(address: String, uuid: String): ActorRef = { - var actorRefOrNull = if (address.startsWith(UUID_PREFIX)) findActorByUuid(address.substring(UUID_PREFIX.length)) - else findActorByAddress(address) - if (actorRefOrNull eq null) actorRefOrNull = findActorByUuid(uuid) - actorRefOrNull - } } /** @@ -145,20 +124,9 @@ abstract class RemoteSupport(val app: AkkaApplication) extends RemoteServerModul def shutdown() { this.shutdownClientModule() this.shutdownServerModule() - clear } protected[akka] override def notifyListeners(message: ⇒ Any): Unit = app.eventHandler.notify(message) - - private[akka] val actors = new ConcurrentHashMap[String, ActorRef] - private[akka] val actorsByUuid = new ConcurrentHashMap[String, ActorRef] - private[akka] val actorsFactories = new ConcurrentHashMap[String, () ⇒ ActorRef] - - def clear { - actors.clear - actorsByUuid.clear - actorsFactories.clear - } } /** @@ -177,39 +145,6 @@ trait RemoteServerModule extends RemoteModule { this: RemoteSupport ⇒ */ def name: String - /** - * Gets the address of the server instance - */ - def address: InetSocketAddress - - /** - * Starts the server up - */ - def start(): RemoteServerModule = - start(app.defaultAddress.getAddress.getHostAddress, - app.defaultAddress.getPort, - None) - - /** - * Starts the server up - */ - def start(loader: ClassLoader): RemoteServerModule = - start(app.defaultAddress.getAddress.getHostAddress, - app.defaultAddress.getPort, - Option(loader)) - - /** - * Starts the server up - */ - def start(host: String, port: Int): RemoteServerModule = - start(host, port, None) - - /** - * Starts the server up - */ - def start(host: String, port: Int, loader: ClassLoader): RemoteServerModule = - start(host, port, Option(loader)) - /** * Starts the server up */ @@ -219,68 +154,9 @@ trait RemoteServerModule extends RemoteModule { this: RemoteSupport ⇒ * Shuts the server down */ def shutdownServerModule(): Unit - - /** - * Register Remote Actor by the Actor's 'id' field. It starts the Actor if it is not started already. - */ - def register(actorRef: ActorRef): Unit = register(actorRef.address, actorRef) - - /** - * Register Remote Actor by the Actor's uuid field. It starts the Actor if it is not started already. - */ - def registerByUuid(actorRef: ActorRef): Unit - - /** - * Register Remote Actor by a specific 'id' passed as argument. The actor is registered by UUID rather than ID - * when prefixing the handle with the “uuid:” protocol. - *

- * NOTE: If you use this method to register your remote actor then you must unregister the actor by this ID yourself. - */ - def register(address: String, actorRef: ActorRef): Unit - - /** - * Register Remote Session Actor by a specific 'id' passed as argument. - *

- * NOTE: If you use this method to register your remote actor then you must unregister the actor by this ID yourself. - */ - def registerPerSession(address: String, factory: ⇒ ActorRef): Unit - - /** - * Register Remote Session Actor by a specific 'id' passed as argument. - *

- * NOTE: If you use this method to register your remote actor then you must unregister the actor by this ID yourself. - * Java API - */ - def registerPerSession(address: String, factory: Creator[ActorRef]): Unit = registerPerSession(address, factory.create) - - /** - * Unregister Remote Actor that is registered using its 'id' field (not custom ID). - */ - def unregister(actorRef: ActorRef): Unit - - /** - * Unregister Remote Actor by specific 'id'. - *

- * NOTE: You need to call this method if you have registered an actor by a custom ID. - */ - def unregister(address: String): Unit - - /** - * Unregister Remote Actor by specific 'id'. - *

- * NOTE: You need to call this method if you have registered an actor by a custom ID. - */ - def unregisterPerSession(address: String): Unit } trait RemoteClientModule extends RemoteModule { self: RemoteSupport ⇒ - - def actorFor(address: String, hostname: String, port: Int): ActorRef = - actorFor(address, hostname, port, None) - - def actorFor(address: String, hostname: String, port: Int, loader: ClassLoader): ActorRef = - actorFor(address, hostname, port, Some(loader)) - /** * Clean-up all open connections. */ @@ -298,11 +174,9 @@ trait RemoteClientModule extends RemoteModule { self: RemoteSupport ⇒ /** Methods that needs to be implemented by a transport **/ - protected[akka] def actorFor(address: String, hostname: String, port: Int, loader: Option[ClassLoader]): ActorRef - protected[akka] def send[T](message: Any, senderOption: Option[ActorRef], remoteAddress: InetSocketAddress, - actorRef: ActorRef, + recipient: ActorRef, loader: Option[ClassLoader]): Unit } diff --git a/akka-camel-typed/src/main/scala/akka/camel/TypedConsumerPublisher.scala b/akka-camel-typed/src/main/scala/akka/camel/TypedConsumerPublisher.scala index c530ded991..850cbd640b 100644 --- a/akka-camel-typed/src/main/scala/akka/camel/TypedConsumerPublisher.scala +++ b/akka-camel-typed/src/main/scala/akka/camel/TypedConsumerPublisher.scala @@ -88,7 +88,6 @@ private[camel] trait ConsumerMethodEvent extends ConsumerEvent { val typedActor: AnyRef val method: Method - val uuid = actorRef.uuid.toString val methodName = method.getName val methodUuid = "%s_%s" format (uuid, methodName) diff --git a/akka-remote/src/main/java/akka/remote/RemoteProtocol.java b/akka-remote/src/main/java/akka/remote/RemoteProtocol.java index 83b8e31da6..dec400def6 100644 --- a/akka-remote/src/main/java/akka/remote/RemoteProtocol.java +++ b/akka-remote/src/main/java/akka/remote/RemoteProtocol.java @@ -13,13 +13,13 @@ public final class RemoteProtocol { CONNECT(0, 1), SHUTDOWN(1, 2), ; - + public static final int CONNECT_VALUE = 1; public static final int SHUTDOWN_VALUE = 2; - - + + public final int getNumber() { return value; } - + public static CommandType valueOf(int value) { switch (value) { case 1: return CONNECT; @@ -27,7 +27,7 @@ public final class RemoteProtocol { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -39,7 +39,7 @@ public final class RemoteProtocol { return CommandType.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -52,11 +52,11 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.getDescriptor().getEnumTypes().get(0); } - + private static final CommandType[] VALUES = { - CONNECT, SHUTDOWN, + CONNECT, SHUTDOWN, }; - + public static CommandType valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -65,32 +65,32 @@ public final class RemoteProtocol { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private CommandType(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:CommandType) } - + public enum ReplicationStorageType implements com.google.protobuf.ProtocolMessageEnum { TRANSIENT(0, 1), TRANSACTION_LOG(1, 2), DATA_GRID(2, 3), ; - + public static final int TRANSIENT_VALUE = 1; public static final int TRANSACTION_LOG_VALUE = 2; public static final int DATA_GRID_VALUE = 3; - - + + public final int getNumber() { return value; } - + public static ReplicationStorageType valueOf(int value) { switch (value) { case 1: return TRANSIENT; @@ -99,7 +99,7 @@ public final class RemoteProtocol { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -111,7 +111,7 @@ public final class RemoteProtocol { return ReplicationStorageType.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -124,11 +124,11 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.getDescriptor().getEnumTypes().get(1); } - + private static final ReplicationStorageType[] VALUES = { - TRANSIENT, TRANSACTION_LOG, DATA_GRID, + TRANSIENT, TRANSACTION_LOG, DATA_GRID, }; - + public static ReplicationStorageType valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -137,30 +137,30 @@ public final class RemoteProtocol { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private ReplicationStorageType(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:ReplicationStorageType) } - + public enum ReplicationStrategyType implements com.google.protobuf.ProtocolMessageEnum { WRITE_THROUGH(0, 1), WRITE_BEHIND(1, 2), ; - + public static final int WRITE_THROUGH_VALUE = 1; public static final int WRITE_BEHIND_VALUE = 2; - - + + public final int getNumber() { return value; } - + public static ReplicationStrategyType valueOf(int value) { switch (value) { case 1: return WRITE_THROUGH; @@ -168,7 +168,7 @@ public final class RemoteProtocol { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -180,7 +180,7 @@ public final class RemoteProtocol { return ReplicationStrategyType.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -193,11 +193,11 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.getDescriptor().getEnumTypes().get(2); } - + private static final ReplicationStrategyType[] VALUES = { - WRITE_THROUGH, WRITE_BEHIND, + WRITE_THROUGH, WRITE_BEHIND, }; - + public static ReplicationStrategyType valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -206,59 +206,86 @@ public final class RemoteProtocol { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private ReplicationStrategyType(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:ReplicationStrategyType) } - - public enum SerializationSchemeType + + public enum RemoteSystemDaemonMessageType implements com.google.protobuf.ProtocolMessageEnum { - JAVA(0, 1), - SBINARY(1, 2), - SCALA_JSON(2, 3), - JAVA_JSON(3, 4), - PROTOBUF(4, 5), + STOP(0, 1), + USE(1, 2), + RELEASE(2, 3), + MAKE_AVAILABLE(3, 4), + MAKE_UNAVAILABLE(4, 5), + DISCONNECT(5, 6), + RECONNECT(6, 7), + RESIGN(7, 8), + GOSSIP(8, 9), + FAIL_OVER_CONNECTIONS(9, 20), + FUNCTION_FUN0_UNIT(10, 21), + FUNCTION_FUN0_ANY(11, 22), + FUNCTION_FUN1_ARG_UNIT(12, 23), + FUNCTION_FUN1_ARG_ANY(13, 24), ; - - public static final int JAVA_VALUE = 1; - public static final int SBINARY_VALUE = 2; - public static final int SCALA_JSON_VALUE = 3; - public static final int JAVA_JSON_VALUE = 4; - public static final int PROTOBUF_VALUE = 5; - - + + public static final int STOP_VALUE = 1; + public static final int USE_VALUE = 2; + public static final int RELEASE_VALUE = 3; + public static final int MAKE_AVAILABLE_VALUE = 4; + public static final int MAKE_UNAVAILABLE_VALUE = 5; + public static final int DISCONNECT_VALUE = 6; + public static final int RECONNECT_VALUE = 7; + public static final int RESIGN_VALUE = 8; + public static final int GOSSIP_VALUE = 9; + public static final int FAIL_OVER_CONNECTIONS_VALUE = 20; + public static final int FUNCTION_FUN0_UNIT_VALUE = 21; + public static final int FUNCTION_FUN0_ANY_VALUE = 22; + public static final int FUNCTION_FUN1_ARG_UNIT_VALUE = 23; + public static final int FUNCTION_FUN1_ARG_ANY_VALUE = 24; + + public final int getNumber() { return value; } - - public static SerializationSchemeType valueOf(int value) { + + public static RemoteSystemDaemonMessageType valueOf(int value) { switch (value) { - case 1: return JAVA; - case 2: return SBINARY; - case 3: return SCALA_JSON; - case 4: return JAVA_JSON; - case 5: return PROTOBUF; + case 1: return STOP; + case 2: return USE; + case 3: return RELEASE; + case 4: return MAKE_AVAILABLE; + case 5: return MAKE_UNAVAILABLE; + case 6: return DISCONNECT; + case 7: return RECONNECT; + case 8: return RESIGN; + case 9: return GOSSIP; + case 20: return FAIL_OVER_CONNECTIONS; + case 21: return FUNCTION_FUN0_UNIT; + case 22: return FUNCTION_FUN0_ANY; + case 23: return FUNCTION_FUN1_ARG_UNIT; + case 24: return FUNCTION_FUN1_ARG_ANY; default: return null; } } - - public static com.google.protobuf.Internal.EnumLiteMap + + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; } - private static com.google.protobuf.Internal.EnumLiteMap + private static com.google.protobuf.Internal.EnumLiteMap internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public SerializationSchemeType findValueByNumber(int number) { - return SerializationSchemeType.valueOf(number); + new com.google.protobuf.Internal.EnumLiteMap() { + public RemoteSystemDaemonMessageType findValueByNumber(int number) { + return RemoteSystemDaemonMessageType.valueOf(number); } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -271,188 +298,11 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.getDescriptor().getEnumTypes().get(3); } - - private static final SerializationSchemeType[] VALUES = { - JAVA, SBINARY, SCALA_JSON, JAVA_JSON, PROTOBUF, - }; - - public static SerializationSchemeType valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private SerializationSchemeType(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:SerializationSchemeType) - } - - public enum LifeCycleType - implements com.google.protobuf.ProtocolMessageEnum { - PERMANENT(0, 1), - TEMPORARY(1, 2), - ; - - public static final int PERMANENT_VALUE = 1; - public static final int TEMPORARY_VALUE = 2; - - - public final int getNumber() { return value; } - - public static LifeCycleType valueOf(int value) { - switch (value) { - case 1: return PERMANENT; - case 2: return TEMPORARY; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public LifeCycleType findValueByNumber(int number) { - return LifeCycleType.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return akka.remote.RemoteProtocol.getDescriptor().getEnumTypes().get(4); - } - - private static final LifeCycleType[] VALUES = { - PERMANENT, TEMPORARY, - }; - - public static LifeCycleType valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private LifeCycleType(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:LifeCycleType) - } - - public enum RemoteSystemDaemonMessageType - implements com.google.protobuf.ProtocolMessageEnum { - STOP(0, 1), - USE(1, 2), - RELEASE(2, 3), - MAKE_AVAILABLE(3, 4), - MAKE_UNAVAILABLE(4, 5), - DISCONNECT(5, 6), - RECONNECT(6, 7), - RESIGN(7, 8), - GOSSIP(8, 9), - GOSSIP_ACK(9, 10), - FAIL_OVER_CONNECTIONS(10, 20), - FUNCTION_FUN0_UNIT(11, 21), - FUNCTION_FUN0_ANY(12, 22), - FUNCTION_FUN1_ARG_UNIT(13, 23), - FUNCTION_FUN1_ARG_ANY(14, 24), - ; - - public static final int STOP_VALUE = 1; - public static final int USE_VALUE = 2; - public static final int RELEASE_VALUE = 3; - public static final int MAKE_AVAILABLE_VALUE = 4; - public static final int MAKE_UNAVAILABLE_VALUE = 5; - public static final int DISCONNECT_VALUE = 6; - public static final int RECONNECT_VALUE = 7; - public static final int RESIGN_VALUE = 8; - public static final int GOSSIP_VALUE = 9; - public static final int GOSSIP_ACK_VALUE = 10; - public static final int FAIL_OVER_CONNECTIONS_VALUE = 20; - public static final int FUNCTION_FUN0_UNIT_VALUE = 21; - public static final int FUNCTION_FUN0_ANY_VALUE = 22; - public static final int FUNCTION_FUN1_ARG_UNIT_VALUE = 23; - public static final int FUNCTION_FUN1_ARG_ANY_VALUE = 24; - - - public final int getNumber() { return value; } - - public static RemoteSystemDaemonMessageType valueOf(int value) { - switch (value) { - case 1: return STOP; - case 2: return USE; - case 3: return RELEASE; - case 4: return MAKE_AVAILABLE; - case 5: return MAKE_UNAVAILABLE; - case 6: return DISCONNECT; - case 7: return RECONNECT; - case 8: return RESIGN; - case 9: return GOSSIP; - case 10: return GOSSIP_ACK; - case 20: return FAIL_OVER_CONNECTIONS; - case 21: return FUNCTION_FUN0_UNIT; - case 22: return FUNCTION_FUN0_ANY; - case 23: return FUNCTION_FUN1_ARG_UNIT; - case 24: return FUNCTION_FUN1_ARG_ANY; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public RemoteSystemDaemonMessageType findValueByNumber(int number) { - return RemoteSystemDaemonMessageType.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return akka.remote.RemoteProtocol.getDescriptor().getEnumTypes().get(5); - } - + private static final RemoteSystemDaemonMessageType[] VALUES = { - STOP, USE, RELEASE, MAKE_AVAILABLE, MAKE_UNAVAILABLE, DISCONNECT, RECONNECT, RESIGN, GOSSIP, GOSSIP_ACK, FAIL_OVER_CONNECTIONS, FUNCTION_FUN0_UNIT, FUNCTION_FUN0_ANY, FUNCTION_FUN1_ARG_UNIT, FUNCTION_FUN1_ARG_ANY, + STOP, USE, RELEASE, MAKE_AVAILABLE, MAKE_UNAVAILABLE, DISCONNECT, RECONNECT, RESIGN, GOSSIP, FAIL_OVER_CONNECTIONS, FUNCTION_FUN0_UNIT, FUNCTION_FUN0_ANY, FUNCTION_FUN1_ARG_UNIT, FUNCTION_FUN1_ARG_ANY, }; - + public static RemoteSystemDaemonMessageType valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { @@ -461,26 +311,26 @@ public final class RemoteProtocol { } return VALUES[desc.getIndex()]; } - + private final int index; private final int value; - + private RemoteSystemDaemonMessageType(int index, int value) { this.index = index; this.value = value; } - + // @@protoc_insertion_point(enum_scope:RemoteSystemDaemonMessageType) } - + public interface AkkaRemoteProtocolOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional .RemoteMessageProtocol message = 1; boolean hasMessage(); akka.remote.RemoteProtocol.RemoteMessageProtocol getMessage(); akka.remote.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessageOrBuilder(); - + // optional .RemoteControlProtocol instruction = 2; boolean hasInstruction(); akka.remote.RemoteProtocol.RemoteControlProtocol getInstruction(); @@ -494,26 +344,26 @@ public final class RemoteProtocol { super(builder); } private AkkaRemoteProtocol(boolean noInit) {} - + private static final AkkaRemoteProtocol defaultInstance; public static AkkaRemoteProtocol getDefaultInstance() { return defaultInstance; } - + public AkkaRemoteProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.RemoteProtocol.internal_static_AkkaRemoteProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_AkkaRemoteProtocol_fieldAccessorTable; } - + private int bitField0_; // optional .RemoteMessageProtocol message = 1; public static final int MESSAGE_FIELD_NUMBER = 1; @@ -527,7 +377,7 @@ public final class RemoteProtocol { public akka.remote.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessageOrBuilder() { return message_; } - + // optional .RemoteControlProtocol instruction = 2; public static final int INSTRUCTION_FIELD_NUMBER = 2; private akka.remote.RemoteProtocol.RemoteControlProtocol instruction_; @@ -540,7 +390,7 @@ public final class RemoteProtocol { public akka.remote.RemoteProtocol.RemoteControlProtocolOrBuilder getInstructionOrBuilder() { return instruction_; } - + private void initFields() { message_ = akka.remote.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance(); instruction_ = akka.remote.RemoteProtocol.RemoteControlProtocol.getDefaultInstance(); @@ -549,7 +399,7 @@ public final class RemoteProtocol { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (hasMessage()) { if (!getMessage().isInitialized()) { memoizedIsInitialized = 0; @@ -565,7 +415,7 @@ public final class RemoteProtocol { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -577,12 +427,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -596,14 +446,14 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.RemoteProtocol.AkkaRemoteProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -670,14 +520,14 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.RemoteProtocol.AkkaRemoteProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { @@ -691,18 +541,18 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.internal_static_AkkaRemoteProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_AkkaRemoteProtocol_fieldAccessorTable; } - + // Construct using akka.remote.RemoteProtocol.AkkaRemoteProtocol.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -715,7 +565,7 @@ public final class RemoteProtocol { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); if (messageBuilder_ == null) { @@ -732,20 +582,20 @@ public final class RemoteProtocol { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return akka.remote.RemoteProtocol.AkkaRemoteProtocol.getDescriptor(); } - + public akka.remote.RemoteProtocol.AkkaRemoteProtocol getDefaultInstanceForType() { return akka.remote.RemoteProtocol.AkkaRemoteProtocol.getDefaultInstance(); } - + public akka.remote.RemoteProtocol.AkkaRemoteProtocol build() { akka.remote.RemoteProtocol.AkkaRemoteProtocol result = buildPartial(); if (!result.isInitialized()) { @@ -753,7 +603,7 @@ public final class RemoteProtocol { } return result; } - + private akka.remote.RemoteProtocol.AkkaRemoteProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { akka.remote.RemoteProtocol.AkkaRemoteProtocol result = buildPartial(); @@ -763,7 +613,7 @@ public final class RemoteProtocol { } return result; } - + public akka.remote.RemoteProtocol.AkkaRemoteProtocol buildPartial() { akka.remote.RemoteProtocol.AkkaRemoteProtocol result = new akka.remote.RemoteProtocol.AkkaRemoteProtocol(this); int from_bitField0_ = bitField0_; @@ -788,7 +638,7 @@ public final class RemoteProtocol { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.RemoteProtocol.AkkaRemoteProtocol) { return mergeFrom((akka.remote.RemoteProtocol.AkkaRemoteProtocol)other); @@ -797,7 +647,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(akka.remote.RemoteProtocol.AkkaRemoteProtocol other) { if (other == akka.remote.RemoteProtocol.AkkaRemoteProtocol.getDefaultInstance()) return this; if (other.hasMessage()) { @@ -809,23 +659,23 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (hasMessage()) { if (!getMessage().isInitialized()) { - + return false; } } if (hasInstruction()) { if (!getInstruction().isInitialized()) { - + return false; } } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -870,9 +720,9 @@ public final class RemoteProtocol { } } } - + private int bitField0_; - + // optional .RemoteMessageProtocol message = 1; private akka.remote.RemoteProtocol.RemoteMessageProtocol message_ = akka.remote.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< @@ -950,7 +800,7 @@ public final class RemoteProtocol { } } private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.RemoteMessageProtocol, akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.RemoteProtocol.RemoteMessageProtocolOrBuilder> + akka.remote.RemoteProtocol.RemoteMessageProtocol, akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.RemoteProtocol.RemoteMessageProtocolOrBuilder> getMessageFieldBuilder() { if (messageBuilder_ == null) { messageBuilder_ = new com.google.protobuf.SingleFieldBuilder< @@ -962,7 +812,7 @@ public final class RemoteProtocol { } return messageBuilder_; } - + // optional .RemoteControlProtocol instruction = 2; private akka.remote.RemoteProtocol.RemoteControlProtocol instruction_ = akka.remote.RemoteProtocol.RemoteControlProtocol.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< @@ -1040,7 +890,7 @@ public final class RemoteProtocol { } } private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.RemoteControlProtocol, akka.remote.RemoteProtocol.RemoteControlProtocol.Builder, akka.remote.RemoteProtocol.RemoteControlProtocolOrBuilder> + akka.remote.RemoteProtocol.RemoteControlProtocol, akka.remote.RemoteProtocol.RemoteControlProtocol.Builder, akka.remote.RemoteProtocol.RemoteControlProtocolOrBuilder> getInstructionFieldBuilder() { if (instructionBuilder_ == null) { instructionBuilder_ = new com.google.protobuf.SingleFieldBuilder< @@ -1052,61 +902,47 @@ public final class RemoteProtocol { } return instructionBuilder_; } - + // @@protoc_insertion_point(builder_scope:AkkaRemoteProtocol) } - + static { defaultInstance = new AkkaRemoteProtocol(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:AkkaRemoteProtocol) } - + public interface RemoteMessageProtocolOrBuilder extends com.google.protobuf.MessageOrBuilder { - - // required .UuidProtocol uuid = 1; - boolean hasUuid(); - akka.remote.RemoteProtocol.UuidProtocol getUuid(); - akka.remote.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder(); - - // required .ActorInfoProtocol actorInfo = 2; - boolean hasActorInfo(); - akka.remote.RemoteProtocol.ActorInfoProtocol getActorInfo(); - akka.remote.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder(); - - // required bool oneWay = 3; - boolean hasOneWay(); - boolean getOneWay(); - - // optional .MessageProtocol message = 4; + + // required .ActorRefProtocol recipient = 1; + boolean hasRecipient(); + akka.remote.RemoteProtocol.ActorRefProtocol getRecipient(); + akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getRecipientOrBuilder(); + + // optional .MessageProtocol message = 2; boolean hasMessage(); akka.remote.RemoteProtocol.MessageProtocol getMessage(); akka.remote.RemoteProtocol.MessageProtocolOrBuilder getMessageOrBuilder(); - - // optional .ExceptionProtocol exception = 5; + + // optional .ExceptionProtocol exception = 3; boolean hasException(); akka.remote.RemoteProtocol.ExceptionProtocol getException(); akka.remote.RemoteProtocol.ExceptionProtocolOrBuilder getExceptionOrBuilder(); - - // optional .UuidProtocol supervisorUuid = 6; - boolean hasSupervisorUuid(); - akka.remote.RemoteProtocol.UuidProtocol getSupervisorUuid(); - akka.remote.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder(); - - // optional .RemoteActorRefProtocol sender = 7; + + // optional .ActorRefProtocol sender = 4; boolean hasSender(); - akka.remote.RemoteProtocol.RemoteActorRefProtocol getSender(); - akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder(); - - // repeated .MetadataEntryProtocol metadata = 8; - java.util.List + akka.remote.RemoteProtocol.ActorRefProtocol getSender(); + akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getSenderOrBuilder(); + + // repeated .MetadataEntryProtocol metadata = 5; + java.util.List getMetadataList(); akka.remote.RemoteProtocol.MetadataEntryProtocol getMetadata(int index); int getMetadataCount(); - java.util.List + java.util.List getMetadataOrBuilderList(); akka.remote.RemoteProtocol.MetadataEntryProtocolOrBuilder getMetadataOrBuilder( int index); @@ -1119,68 +955,45 @@ public final class RemoteProtocol { super(builder); } private RemoteMessageProtocol(boolean noInit) {} - + private static final RemoteMessageProtocol defaultInstance; public static RemoteMessageProtocol getDefaultInstance() { return defaultInstance; } - + public RemoteMessageProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.RemoteProtocol.internal_static_RemoteMessageProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_RemoteMessageProtocol_fieldAccessorTable; } - + private int bitField0_; - // required .UuidProtocol uuid = 1; - public static final int UUID_FIELD_NUMBER = 1; - private akka.remote.RemoteProtocol.UuidProtocol uuid_; - public boolean hasUuid() { + // required .ActorRefProtocol recipient = 1; + public static final int RECIPIENT_FIELD_NUMBER = 1; + private akka.remote.RemoteProtocol.ActorRefProtocol recipient_; + public boolean hasRecipient() { return ((bitField0_ & 0x00000001) == 0x00000001); } - public akka.remote.RemoteProtocol.UuidProtocol getUuid() { - return uuid_; + public akka.remote.RemoteProtocol.ActorRefProtocol getRecipient() { + return recipient_; } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() { - return uuid_; + public akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getRecipientOrBuilder() { + return recipient_; } - - // required .ActorInfoProtocol actorInfo = 2; - public static final int ACTORINFO_FIELD_NUMBER = 2; - private akka.remote.RemoteProtocol.ActorInfoProtocol actorInfo_; - public boolean hasActorInfo() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - public akka.remote.RemoteProtocol.ActorInfoProtocol getActorInfo() { - return actorInfo_; - } - public akka.remote.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder() { - return actorInfo_; - } - - // required bool oneWay = 3; - public static final int ONEWAY_FIELD_NUMBER = 3; - private boolean oneWay_; - public boolean hasOneWay() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - public boolean getOneWay() { - return oneWay_; - } - - // optional .MessageProtocol message = 4; - public static final int MESSAGE_FIELD_NUMBER = 4; + + // optional .MessageProtocol message = 2; + public static final int MESSAGE_FIELD_NUMBER = 2; private akka.remote.RemoteProtocol.MessageProtocol message_; public boolean hasMessage() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000002) == 0x00000002); } public akka.remote.RemoteProtocol.MessageProtocol getMessage() { return message_; @@ -1188,12 +1001,12 @@ public final class RemoteProtocol { public akka.remote.RemoteProtocol.MessageProtocolOrBuilder getMessageOrBuilder() { return message_; } - - // optional .ExceptionProtocol exception = 5; - public static final int EXCEPTION_FIELD_NUMBER = 5; + + // optional .ExceptionProtocol exception = 3; + public static final int EXCEPTION_FIELD_NUMBER = 3; private akka.remote.RemoteProtocol.ExceptionProtocol exception_; public boolean hasException() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000004) == 0x00000004); } public akka.remote.RemoteProtocol.ExceptionProtocol getException() { return exception_; @@ -1201,40 +1014,27 @@ public final class RemoteProtocol { public akka.remote.RemoteProtocol.ExceptionProtocolOrBuilder getExceptionOrBuilder() { return exception_; } - - // optional .UuidProtocol supervisorUuid = 6; - public static final int SUPERVISORUUID_FIELD_NUMBER = 6; - private akka.remote.RemoteProtocol.UuidProtocol supervisorUuid_; - public boolean hasSupervisorUuid() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - public akka.remote.RemoteProtocol.UuidProtocol getSupervisorUuid() { - return supervisorUuid_; - } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder() { - return supervisorUuid_; - } - - // optional .RemoteActorRefProtocol sender = 7; - public static final int SENDER_FIELD_NUMBER = 7; - private akka.remote.RemoteProtocol.RemoteActorRefProtocol sender_; + + // optional .ActorRefProtocol sender = 4; + public static final int SENDER_FIELD_NUMBER = 4; + private akka.remote.RemoteProtocol.ActorRefProtocol sender_; public boolean hasSender() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000008) == 0x00000008); } - public akka.remote.RemoteProtocol.RemoteActorRefProtocol getSender() { + public akka.remote.RemoteProtocol.ActorRefProtocol getSender() { return sender_; } - public akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder() { + public akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getSenderOrBuilder() { return sender_; } - - // repeated .MetadataEntryProtocol metadata = 8; - public static final int METADATA_FIELD_NUMBER = 8; + + // repeated .MetadataEntryProtocol metadata = 5; + public static final int METADATA_FIELD_NUMBER = 5; private java.util.List metadata_; public java.util.List getMetadataList() { return metadata_; } - public java.util.List + public java.util.List getMetadataOrBuilderList() { return metadata_; } @@ -1248,39 +1048,24 @@ public final class RemoteProtocol { int index) { return metadata_.get(index); } - + private void initFields() { - uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - actorInfo_ = akka.remote.RemoteProtocol.ActorInfoProtocol.getDefaultInstance(); - oneWay_ = false; + recipient_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); message_ = akka.remote.RemoteProtocol.MessageProtocol.getDefaultInstance(); exception_ = akka.remote.RemoteProtocol.ExceptionProtocol.getDefaultInstance(); - supervisorUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - sender_ = akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); + sender_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); metadata_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - - if (!hasUuid()) { + + if (!hasRecipient()) { memoizedIsInitialized = 0; return false; } - if (!hasActorInfo()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasOneWay()) { - memoizedIsInitialized = 0; - return false; - } - if (!getUuid().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - if (!getActorInfo().isInitialized()) { + if (!getRecipient().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -1296,12 +1081,6 @@ public final class RemoteProtocol { return false; } } - if (hasSupervisorUuid()) { - if (!getSupervisorUuid().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } if (hasSender()) { if (!getSender().isInitialized()) { memoizedIsInitialized = 0; @@ -1317,87 +1096,66 @@ public final class RemoteProtocol { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, uuid_); + output.writeMessage(1, recipient_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, actorInfo_); + output.writeMessage(2, message_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBool(3, oneWay_); + output.writeMessage(3, exception_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeMessage(4, message_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeMessage(5, exception_); - } - if (((bitField0_ & 0x00000020) == 0x00000020)) { - output.writeMessage(6, supervisorUuid_); - } - if (((bitField0_ & 0x00000040) == 0x00000040)) { - output.writeMessage(7, sender_); + output.writeMessage(4, sender_); } for (int i = 0; i < metadata_.size(); i++) { - output.writeMessage(8, metadata_.get(i)); + output.writeMessage(5, metadata_.get(i)); } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, uuid_); + .computeMessageSize(1, recipient_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, actorInfo_); + .computeMessageSize(2, message_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, oneWay_); + .computeMessageSize(3, exception_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, message_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, exception_); - } - if (((bitField0_ & 0x00000020) == 0x00000020)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, supervisorUuid_); - } - if (((bitField0_ & 0x00000040) == 0x00000040)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, sender_); + .computeMessageSize(4, sender_); } for (int i = 0; i < metadata_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, metadata_.get(i)); + .computeMessageSize(5, metadata_.get(i)); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.RemoteProtocol.RemoteMessageProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -1464,14 +1222,14 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.RemoteProtocol.RemoteMessageProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { @@ -1485,28 +1243,26 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.internal_static_RemoteMessageProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_RemoteMessageProtocol_fieldAccessorTable; } - + // Construct using akka.remote.RemoteProtocol.RemoteMessageProtocol.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getUuidFieldBuilder(); - getActorInfoFieldBuilder(); + getRecipientFieldBuilder(); getMessageFieldBuilder(); getExceptionFieldBuilder(); - getSupervisorUuidFieldBuilder(); getSenderFieldBuilder(); getMetadataFieldBuilder(); } @@ -1514,69 +1270,55 @@ public final class RemoteProtocol { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); - if (uuidBuilder_ == null) { - uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); + if (recipientBuilder_ == null) { + recipient_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); } else { - uuidBuilder_.clear(); + recipientBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - if (actorInfoBuilder_ == null) { - actorInfo_ = akka.remote.RemoteProtocol.ActorInfoProtocol.getDefaultInstance(); - } else { - actorInfoBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - oneWay_ = false; - bitField0_ = (bitField0_ & ~0x00000004); if (messageBuilder_ == null) { message_ = akka.remote.RemoteProtocol.MessageProtocol.getDefaultInstance(); } else { messageBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000002); if (exceptionBuilder_ == null) { exception_ = akka.remote.RemoteProtocol.ExceptionProtocol.getDefaultInstance(); } else { exceptionBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000010); - if (supervisorUuidBuilder_ == null) { - supervisorUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - } else { - supervisorUuidBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000004); if (senderBuilder_ == null) { - sender_ = akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); + sender_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); } else { senderBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000008); if (metadataBuilder_ == null) { metadata_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000010); } else { metadataBuilder_.clear(); } return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return akka.remote.RemoteProtocol.RemoteMessageProtocol.getDescriptor(); } - + public akka.remote.RemoteProtocol.RemoteMessageProtocol getDefaultInstanceForType() { return akka.remote.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance(); } - + public akka.remote.RemoteProtocol.RemoteMessageProtocol build() { akka.remote.RemoteProtocol.RemoteMessageProtocol result = buildPartial(); if (!result.isInitialized()) { @@ -1584,7 +1326,7 @@ public final class RemoteProtocol { } return result; } - + private akka.remote.RemoteProtocol.RemoteMessageProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { akka.remote.RemoteProtocol.RemoteMessageProtocol result = buildPartial(); @@ -1594,7 +1336,7 @@ public final class RemoteProtocol { } return result; } - + public akka.remote.RemoteProtocol.RemoteMessageProtocol buildPartial() { akka.remote.RemoteProtocol.RemoteMessageProtocol result = new akka.remote.RemoteProtocol.RemoteMessageProtocol(this); int from_bitField0_ = bitField0_; @@ -1602,49 +1344,29 @@ public final class RemoteProtocol { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - if (uuidBuilder_ == null) { - result.uuid_ = uuid_; + if (recipientBuilder_ == null) { + result.recipient_ = recipient_; } else { - result.uuid_ = uuidBuilder_.build(); + result.recipient_ = recipientBuilder_.build(); } if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - if (actorInfoBuilder_ == null) { - result.actorInfo_ = actorInfo_; - } else { - result.actorInfo_ = actorInfoBuilder_.build(); - } - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.oneWay_ = oneWay_; - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; - } if (messageBuilder_ == null) { result.message_ = message_; } else { result.message_ = messageBuilder_.build(); } - if (((from_bitField0_ & 0x00000010) == 0x00000010)) { - to_bitField0_ |= 0x00000010; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; } if (exceptionBuilder_ == null) { result.exception_ = exception_; } else { result.exception_ = exceptionBuilder_.build(); } - if (((from_bitField0_ & 0x00000020) == 0x00000020)) { - to_bitField0_ |= 0x00000020; - } - if (supervisorUuidBuilder_ == null) { - result.supervisorUuid_ = supervisorUuid_; - } else { - result.supervisorUuid_ = supervisorUuidBuilder_.build(); - } - if (((from_bitField0_ & 0x00000040) == 0x00000040)) { - to_bitField0_ |= 0x00000040; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; } if (senderBuilder_ == null) { result.sender_ = sender_; @@ -1652,9 +1374,9 @@ public final class RemoteProtocol { result.sender_ = senderBuilder_.build(); } if (metadataBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { metadata_ = java.util.Collections.unmodifiableList(metadata_); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000010); } result.metadata_ = metadata_; } else { @@ -1664,7 +1386,7 @@ public final class RemoteProtocol { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.RemoteProtocol.RemoteMessageProtocol) { return mergeFrom((akka.remote.RemoteProtocol.RemoteMessageProtocol)other); @@ -1673,17 +1395,11 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(akka.remote.RemoteProtocol.RemoteMessageProtocol other) { if (other == akka.remote.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance()) return this; - if (other.hasUuid()) { - mergeUuid(other.getUuid()); - } - if (other.hasActorInfo()) { - mergeActorInfo(other.getActorInfo()); - } - if (other.hasOneWay()) { - setOneWay(other.getOneWay()); + if (other.hasRecipient()) { + mergeRecipient(other.getRecipient()); } if (other.hasMessage()) { mergeMessage(other.getMessage()); @@ -1691,9 +1407,6 @@ public final class RemoteProtocol { if (other.hasException()) { mergeException(other.getException()); } - if (other.hasSupervisorUuid()) { - mergeSupervisorUuid(other.getSupervisorUuid()); - } if (other.hasSender()) { mergeSender(other.getSender()); } @@ -1701,7 +1414,7 @@ public final class RemoteProtocol { if (!other.metadata_.isEmpty()) { if (metadata_.isEmpty()) { metadata_ = other.metadata_; - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000010); } else { ensureMetadataIsMutable(); metadata_.addAll(other.metadata_); @@ -1714,8 +1427,8 @@ public final class RemoteProtocol { metadataBuilder_.dispose(); metadataBuilder_ = null; metadata_ = other.metadata_; - bitField0_ = (bitField0_ & ~0x00000080); - metadataBuilder_ = + bitField0_ = (bitField0_ & ~0x00000010); + metadataBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? getMetadataFieldBuilder() : null; } else { @@ -1726,61 +1439,43 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { - if (!hasUuid()) { - + if (!hasRecipient()) { + return false; } - if (!hasActorInfo()) { - - return false; - } - if (!hasOneWay()) { - - return false; - } - if (!getUuid().isInitialized()) { - - return false; - } - if (!getActorInfo().isInitialized()) { - + if (!getRecipient().isInitialized()) { + return false; } if (hasMessage()) { if (!getMessage().isInitialized()) { - + return false; } } if (hasException()) { if (!getException().isInitialized()) { - - return false; - } - } - if (hasSupervisorUuid()) { - if (!getSupervisorUuid().isInitialized()) { - + return false; } } if (hasSender()) { if (!getSender().isInitialized()) { - + return false; } } for (int i = 0; i < getMetadataCount(); i++) { if (!getMetadata(i).isInitialized()) { - + return false; } } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1805,29 +1500,15 @@ public final class RemoteProtocol { break; } case 10: { - akka.remote.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.remote.RemoteProtocol.UuidProtocol.newBuilder(); - if (hasUuid()) { - subBuilder.mergeFrom(getUuid()); + akka.remote.RemoteProtocol.ActorRefProtocol.Builder subBuilder = akka.remote.RemoteProtocol.ActorRefProtocol.newBuilder(); + if (hasRecipient()) { + subBuilder.mergeFrom(getRecipient()); } input.readMessage(subBuilder, extensionRegistry); - setUuid(subBuilder.buildPartial()); + setRecipient(subBuilder.buildPartial()); break; } case 18: { - akka.remote.RemoteProtocol.ActorInfoProtocol.Builder subBuilder = akka.remote.RemoteProtocol.ActorInfoProtocol.newBuilder(); - if (hasActorInfo()) { - subBuilder.mergeFrom(getActorInfo()); - } - input.readMessage(subBuilder, extensionRegistry); - setActorInfo(subBuilder.buildPartial()); - break; - } - case 24: { - bitField0_ |= 0x00000004; - oneWay_ = input.readBool(); - break; - } - case 34: { akka.remote.RemoteProtocol.MessageProtocol.Builder subBuilder = akka.remote.RemoteProtocol.MessageProtocol.newBuilder(); if (hasMessage()) { subBuilder.mergeFrom(getMessage()); @@ -1836,7 +1517,7 @@ public final class RemoteProtocol { setMessage(subBuilder.buildPartial()); break; } - case 42: { + case 26: { akka.remote.RemoteProtocol.ExceptionProtocol.Builder subBuilder = akka.remote.RemoteProtocol.ExceptionProtocol.newBuilder(); if (hasException()) { subBuilder.mergeFrom(getException()); @@ -1845,17 +1526,8 @@ public final class RemoteProtocol { setException(subBuilder.buildPartial()); break; } - case 50: { - akka.remote.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.remote.RemoteProtocol.UuidProtocol.newBuilder(); - if (hasSupervisorUuid()) { - subBuilder.mergeFrom(getSupervisorUuid()); - } - input.readMessage(subBuilder, extensionRegistry); - setSupervisorUuid(subBuilder.buildPartial()); - break; - } - case 58: { - akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder subBuilder = akka.remote.RemoteProtocol.RemoteActorRefProtocol.newBuilder(); + case 34: { + akka.remote.RemoteProtocol.ActorRefProtocol.Builder subBuilder = akka.remote.RemoteProtocol.ActorRefProtocol.newBuilder(); if (hasSender()) { subBuilder.mergeFrom(getSender()); } @@ -1863,7 +1535,7 @@ public final class RemoteProtocol { setSender(subBuilder.buildPartial()); break; } - case 66: { + case 42: { akka.remote.RemoteProtocol.MetadataEntryProtocol.Builder subBuilder = akka.remote.RemoteProtocol.MetadataEntryProtocol.newBuilder(); input.readMessage(subBuilder, extensionRegistry); addMetadata(subBuilder.buildPartial()); @@ -1872,216 +1544,105 @@ public final class RemoteProtocol { } } } - + private int bitField0_; - - // required .UuidProtocol uuid = 1; - private akka.remote.RemoteProtocol.UuidProtocol uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); + + // required .ActorRefProtocol recipient = 1; + private akka.remote.RemoteProtocol.ActorRefProtocol recipient_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_; - public boolean hasUuid() { + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder> recipientBuilder_; + public boolean hasRecipient() { return ((bitField0_ & 0x00000001) == 0x00000001); } - public akka.remote.RemoteProtocol.UuidProtocol getUuid() { - if (uuidBuilder_ == null) { - return uuid_; + public akka.remote.RemoteProtocol.ActorRefProtocol getRecipient() { + if (recipientBuilder_ == null) { + return recipient_; } else { - return uuidBuilder_.getMessage(); + return recipientBuilder_.getMessage(); } } - public Builder setUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (uuidBuilder_ == null) { + public Builder setRecipient(akka.remote.RemoteProtocol.ActorRefProtocol value) { + if (recipientBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - uuid_ = value; + recipient_ = value; onChanged(); } else { - uuidBuilder_.setMessage(value); + recipientBuilder_.setMessage(value); } bitField0_ |= 0x00000001; return this; } - public Builder setUuid( - akka.remote.RemoteProtocol.UuidProtocol.Builder builderForValue) { - if (uuidBuilder_ == null) { - uuid_ = builderForValue.build(); + public Builder setRecipient( + akka.remote.RemoteProtocol.ActorRefProtocol.Builder builderForValue) { + if (recipientBuilder_ == null) { + recipient_ = builderForValue.build(); onChanged(); } else { - uuidBuilder_.setMessage(builderForValue.build()); + recipientBuilder_.setMessage(builderForValue.build()); } bitField0_ |= 0x00000001; return this; } - public Builder mergeUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (uuidBuilder_ == null) { + public Builder mergeRecipient(akka.remote.RemoteProtocol.ActorRefProtocol value) { + if (recipientBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - uuid_ != akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance()) { - uuid_ = - akka.remote.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial(); + recipient_ != akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance()) { + recipient_ = + akka.remote.RemoteProtocol.ActorRefProtocol.newBuilder(recipient_).mergeFrom(value).buildPartial(); } else { - uuid_ = value; + recipient_ = value; } onChanged(); } else { - uuidBuilder_.mergeFrom(value); + recipientBuilder_.mergeFrom(value); } bitField0_ |= 0x00000001; return this; } - public Builder clearUuid() { - if (uuidBuilder_ == null) { - uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); + public Builder clearRecipient() { + if (recipientBuilder_ == null) { + recipient_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); onChanged(); } else { - uuidBuilder_.clear(); + recipientBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); return this; } - public akka.remote.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() { + public akka.remote.RemoteProtocol.ActorRefProtocol.Builder getRecipientBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getUuidFieldBuilder().getBuilder(); + return getRecipientFieldBuilder().getBuilder(); } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() { - if (uuidBuilder_ != null) { - return uuidBuilder_.getMessageOrBuilder(); + public akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getRecipientOrBuilder() { + if (recipientBuilder_ != null) { + return recipientBuilder_.getMessageOrBuilder(); } else { - return uuid_; + return recipient_; } } private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> - getUuidFieldBuilder() { - if (uuidBuilder_ == null) { - uuidBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder>( - uuid_, + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder> + getRecipientFieldBuilder() { + if (recipientBuilder_ == null) { + recipientBuilder_ = new com.google.protobuf.SingleFieldBuilder< + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder>( + recipient_, getParentForChildren(), isClean()); - uuid_ = null; + recipient_ = null; } - return uuidBuilder_; + return recipientBuilder_; } - - // required .ActorInfoProtocol actorInfo = 2; - private akka.remote.RemoteProtocol.ActorInfoProtocol actorInfo_ = akka.remote.RemoteProtocol.ActorInfoProtocol.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.ActorInfoProtocol, akka.remote.RemoteProtocol.ActorInfoProtocol.Builder, akka.remote.RemoteProtocol.ActorInfoProtocolOrBuilder> actorInfoBuilder_; - public boolean hasActorInfo() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - public akka.remote.RemoteProtocol.ActorInfoProtocol getActorInfo() { - if (actorInfoBuilder_ == null) { - return actorInfo_; - } else { - return actorInfoBuilder_.getMessage(); - } - } - public Builder setActorInfo(akka.remote.RemoteProtocol.ActorInfoProtocol value) { - if (actorInfoBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - actorInfo_ = value; - onChanged(); - } else { - actorInfoBuilder_.setMessage(value); - } - bitField0_ |= 0x00000002; - return this; - } - public Builder setActorInfo( - akka.remote.RemoteProtocol.ActorInfoProtocol.Builder builderForValue) { - if (actorInfoBuilder_ == null) { - actorInfo_ = builderForValue.build(); - onChanged(); - } else { - actorInfoBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000002; - return this; - } - public Builder mergeActorInfo(akka.remote.RemoteProtocol.ActorInfoProtocol value) { - if (actorInfoBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002) && - actorInfo_ != akka.remote.RemoteProtocol.ActorInfoProtocol.getDefaultInstance()) { - actorInfo_ = - akka.remote.RemoteProtocol.ActorInfoProtocol.newBuilder(actorInfo_).mergeFrom(value).buildPartial(); - } else { - actorInfo_ = value; - } - onChanged(); - } else { - actorInfoBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000002; - return this; - } - public Builder clearActorInfo() { - if (actorInfoBuilder_ == null) { - actorInfo_ = akka.remote.RemoteProtocol.ActorInfoProtocol.getDefaultInstance(); - onChanged(); - } else { - actorInfoBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - public akka.remote.RemoteProtocol.ActorInfoProtocol.Builder getActorInfoBuilder() { - bitField0_ |= 0x00000002; - onChanged(); - return getActorInfoFieldBuilder().getBuilder(); - } - public akka.remote.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder() { - if (actorInfoBuilder_ != null) { - return actorInfoBuilder_.getMessageOrBuilder(); - } else { - return actorInfo_; - } - } - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.ActorInfoProtocol, akka.remote.RemoteProtocol.ActorInfoProtocol.Builder, akka.remote.RemoteProtocol.ActorInfoProtocolOrBuilder> - getActorInfoFieldBuilder() { - if (actorInfoBuilder_ == null) { - actorInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.ActorInfoProtocol, akka.remote.RemoteProtocol.ActorInfoProtocol.Builder, akka.remote.RemoteProtocol.ActorInfoProtocolOrBuilder>( - actorInfo_, - getParentForChildren(), - isClean()); - actorInfo_ = null; - } - return actorInfoBuilder_; - } - - // required bool oneWay = 3; - private boolean oneWay_ ; - public boolean hasOneWay() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - public boolean getOneWay() { - return oneWay_; - } - public Builder setOneWay(boolean value) { - bitField0_ |= 0x00000004; - oneWay_ = value; - onChanged(); - return this; - } - public Builder clearOneWay() { - bitField0_ = (bitField0_ & ~0x00000004); - oneWay_ = false; - onChanged(); - return this; - } - - // optional .MessageProtocol message = 4; + + // optional .MessageProtocol message = 2; private akka.remote.RemoteProtocol.MessageProtocol message_ = akka.remote.RemoteProtocol.MessageProtocol.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< akka.remote.RemoteProtocol.MessageProtocol, akka.remote.RemoteProtocol.MessageProtocol.Builder, akka.remote.RemoteProtocol.MessageProtocolOrBuilder> messageBuilder_; public boolean hasMessage() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000002) == 0x00000002); } public akka.remote.RemoteProtocol.MessageProtocol getMessage() { if (messageBuilder_ == null) { @@ -2100,7 +1661,7 @@ public final class RemoteProtocol { } else { messageBuilder_.setMessage(value); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; return this; } public Builder setMessage( @@ -2111,12 +1672,12 @@ public final class RemoteProtocol { } else { messageBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; return this; } public Builder mergeMessage(akka.remote.RemoteProtocol.MessageProtocol value) { if (messageBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008) && + if (((bitField0_ & 0x00000002) == 0x00000002) && message_ != akka.remote.RemoteProtocol.MessageProtocol.getDefaultInstance()) { message_ = akka.remote.RemoteProtocol.MessageProtocol.newBuilder(message_).mergeFrom(value).buildPartial(); @@ -2127,7 +1688,7 @@ public final class RemoteProtocol { } else { messageBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; return this; } public Builder clearMessage() { @@ -2137,11 +1698,11 @@ public final class RemoteProtocol { } else { messageBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000002); return this; } public akka.remote.RemoteProtocol.MessageProtocol.Builder getMessageBuilder() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; onChanged(); return getMessageFieldBuilder().getBuilder(); } @@ -2153,7 +1714,7 @@ public final class RemoteProtocol { } } private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.MessageProtocol, akka.remote.RemoteProtocol.MessageProtocol.Builder, akka.remote.RemoteProtocol.MessageProtocolOrBuilder> + akka.remote.RemoteProtocol.MessageProtocol, akka.remote.RemoteProtocol.MessageProtocol.Builder, akka.remote.RemoteProtocol.MessageProtocolOrBuilder> getMessageFieldBuilder() { if (messageBuilder_ == null) { messageBuilder_ = new com.google.protobuf.SingleFieldBuilder< @@ -2165,13 +1726,13 @@ public final class RemoteProtocol { } return messageBuilder_; } - - // optional .ExceptionProtocol exception = 5; + + // optional .ExceptionProtocol exception = 3; private akka.remote.RemoteProtocol.ExceptionProtocol exception_ = akka.remote.RemoteProtocol.ExceptionProtocol.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< akka.remote.RemoteProtocol.ExceptionProtocol, akka.remote.RemoteProtocol.ExceptionProtocol.Builder, akka.remote.RemoteProtocol.ExceptionProtocolOrBuilder> exceptionBuilder_; public boolean hasException() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000004) == 0x00000004); } public akka.remote.RemoteProtocol.ExceptionProtocol getException() { if (exceptionBuilder_ == null) { @@ -2190,7 +1751,7 @@ public final class RemoteProtocol { } else { exceptionBuilder_.setMessage(value); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; return this; } public Builder setException( @@ -2201,12 +1762,12 @@ public final class RemoteProtocol { } else { exceptionBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; return this; } public Builder mergeException(akka.remote.RemoteProtocol.ExceptionProtocol value) { if (exceptionBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010) && + if (((bitField0_ & 0x00000004) == 0x00000004) && exception_ != akka.remote.RemoteProtocol.ExceptionProtocol.getDefaultInstance()) { exception_ = akka.remote.RemoteProtocol.ExceptionProtocol.newBuilder(exception_).mergeFrom(value).buildPartial(); @@ -2217,7 +1778,7 @@ public final class RemoteProtocol { } else { exceptionBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; return this; } public Builder clearException() { @@ -2227,11 +1788,11 @@ public final class RemoteProtocol { } else { exceptionBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000004); return this; } public akka.remote.RemoteProtocol.ExceptionProtocol.Builder getExceptionBuilder() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000004; onChanged(); return getExceptionFieldBuilder().getBuilder(); } @@ -2243,7 +1804,7 @@ public final class RemoteProtocol { } } private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.ExceptionProtocol, akka.remote.RemoteProtocol.ExceptionProtocol.Builder, akka.remote.RemoteProtocol.ExceptionProtocolOrBuilder> + akka.remote.RemoteProtocol.ExceptionProtocol, akka.remote.RemoteProtocol.ExceptionProtocol.Builder, akka.remote.RemoteProtocol.ExceptionProtocolOrBuilder> getExceptionFieldBuilder() { if (exceptionBuilder_ == null) { exceptionBuilder_ = new com.google.protobuf.SingleFieldBuilder< @@ -2255,112 +1816,22 @@ public final class RemoteProtocol { } return exceptionBuilder_; } - - // optional .UuidProtocol supervisorUuid = 6; - private akka.remote.RemoteProtocol.UuidProtocol supervisorUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); + + // optional .ActorRefProtocol sender = 4; + private akka.remote.RemoteProtocol.ActorRefProtocol sender_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> supervisorUuidBuilder_; - public boolean hasSupervisorUuid() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - public akka.remote.RemoteProtocol.UuidProtocol getSupervisorUuid() { - if (supervisorUuidBuilder_ == null) { - return supervisorUuid_; - } else { - return supervisorUuidBuilder_.getMessage(); - } - } - public Builder setSupervisorUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (supervisorUuidBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - supervisorUuid_ = value; - onChanged(); - } else { - supervisorUuidBuilder_.setMessage(value); - } - bitField0_ |= 0x00000020; - return this; - } - public Builder setSupervisorUuid( - akka.remote.RemoteProtocol.UuidProtocol.Builder builderForValue) { - if (supervisorUuidBuilder_ == null) { - supervisorUuid_ = builderForValue.build(); - onChanged(); - } else { - supervisorUuidBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000020; - return this; - } - public Builder mergeSupervisorUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (supervisorUuidBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020) && - supervisorUuid_ != akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance()) { - supervisorUuid_ = - akka.remote.RemoteProtocol.UuidProtocol.newBuilder(supervisorUuid_).mergeFrom(value).buildPartial(); - } else { - supervisorUuid_ = value; - } - onChanged(); - } else { - supervisorUuidBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000020; - return this; - } - public Builder clearSupervisorUuid() { - if (supervisorUuidBuilder_ == null) { - supervisorUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - onChanged(); - } else { - supervisorUuidBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000020); - return this; - } - public akka.remote.RemoteProtocol.UuidProtocol.Builder getSupervisorUuidBuilder() { - bitField0_ |= 0x00000020; - onChanged(); - return getSupervisorUuidFieldBuilder().getBuilder(); - } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder() { - if (supervisorUuidBuilder_ != null) { - return supervisorUuidBuilder_.getMessageOrBuilder(); - } else { - return supervisorUuid_; - } - } - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> - getSupervisorUuidFieldBuilder() { - if (supervisorUuidBuilder_ == null) { - supervisorUuidBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder>( - supervisorUuid_, - getParentForChildren(), - isClean()); - supervisorUuid_ = null; - } - return supervisorUuidBuilder_; - } - - // optional .RemoteActorRefProtocol sender = 7; - private akka.remote.RemoteProtocol.RemoteActorRefProtocol sender_ = akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.RemoteActorRefProtocol, akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder> senderBuilder_; + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder> senderBuilder_; public boolean hasSender() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000008) == 0x00000008); } - public akka.remote.RemoteProtocol.RemoteActorRefProtocol getSender() { + public akka.remote.RemoteProtocol.ActorRefProtocol getSender() { if (senderBuilder_ == null) { return sender_; } else { return senderBuilder_.getMessage(); } } - public Builder setSender(akka.remote.RemoteProtocol.RemoteActorRefProtocol value) { + public Builder setSender(akka.remote.RemoteProtocol.ActorRefProtocol value) { if (senderBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2370,26 +1841,26 @@ public final class RemoteProtocol { } else { senderBuilder_.setMessage(value); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000008; return this; } public Builder setSender( - akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder builderForValue) { + akka.remote.RemoteProtocol.ActorRefProtocol.Builder builderForValue) { if (senderBuilder_ == null) { sender_ = builderForValue.build(); onChanged(); } else { senderBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000008; return this; } - public Builder mergeSender(akka.remote.RemoteProtocol.RemoteActorRefProtocol value) { + public Builder mergeSender(akka.remote.RemoteProtocol.ActorRefProtocol value) { if (senderBuilder_ == null) { - if (((bitField0_ & 0x00000040) == 0x00000040) && - sender_ != akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) { + if (((bitField0_ & 0x00000008) == 0x00000008) && + sender_ != akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance()) { sender_ = - akka.remote.RemoteProtocol.RemoteActorRefProtocol.newBuilder(sender_).mergeFrom(value).buildPartial(); + akka.remote.RemoteProtocol.ActorRefProtocol.newBuilder(sender_).mergeFrom(value).buildPartial(); } else { sender_ = value; } @@ -2397,25 +1868,25 @@ public final class RemoteProtocol { } else { senderBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000008; return this; } public Builder clearSender() { if (senderBuilder_ == null) { - sender_ = akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); + sender_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); onChanged(); } else { senderBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000008); return this; } - public akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder getSenderBuilder() { - bitField0_ |= 0x00000040; + public akka.remote.RemoteProtocol.ActorRefProtocol.Builder getSenderBuilder() { + bitField0_ |= 0x00000008; onChanged(); return getSenderFieldBuilder().getBuilder(); } - public akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder() { + public akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getSenderOrBuilder() { if (senderBuilder_ != null) { return senderBuilder_.getMessageOrBuilder(); } else { @@ -2423,11 +1894,11 @@ public final class RemoteProtocol { } } private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.RemoteActorRefProtocol, akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder> + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder> getSenderFieldBuilder() { if (senderBuilder_ == null) { senderBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.RemoteActorRefProtocol, akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder>( + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder>( sender_, getParentForChildren(), isClean()); @@ -2435,20 +1906,20 @@ public final class RemoteProtocol { } return senderBuilder_; } - - // repeated .MetadataEntryProtocol metadata = 8; + + // repeated .MetadataEntryProtocol metadata = 5; private java.util.List metadata_ = java.util.Collections.emptyList(); private void ensureMetadataIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000010) == 0x00000010)) { metadata_ = new java.util.ArrayList(metadata_); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000010; } } - + private com.google.protobuf.RepeatedFieldBuilder< akka.remote.RemoteProtocol.MetadataEntryProtocol, akka.remote.RemoteProtocol.MetadataEntryProtocol.Builder, akka.remote.RemoteProtocol.MetadataEntryProtocolOrBuilder> metadataBuilder_; - + public java.util.List getMetadataList() { if (metadataBuilder_ == null) { return java.util.Collections.unmodifiableList(metadata_); @@ -2558,7 +2029,7 @@ public final class RemoteProtocol { public Builder clearMetadata() { if (metadataBuilder_ == null) { metadata_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); } else { metadataBuilder_.clear(); @@ -2586,7 +2057,7 @@ public final class RemoteProtocol { return metadataBuilder_.getMessageOrBuilder(index); } } - public java.util.List + public java.util.List getMetadataOrBuilderList() { if (metadataBuilder_ != null) { return metadataBuilder_.getMessageOrBuilderList(); @@ -2603,43 +2074,43 @@ public final class RemoteProtocol { return getMetadataFieldBuilder().addBuilder( index, akka.remote.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance()); } - public java.util.List + public java.util.List getMetadataBuilderList() { return getMetadataFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - akka.remote.RemoteProtocol.MetadataEntryProtocol, akka.remote.RemoteProtocol.MetadataEntryProtocol.Builder, akka.remote.RemoteProtocol.MetadataEntryProtocolOrBuilder> + akka.remote.RemoteProtocol.MetadataEntryProtocol, akka.remote.RemoteProtocol.MetadataEntryProtocol.Builder, akka.remote.RemoteProtocol.MetadataEntryProtocolOrBuilder> getMetadataFieldBuilder() { if (metadataBuilder_ == null) { metadataBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< akka.remote.RemoteProtocol.MetadataEntryProtocol, akka.remote.RemoteProtocol.MetadataEntryProtocol.Builder, akka.remote.RemoteProtocol.MetadataEntryProtocolOrBuilder>( metadata_, - ((bitField0_ & 0x00000080) == 0x00000080), + ((bitField0_ & 0x00000010) == 0x00000010), getParentForChildren(), isClean()); metadata_ = null; } return metadataBuilder_; } - + // @@protoc_insertion_point(builder_scope:RemoteMessageProtocol) } - + static { defaultInstance = new RemoteMessageProtocol(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:RemoteMessageProtocol) } - + public interface RemoteControlProtocolOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // optional string cookie = 1; boolean hasCookie(); String getCookie(); - + // required .CommandType commandType = 2; boolean hasCommandType(); akka.remote.RemoteProtocol.CommandType getCommandType(); @@ -2652,26 +2123,26 @@ public final class RemoteProtocol { super(builder); } private RemoteControlProtocol(boolean noInit) {} - + private static final RemoteControlProtocol defaultInstance; public static RemoteControlProtocol getDefaultInstance() { return defaultInstance; } - + public RemoteControlProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.RemoteProtocol.internal_static_RemoteControlProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_RemoteControlProtocol_fieldAccessorTable; } - + private int bitField0_; // optional string cookie = 1; public static final int COOKIE_FIELD_NUMBER = 1; @@ -2684,7 +2155,7 @@ public final class RemoteProtocol { if (ref instanceof String) { return (String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; String s = bs.toStringUtf8(); if (com.google.protobuf.Internal.isValidUtf8(bs)) { @@ -2696,7 +2167,7 @@ public final class RemoteProtocol { private com.google.protobuf.ByteString getCookieBytes() { java.lang.Object ref = cookie_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref); cookie_ = b; return b; @@ -2704,7 +2175,7 @@ public final class RemoteProtocol { return (com.google.protobuf.ByteString) ref; } } - + // required .CommandType commandType = 2; public static final int COMMANDTYPE_FIELD_NUMBER = 2; private akka.remote.RemoteProtocol.CommandType commandType_; @@ -2714,7 +2185,7 @@ public final class RemoteProtocol { public akka.remote.RemoteProtocol.CommandType getCommandType() { return commandType_; } - + private void initFields() { cookie_ = ""; commandType_ = akka.remote.RemoteProtocol.CommandType.CONNECT; @@ -2723,7 +2194,7 @@ public final class RemoteProtocol { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (!hasCommandType()) { memoizedIsInitialized = 0; return false; @@ -2731,7 +2202,7 @@ public final class RemoteProtocol { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -2743,12 +2214,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -2762,14 +2233,14 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.RemoteProtocol.RemoteControlProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -2836,14 +2307,14 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.RemoteProtocol.RemoteControlProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { @@ -2857,18 +2328,18 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.internal_static_RemoteControlProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_RemoteControlProtocol_fieldAccessorTable; } - + // Construct using akka.remote.RemoteProtocol.RemoteControlProtocol.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -2879,7 +2350,7 @@ public final class RemoteProtocol { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); cookie_ = ""; @@ -2888,20 +2359,20 @@ public final class RemoteProtocol { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return akka.remote.RemoteProtocol.RemoteControlProtocol.getDescriptor(); } - + public akka.remote.RemoteProtocol.RemoteControlProtocol getDefaultInstanceForType() { return akka.remote.RemoteProtocol.RemoteControlProtocol.getDefaultInstance(); } - + public akka.remote.RemoteProtocol.RemoteControlProtocol build() { akka.remote.RemoteProtocol.RemoteControlProtocol result = buildPartial(); if (!result.isInitialized()) { @@ -2909,7 +2380,7 @@ public final class RemoteProtocol { } return result; } - + private akka.remote.RemoteProtocol.RemoteControlProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { akka.remote.RemoteProtocol.RemoteControlProtocol result = buildPartial(); @@ -2919,7 +2390,7 @@ public final class RemoteProtocol { } return result; } - + public akka.remote.RemoteProtocol.RemoteControlProtocol buildPartial() { akka.remote.RemoteProtocol.RemoteControlProtocol result = new akka.remote.RemoteProtocol.RemoteControlProtocol(this); int from_bitField0_ = bitField0_; @@ -2936,7 +2407,7 @@ public final class RemoteProtocol { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.RemoteProtocol.RemoteControlProtocol) { return mergeFrom((akka.remote.RemoteProtocol.RemoteControlProtocol)other); @@ -2945,7 +2416,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(akka.remote.RemoteProtocol.RemoteControlProtocol other) { if (other == akka.remote.RemoteProtocol.RemoteControlProtocol.getDefaultInstance()) return this; if (other.hasCookie()) { @@ -2957,15 +2428,15 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (!hasCommandType()) { - + return false; } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -3008,9 +2479,9 @@ public final class RemoteProtocol { } } } - + private int bitField0_; - + // optional string cookie = 1; private java.lang.Object cookie_ = ""; public boolean hasCookie() { @@ -3046,7 +2517,7 @@ public final class RemoteProtocol { cookie_ = value; onChanged(); } - + // required .CommandType commandType = 2; private akka.remote.RemoteProtocol.CommandType commandType_ = akka.remote.RemoteProtocol.CommandType.CONNECT; public boolean hasCommandType() { @@ -3070,61 +2541,61 @@ public final class RemoteProtocol { onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:RemoteControlProtocol) } - + static { defaultInstance = new RemoteControlProtocol(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:RemoteControlProtocol) } - - public interface RemoteActorRefProtocolOrBuilder + + public interface ActorRefProtocolOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // required string address = 1; boolean hasAddress(); String getAddress(); - - // required bytes inetSocketAddress = 2; - boolean hasInetSocketAddress(); - com.google.protobuf.ByteString getInetSocketAddress(); - - // optional uint64 timeout = 3; - boolean hasTimeout(); - long getTimeout(); + + // required string host = 2; + boolean hasHost(); + String getHost(); + + // required uint32 port = 3; + boolean hasPort(); + int getPort(); } - public static final class RemoteActorRefProtocol extends + public static final class ActorRefProtocol extends com.google.protobuf.GeneratedMessage - implements RemoteActorRefProtocolOrBuilder { - // Use RemoteActorRefProtocol.newBuilder() to construct. - private RemoteActorRefProtocol(Builder builder) { + implements ActorRefProtocolOrBuilder { + // Use ActorRefProtocol.newBuilder() to construct. + private ActorRefProtocol(Builder builder) { super(builder); } - private RemoteActorRefProtocol(boolean noInit) {} - - private static final RemoteActorRefProtocol defaultInstance; - public static RemoteActorRefProtocol getDefaultInstance() { + private ActorRefProtocol(boolean noInit) {} + + private static final ActorRefProtocol defaultInstance; + public static ActorRefProtocol getDefaultInstance() { return defaultInstance; } - - public RemoteActorRefProtocol getDefaultInstanceForType() { + + public ActorRefProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.remote.RemoteProtocol.internal_static_RemoteActorRefProtocol_descriptor; + return akka.remote.RemoteProtocol.internal_static_ActorRefProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.remote.RemoteProtocol.internal_static_RemoteActorRefProtocol_fieldAccessorTable; + return akka.remote.RemoteProtocol.internal_static_ActorRefProtocol_fieldAccessorTable; } - + private int bitField0_; // required string address = 1; public static final int ADDRESS_FIELD_NUMBER = 1; @@ -3137,7 +2608,7 @@ public final class RemoteProtocol { if (ref instanceof String) { return (String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; String s = bs.toStringUtf8(); if (com.google.protobuf.Internal.isValidUtf8(bs)) { @@ -3149,7 +2620,7 @@ public final class RemoteProtocol { private com.google.protobuf.ByteString getAddressBytes() { java.lang.Object ref = address_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref); address_ = b; return b; @@ -3157,49 +2628,75 @@ public final class RemoteProtocol { return (com.google.protobuf.ByteString) ref; } } - - // required bytes inetSocketAddress = 2; - public static final int INETSOCKETADDRESS_FIELD_NUMBER = 2; - private com.google.protobuf.ByteString inetSocketAddress_; - public boolean hasInetSocketAddress() { + + // required string host = 2; + public static final int HOST_FIELD_NUMBER = 2; + private java.lang.Object host_; + public boolean hasHost() { return ((bitField0_ & 0x00000002) == 0x00000002); } - public com.google.protobuf.ByteString getInetSocketAddress() { - return inetSocketAddress_; + public String getHost() { + java.lang.Object ref = host_; + if (ref instanceof String) { + return (String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + String s = bs.toStringUtf8(); + if (com.google.protobuf.Internal.isValidUtf8(bs)) { + host_ = s; + } + return s; + } } - - // optional uint64 timeout = 3; - public static final int TIMEOUT_FIELD_NUMBER = 3; - private long timeout_; - public boolean hasTimeout() { + private com.google.protobuf.ByteString getHostBytes() { + java.lang.Object ref = host_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((String) ref); + host_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + // required uint32 port = 3; + public static final int PORT_FIELD_NUMBER = 3; + private int port_; + public boolean hasPort() { return ((bitField0_ & 0x00000004) == 0x00000004); } - public long getTimeout() { - return timeout_; + public int getPort() { + return port_; } - + private void initFields() { address_ = ""; - inetSocketAddress_ = com.google.protobuf.ByteString.EMPTY; - timeout_ = 0L; + host_ = ""; + port_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (!hasAddress()) { memoizedIsInitialized = 0; return false; } - if (!hasInetSocketAddress()) { + if (!hasHost()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasPort()) { memoizedIsInitialized = 0; return false; } memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -3207,19 +2704,19 @@ public final class RemoteProtocol { output.writeBytes(1, getAddressBytes()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, inetSocketAddress_); + output.writeBytes(2, getHostBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeUInt64(3, timeout_); + output.writeUInt32(3, port_); } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -3227,59 +2724,59 @@ public final class RemoteProtocol { } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, inetSocketAddress_); + .computeBytesSize(2, getHostBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(3, timeout_); + .computeUInt32Size(3, port_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - - public static akka.remote.RemoteProtocol.RemoteActorRefProtocol parseFrom( + + public static akka.remote.RemoteProtocol.ActorRefProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static akka.remote.RemoteProtocol.RemoteActorRefProtocol parseFrom( + public static akka.remote.RemoteProtocol.ActorRefProtocol parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static akka.remote.RemoteProtocol.RemoteActorRefProtocol parseFrom(byte[] data) + public static akka.remote.RemoteProtocol.ActorRefProtocol parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data).buildParsed(); } - public static akka.remote.RemoteProtocol.RemoteActorRefProtocol parseFrom( + public static akka.remote.RemoteProtocol.ActorRefProtocol parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return newBuilder().mergeFrom(data, extensionRegistry) .buildParsed(); } - public static akka.remote.RemoteProtocol.RemoteActorRefProtocol parseFrom(java.io.InputStream input) + public static akka.remote.RemoteProtocol.ActorRefProtocol parseFrom(java.io.InputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static akka.remote.RemoteProtocol.RemoteActorRefProtocol parseFrom( + public static akka.remote.RemoteProtocol.ActorRefProtocol parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - public static akka.remote.RemoteProtocol.RemoteActorRefProtocol parseDelimitedFrom(java.io.InputStream input) + public static akka.remote.RemoteProtocol.ActorRefProtocol parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { Builder builder = newBuilder(); if (builder.mergeDelimitedFrom(input)) { @@ -3288,7 +2785,7 @@ public final class RemoteProtocol { return null; } } - public static akka.remote.RemoteProtocol.RemoteActorRefProtocol parseDelimitedFrom( + public static akka.remote.RemoteProtocol.ActorRefProtocol parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3299,26 +2796,26 @@ public final class RemoteProtocol { return null; } } - public static akka.remote.RemoteProtocol.RemoteActorRefProtocol parseFrom( + public static akka.remote.RemoteProtocol.ActorRefProtocol parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return newBuilder().mergeFrom(input).buildParsed(); } - public static akka.remote.RemoteProtocol.RemoteActorRefProtocol parseFrom( + public static akka.remote.RemoteProtocol.ActorRefProtocol parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.remote.RemoteProtocol.RemoteActorRefProtocol prototype) { + public static Builder newBuilder(akka.remote.RemoteProtocol.ActorRefProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { @@ -3327,23 +2824,23 @@ public final class RemoteProtocol { } public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder { + implements akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.remote.RemoteProtocol.internal_static_RemoteActorRefProtocol_descriptor; + return akka.remote.RemoteProtocol.internal_static_ActorRefProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.remote.RemoteProtocol.internal_static_RemoteActorRefProtocol_fieldAccessorTable; + return akka.remote.RemoteProtocol.internal_static_ActorRefProtocol_fieldAccessorTable; } - - // Construct using akka.remote.RemoteProtocol.RemoteActorRefProtocol.newBuilder() + + // Construct using akka.remote.RemoteProtocol.ActorRefProtocol.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -3354,51 +2851,51 @@ public final class RemoteProtocol { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); address_ = ""; bitField0_ = (bitField0_ & ~0x00000001); - inetSocketAddress_ = com.google.protobuf.ByteString.EMPTY; + host_ = ""; bitField0_ = (bitField0_ & ~0x00000002); - timeout_ = 0L; + port_ = 0; bitField0_ = (bitField0_ & ~0x00000004); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDescriptor(); + return akka.remote.RemoteProtocol.ActorRefProtocol.getDescriptor(); } - - public akka.remote.RemoteProtocol.RemoteActorRefProtocol getDefaultInstanceForType() { - return akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); + + public akka.remote.RemoteProtocol.ActorRefProtocol getDefaultInstanceForType() { + return akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); } - - public akka.remote.RemoteProtocol.RemoteActorRefProtocol build() { - akka.remote.RemoteProtocol.RemoteActorRefProtocol result = buildPartial(); + + public akka.remote.RemoteProtocol.ActorRefProtocol build() { + akka.remote.RemoteProtocol.ActorRefProtocol result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - - private akka.remote.RemoteProtocol.RemoteActorRefProtocol buildParsed() + + private akka.remote.RemoteProtocol.ActorRefProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { - akka.remote.RemoteProtocol.RemoteActorRefProtocol result = buildPartial(); + akka.remote.RemoteProtocol.ActorRefProtocol result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException( result).asInvalidProtocolBufferException(); } return result; } - - public akka.remote.RemoteProtocol.RemoteActorRefProtocol buildPartial() { - akka.remote.RemoteProtocol.RemoteActorRefProtocol result = new akka.remote.RemoteProtocol.RemoteActorRefProtocol(this); + + public akka.remote.RemoteProtocol.ActorRefProtocol buildPartial() { + akka.remote.RemoteProtocol.ActorRefProtocol result = new akka.remote.RemoteProtocol.ActorRefProtocol(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -3408,52 +2905,56 @@ public final class RemoteProtocol { if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.inetSocketAddress_ = inetSocketAddress_; + result.host_ = host_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.timeout_ = timeout_; + result.port_ = port_; result.bitField0_ = to_bitField0_; onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.remote.RemoteProtocol.RemoteActorRefProtocol) { - return mergeFrom((akka.remote.RemoteProtocol.RemoteActorRefProtocol)other); + if (other instanceof akka.remote.RemoteProtocol.ActorRefProtocol) { + return mergeFrom((akka.remote.RemoteProtocol.ActorRefProtocol)other); } else { super.mergeFrom(other); return this; } } - - public Builder mergeFrom(akka.remote.RemoteProtocol.RemoteActorRefProtocol other) { - if (other == akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) return this; + + public Builder mergeFrom(akka.remote.RemoteProtocol.ActorRefProtocol other) { + if (other == akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance()) return this; if (other.hasAddress()) { setAddress(other.getAddress()); } - if (other.hasInetSocketAddress()) { - setInetSocketAddress(other.getInetSocketAddress()); + if (other.hasHost()) { + setHost(other.getHost()); } - if (other.hasTimeout()) { - setTimeout(other.getTimeout()); + if (other.hasPort()) { + setPort(other.getPort()); } this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (!hasAddress()) { - + return false; } - if (!hasInetSocketAddress()) { - + if (!hasHost()) { + + return false; + } + if (!hasPort()) { + return false; } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -3484,20 +2985,20 @@ public final class RemoteProtocol { } case 18: { bitField0_ |= 0x00000002; - inetSocketAddress_ = input.readBytes(); + host_ = input.readBytes(); break; } case 24: { bitField0_ |= 0x00000004; - timeout_ = input.readUInt64(); + port_ = input.readUInt32(); break; } } } } - + private int bitField0_; - + // required string address = 1; private java.lang.Object address_ = ""; public boolean hasAddress() { @@ -3533,2311 +3034,82 @@ public final class RemoteProtocol { address_ = value; onChanged(); } - - // required bytes inetSocketAddress = 2; - private com.google.protobuf.ByteString inetSocketAddress_ = com.google.protobuf.ByteString.EMPTY; - public boolean hasInetSocketAddress() { + + // required string host = 2; + private java.lang.Object host_ = ""; + public boolean hasHost() { return ((bitField0_ & 0x00000002) == 0x00000002); } - public com.google.protobuf.ByteString getInetSocketAddress() { - return inetSocketAddress_; + public String getHost() { + java.lang.Object ref = host_; + if (!(ref instanceof String)) { + String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); + host_ = s; + return s; + } else { + return (String) ref; + } } - public Builder setInetSocketAddress(com.google.protobuf.ByteString value) { + public Builder setHost(String value) { if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000002; - inetSocketAddress_ = value; + host_ = value; onChanged(); return this; } - public Builder clearInetSocketAddress() { + public Builder clearHost() { bitField0_ = (bitField0_ & ~0x00000002); - inetSocketAddress_ = getDefaultInstance().getInetSocketAddress(); + host_ = getDefaultInstance().getHost(); onChanged(); return this; } - - // optional uint64 timeout = 3; - private long timeout_ ; - public boolean hasTimeout() { + void setHost(com.google.protobuf.ByteString value) { + bitField0_ |= 0x00000002; + host_ = value; + onChanged(); + } + + // required uint32 port = 3; + private int port_ ; + public boolean hasPort() { return ((bitField0_ & 0x00000004) == 0x00000004); } - public long getTimeout() { - return timeout_; + public int getPort() { + return port_; } - public Builder setTimeout(long value) { + public Builder setPort(int value) { bitField0_ |= 0x00000004; - timeout_ = value; + port_ = value; onChanged(); return this; } - public Builder clearTimeout() { + public Builder clearPort() { bitField0_ = (bitField0_ & ~0x00000004); - timeout_ = 0L; + port_ = 0; onChanged(); return this; } - - // @@protoc_insertion_point(builder_scope:RemoteActorRefProtocol) + + // @@protoc_insertion_point(builder_scope:ActorRefProtocol) } - + static { - defaultInstance = new RemoteActorRefProtocol(true); + defaultInstance = new ActorRefProtocol(true); defaultInstance.initFields(); } - - // @@protoc_insertion_point(class_scope:RemoteActorRefProtocol) + + // @@protoc_insertion_point(class_scope:ActorRefProtocol) } - - public interface SerializedActorRefProtocolOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // required .UuidProtocol uuid = 1; - boolean hasUuid(); - akka.remote.RemoteProtocol.UuidProtocol getUuid(); - akka.remote.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder(); - - // required string address = 2; - boolean hasAddress(); - String getAddress(); - - // required string actorClassname = 3; - boolean hasActorClassname(); - String getActorClassname(); - - // optional bytes actorInstance = 4; - boolean hasActorInstance(); - com.google.protobuf.ByteString getActorInstance(); - - // optional string serializerClassname = 5; - boolean hasSerializerClassname(); - String getSerializerClassname(); - - // optional uint64 timeout = 6; - boolean hasTimeout(); - long getTimeout(); - - // optional uint64 receiveTimeout = 7; - boolean hasReceiveTimeout(); - long getReceiveTimeout(); - - // optional .LifeCycleProtocol lifeCycle = 8; - boolean hasLifeCycle(); - akka.remote.RemoteProtocol.LifeCycleProtocol getLifeCycle(); - akka.remote.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder(); - - // optional .RemoteActorRefProtocol supervisor = 9; - boolean hasSupervisor(); - akka.remote.RemoteProtocol.RemoteActorRefProtocol getSupervisor(); - akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder(); - - // optional bytes hotswapStack = 10; - boolean hasHotswapStack(); - com.google.protobuf.ByteString getHotswapStack(); - - // optional .ReplicationStorageType replicationStorage = 11; - boolean hasReplicationStorage(); - akka.remote.RemoteProtocol.ReplicationStorageType getReplicationStorage(); - - // optional .ReplicationStrategyType replicationStrategy = 12; - boolean hasReplicationStrategy(); - akka.remote.RemoteProtocol.ReplicationStrategyType getReplicationStrategy(); - - // repeated .RemoteMessageProtocol messages = 13; - java.util.List - getMessagesList(); - akka.remote.RemoteProtocol.RemoteMessageProtocol getMessages(int index); - int getMessagesCount(); - java.util.List - getMessagesOrBuilderList(); - akka.remote.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessagesOrBuilder( - int index); - } - public static final class SerializedActorRefProtocol extends - com.google.protobuf.GeneratedMessage - implements SerializedActorRefProtocolOrBuilder { - // Use SerializedActorRefProtocol.newBuilder() to construct. - private SerializedActorRefProtocol(Builder builder) { - super(builder); - } - private SerializedActorRefProtocol(boolean noInit) {} - - private static final SerializedActorRefProtocol defaultInstance; - public static SerializedActorRefProtocol getDefaultInstance() { - return defaultInstance; - } - - public SerializedActorRefProtocol getDefaultInstanceForType() { - return defaultInstance; - } - - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return akka.remote.RemoteProtocol.internal_static_SerializedActorRefProtocol_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return akka.remote.RemoteProtocol.internal_static_SerializedActorRefProtocol_fieldAccessorTable; - } - - private int bitField0_; - // required .UuidProtocol uuid = 1; - public static final int UUID_FIELD_NUMBER = 1; - private akka.remote.RemoteProtocol.UuidProtocol uuid_; - public boolean hasUuid() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - public akka.remote.RemoteProtocol.UuidProtocol getUuid() { - return uuid_; - } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() { - return uuid_; - } - - // required string address = 2; - public static final int ADDRESS_FIELD_NUMBER = 2; - private java.lang.Object address_; - public boolean hasAddress() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - public String getAddress() { - java.lang.Object ref = address_; - if (ref instanceof String) { - return (String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); - if (com.google.protobuf.Internal.isValidUtf8(bs)) { - address_ = s; - } - return s; - } - } - private com.google.protobuf.ByteString getAddressBytes() { - java.lang.Object ref = address_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((String) ref); - address_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // required string actorClassname = 3; - public static final int ACTORCLASSNAME_FIELD_NUMBER = 3; - private java.lang.Object actorClassname_; - public boolean hasActorClassname() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - public String getActorClassname() { - java.lang.Object ref = actorClassname_; - if (ref instanceof String) { - return (String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); - if (com.google.protobuf.Internal.isValidUtf8(bs)) { - actorClassname_ = s; - } - return s; - } - } - private com.google.protobuf.ByteString getActorClassnameBytes() { - java.lang.Object ref = actorClassname_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((String) ref); - actorClassname_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // optional bytes actorInstance = 4; - public static final int ACTORINSTANCE_FIELD_NUMBER = 4; - private com.google.protobuf.ByteString actorInstance_; - public boolean hasActorInstance() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - public com.google.protobuf.ByteString getActorInstance() { - return actorInstance_; - } - - // optional string serializerClassname = 5; - public static final int SERIALIZERCLASSNAME_FIELD_NUMBER = 5; - private java.lang.Object serializerClassname_; - public boolean hasSerializerClassname() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - public String getSerializerClassname() { - java.lang.Object ref = serializerClassname_; - if (ref instanceof String) { - return (String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); - if (com.google.protobuf.Internal.isValidUtf8(bs)) { - serializerClassname_ = s; - } - return s; - } - } - private com.google.protobuf.ByteString getSerializerClassnameBytes() { - java.lang.Object ref = serializerClassname_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((String) ref); - serializerClassname_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // optional uint64 timeout = 6; - public static final int TIMEOUT_FIELD_NUMBER = 6; - private long timeout_; - public boolean hasTimeout() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - public long getTimeout() { - return timeout_; - } - - // optional uint64 receiveTimeout = 7; - public static final int RECEIVETIMEOUT_FIELD_NUMBER = 7; - private long receiveTimeout_; - public boolean hasReceiveTimeout() { - return ((bitField0_ & 0x00000040) == 0x00000040); - } - public long getReceiveTimeout() { - return receiveTimeout_; - } - - // optional .LifeCycleProtocol lifeCycle = 8; - public static final int LIFECYCLE_FIELD_NUMBER = 8; - private akka.remote.RemoteProtocol.LifeCycleProtocol lifeCycle_; - public boolean hasLifeCycle() { - return ((bitField0_ & 0x00000080) == 0x00000080); - } - public akka.remote.RemoteProtocol.LifeCycleProtocol getLifeCycle() { - return lifeCycle_; - } - public akka.remote.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder() { - return lifeCycle_; - } - - // optional .RemoteActorRefProtocol supervisor = 9; - public static final int SUPERVISOR_FIELD_NUMBER = 9; - private akka.remote.RemoteProtocol.RemoteActorRefProtocol supervisor_; - public boolean hasSupervisor() { - return ((bitField0_ & 0x00000100) == 0x00000100); - } - public akka.remote.RemoteProtocol.RemoteActorRefProtocol getSupervisor() { - return supervisor_; - } - public akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder() { - return supervisor_; - } - - // optional bytes hotswapStack = 10; - public static final int HOTSWAPSTACK_FIELD_NUMBER = 10; - private com.google.protobuf.ByteString hotswapStack_; - public boolean hasHotswapStack() { - return ((bitField0_ & 0x00000200) == 0x00000200); - } - public com.google.protobuf.ByteString getHotswapStack() { - return hotswapStack_; - } - - // optional .ReplicationStorageType replicationStorage = 11; - public static final int REPLICATIONSTORAGE_FIELD_NUMBER = 11; - private akka.remote.RemoteProtocol.ReplicationStorageType replicationStorage_; - public boolean hasReplicationStorage() { - return ((bitField0_ & 0x00000400) == 0x00000400); - } - public akka.remote.RemoteProtocol.ReplicationStorageType getReplicationStorage() { - return replicationStorage_; - } - - // optional .ReplicationStrategyType replicationStrategy = 12; - public static final int REPLICATIONSTRATEGY_FIELD_NUMBER = 12; - private akka.remote.RemoteProtocol.ReplicationStrategyType replicationStrategy_; - public boolean hasReplicationStrategy() { - return ((bitField0_ & 0x00000800) == 0x00000800); - } - public akka.remote.RemoteProtocol.ReplicationStrategyType getReplicationStrategy() { - return replicationStrategy_; - } - - // repeated .RemoteMessageProtocol messages = 13; - public static final int MESSAGES_FIELD_NUMBER = 13; - private java.util.List messages_; - public java.util.List getMessagesList() { - return messages_; - } - public java.util.List - getMessagesOrBuilderList() { - return messages_; - } - public int getMessagesCount() { - return messages_.size(); - } - public akka.remote.RemoteProtocol.RemoteMessageProtocol getMessages(int index) { - return messages_.get(index); - } - public akka.remote.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessagesOrBuilder( - int index) { - return messages_.get(index); - } - - private void initFields() { - uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - address_ = ""; - actorClassname_ = ""; - actorInstance_ = com.google.protobuf.ByteString.EMPTY; - serializerClassname_ = ""; - timeout_ = 0L; - receiveTimeout_ = 0L; - lifeCycle_ = akka.remote.RemoteProtocol.LifeCycleProtocol.getDefaultInstance(); - supervisor_ = akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); - hotswapStack_ = com.google.protobuf.ByteString.EMPTY; - replicationStorage_ = akka.remote.RemoteProtocol.ReplicationStorageType.TRANSIENT; - replicationStrategy_ = akka.remote.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH; - messages_ = java.util.Collections.emptyList(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasUuid()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasAddress()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasActorClassname()) { - memoizedIsInitialized = 0; - return false; - } - if (!getUuid().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - if (hasLifeCycle()) { - if (!getLifeCycle().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (hasSupervisor()) { - if (!getSupervisor().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - for (int i = 0; i < getMessagesCount(); i++) { - if (!getMessages(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, uuid_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getAddressBytes()); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBytes(3, getActorClassnameBytes()); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeBytes(4, actorInstance_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeBytes(5, getSerializerClassnameBytes()); - } - if (((bitField0_ & 0x00000020) == 0x00000020)) { - output.writeUInt64(6, timeout_); - } - if (((bitField0_ & 0x00000040) == 0x00000040)) { - output.writeUInt64(7, receiveTimeout_); - } - if (((bitField0_ & 0x00000080) == 0x00000080)) { - output.writeMessage(8, lifeCycle_); - } - if (((bitField0_ & 0x00000100) == 0x00000100)) { - output.writeMessage(9, supervisor_); - } - if (((bitField0_ & 0x00000200) == 0x00000200)) { - output.writeBytes(10, hotswapStack_); - } - if (((bitField0_ & 0x00000400) == 0x00000400)) { - output.writeEnum(11, replicationStorage_.getNumber()); - } - if (((bitField0_ & 0x00000800) == 0x00000800)) { - output.writeEnum(12, replicationStrategy_.getNumber()); - } - for (int i = 0; i < messages_.size(); i++) { - output.writeMessage(13, messages_.get(i)); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, uuid_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getAddressBytes()); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(3, getActorClassnameBytes()); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(4, actorInstance_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(5, getSerializerClassnameBytes()); - } - if (((bitField0_ & 0x00000020) == 0x00000020)) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(6, timeout_); - } - if (((bitField0_ & 0x00000040) == 0x00000040)) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(7, receiveTimeout_); - } - if (((bitField0_ & 0x00000080) == 0x00000080)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, lifeCycle_); - } - if (((bitField0_ & 0x00000100) == 0x00000100)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, supervisor_); - } - if (((bitField0_ & 0x00000200) == 0x00000200)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(10, hotswapStack_); - } - if (((bitField0_ & 0x00000400) == 0x00000400)) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(11, replicationStorage_.getNumber()); - } - if (((bitField0_ & 0x00000800) == 0x00000800)) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(12, replicationStrategy_.getNumber()); - } - for (int i = 0; i < messages_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, messages_.get(i)); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static akka.remote.RemoteProtocol.SerializedActorRefProtocol parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data).buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedActorRefProtocol parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedActorRefProtocol parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data).buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedActorRefProtocol parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedActorRefProtocol parseFrom(java.io.InputStream input) - throws java.io.IOException { - return newBuilder().mergeFrom(input).buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedActorRefProtocol parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return newBuilder().mergeFrom(input, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedActorRefProtocol parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - Builder builder = newBuilder(); - if (builder.mergeDelimitedFrom(input)) { - return builder.buildParsed(); - } else { - return null; - } - } - public static akka.remote.RemoteProtocol.SerializedActorRefProtocol parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - Builder builder = newBuilder(); - if (builder.mergeDelimitedFrom(input, extensionRegistry)) { - return builder.buildParsed(); - } else { - return null; - } - } - public static akka.remote.RemoteProtocol.SerializedActorRefProtocol parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return newBuilder().mergeFrom(input).buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedActorRefProtocol parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return newBuilder().mergeFrom(input, extensionRegistry) - .buildParsed(); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.remote.RemoteProtocol.SerializedActorRefProtocol prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements akka.remote.RemoteProtocol.SerializedActorRefProtocolOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return akka.remote.RemoteProtocol.internal_static_SerializedActorRefProtocol_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return akka.remote.RemoteProtocol.internal_static_SerializedActorRefProtocol_fieldAccessorTable; - } - - // Construct using akka.remote.RemoteProtocol.SerializedActorRefProtocol.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getUuidFieldBuilder(); - getLifeCycleFieldBuilder(); - getSupervisorFieldBuilder(); - getMessagesFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - if (uuidBuilder_ == null) { - uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - } else { - uuidBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - address_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); - actorClassname_ = ""; - bitField0_ = (bitField0_ & ~0x00000004); - actorInstance_ = com.google.protobuf.ByteString.EMPTY; - bitField0_ = (bitField0_ & ~0x00000008); - serializerClassname_ = ""; - bitField0_ = (bitField0_ & ~0x00000010); - timeout_ = 0L; - bitField0_ = (bitField0_ & ~0x00000020); - receiveTimeout_ = 0L; - bitField0_ = (bitField0_ & ~0x00000040); - if (lifeCycleBuilder_ == null) { - lifeCycle_ = akka.remote.RemoteProtocol.LifeCycleProtocol.getDefaultInstance(); - } else { - lifeCycleBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000080); - if (supervisorBuilder_ == null) { - supervisor_ = akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); - } else { - supervisorBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000100); - hotswapStack_ = com.google.protobuf.ByteString.EMPTY; - bitField0_ = (bitField0_ & ~0x00000200); - replicationStorage_ = akka.remote.RemoteProtocol.ReplicationStorageType.TRANSIENT; - bitField0_ = (bitField0_ & ~0x00000400); - replicationStrategy_ = akka.remote.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH; - bitField0_ = (bitField0_ & ~0x00000800); - if (messagesBuilder_ == null) { - messages_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00001000); - } else { - messagesBuilder_.clear(); - } - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return akka.remote.RemoteProtocol.SerializedActorRefProtocol.getDescriptor(); - } - - public akka.remote.RemoteProtocol.SerializedActorRefProtocol getDefaultInstanceForType() { - return akka.remote.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance(); - } - - public akka.remote.RemoteProtocol.SerializedActorRefProtocol build() { - akka.remote.RemoteProtocol.SerializedActorRefProtocol result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - private akka.remote.RemoteProtocol.SerializedActorRefProtocol buildParsed() - throws com.google.protobuf.InvalidProtocolBufferException { - akka.remote.RemoteProtocol.SerializedActorRefProtocol result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException( - result).asInvalidProtocolBufferException(); - } - return result; - } - - public akka.remote.RemoteProtocol.SerializedActorRefProtocol buildPartial() { - akka.remote.RemoteProtocol.SerializedActorRefProtocol result = new akka.remote.RemoteProtocol.SerializedActorRefProtocol(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - if (uuidBuilder_ == null) { - result.uuid_ = uuid_; - } else { - result.uuid_ = uuidBuilder_.build(); - } - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.address_ = address_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.actorClassname_ = actorClassname_; - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; - } - result.actorInstance_ = actorInstance_; - if (((from_bitField0_ & 0x00000010) == 0x00000010)) { - to_bitField0_ |= 0x00000010; - } - result.serializerClassname_ = serializerClassname_; - if (((from_bitField0_ & 0x00000020) == 0x00000020)) { - to_bitField0_ |= 0x00000020; - } - result.timeout_ = timeout_; - if (((from_bitField0_ & 0x00000040) == 0x00000040)) { - to_bitField0_ |= 0x00000040; - } - result.receiveTimeout_ = receiveTimeout_; - if (((from_bitField0_ & 0x00000080) == 0x00000080)) { - to_bitField0_ |= 0x00000080; - } - if (lifeCycleBuilder_ == null) { - result.lifeCycle_ = lifeCycle_; - } else { - result.lifeCycle_ = lifeCycleBuilder_.build(); - } - if (((from_bitField0_ & 0x00000100) == 0x00000100)) { - to_bitField0_ |= 0x00000100; - } - if (supervisorBuilder_ == null) { - result.supervisor_ = supervisor_; - } else { - result.supervisor_ = supervisorBuilder_.build(); - } - if (((from_bitField0_ & 0x00000200) == 0x00000200)) { - to_bitField0_ |= 0x00000200; - } - result.hotswapStack_ = hotswapStack_; - if (((from_bitField0_ & 0x00000400) == 0x00000400)) { - to_bitField0_ |= 0x00000400; - } - result.replicationStorage_ = replicationStorage_; - if (((from_bitField0_ & 0x00000800) == 0x00000800)) { - to_bitField0_ |= 0x00000800; - } - result.replicationStrategy_ = replicationStrategy_; - if (messagesBuilder_ == null) { - if (((bitField0_ & 0x00001000) == 0x00001000)) { - messages_ = java.util.Collections.unmodifiableList(messages_); - bitField0_ = (bitField0_ & ~0x00001000); - } - result.messages_ = messages_; - } else { - result.messages_ = messagesBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.remote.RemoteProtocol.SerializedActorRefProtocol) { - return mergeFrom((akka.remote.RemoteProtocol.SerializedActorRefProtocol)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(akka.remote.RemoteProtocol.SerializedActorRefProtocol other) { - if (other == akka.remote.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance()) return this; - if (other.hasUuid()) { - mergeUuid(other.getUuid()); - } - if (other.hasAddress()) { - setAddress(other.getAddress()); - } - if (other.hasActorClassname()) { - setActorClassname(other.getActorClassname()); - } - if (other.hasActorInstance()) { - setActorInstance(other.getActorInstance()); - } - if (other.hasSerializerClassname()) { - setSerializerClassname(other.getSerializerClassname()); - } - if (other.hasTimeout()) { - setTimeout(other.getTimeout()); - } - if (other.hasReceiveTimeout()) { - setReceiveTimeout(other.getReceiveTimeout()); - } - if (other.hasLifeCycle()) { - mergeLifeCycle(other.getLifeCycle()); - } - if (other.hasSupervisor()) { - mergeSupervisor(other.getSupervisor()); - } - if (other.hasHotswapStack()) { - setHotswapStack(other.getHotswapStack()); - } - if (other.hasReplicationStorage()) { - setReplicationStorage(other.getReplicationStorage()); - } - if (other.hasReplicationStrategy()) { - setReplicationStrategy(other.getReplicationStrategy()); - } - if (messagesBuilder_ == null) { - if (!other.messages_.isEmpty()) { - if (messages_.isEmpty()) { - messages_ = other.messages_; - bitField0_ = (bitField0_ & ~0x00001000); - } else { - ensureMessagesIsMutable(); - messages_.addAll(other.messages_); - } - onChanged(); - } - } else { - if (!other.messages_.isEmpty()) { - if (messagesBuilder_.isEmpty()) { - messagesBuilder_.dispose(); - messagesBuilder_ = null; - messages_ = other.messages_; - bitField0_ = (bitField0_ & ~0x00001000); - messagesBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getMessagesFieldBuilder() : null; - } else { - messagesBuilder_.addAllMessages(other.messages_); - } - } - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasUuid()) { - - return false; - } - if (!hasAddress()) { - - return false; - } - if (!hasActorClassname()) { - - return false; - } - if (!getUuid().isInitialized()) { - - return false; - } - if (hasLifeCycle()) { - if (!getLifeCycle().isInitialized()) { - - return false; - } - } - if (hasSupervisor()) { - if (!getSupervisor().isInitialized()) { - - return false; - } - } - for (int i = 0; i < getMessagesCount(); i++) { - if (!getMessages(i).isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder( - this.getUnknownFields()); - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - this.setUnknownFields(unknownFields.build()); - onChanged(); - return this; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - this.setUnknownFields(unknownFields.build()); - onChanged(); - return this; - } - break; - } - case 10: { - akka.remote.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.remote.RemoteProtocol.UuidProtocol.newBuilder(); - if (hasUuid()) { - subBuilder.mergeFrom(getUuid()); - } - input.readMessage(subBuilder, extensionRegistry); - setUuid(subBuilder.buildPartial()); - break; - } - case 18: { - bitField0_ |= 0x00000002; - address_ = input.readBytes(); - break; - } - case 26: { - bitField0_ |= 0x00000004; - actorClassname_ = input.readBytes(); - break; - } - case 34: { - bitField0_ |= 0x00000008; - actorInstance_ = input.readBytes(); - break; - } - case 42: { - bitField0_ |= 0x00000010; - serializerClassname_ = input.readBytes(); - break; - } - case 48: { - bitField0_ |= 0x00000020; - timeout_ = input.readUInt64(); - break; - } - case 56: { - bitField0_ |= 0x00000040; - receiveTimeout_ = input.readUInt64(); - break; - } - case 66: { - akka.remote.RemoteProtocol.LifeCycleProtocol.Builder subBuilder = akka.remote.RemoteProtocol.LifeCycleProtocol.newBuilder(); - if (hasLifeCycle()) { - subBuilder.mergeFrom(getLifeCycle()); - } - input.readMessage(subBuilder, extensionRegistry); - setLifeCycle(subBuilder.buildPartial()); - break; - } - case 74: { - akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder subBuilder = akka.remote.RemoteProtocol.RemoteActorRefProtocol.newBuilder(); - if (hasSupervisor()) { - subBuilder.mergeFrom(getSupervisor()); - } - input.readMessage(subBuilder, extensionRegistry); - setSupervisor(subBuilder.buildPartial()); - break; - } - case 82: { - bitField0_ |= 0x00000200; - hotswapStack_ = input.readBytes(); - break; - } - case 88: { - int rawValue = input.readEnum(); - akka.remote.RemoteProtocol.ReplicationStorageType value = akka.remote.RemoteProtocol.ReplicationStorageType.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(11, rawValue); - } else { - bitField0_ |= 0x00000400; - replicationStorage_ = value; - } - break; - } - case 96: { - int rawValue = input.readEnum(); - akka.remote.RemoteProtocol.ReplicationStrategyType value = akka.remote.RemoteProtocol.ReplicationStrategyType.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(12, rawValue); - } else { - bitField0_ |= 0x00000800; - replicationStrategy_ = value; - } - break; - } - case 106: { - akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder subBuilder = akka.remote.RemoteProtocol.RemoteMessageProtocol.newBuilder(); - input.readMessage(subBuilder, extensionRegistry); - addMessages(subBuilder.buildPartial()); - break; - } - } - } - } - - private int bitField0_; - - // required .UuidProtocol uuid = 1; - private akka.remote.RemoteProtocol.UuidProtocol uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_; - public boolean hasUuid() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - public akka.remote.RemoteProtocol.UuidProtocol getUuid() { - if (uuidBuilder_ == null) { - return uuid_; - } else { - return uuidBuilder_.getMessage(); - } - } - public Builder setUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (uuidBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - uuid_ = value; - onChanged(); - } else { - uuidBuilder_.setMessage(value); - } - bitField0_ |= 0x00000001; - return this; - } - public Builder setUuid( - akka.remote.RemoteProtocol.UuidProtocol.Builder builderForValue) { - if (uuidBuilder_ == null) { - uuid_ = builderForValue.build(); - onChanged(); - } else { - uuidBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000001; - return this; - } - public Builder mergeUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (uuidBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - uuid_ != akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance()) { - uuid_ = - akka.remote.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial(); - } else { - uuid_ = value; - } - onChanged(); - } else { - uuidBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000001; - return this; - } - public Builder clearUuid() { - if (uuidBuilder_ == null) { - uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - onChanged(); - } else { - uuidBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - public akka.remote.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() { - bitField0_ |= 0x00000001; - onChanged(); - return getUuidFieldBuilder().getBuilder(); - } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() { - if (uuidBuilder_ != null) { - return uuidBuilder_.getMessageOrBuilder(); - } else { - return uuid_; - } - } - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> - getUuidFieldBuilder() { - if (uuidBuilder_ == null) { - uuidBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder>( - uuid_, - getParentForChildren(), - isClean()); - uuid_ = null; - } - return uuidBuilder_; - } - - // required string address = 2; - private java.lang.Object address_ = ""; - public boolean hasAddress() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - public String getAddress() { - java.lang.Object ref = address_; - if (!(ref instanceof String)) { - String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); - address_ = s; - return s; - } else { - return (String) ref; - } - } - public Builder setAddress(String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - address_ = value; - onChanged(); - return this; - } - public Builder clearAddress() { - bitField0_ = (bitField0_ & ~0x00000002); - address_ = getDefaultInstance().getAddress(); - onChanged(); - return this; - } - void setAddress(com.google.protobuf.ByteString value) { - bitField0_ |= 0x00000002; - address_ = value; - onChanged(); - } - - // required string actorClassname = 3; - private java.lang.Object actorClassname_ = ""; - public boolean hasActorClassname() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - public String getActorClassname() { - java.lang.Object ref = actorClassname_; - if (!(ref instanceof String)) { - String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); - actorClassname_ = s; - return s; - } else { - return (String) ref; - } - } - public Builder setActorClassname(String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - actorClassname_ = value; - onChanged(); - return this; - } - public Builder clearActorClassname() { - bitField0_ = (bitField0_ & ~0x00000004); - actorClassname_ = getDefaultInstance().getActorClassname(); - onChanged(); - return this; - } - void setActorClassname(com.google.protobuf.ByteString value) { - bitField0_ |= 0x00000004; - actorClassname_ = value; - onChanged(); - } - - // optional bytes actorInstance = 4; - private com.google.protobuf.ByteString actorInstance_ = com.google.protobuf.ByteString.EMPTY; - public boolean hasActorInstance() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - public com.google.protobuf.ByteString getActorInstance() { - return actorInstance_; - } - public Builder setActorInstance(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; - actorInstance_ = value; - onChanged(); - return this; - } - public Builder clearActorInstance() { - bitField0_ = (bitField0_ & ~0x00000008); - actorInstance_ = getDefaultInstance().getActorInstance(); - onChanged(); - return this; - } - - // optional string serializerClassname = 5; - private java.lang.Object serializerClassname_ = ""; - public boolean hasSerializerClassname() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - public String getSerializerClassname() { - java.lang.Object ref = serializerClassname_; - if (!(ref instanceof String)) { - String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); - serializerClassname_ = s; - return s; - } else { - return (String) ref; - } - } - public Builder setSerializerClassname(String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000010; - serializerClassname_ = value; - onChanged(); - return this; - } - public Builder clearSerializerClassname() { - bitField0_ = (bitField0_ & ~0x00000010); - serializerClassname_ = getDefaultInstance().getSerializerClassname(); - onChanged(); - return this; - } - void setSerializerClassname(com.google.protobuf.ByteString value) { - bitField0_ |= 0x00000010; - serializerClassname_ = value; - onChanged(); - } - - // optional uint64 timeout = 6; - private long timeout_ ; - public boolean hasTimeout() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - public long getTimeout() { - return timeout_; - } - public Builder setTimeout(long value) { - bitField0_ |= 0x00000020; - timeout_ = value; - onChanged(); - return this; - } - public Builder clearTimeout() { - bitField0_ = (bitField0_ & ~0x00000020); - timeout_ = 0L; - onChanged(); - return this; - } - - // optional uint64 receiveTimeout = 7; - private long receiveTimeout_ ; - public boolean hasReceiveTimeout() { - return ((bitField0_ & 0x00000040) == 0x00000040); - } - public long getReceiveTimeout() { - return receiveTimeout_; - } - public Builder setReceiveTimeout(long value) { - bitField0_ |= 0x00000040; - receiveTimeout_ = value; - onChanged(); - return this; - } - public Builder clearReceiveTimeout() { - bitField0_ = (bitField0_ & ~0x00000040); - receiveTimeout_ = 0L; - onChanged(); - return this; - } - - // optional .LifeCycleProtocol lifeCycle = 8; - private akka.remote.RemoteProtocol.LifeCycleProtocol lifeCycle_ = akka.remote.RemoteProtocol.LifeCycleProtocol.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.LifeCycleProtocol, akka.remote.RemoteProtocol.LifeCycleProtocol.Builder, akka.remote.RemoteProtocol.LifeCycleProtocolOrBuilder> lifeCycleBuilder_; - public boolean hasLifeCycle() { - return ((bitField0_ & 0x00000080) == 0x00000080); - } - public akka.remote.RemoteProtocol.LifeCycleProtocol getLifeCycle() { - if (lifeCycleBuilder_ == null) { - return lifeCycle_; - } else { - return lifeCycleBuilder_.getMessage(); - } - } - public Builder setLifeCycle(akka.remote.RemoteProtocol.LifeCycleProtocol value) { - if (lifeCycleBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - lifeCycle_ = value; - onChanged(); - } else { - lifeCycleBuilder_.setMessage(value); - } - bitField0_ |= 0x00000080; - return this; - } - public Builder setLifeCycle( - akka.remote.RemoteProtocol.LifeCycleProtocol.Builder builderForValue) { - if (lifeCycleBuilder_ == null) { - lifeCycle_ = builderForValue.build(); - onChanged(); - } else { - lifeCycleBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000080; - return this; - } - public Builder mergeLifeCycle(akka.remote.RemoteProtocol.LifeCycleProtocol value) { - if (lifeCycleBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080) && - lifeCycle_ != akka.remote.RemoteProtocol.LifeCycleProtocol.getDefaultInstance()) { - lifeCycle_ = - akka.remote.RemoteProtocol.LifeCycleProtocol.newBuilder(lifeCycle_).mergeFrom(value).buildPartial(); - } else { - lifeCycle_ = value; - } - onChanged(); - } else { - lifeCycleBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000080; - return this; - } - public Builder clearLifeCycle() { - if (lifeCycleBuilder_ == null) { - lifeCycle_ = akka.remote.RemoteProtocol.LifeCycleProtocol.getDefaultInstance(); - onChanged(); - } else { - lifeCycleBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000080); - return this; - } - public akka.remote.RemoteProtocol.LifeCycleProtocol.Builder getLifeCycleBuilder() { - bitField0_ |= 0x00000080; - onChanged(); - return getLifeCycleFieldBuilder().getBuilder(); - } - public akka.remote.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder() { - if (lifeCycleBuilder_ != null) { - return lifeCycleBuilder_.getMessageOrBuilder(); - } else { - return lifeCycle_; - } - } - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.LifeCycleProtocol, akka.remote.RemoteProtocol.LifeCycleProtocol.Builder, akka.remote.RemoteProtocol.LifeCycleProtocolOrBuilder> - getLifeCycleFieldBuilder() { - if (lifeCycleBuilder_ == null) { - lifeCycleBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.LifeCycleProtocol, akka.remote.RemoteProtocol.LifeCycleProtocol.Builder, akka.remote.RemoteProtocol.LifeCycleProtocolOrBuilder>( - lifeCycle_, - getParentForChildren(), - isClean()); - lifeCycle_ = null; - } - return lifeCycleBuilder_; - } - - // optional .RemoteActorRefProtocol supervisor = 9; - private akka.remote.RemoteProtocol.RemoteActorRefProtocol supervisor_ = akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.RemoteActorRefProtocol, akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder> supervisorBuilder_; - public boolean hasSupervisor() { - return ((bitField0_ & 0x00000100) == 0x00000100); - } - public akka.remote.RemoteProtocol.RemoteActorRefProtocol getSupervisor() { - if (supervisorBuilder_ == null) { - return supervisor_; - } else { - return supervisorBuilder_.getMessage(); - } - } - public Builder setSupervisor(akka.remote.RemoteProtocol.RemoteActorRefProtocol value) { - if (supervisorBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - supervisor_ = value; - onChanged(); - } else { - supervisorBuilder_.setMessage(value); - } - bitField0_ |= 0x00000100; - return this; - } - public Builder setSupervisor( - akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder builderForValue) { - if (supervisorBuilder_ == null) { - supervisor_ = builderForValue.build(); - onChanged(); - } else { - supervisorBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000100; - return this; - } - public Builder mergeSupervisor(akka.remote.RemoteProtocol.RemoteActorRefProtocol value) { - if (supervisorBuilder_ == null) { - if (((bitField0_ & 0x00000100) == 0x00000100) && - supervisor_ != akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) { - supervisor_ = - akka.remote.RemoteProtocol.RemoteActorRefProtocol.newBuilder(supervisor_).mergeFrom(value).buildPartial(); - } else { - supervisor_ = value; - } - onChanged(); - } else { - supervisorBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000100; - return this; - } - public Builder clearSupervisor() { - if (supervisorBuilder_ == null) { - supervisor_ = akka.remote.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); - onChanged(); - } else { - supervisorBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000100); - return this; - } - public akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder getSupervisorBuilder() { - bitField0_ |= 0x00000100; - onChanged(); - return getSupervisorFieldBuilder().getBuilder(); - } - public akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder() { - if (supervisorBuilder_ != null) { - return supervisorBuilder_.getMessageOrBuilder(); - } else { - return supervisor_; - } - } - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.RemoteActorRefProtocol, akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder> - getSupervisorFieldBuilder() { - if (supervisorBuilder_ == null) { - supervisorBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.RemoteActorRefProtocol, akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.RemoteProtocol.RemoteActorRefProtocolOrBuilder>( - supervisor_, - getParentForChildren(), - isClean()); - supervisor_ = null; - } - return supervisorBuilder_; - } - - // optional bytes hotswapStack = 10; - private com.google.protobuf.ByteString hotswapStack_ = com.google.protobuf.ByteString.EMPTY; - public boolean hasHotswapStack() { - return ((bitField0_ & 0x00000200) == 0x00000200); - } - public com.google.protobuf.ByteString getHotswapStack() { - return hotswapStack_; - } - public Builder setHotswapStack(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000200; - hotswapStack_ = value; - onChanged(); - return this; - } - public Builder clearHotswapStack() { - bitField0_ = (bitField0_ & ~0x00000200); - hotswapStack_ = getDefaultInstance().getHotswapStack(); - onChanged(); - return this; - } - - // optional .ReplicationStorageType replicationStorage = 11; - private akka.remote.RemoteProtocol.ReplicationStorageType replicationStorage_ = akka.remote.RemoteProtocol.ReplicationStorageType.TRANSIENT; - public boolean hasReplicationStorage() { - return ((bitField0_ & 0x00000400) == 0x00000400); - } - public akka.remote.RemoteProtocol.ReplicationStorageType getReplicationStorage() { - return replicationStorage_; - } - public Builder setReplicationStorage(akka.remote.RemoteProtocol.ReplicationStorageType value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000400; - replicationStorage_ = value; - onChanged(); - return this; - } - public Builder clearReplicationStorage() { - bitField0_ = (bitField0_ & ~0x00000400); - replicationStorage_ = akka.remote.RemoteProtocol.ReplicationStorageType.TRANSIENT; - onChanged(); - return this; - } - - // optional .ReplicationStrategyType replicationStrategy = 12; - private akka.remote.RemoteProtocol.ReplicationStrategyType replicationStrategy_ = akka.remote.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH; - public boolean hasReplicationStrategy() { - return ((bitField0_ & 0x00000800) == 0x00000800); - } - public akka.remote.RemoteProtocol.ReplicationStrategyType getReplicationStrategy() { - return replicationStrategy_; - } - public Builder setReplicationStrategy(akka.remote.RemoteProtocol.ReplicationStrategyType value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000800; - replicationStrategy_ = value; - onChanged(); - return this; - } - public Builder clearReplicationStrategy() { - bitField0_ = (bitField0_ & ~0x00000800); - replicationStrategy_ = akka.remote.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH; - onChanged(); - return this; - } - - // repeated .RemoteMessageProtocol messages = 13; - private java.util.List messages_ = - java.util.Collections.emptyList(); - private void ensureMessagesIsMutable() { - if (!((bitField0_ & 0x00001000) == 0x00001000)) { - messages_ = new java.util.ArrayList(messages_); - bitField0_ |= 0x00001000; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - akka.remote.RemoteProtocol.RemoteMessageProtocol, akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.RemoteProtocol.RemoteMessageProtocolOrBuilder> messagesBuilder_; - - public java.util.List getMessagesList() { - if (messagesBuilder_ == null) { - return java.util.Collections.unmodifiableList(messages_); - } else { - return messagesBuilder_.getMessageList(); - } - } - public int getMessagesCount() { - if (messagesBuilder_ == null) { - return messages_.size(); - } else { - return messagesBuilder_.getCount(); - } - } - public akka.remote.RemoteProtocol.RemoteMessageProtocol getMessages(int index) { - if (messagesBuilder_ == null) { - return messages_.get(index); - } else { - return messagesBuilder_.getMessage(index); - } - } - public Builder setMessages( - int index, akka.remote.RemoteProtocol.RemoteMessageProtocol value) { - if (messagesBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureMessagesIsMutable(); - messages_.set(index, value); - onChanged(); - } else { - messagesBuilder_.setMessage(index, value); - } - return this; - } - public Builder setMessages( - int index, akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) { - if (messagesBuilder_ == null) { - ensureMessagesIsMutable(); - messages_.set(index, builderForValue.build()); - onChanged(); - } else { - messagesBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - public Builder addMessages(akka.remote.RemoteProtocol.RemoteMessageProtocol value) { - if (messagesBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureMessagesIsMutable(); - messages_.add(value); - onChanged(); - } else { - messagesBuilder_.addMessage(value); - } - return this; - } - public Builder addMessages( - int index, akka.remote.RemoteProtocol.RemoteMessageProtocol value) { - if (messagesBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureMessagesIsMutable(); - messages_.add(index, value); - onChanged(); - } else { - messagesBuilder_.addMessage(index, value); - } - return this; - } - public Builder addMessages( - akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) { - if (messagesBuilder_ == null) { - ensureMessagesIsMutable(); - messages_.add(builderForValue.build()); - onChanged(); - } else { - messagesBuilder_.addMessage(builderForValue.build()); - } - return this; - } - public Builder addMessages( - int index, akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) { - if (messagesBuilder_ == null) { - ensureMessagesIsMutable(); - messages_.add(index, builderForValue.build()); - onChanged(); - } else { - messagesBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - public Builder addAllMessages( - java.lang.Iterable values) { - if (messagesBuilder_ == null) { - ensureMessagesIsMutable(); - super.addAll(values, messages_); - onChanged(); - } else { - messagesBuilder_.addAllMessages(values); - } - return this; - } - public Builder clearMessages() { - if (messagesBuilder_ == null) { - messages_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00001000); - onChanged(); - } else { - messagesBuilder_.clear(); - } - return this; - } - public Builder removeMessages(int index) { - if (messagesBuilder_ == null) { - ensureMessagesIsMutable(); - messages_.remove(index); - onChanged(); - } else { - messagesBuilder_.remove(index); - } - return this; - } - public akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder getMessagesBuilder( - int index) { - return getMessagesFieldBuilder().getBuilder(index); - } - public akka.remote.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessagesOrBuilder( - int index) { - if (messagesBuilder_ == null) { - return messages_.get(index); } else { - return messagesBuilder_.getMessageOrBuilder(index); - } - } - public java.util.List - getMessagesOrBuilderList() { - if (messagesBuilder_ != null) { - return messagesBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(messages_); - } - } - public akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder addMessagesBuilder() { - return getMessagesFieldBuilder().addBuilder( - akka.remote.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance()); - } - public akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder addMessagesBuilder( - int index) { - return getMessagesFieldBuilder().addBuilder( - index, akka.remote.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance()); - } - public java.util.List - getMessagesBuilderList() { - return getMessagesFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - akka.remote.RemoteProtocol.RemoteMessageProtocol, akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.RemoteProtocol.RemoteMessageProtocolOrBuilder> - getMessagesFieldBuilder() { - if (messagesBuilder_ == null) { - messagesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - akka.remote.RemoteProtocol.RemoteMessageProtocol, akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.RemoteProtocol.RemoteMessageProtocolOrBuilder>( - messages_, - ((bitField0_ & 0x00001000) == 0x00001000), - getParentForChildren(), - isClean()); - messages_ = null; - } - return messagesBuilder_; - } - - // @@protoc_insertion_point(builder_scope:SerializedActorRefProtocol) - } - - static { - defaultInstance = new SerializedActorRefProtocol(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:SerializedActorRefProtocol) - } - - public interface SerializedTypedActorRefProtocolOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // required .SerializedActorRefProtocol actorRef = 1; - boolean hasActorRef(); - akka.remote.RemoteProtocol.SerializedActorRefProtocol getActorRef(); - akka.remote.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder(); - - // required string interfaceName = 2; - boolean hasInterfaceName(); - String getInterfaceName(); - } - public static final class SerializedTypedActorRefProtocol extends - com.google.protobuf.GeneratedMessage - implements SerializedTypedActorRefProtocolOrBuilder { - // Use SerializedTypedActorRefProtocol.newBuilder() to construct. - private SerializedTypedActorRefProtocol(Builder builder) { - super(builder); - } - private SerializedTypedActorRefProtocol(boolean noInit) {} - - private static final SerializedTypedActorRefProtocol defaultInstance; - public static SerializedTypedActorRefProtocol getDefaultInstance() { - return defaultInstance; - } - - public SerializedTypedActorRefProtocol getDefaultInstanceForType() { - return defaultInstance; - } - - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return akka.remote.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return akka.remote.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_fieldAccessorTable; - } - - private int bitField0_; - // required .SerializedActorRefProtocol actorRef = 1; - public static final int ACTORREF_FIELD_NUMBER = 1; - private akka.remote.RemoteProtocol.SerializedActorRefProtocol actorRef_; - public boolean hasActorRef() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - public akka.remote.RemoteProtocol.SerializedActorRefProtocol getActorRef() { - return actorRef_; - } - public akka.remote.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder() { - return actorRef_; - } - - // required string interfaceName = 2; - public static final int INTERFACENAME_FIELD_NUMBER = 2; - private java.lang.Object interfaceName_; - public boolean hasInterfaceName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - public String getInterfaceName() { - java.lang.Object ref = interfaceName_; - if (ref instanceof String) { - return (String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); - if (com.google.protobuf.Internal.isValidUtf8(bs)) { - interfaceName_ = s; - } - return s; - } - } - private com.google.protobuf.ByteString getInterfaceNameBytes() { - java.lang.Object ref = interfaceName_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((String) ref); - interfaceName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - private void initFields() { - actorRef_ = akka.remote.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance(); - interfaceName_ = ""; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasActorRef()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasInterfaceName()) { - memoizedIsInitialized = 0; - return false; - } - if (!getActorRef().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, actorRef_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getInterfaceNameBytes()); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, actorRef_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getInterfaceNameBytes()); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data).buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data).buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(java.io.InputStream input) - throws java.io.IOException { - return newBuilder().mergeFrom(input).buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return newBuilder().mergeFrom(input, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - Builder builder = newBuilder(); - if (builder.mergeDelimitedFrom(input)) { - return builder.buildParsed(); - } else { - return null; - } - } - public static akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - Builder builder = newBuilder(); - if (builder.mergeDelimitedFrom(input, extensionRegistry)) { - return builder.buildParsed(); - } else { - return null; - } - } - public static akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return newBuilder().mergeFrom(input).buildParsed(); - } - public static akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return newBuilder().mergeFrom(input, extensionRegistry) - .buildParsed(); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements akka.remote.RemoteProtocol.SerializedTypedActorRefProtocolOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return akka.remote.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return akka.remote.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_fieldAccessorTable; - } - - // Construct using akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getActorRefFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - if (actorRefBuilder_ == null) { - actorRef_ = akka.remote.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance(); - } else { - actorRefBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - interfaceName_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol.getDescriptor(); - } - - public akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol getDefaultInstanceForType() { - return akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol.getDefaultInstance(); - } - - public akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol build() { - akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - private akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol buildParsed() - throws com.google.protobuf.InvalidProtocolBufferException { - akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException( - result).asInvalidProtocolBufferException(); - } - return result; - } - - public akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol buildPartial() { - akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol result = new akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - if (actorRefBuilder_ == null) { - result.actorRef_ = actorRef_; - } else { - result.actorRef_ = actorRefBuilder_.build(); - } - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.interfaceName_ = interfaceName_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol) { - return mergeFrom((akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol other) { - if (other == akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol.getDefaultInstance()) return this; - if (other.hasActorRef()) { - mergeActorRef(other.getActorRef()); - } - if (other.hasInterfaceName()) { - setInterfaceName(other.getInterfaceName()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasActorRef()) { - - return false; - } - if (!hasInterfaceName()) { - - return false; - } - if (!getActorRef().isInitialized()) { - - return false; - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder( - this.getUnknownFields()); - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - this.setUnknownFields(unknownFields.build()); - onChanged(); - return this; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - this.setUnknownFields(unknownFields.build()); - onChanged(); - return this; - } - break; - } - case 10: { - akka.remote.RemoteProtocol.SerializedActorRefProtocol.Builder subBuilder = akka.remote.RemoteProtocol.SerializedActorRefProtocol.newBuilder(); - if (hasActorRef()) { - subBuilder.mergeFrom(getActorRef()); - } - input.readMessage(subBuilder, extensionRegistry); - setActorRef(subBuilder.buildPartial()); - break; - } - case 18: { - bitField0_ |= 0x00000002; - interfaceName_ = input.readBytes(); - break; - } - } - } - } - - private int bitField0_; - - // required .SerializedActorRefProtocol actorRef = 1; - private akka.remote.RemoteProtocol.SerializedActorRefProtocol actorRef_ = akka.remote.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.SerializedActorRefProtocol, akka.remote.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.remote.RemoteProtocol.SerializedActorRefProtocolOrBuilder> actorRefBuilder_; - public boolean hasActorRef() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - public akka.remote.RemoteProtocol.SerializedActorRefProtocol getActorRef() { - if (actorRefBuilder_ == null) { - return actorRef_; - } else { - return actorRefBuilder_.getMessage(); - } - } - public Builder setActorRef(akka.remote.RemoteProtocol.SerializedActorRefProtocol value) { - if (actorRefBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - actorRef_ = value; - onChanged(); - } else { - actorRefBuilder_.setMessage(value); - } - bitField0_ |= 0x00000001; - return this; - } - public Builder setActorRef( - akka.remote.RemoteProtocol.SerializedActorRefProtocol.Builder builderForValue) { - if (actorRefBuilder_ == null) { - actorRef_ = builderForValue.build(); - onChanged(); - } else { - actorRefBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000001; - return this; - } - public Builder mergeActorRef(akka.remote.RemoteProtocol.SerializedActorRefProtocol value) { - if (actorRefBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - actorRef_ != akka.remote.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance()) { - actorRef_ = - akka.remote.RemoteProtocol.SerializedActorRefProtocol.newBuilder(actorRef_).mergeFrom(value).buildPartial(); - } else { - actorRef_ = value; - } - onChanged(); - } else { - actorRefBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000001; - return this; - } - public Builder clearActorRef() { - if (actorRefBuilder_ == null) { - actorRef_ = akka.remote.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance(); - onChanged(); - } else { - actorRefBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - public akka.remote.RemoteProtocol.SerializedActorRefProtocol.Builder getActorRefBuilder() { - bitField0_ |= 0x00000001; - onChanged(); - return getActorRefFieldBuilder().getBuilder(); - } - public akka.remote.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder() { - if (actorRefBuilder_ != null) { - return actorRefBuilder_.getMessageOrBuilder(); - } else { - return actorRef_; - } - } - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.SerializedActorRefProtocol, akka.remote.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.remote.RemoteProtocol.SerializedActorRefProtocolOrBuilder> - getActorRefFieldBuilder() { - if (actorRefBuilder_ == null) { - actorRefBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.SerializedActorRefProtocol, akka.remote.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.remote.RemoteProtocol.SerializedActorRefProtocolOrBuilder>( - actorRef_, - getParentForChildren(), - isClean()); - actorRef_ = null; - } - return actorRefBuilder_; - } - - // required string interfaceName = 2; - private java.lang.Object interfaceName_ = ""; - public boolean hasInterfaceName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - public String getInterfaceName() { - java.lang.Object ref = interfaceName_; - if (!(ref instanceof String)) { - String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); - interfaceName_ = s; - return s; - } else { - return (String) ref; - } - } - public Builder setInterfaceName(String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - interfaceName_ = value; - onChanged(); - return this; - } - public Builder clearInterfaceName() { - bitField0_ = (bitField0_ & ~0x00000002); - interfaceName_ = getDefaultInstance().getInterfaceName(); - onChanged(); - return this; - } - void setInterfaceName(com.google.protobuf.ByteString value) { - bitField0_ |= 0x00000002; - interfaceName_ = value; - onChanged(); - } - - // @@protoc_insertion_point(builder_scope:SerializedTypedActorRefProtocol) - } - - static { - defaultInstance = new SerializedTypedActorRefProtocol(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:SerializedTypedActorRefProtocol) - } - + public interface MessageProtocolOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // required bytes message = 1; boolean hasMessage(); com.google.protobuf.ByteString getMessage(); - + // optional bytes messageManifest = 2; boolean hasMessageManifest(); com.google.protobuf.ByteString getMessageManifest(); @@ -5850,26 +3122,26 @@ public final class RemoteProtocol { super(builder); } private MessageProtocol(boolean noInit) {} - + private static final MessageProtocol defaultInstance; public static MessageProtocol getDefaultInstance() { return defaultInstance; } - + public MessageProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.RemoteProtocol.internal_static_MessageProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_MessageProtocol_fieldAccessorTable; } - + private int bitField0_; // required bytes message = 1; public static final int MESSAGE_FIELD_NUMBER = 1; @@ -5880,7 +3152,7 @@ public final class RemoteProtocol { public com.google.protobuf.ByteString getMessage() { return message_; } - + // optional bytes messageManifest = 2; public static final int MESSAGEMANIFEST_FIELD_NUMBER = 2; private com.google.protobuf.ByteString messageManifest_; @@ -5890,7 +3162,7 @@ public final class RemoteProtocol { public com.google.protobuf.ByteString getMessageManifest() { return messageManifest_; } - + private void initFields() { message_ = com.google.protobuf.ByteString.EMPTY; messageManifest_ = com.google.protobuf.ByteString.EMPTY; @@ -5899,7 +3171,7 @@ public final class RemoteProtocol { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (!hasMessage()) { memoizedIsInitialized = 0; return false; @@ -5907,7 +3179,7 @@ public final class RemoteProtocol { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -5919,12 +3191,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -5938,14 +3210,14 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.RemoteProtocol.MessageProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -6012,14 +3284,14 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.RemoteProtocol.MessageProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { @@ -6033,18 +3305,18 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.internal_static_MessageProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_MessageProtocol_fieldAccessorTable; } - + // Construct using akka.remote.RemoteProtocol.MessageProtocol.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -6055,7 +3327,7 @@ public final class RemoteProtocol { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); message_ = com.google.protobuf.ByteString.EMPTY; @@ -6064,20 +3336,20 @@ public final class RemoteProtocol { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return akka.remote.RemoteProtocol.MessageProtocol.getDescriptor(); } - + public akka.remote.RemoteProtocol.MessageProtocol getDefaultInstanceForType() { return akka.remote.RemoteProtocol.MessageProtocol.getDefaultInstance(); } - + public akka.remote.RemoteProtocol.MessageProtocol build() { akka.remote.RemoteProtocol.MessageProtocol result = buildPartial(); if (!result.isInitialized()) { @@ -6085,7 +3357,7 @@ public final class RemoteProtocol { } return result; } - + private akka.remote.RemoteProtocol.MessageProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { akka.remote.RemoteProtocol.MessageProtocol result = buildPartial(); @@ -6095,7 +3367,7 @@ public final class RemoteProtocol { } return result; } - + public akka.remote.RemoteProtocol.MessageProtocol buildPartial() { akka.remote.RemoteProtocol.MessageProtocol result = new akka.remote.RemoteProtocol.MessageProtocol(this); int from_bitField0_ = bitField0_; @@ -6112,7 +3384,7 @@ public final class RemoteProtocol { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.RemoteProtocol.MessageProtocol) { return mergeFrom((akka.remote.RemoteProtocol.MessageProtocol)other); @@ -6121,7 +3393,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(akka.remote.RemoteProtocol.MessageProtocol other) { if (other == akka.remote.RemoteProtocol.MessageProtocol.getDefaultInstance()) return this; if (other.hasMessage()) { @@ -6133,15 +3405,15 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (!hasMessage()) { - + return false; } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -6178,9 +3450,9 @@ public final class RemoteProtocol { } } } - + private int bitField0_; - + // required bytes message = 1; private com.google.protobuf.ByteString message_ = com.google.protobuf.ByteString.EMPTY; public boolean hasMessage() { @@ -6204,7 +3476,7 @@ public final class RemoteProtocol { onChanged(); return this; } - + // optional bytes messageManifest = 2; private com.google.protobuf.ByteString messageManifest_ = com.google.protobuf.ByteString.EMPTY; public boolean hasMessageManifest() { @@ -6228,624 +3500,25 @@ public final class RemoteProtocol { onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:MessageProtocol) } - + static { defaultInstance = new MessageProtocol(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:MessageProtocol) } - - public interface ActorInfoProtocolOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // required .UuidProtocol uuid = 1; - boolean hasUuid(); - akka.remote.RemoteProtocol.UuidProtocol getUuid(); - akka.remote.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder(); - - // required uint64 timeout = 2; - boolean hasTimeout(); - long getTimeout(); - - // optional string address = 3; - boolean hasAddress(); - String getAddress(); - } - public static final class ActorInfoProtocol extends - com.google.protobuf.GeneratedMessage - implements ActorInfoProtocolOrBuilder { - // Use ActorInfoProtocol.newBuilder() to construct. - private ActorInfoProtocol(Builder builder) { - super(builder); - } - private ActorInfoProtocol(boolean noInit) {} - - private static final ActorInfoProtocol defaultInstance; - public static ActorInfoProtocol getDefaultInstance() { - return defaultInstance; - } - - public ActorInfoProtocol getDefaultInstanceForType() { - return defaultInstance; - } - - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return akka.remote.RemoteProtocol.internal_static_ActorInfoProtocol_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return akka.remote.RemoteProtocol.internal_static_ActorInfoProtocol_fieldAccessorTable; - } - - private int bitField0_; - // required .UuidProtocol uuid = 1; - public static final int UUID_FIELD_NUMBER = 1; - private akka.remote.RemoteProtocol.UuidProtocol uuid_; - public boolean hasUuid() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - public akka.remote.RemoteProtocol.UuidProtocol getUuid() { - return uuid_; - } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() { - return uuid_; - } - - // required uint64 timeout = 2; - public static final int TIMEOUT_FIELD_NUMBER = 2; - private long timeout_; - public boolean hasTimeout() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - public long getTimeout() { - return timeout_; - } - - // optional string address = 3; - public static final int ADDRESS_FIELD_NUMBER = 3; - private java.lang.Object address_; - public boolean hasAddress() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - public String getAddress() { - java.lang.Object ref = address_; - if (ref instanceof String) { - return (String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); - if (com.google.protobuf.Internal.isValidUtf8(bs)) { - address_ = s; - } - return s; - } - } - private com.google.protobuf.ByteString getAddressBytes() { - java.lang.Object ref = address_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((String) ref); - address_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - private void initFields() { - uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - timeout_ = 0L; - address_ = ""; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasUuid()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasTimeout()) { - memoizedIsInitialized = 0; - return false; - } - if (!getUuid().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, uuid_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeUInt64(2, timeout_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBytes(3, getAddressBytes()); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, uuid_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(2, timeout_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(3, getAddressBytes()); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static akka.remote.RemoteProtocol.ActorInfoProtocol parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data).buildParsed(); - } - public static akka.remote.RemoteProtocol.ActorInfoProtocol parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.ActorInfoProtocol parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data).buildParsed(); - } - public static akka.remote.RemoteProtocol.ActorInfoProtocol parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.ActorInfoProtocol parseFrom(java.io.InputStream input) - throws java.io.IOException { - return newBuilder().mergeFrom(input).buildParsed(); - } - public static akka.remote.RemoteProtocol.ActorInfoProtocol parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return newBuilder().mergeFrom(input, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.ActorInfoProtocol parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - Builder builder = newBuilder(); - if (builder.mergeDelimitedFrom(input)) { - return builder.buildParsed(); - } else { - return null; - } - } - public static akka.remote.RemoteProtocol.ActorInfoProtocol parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - Builder builder = newBuilder(); - if (builder.mergeDelimitedFrom(input, extensionRegistry)) { - return builder.buildParsed(); - } else { - return null; - } - } - public static akka.remote.RemoteProtocol.ActorInfoProtocol parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return newBuilder().mergeFrom(input).buildParsed(); - } - public static akka.remote.RemoteProtocol.ActorInfoProtocol parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return newBuilder().mergeFrom(input, extensionRegistry) - .buildParsed(); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.remote.RemoteProtocol.ActorInfoProtocol prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements akka.remote.RemoteProtocol.ActorInfoProtocolOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return akka.remote.RemoteProtocol.internal_static_ActorInfoProtocol_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return akka.remote.RemoteProtocol.internal_static_ActorInfoProtocol_fieldAccessorTable; - } - - // Construct using akka.remote.RemoteProtocol.ActorInfoProtocol.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getUuidFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - if (uuidBuilder_ == null) { - uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - } else { - uuidBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - timeout_ = 0L; - bitField0_ = (bitField0_ & ~0x00000002); - address_ = ""; - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return akka.remote.RemoteProtocol.ActorInfoProtocol.getDescriptor(); - } - - public akka.remote.RemoteProtocol.ActorInfoProtocol getDefaultInstanceForType() { - return akka.remote.RemoteProtocol.ActorInfoProtocol.getDefaultInstance(); - } - - public akka.remote.RemoteProtocol.ActorInfoProtocol build() { - akka.remote.RemoteProtocol.ActorInfoProtocol result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - private akka.remote.RemoteProtocol.ActorInfoProtocol buildParsed() - throws com.google.protobuf.InvalidProtocolBufferException { - akka.remote.RemoteProtocol.ActorInfoProtocol result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException( - result).asInvalidProtocolBufferException(); - } - return result; - } - - public akka.remote.RemoteProtocol.ActorInfoProtocol buildPartial() { - akka.remote.RemoteProtocol.ActorInfoProtocol result = new akka.remote.RemoteProtocol.ActorInfoProtocol(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - if (uuidBuilder_ == null) { - result.uuid_ = uuid_; - } else { - result.uuid_ = uuidBuilder_.build(); - } - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.timeout_ = timeout_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.address_ = address_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.remote.RemoteProtocol.ActorInfoProtocol) { - return mergeFrom((akka.remote.RemoteProtocol.ActorInfoProtocol)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(akka.remote.RemoteProtocol.ActorInfoProtocol other) { - if (other == akka.remote.RemoteProtocol.ActorInfoProtocol.getDefaultInstance()) return this; - if (other.hasUuid()) { - mergeUuid(other.getUuid()); - } - if (other.hasTimeout()) { - setTimeout(other.getTimeout()); - } - if (other.hasAddress()) { - setAddress(other.getAddress()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasUuid()) { - - return false; - } - if (!hasTimeout()) { - - return false; - } - if (!getUuid().isInitialized()) { - - return false; - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder( - this.getUnknownFields()); - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - this.setUnknownFields(unknownFields.build()); - onChanged(); - return this; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - this.setUnknownFields(unknownFields.build()); - onChanged(); - return this; - } - break; - } - case 10: { - akka.remote.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.remote.RemoteProtocol.UuidProtocol.newBuilder(); - if (hasUuid()) { - subBuilder.mergeFrom(getUuid()); - } - input.readMessage(subBuilder, extensionRegistry); - setUuid(subBuilder.buildPartial()); - break; - } - case 16: { - bitField0_ |= 0x00000002; - timeout_ = input.readUInt64(); - break; - } - case 26: { - bitField0_ |= 0x00000004; - address_ = input.readBytes(); - break; - } - } - } - } - - private int bitField0_; - - // required .UuidProtocol uuid = 1; - private akka.remote.RemoteProtocol.UuidProtocol uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_; - public boolean hasUuid() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - public akka.remote.RemoteProtocol.UuidProtocol getUuid() { - if (uuidBuilder_ == null) { - return uuid_; - } else { - return uuidBuilder_.getMessage(); - } - } - public Builder setUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (uuidBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - uuid_ = value; - onChanged(); - } else { - uuidBuilder_.setMessage(value); - } - bitField0_ |= 0x00000001; - return this; - } - public Builder setUuid( - akka.remote.RemoteProtocol.UuidProtocol.Builder builderForValue) { - if (uuidBuilder_ == null) { - uuid_ = builderForValue.build(); - onChanged(); - } else { - uuidBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000001; - return this; - } - public Builder mergeUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (uuidBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - uuid_ != akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance()) { - uuid_ = - akka.remote.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial(); - } else { - uuid_ = value; - } - onChanged(); - } else { - uuidBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000001; - return this; - } - public Builder clearUuid() { - if (uuidBuilder_ == null) { - uuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - onChanged(); - } else { - uuidBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - public akka.remote.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() { - bitField0_ |= 0x00000001; - onChanged(); - return getUuidFieldBuilder().getBuilder(); - } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() { - if (uuidBuilder_ != null) { - return uuidBuilder_.getMessageOrBuilder(); - } else { - return uuid_; - } - } - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> - getUuidFieldBuilder() { - if (uuidBuilder_ == null) { - uuidBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder>( - uuid_, - getParentForChildren(), - isClean()); - uuid_ = null; - } - return uuidBuilder_; - } - - // required uint64 timeout = 2; - private long timeout_ ; - public boolean hasTimeout() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - public long getTimeout() { - return timeout_; - } - public Builder setTimeout(long value) { - bitField0_ |= 0x00000002; - timeout_ = value; - onChanged(); - return this; - } - public Builder clearTimeout() { - bitField0_ = (bitField0_ & ~0x00000002); - timeout_ = 0L; - onChanged(); - return this; - } - - // optional string address = 3; - private java.lang.Object address_ = ""; - public boolean hasAddress() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - public String getAddress() { - java.lang.Object ref = address_; - if (!(ref instanceof String)) { - String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); - address_ = s; - return s; - } else { - return (String) ref; - } - } - public Builder setAddress(String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - address_ = value; - onChanged(); - return this; - } - public Builder clearAddress() { - bitField0_ = (bitField0_ & ~0x00000004); - address_ = getDefaultInstance().getAddress(); - onChanged(); - return this; - } - void setAddress(com.google.protobuf.ByteString value) { - bitField0_ |= 0x00000004; - address_ = value; - onChanged(); - } - - // @@protoc_insertion_point(builder_scope:ActorInfoProtocol) - } - - static { - defaultInstance = new ActorInfoProtocol(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:ActorInfoProtocol) - } - + public interface UuidProtocolOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // required uint64 high = 1; boolean hasHigh(); long getHigh(); - + // required uint64 low = 2; boolean hasLow(); long getLow(); @@ -6858,26 +3531,26 @@ public final class RemoteProtocol { super(builder); } private UuidProtocol(boolean noInit) {} - + private static final UuidProtocol defaultInstance; public static UuidProtocol getDefaultInstance() { return defaultInstance; } - + public UuidProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.RemoteProtocol.internal_static_UuidProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_UuidProtocol_fieldAccessorTable; } - + private int bitField0_; // required uint64 high = 1; public static final int HIGH_FIELD_NUMBER = 1; @@ -6888,7 +3561,7 @@ public final class RemoteProtocol { public long getHigh() { return high_; } - + // required uint64 low = 2; public static final int LOW_FIELD_NUMBER = 2; private long low_; @@ -6898,7 +3571,7 @@ public final class RemoteProtocol { public long getLow() { return low_; } - + private void initFields() { high_ = 0L; low_ = 0L; @@ -6907,7 +3580,7 @@ public final class RemoteProtocol { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (!hasHigh()) { memoizedIsInitialized = 0; return false; @@ -6919,7 +3592,7 @@ public final class RemoteProtocol { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -6931,12 +3604,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -6950,14 +3623,14 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.RemoteProtocol.UuidProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -7024,14 +3697,14 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.RemoteProtocol.UuidProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { @@ -7045,18 +3718,18 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.internal_static_UuidProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_UuidProtocol_fieldAccessorTable; } - + // Construct using akka.remote.RemoteProtocol.UuidProtocol.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -7067,7 +3740,7 @@ public final class RemoteProtocol { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); high_ = 0L; @@ -7076,20 +3749,20 @@ public final class RemoteProtocol { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return akka.remote.RemoteProtocol.UuidProtocol.getDescriptor(); } - + public akka.remote.RemoteProtocol.UuidProtocol getDefaultInstanceForType() { return akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); } - + public akka.remote.RemoteProtocol.UuidProtocol build() { akka.remote.RemoteProtocol.UuidProtocol result = buildPartial(); if (!result.isInitialized()) { @@ -7097,7 +3770,7 @@ public final class RemoteProtocol { } return result; } - + private akka.remote.RemoteProtocol.UuidProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { akka.remote.RemoteProtocol.UuidProtocol result = buildPartial(); @@ -7107,7 +3780,7 @@ public final class RemoteProtocol { } return result; } - + public akka.remote.RemoteProtocol.UuidProtocol buildPartial() { akka.remote.RemoteProtocol.UuidProtocol result = new akka.remote.RemoteProtocol.UuidProtocol(this); int from_bitField0_ = bitField0_; @@ -7124,7 +3797,7 @@ public final class RemoteProtocol { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.RemoteProtocol.UuidProtocol) { return mergeFrom((akka.remote.RemoteProtocol.UuidProtocol)other); @@ -7133,7 +3806,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(akka.remote.RemoteProtocol.UuidProtocol other) { if (other == akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance()) return this; if (other.hasHigh()) { @@ -7145,19 +3818,19 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (!hasHigh()) { - + return false; } if (!hasLow()) { - + return false; } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -7194,9 +3867,9 @@ public final class RemoteProtocol { } } } - + private int bitField0_; - + // required uint64 high = 1; private long high_ ; public boolean hasHigh() { @@ -7217,7 +3890,7 @@ public final class RemoteProtocol { onChanged(); return this; } - + // required uint64 low = 2; private long low_ ; public boolean hasLow() { @@ -7238,25 +3911,25 @@ public final class RemoteProtocol { onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:UuidProtocol) } - + static { defaultInstance = new UuidProtocol(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:UuidProtocol) } - + public interface MetadataEntryProtocolOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // required string key = 1; boolean hasKey(); String getKey(); - + // required bytes value = 2; boolean hasValue(); com.google.protobuf.ByteString getValue(); @@ -7269,26 +3942,26 @@ public final class RemoteProtocol { super(builder); } private MetadataEntryProtocol(boolean noInit) {} - + private static final MetadataEntryProtocol defaultInstance; public static MetadataEntryProtocol getDefaultInstance() { return defaultInstance; } - + public MetadataEntryProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.RemoteProtocol.internal_static_MetadataEntryProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_MetadataEntryProtocol_fieldAccessorTable; } - + private int bitField0_; // required string key = 1; public static final int KEY_FIELD_NUMBER = 1; @@ -7301,7 +3974,7 @@ public final class RemoteProtocol { if (ref instanceof String) { return (String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; String s = bs.toStringUtf8(); if (com.google.protobuf.Internal.isValidUtf8(bs)) { @@ -7313,7 +3986,7 @@ public final class RemoteProtocol { private com.google.protobuf.ByteString getKeyBytes() { java.lang.Object ref = key_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref); key_ = b; return b; @@ -7321,7 +3994,7 @@ public final class RemoteProtocol { return (com.google.protobuf.ByteString) ref; } } - + // required bytes value = 2; public static final int VALUE_FIELD_NUMBER = 2; private com.google.protobuf.ByteString value_; @@ -7331,7 +4004,7 @@ public final class RemoteProtocol { public com.google.protobuf.ByteString getValue() { return value_; } - + private void initFields() { key_ = ""; value_ = com.google.protobuf.ByteString.EMPTY; @@ -7340,7 +4013,7 @@ public final class RemoteProtocol { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (!hasKey()) { memoizedIsInitialized = 0; return false; @@ -7352,7 +4025,7 @@ public final class RemoteProtocol { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -7364,12 +4037,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -7383,14 +4056,14 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.RemoteProtocol.MetadataEntryProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -7457,14 +4130,14 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.RemoteProtocol.MetadataEntryProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { @@ -7478,18 +4151,18 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.internal_static_MetadataEntryProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_MetadataEntryProtocol_fieldAccessorTable; } - + // Construct using akka.remote.RemoteProtocol.MetadataEntryProtocol.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -7500,7 +4173,7 @@ public final class RemoteProtocol { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); key_ = ""; @@ -7509,20 +4182,20 @@ public final class RemoteProtocol { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return akka.remote.RemoteProtocol.MetadataEntryProtocol.getDescriptor(); } - + public akka.remote.RemoteProtocol.MetadataEntryProtocol getDefaultInstanceForType() { return akka.remote.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance(); } - + public akka.remote.RemoteProtocol.MetadataEntryProtocol build() { akka.remote.RemoteProtocol.MetadataEntryProtocol result = buildPartial(); if (!result.isInitialized()) { @@ -7530,7 +4203,7 @@ public final class RemoteProtocol { } return result; } - + private akka.remote.RemoteProtocol.MetadataEntryProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { akka.remote.RemoteProtocol.MetadataEntryProtocol result = buildPartial(); @@ -7540,7 +4213,7 @@ public final class RemoteProtocol { } return result; } - + public akka.remote.RemoteProtocol.MetadataEntryProtocol buildPartial() { akka.remote.RemoteProtocol.MetadataEntryProtocol result = new akka.remote.RemoteProtocol.MetadataEntryProtocol(this); int from_bitField0_ = bitField0_; @@ -7557,7 +4230,7 @@ public final class RemoteProtocol { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.RemoteProtocol.MetadataEntryProtocol) { return mergeFrom((akka.remote.RemoteProtocol.MetadataEntryProtocol)other); @@ -7566,7 +4239,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(akka.remote.RemoteProtocol.MetadataEntryProtocol other) { if (other == akka.remote.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance()) return this; if (other.hasKey()) { @@ -7578,19 +4251,19 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (!hasKey()) { - + return false; } if (!hasValue()) { - + return false; } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -7627,9 +4300,9 @@ public final class RemoteProtocol { } } } - + private int bitField0_; - + // required string key = 1; private java.lang.Object key_ = ""; public boolean hasKey() { @@ -7665,7 +4338,7 @@ public final class RemoteProtocol { key_ = value; onChanged(); } - + // required bytes value = 2; private com.google.protobuf.ByteString value_ = com.google.protobuf.ByteString.EMPTY; public boolean hasValue() { @@ -7689,380 +4362,25 @@ public final class RemoteProtocol { onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:MetadataEntryProtocol) } - + static { defaultInstance = new MetadataEntryProtocol(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:MetadataEntryProtocol) } - - public interface LifeCycleProtocolOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // required .LifeCycleType lifeCycle = 1; - boolean hasLifeCycle(); - akka.remote.RemoteProtocol.LifeCycleType getLifeCycle(); - } - public static final class LifeCycleProtocol extends - com.google.protobuf.GeneratedMessage - implements LifeCycleProtocolOrBuilder { - // Use LifeCycleProtocol.newBuilder() to construct. - private LifeCycleProtocol(Builder builder) { - super(builder); - } - private LifeCycleProtocol(boolean noInit) {} - - private static final LifeCycleProtocol defaultInstance; - public static LifeCycleProtocol getDefaultInstance() { - return defaultInstance; - } - - public LifeCycleProtocol getDefaultInstanceForType() { - return defaultInstance; - } - - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return akka.remote.RemoteProtocol.internal_static_LifeCycleProtocol_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return akka.remote.RemoteProtocol.internal_static_LifeCycleProtocol_fieldAccessorTable; - } - - private int bitField0_; - // required .LifeCycleType lifeCycle = 1; - public static final int LIFECYCLE_FIELD_NUMBER = 1; - private akka.remote.RemoteProtocol.LifeCycleType lifeCycle_; - public boolean hasLifeCycle() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - public akka.remote.RemoteProtocol.LifeCycleType getLifeCycle() { - return lifeCycle_; - } - - private void initFields() { - lifeCycle_ = akka.remote.RemoteProtocol.LifeCycleType.PERMANENT; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasLifeCycle()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeEnum(1, lifeCycle_.getNumber()); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(1, lifeCycle_.getNumber()); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static akka.remote.RemoteProtocol.LifeCycleProtocol parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data).buildParsed(); - } - public static akka.remote.RemoteProtocol.LifeCycleProtocol parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.LifeCycleProtocol parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data).buildParsed(); - } - public static akka.remote.RemoteProtocol.LifeCycleProtocol parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return newBuilder().mergeFrom(data, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.LifeCycleProtocol parseFrom(java.io.InputStream input) - throws java.io.IOException { - return newBuilder().mergeFrom(input).buildParsed(); - } - public static akka.remote.RemoteProtocol.LifeCycleProtocol parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return newBuilder().mergeFrom(input, extensionRegistry) - .buildParsed(); - } - public static akka.remote.RemoteProtocol.LifeCycleProtocol parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - Builder builder = newBuilder(); - if (builder.mergeDelimitedFrom(input)) { - return builder.buildParsed(); - } else { - return null; - } - } - public static akka.remote.RemoteProtocol.LifeCycleProtocol parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - Builder builder = newBuilder(); - if (builder.mergeDelimitedFrom(input, extensionRegistry)) { - return builder.buildParsed(); - } else { - return null; - } - } - public static akka.remote.RemoteProtocol.LifeCycleProtocol parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return newBuilder().mergeFrom(input).buildParsed(); - } - public static akka.remote.RemoteProtocol.LifeCycleProtocol parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return newBuilder().mergeFrom(input, extensionRegistry) - .buildParsed(); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.remote.RemoteProtocol.LifeCycleProtocol prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements akka.remote.RemoteProtocol.LifeCycleProtocolOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return akka.remote.RemoteProtocol.internal_static_LifeCycleProtocol_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return akka.remote.RemoteProtocol.internal_static_LifeCycleProtocol_fieldAccessorTable; - } - - // Construct using akka.remote.RemoteProtocol.LifeCycleProtocol.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - lifeCycle_ = akka.remote.RemoteProtocol.LifeCycleType.PERMANENT; - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return akka.remote.RemoteProtocol.LifeCycleProtocol.getDescriptor(); - } - - public akka.remote.RemoteProtocol.LifeCycleProtocol getDefaultInstanceForType() { - return akka.remote.RemoteProtocol.LifeCycleProtocol.getDefaultInstance(); - } - - public akka.remote.RemoteProtocol.LifeCycleProtocol build() { - akka.remote.RemoteProtocol.LifeCycleProtocol result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - private akka.remote.RemoteProtocol.LifeCycleProtocol buildParsed() - throws com.google.protobuf.InvalidProtocolBufferException { - akka.remote.RemoteProtocol.LifeCycleProtocol result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException( - result).asInvalidProtocolBufferException(); - } - return result; - } - - public akka.remote.RemoteProtocol.LifeCycleProtocol buildPartial() { - akka.remote.RemoteProtocol.LifeCycleProtocol result = new akka.remote.RemoteProtocol.LifeCycleProtocol(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.lifeCycle_ = lifeCycle_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.remote.RemoteProtocol.LifeCycleProtocol) { - return mergeFrom((akka.remote.RemoteProtocol.LifeCycleProtocol)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(akka.remote.RemoteProtocol.LifeCycleProtocol other) { - if (other == akka.remote.RemoteProtocol.LifeCycleProtocol.getDefaultInstance()) return this; - if (other.hasLifeCycle()) { - setLifeCycle(other.getLifeCycle()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasLifeCycle()) { - - return false; - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder( - this.getUnknownFields()); - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - this.setUnknownFields(unknownFields.build()); - onChanged(); - return this; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - this.setUnknownFields(unknownFields.build()); - onChanged(); - return this; - } - break; - } - case 8: { - int rawValue = input.readEnum(); - akka.remote.RemoteProtocol.LifeCycleType value = akka.remote.RemoteProtocol.LifeCycleType.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - lifeCycle_ = value; - } - break; - } - } - } - } - - private int bitField0_; - - // required .LifeCycleType lifeCycle = 1; - private akka.remote.RemoteProtocol.LifeCycleType lifeCycle_ = akka.remote.RemoteProtocol.LifeCycleType.PERMANENT; - public boolean hasLifeCycle() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - public akka.remote.RemoteProtocol.LifeCycleType getLifeCycle() { - return lifeCycle_; - } - public Builder setLifeCycle(akka.remote.RemoteProtocol.LifeCycleType value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - lifeCycle_ = value; - onChanged(); - return this; - } - public Builder clearLifeCycle() { - bitField0_ = (bitField0_ & ~0x00000001); - lifeCycle_ = akka.remote.RemoteProtocol.LifeCycleType.PERMANENT; - onChanged(); - return this; - } - - // @@protoc_insertion_point(builder_scope:LifeCycleProtocol) - } - - static { - defaultInstance = new LifeCycleProtocol(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:LifeCycleProtocol) - } - + public interface AddressProtocolOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // required string hostname = 1; boolean hasHostname(); String getHostname(); - + // required uint32 port = 2; boolean hasPort(); int getPort(); @@ -8075,26 +4393,26 @@ public final class RemoteProtocol { super(builder); } private AddressProtocol(boolean noInit) {} - + private static final AddressProtocol defaultInstance; public static AddressProtocol getDefaultInstance() { return defaultInstance; } - + public AddressProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.RemoteProtocol.internal_static_AddressProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_AddressProtocol_fieldAccessorTable; } - + private int bitField0_; // required string hostname = 1; public static final int HOSTNAME_FIELD_NUMBER = 1; @@ -8107,7 +4425,7 @@ public final class RemoteProtocol { if (ref instanceof String) { return (String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; String s = bs.toStringUtf8(); if (com.google.protobuf.Internal.isValidUtf8(bs)) { @@ -8119,7 +4437,7 @@ public final class RemoteProtocol { private com.google.protobuf.ByteString getHostnameBytes() { java.lang.Object ref = hostname_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref); hostname_ = b; return b; @@ -8127,7 +4445,7 @@ public final class RemoteProtocol { return (com.google.protobuf.ByteString) ref; } } - + // required uint32 port = 2; public static final int PORT_FIELD_NUMBER = 2; private int port_; @@ -8137,7 +4455,7 @@ public final class RemoteProtocol { public int getPort() { return port_; } - + private void initFields() { hostname_ = ""; port_ = 0; @@ -8146,7 +4464,7 @@ public final class RemoteProtocol { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (!hasHostname()) { memoizedIsInitialized = 0; return false; @@ -8158,7 +4476,7 @@ public final class RemoteProtocol { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -8170,12 +4488,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -8189,14 +4507,14 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.RemoteProtocol.AddressProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -8263,14 +4581,14 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.RemoteProtocol.AddressProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { @@ -8284,18 +4602,18 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.internal_static_AddressProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_AddressProtocol_fieldAccessorTable; } - + // Construct using akka.remote.RemoteProtocol.AddressProtocol.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -8306,7 +4624,7 @@ public final class RemoteProtocol { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); hostname_ = ""; @@ -8315,20 +4633,20 @@ public final class RemoteProtocol { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return akka.remote.RemoteProtocol.AddressProtocol.getDescriptor(); } - + public akka.remote.RemoteProtocol.AddressProtocol getDefaultInstanceForType() { return akka.remote.RemoteProtocol.AddressProtocol.getDefaultInstance(); } - + public akka.remote.RemoteProtocol.AddressProtocol build() { akka.remote.RemoteProtocol.AddressProtocol result = buildPartial(); if (!result.isInitialized()) { @@ -8336,7 +4654,7 @@ public final class RemoteProtocol { } return result; } - + private akka.remote.RemoteProtocol.AddressProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { akka.remote.RemoteProtocol.AddressProtocol result = buildPartial(); @@ -8346,7 +4664,7 @@ public final class RemoteProtocol { } return result; } - + public akka.remote.RemoteProtocol.AddressProtocol buildPartial() { akka.remote.RemoteProtocol.AddressProtocol result = new akka.remote.RemoteProtocol.AddressProtocol(this); int from_bitField0_ = bitField0_; @@ -8363,7 +4681,7 @@ public final class RemoteProtocol { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.RemoteProtocol.AddressProtocol) { return mergeFrom((akka.remote.RemoteProtocol.AddressProtocol)other); @@ -8372,7 +4690,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(akka.remote.RemoteProtocol.AddressProtocol other) { if (other == akka.remote.RemoteProtocol.AddressProtocol.getDefaultInstance()) return this; if (other.hasHostname()) { @@ -8384,19 +4702,19 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (!hasHostname()) { - + return false; } if (!hasPort()) { - + return false; } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -8433,9 +4751,9 @@ public final class RemoteProtocol { } } } - + private int bitField0_; - + // required string hostname = 1; private java.lang.Object hostname_ = ""; public boolean hasHostname() { @@ -8471,7 +4789,7 @@ public final class RemoteProtocol { hostname_ = value; onChanged(); } - + // required uint32 port = 2; private int port_ ; public boolean hasPort() { @@ -8492,25 +4810,25 @@ public final class RemoteProtocol { onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:AddressProtocol) } - + static { defaultInstance = new AddressProtocol(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:AddressProtocol) } - + public interface ExceptionProtocolOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // required string classname = 1; boolean hasClassname(); String getClassname(); - + // required string message = 2; boolean hasMessage(); String getMessage(); @@ -8523,26 +4841,26 @@ public final class RemoteProtocol { super(builder); } private ExceptionProtocol(boolean noInit) {} - + private static final ExceptionProtocol defaultInstance; public static ExceptionProtocol getDefaultInstance() { return defaultInstance; } - + public ExceptionProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.RemoteProtocol.internal_static_ExceptionProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_ExceptionProtocol_fieldAccessorTable; } - + private int bitField0_; // required string classname = 1; public static final int CLASSNAME_FIELD_NUMBER = 1; @@ -8555,7 +4873,7 @@ public final class RemoteProtocol { if (ref instanceof String) { return (String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; String s = bs.toStringUtf8(); if (com.google.protobuf.Internal.isValidUtf8(bs)) { @@ -8567,7 +4885,7 @@ public final class RemoteProtocol { private com.google.protobuf.ByteString getClassnameBytes() { java.lang.Object ref = classname_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref); classname_ = b; return b; @@ -8575,7 +4893,7 @@ public final class RemoteProtocol { return (com.google.protobuf.ByteString) ref; } } - + // required string message = 2; public static final int MESSAGE_FIELD_NUMBER = 2; private java.lang.Object message_; @@ -8587,7 +4905,7 @@ public final class RemoteProtocol { if (ref instanceof String) { return (String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; String s = bs.toStringUtf8(); if (com.google.protobuf.Internal.isValidUtf8(bs)) { @@ -8599,7 +4917,7 @@ public final class RemoteProtocol { private com.google.protobuf.ByteString getMessageBytes() { java.lang.Object ref = message_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref); message_ = b; return b; @@ -8607,7 +4925,7 @@ public final class RemoteProtocol { return (com.google.protobuf.ByteString) ref; } } - + private void initFields() { classname_ = ""; message_ = ""; @@ -8616,7 +4934,7 @@ public final class RemoteProtocol { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (!hasClassname()) { memoizedIsInitialized = 0; return false; @@ -8628,7 +4946,7 @@ public final class RemoteProtocol { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -8640,12 +4958,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -8659,14 +4977,14 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.RemoteProtocol.ExceptionProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -8733,14 +5051,14 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.RemoteProtocol.ExceptionProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { @@ -8754,18 +5072,18 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.internal_static_ExceptionProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_ExceptionProtocol_fieldAccessorTable; } - + // Construct using akka.remote.RemoteProtocol.ExceptionProtocol.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } @@ -8776,7 +5094,7 @@ public final class RemoteProtocol { private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); classname_ = ""; @@ -8785,20 +5103,20 @@ public final class RemoteProtocol { bitField0_ = (bitField0_ & ~0x00000002); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return akka.remote.RemoteProtocol.ExceptionProtocol.getDescriptor(); } - + public akka.remote.RemoteProtocol.ExceptionProtocol getDefaultInstanceForType() { return akka.remote.RemoteProtocol.ExceptionProtocol.getDefaultInstance(); } - + public akka.remote.RemoteProtocol.ExceptionProtocol build() { akka.remote.RemoteProtocol.ExceptionProtocol result = buildPartial(); if (!result.isInitialized()) { @@ -8806,7 +5124,7 @@ public final class RemoteProtocol { } return result; } - + private akka.remote.RemoteProtocol.ExceptionProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { akka.remote.RemoteProtocol.ExceptionProtocol result = buildPartial(); @@ -8816,7 +5134,7 @@ public final class RemoteProtocol { } return result; } - + public akka.remote.RemoteProtocol.ExceptionProtocol buildPartial() { akka.remote.RemoteProtocol.ExceptionProtocol result = new akka.remote.RemoteProtocol.ExceptionProtocol(this); int from_bitField0_ = bitField0_; @@ -8833,7 +5151,7 @@ public final class RemoteProtocol { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.RemoteProtocol.ExceptionProtocol) { return mergeFrom((akka.remote.RemoteProtocol.ExceptionProtocol)other); @@ -8842,7 +5160,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(akka.remote.RemoteProtocol.ExceptionProtocol other) { if (other == akka.remote.RemoteProtocol.ExceptionProtocol.getDefaultInstance()) return this; if (other.hasClassname()) { @@ -8854,19 +5172,19 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (!hasClassname()) { - + return false; } if (!hasMessage()) { - + return false; } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -8903,9 +5221,9 @@ public final class RemoteProtocol { } } } - + private int bitField0_; - + // required string classname = 1; private java.lang.Object classname_ = ""; public boolean hasClassname() { @@ -8941,7 +5259,7 @@ public final class RemoteProtocol { classname_ = value; onChanged(); } - + // required string message = 2; private java.lang.Object message_ = ""; public boolean hasMessage() { @@ -8977,39 +5295,34 @@ public final class RemoteProtocol { message_ = value; onChanged(); } - + // @@protoc_insertion_point(builder_scope:ExceptionProtocol) } - + static { defaultInstance = new ExceptionProtocol(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:ExceptionProtocol) } - + public interface RemoteSystemDaemonMessageProtocolOrBuilder extends com.google.protobuf.MessageOrBuilder { - + // required .RemoteSystemDaemonMessageType messageType = 1; boolean hasMessageType(); akka.remote.RemoteProtocol.RemoteSystemDaemonMessageType getMessageType(); - - // optional .UuidProtocol actorUuid = 2; - boolean hasActorUuid(); - akka.remote.RemoteProtocol.UuidProtocol getActorUuid(); - akka.remote.RemoteProtocol.UuidProtocolOrBuilder getActorUuidOrBuilder(); - - // optional string actorAddress = 3; + + // optional string actorAddress = 2; boolean hasActorAddress(); String getActorAddress(); - - // optional bytes payload = 5; + + // optional bytes payload = 3; boolean hasPayload(); com.google.protobuf.ByteString getPayload(); - - // optional .UuidProtocol replicateActorFromUuid = 6; + + // optional .UuidProtocol replicateActorFromUuid = 4; boolean hasReplicateActorFromUuid(); akka.remote.RemoteProtocol.UuidProtocol getReplicateActorFromUuid(); akka.remote.RemoteProtocol.UuidProtocolOrBuilder getReplicateActorFromUuidOrBuilder(); @@ -9022,26 +5335,26 @@ public final class RemoteProtocol { super(builder); } private RemoteSystemDaemonMessageProtocol(boolean noInit) {} - + private static final RemoteSystemDaemonMessageProtocol defaultInstance; public static RemoteSystemDaemonMessageProtocol getDefaultInstance() { return defaultInstance; } - + public RemoteSystemDaemonMessageProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.RemoteProtocol.internal_static_RemoteSystemDaemonMessageProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_RemoteSystemDaemonMessageProtocol_fieldAccessorTable; } - + private int bitField0_; // required .RemoteSystemDaemonMessageType messageType = 1; public static final int MESSAGETYPE_FIELD_NUMBER = 1; @@ -9052,32 +5365,19 @@ public final class RemoteProtocol { public akka.remote.RemoteProtocol.RemoteSystemDaemonMessageType getMessageType() { return messageType_; } - - // optional .UuidProtocol actorUuid = 2; - public static final int ACTORUUID_FIELD_NUMBER = 2; - private akka.remote.RemoteProtocol.UuidProtocol actorUuid_; - public boolean hasActorUuid() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - public akka.remote.RemoteProtocol.UuidProtocol getActorUuid() { - return actorUuid_; - } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getActorUuidOrBuilder() { - return actorUuid_; - } - - // optional string actorAddress = 3; - public static final int ACTORADDRESS_FIELD_NUMBER = 3; + + // optional string actorAddress = 2; + public static final int ACTORADDRESS_FIELD_NUMBER = 2; private java.lang.Object actorAddress_; public boolean hasActorAddress() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000002) == 0x00000002); } public String getActorAddress() { java.lang.Object ref = actorAddress_; if (ref instanceof String) { return (String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; String s = bs.toStringUtf8(); if (com.google.protobuf.Internal.isValidUtf8(bs)) { @@ -9089,7 +5389,7 @@ public final class RemoteProtocol { private com.google.protobuf.ByteString getActorAddressBytes() { java.lang.Object ref = actorAddress_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((String) ref); actorAddress_ = b; return b; @@ -9097,22 +5397,22 @@ public final class RemoteProtocol { return (com.google.protobuf.ByteString) ref; } } - - // optional bytes payload = 5; - public static final int PAYLOAD_FIELD_NUMBER = 5; + + // optional bytes payload = 3; + public static final int PAYLOAD_FIELD_NUMBER = 3; private com.google.protobuf.ByteString payload_; public boolean hasPayload() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000004) == 0x00000004); } public com.google.protobuf.ByteString getPayload() { return payload_; } - - // optional .UuidProtocol replicateActorFromUuid = 6; - public static final int REPLICATEACTORFROMUUID_FIELD_NUMBER = 6; + + // optional .UuidProtocol replicateActorFromUuid = 4; + public static final int REPLICATEACTORFROMUUID_FIELD_NUMBER = 4; private akka.remote.RemoteProtocol.UuidProtocol replicateActorFromUuid_; public boolean hasReplicateActorFromUuid() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000008) == 0x00000008); } public akka.remote.RemoteProtocol.UuidProtocol getReplicateActorFromUuid() { return replicateActorFromUuid_; @@ -9120,10 +5420,9 @@ public final class RemoteProtocol { public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getReplicateActorFromUuidOrBuilder() { return replicateActorFromUuid_; } - + private void initFields() { messageType_ = akka.remote.RemoteProtocol.RemoteSystemDaemonMessageType.STOP; - actorUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); actorAddress_ = ""; payload_ = com.google.protobuf.ByteString.EMPTY; replicateActorFromUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); @@ -9132,17 +5431,11 @@ public final class RemoteProtocol { public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - + if (!hasMessageType()) { memoizedIsInitialized = 0; return false; } - if (hasActorUuid()) { - if (!getActorUuid().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } if (hasReplicateActorFromUuid()) { if (!getReplicateActorFromUuid().isInitialized()) { memoizedIsInitialized = 0; @@ -9152,7 +5445,7 @@ public final class RemoteProtocol { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -9160,25 +5453,22 @@ public final class RemoteProtocol { output.writeEnum(1, messageType_.getNumber()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, actorUuid_); + output.writeBytes(2, getActorAddressBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBytes(3, getActorAddressBytes()); + output.writeBytes(3, payload_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeBytes(5, payload_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeMessage(6, replicateActorFromUuid_); + output.writeMessage(4, replicateActorFromUuid_); } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream @@ -9186,32 +5476,28 @@ public final class RemoteProtocol { } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, actorUuid_); + .computeBytesSize(2, getActorAddressBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(3, getActorAddressBytes()); + .computeBytesSize(3, payload_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(5, payload_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, replicateActorFromUuid_); + .computeMessageSize(4, replicateActorFromUuid_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -9278,14 +5564,14 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { @@ -9299,67 +5585,60 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.internal_static_RemoteSystemDaemonMessageProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_RemoteSystemDaemonMessageProtocol_fieldAccessorTable; } - + // Construct using akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getActorUuidFieldBuilder(); getReplicateActorFromUuidFieldBuilder(); } } private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); messageType_ = akka.remote.RemoteProtocol.RemoteSystemDaemonMessageType.STOP; bitField0_ = (bitField0_ & ~0x00000001); - if (actorUuidBuilder_ == null) { - actorUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - } else { - actorUuidBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); actorAddress_ = ""; - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); payload_ = com.google.protobuf.ByteString.EMPTY; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000004); if (replicateActorFromUuidBuilder_ == null) { replicateActorFromUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); } else { replicateActorFromUuidBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000008); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol.getDescriptor(); } - + public akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol getDefaultInstanceForType() { return akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol.getDefaultInstance(); } - + public akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol build() { akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol result = buildPartial(); if (!result.isInitialized()) { @@ -9367,7 +5646,7 @@ public final class RemoteProtocol { } return result; } - + private akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol result = buildPartial(); @@ -9377,7 +5656,7 @@ public final class RemoteProtocol { } return result; } - + public akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol buildPartial() { akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol result = new akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol(this); int from_bitField0_ = bitField0_; @@ -9389,22 +5668,14 @@ public final class RemoteProtocol { if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - if (actorUuidBuilder_ == null) { - result.actorUuid_ = actorUuid_; - } else { - result.actorUuid_ = actorUuidBuilder_.build(); - } + result.actorAddress_ = actorAddress_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.actorAddress_ = actorAddress_; + result.payload_ = payload_; if (((from_bitField0_ & 0x00000008) == 0x00000008)) { to_bitField0_ |= 0x00000008; } - result.payload_ = payload_; - if (((from_bitField0_ & 0x00000010) == 0x00000010)) { - to_bitField0_ |= 0x00000010; - } if (replicateActorFromUuidBuilder_ == null) { result.replicateActorFromUuid_ = replicateActorFromUuid_; } else { @@ -9414,7 +5685,7 @@ public final class RemoteProtocol { onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol) { return mergeFrom((akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol)other); @@ -9423,15 +5694,12 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol other) { if (other == akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol.getDefaultInstance()) return this; if (other.hasMessageType()) { setMessageType(other.getMessageType()); } - if (other.hasActorUuid()) { - mergeActorUuid(other.getActorUuid()); - } if (other.hasActorAddress()) { setActorAddress(other.getActorAddress()); } @@ -9444,27 +5712,21 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { if (!hasMessageType()) { - + return false; } - if (hasActorUuid()) { - if (!getActorUuid().isInitialized()) { - - return false; - } - } if (hasReplicateActorFromUuid()) { if (!getReplicateActorFromUuid().isInitialized()) { - + return false; } } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -9500,25 +5762,16 @@ public final class RemoteProtocol { break; } case 18: { - akka.remote.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.remote.RemoteProtocol.UuidProtocol.newBuilder(); - if (hasActorUuid()) { - subBuilder.mergeFrom(getActorUuid()); - } - input.readMessage(subBuilder, extensionRegistry); - setActorUuid(subBuilder.buildPartial()); + bitField0_ |= 0x00000002; + actorAddress_ = input.readBytes(); break; } case 26: { bitField0_ |= 0x00000004; - actorAddress_ = input.readBytes(); - break; - } - case 42: { - bitField0_ |= 0x00000008; payload_ = input.readBytes(); break; } - case 50: { + case 34: { akka.remote.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.remote.RemoteProtocol.UuidProtocol.newBuilder(); if (hasReplicateActorFromUuid()) { subBuilder.mergeFrom(getReplicateActorFromUuid()); @@ -9530,9 +5783,9 @@ public final class RemoteProtocol { } } } - + private int bitField0_; - + // required .RemoteSystemDaemonMessageType messageType = 1; private akka.remote.RemoteProtocol.RemoteSystemDaemonMessageType messageType_ = akka.remote.RemoteProtocol.RemoteSystemDaemonMessageType.STOP; public boolean hasMessageType() { @@ -9556,101 +5809,11 @@ public final class RemoteProtocol { onChanged(); return this; } - - // optional .UuidProtocol actorUuid = 2; - private akka.remote.RemoteProtocol.UuidProtocol actorUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> actorUuidBuilder_; - public boolean hasActorUuid() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - public akka.remote.RemoteProtocol.UuidProtocol getActorUuid() { - if (actorUuidBuilder_ == null) { - return actorUuid_; - } else { - return actorUuidBuilder_.getMessage(); - } - } - public Builder setActorUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (actorUuidBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - actorUuid_ = value; - onChanged(); - } else { - actorUuidBuilder_.setMessage(value); - } - bitField0_ |= 0x00000002; - return this; - } - public Builder setActorUuid( - akka.remote.RemoteProtocol.UuidProtocol.Builder builderForValue) { - if (actorUuidBuilder_ == null) { - actorUuid_ = builderForValue.build(); - onChanged(); - } else { - actorUuidBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000002; - return this; - } - public Builder mergeActorUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (actorUuidBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002) && - actorUuid_ != akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance()) { - actorUuid_ = - akka.remote.RemoteProtocol.UuidProtocol.newBuilder(actorUuid_).mergeFrom(value).buildPartial(); - } else { - actorUuid_ = value; - } - onChanged(); - } else { - actorUuidBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000002; - return this; - } - public Builder clearActorUuid() { - if (actorUuidBuilder_ == null) { - actorUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - onChanged(); - } else { - actorUuidBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - public akka.remote.RemoteProtocol.UuidProtocol.Builder getActorUuidBuilder() { - bitField0_ |= 0x00000002; - onChanged(); - return getActorUuidFieldBuilder().getBuilder(); - } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getActorUuidOrBuilder() { - if (actorUuidBuilder_ != null) { - return actorUuidBuilder_.getMessageOrBuilder(); - } else { - return actorUuid_; - } - } - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> - getActorUuidFieldBuilder() { - if (actorUuidBuilder_ == null) { - actorUuidBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder>( - actorUuid_, - getParentForChildren(), - isClean()); - actorUuid_ = null; - } - return actorUuidBuilder_; - } - - // optional string actorAddress = 3; + + // optional string actorAddress = 2; private java.lang.Object actorAddress_ = ""; public boolean hasActorAddress() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000002) == 0x00000002); } public String getActorAddress() { java.lang.Object ref = actorAddress_; @@ -9666,27 +5829,27 @@ public final class RemoteProtocol { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; actorAddress_ = value; onChanged(); return this; } public Builder clearActorAddress() { - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); actorAddress_ = getDefaultInstance().getActorAddress(); onChanged(); return this; } void setActorAddress(com.google.protobuf.ByteString value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; actorAddress_ = value; onChanged(); } - - // optional bytes payload = 5; + + // optional bytes payload = 3; private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY; public boolean hasPayload() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000004) == 0x00000004); } public com.google.protobuf.ByteString getPayload() { return payload_; @@ -9695,24 +5858,24 @@ public final class RemoteProtocol { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; payload_ = value; onChanged(); return this; } public Builder clearPayload() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000004); payload_ = getDefaultInstance().getPayload(); onChanged(); return this; } - - // optional .UuidProtocol replicateActorFromUuid = 6; + + // optional .UuidProtocol replicateActorFromUuid = 4; private akka.remote.RemoteProtocol.UuidProtocol replicateActorFromUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> replicateActorFromUuidBuilder_; public boolean hasReplicateActorFromUuid() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000008) == 0x00000008); } public akka.remote.RemoteProtocol.UuidProtocol getReplicateActorFromUuid() { if (replicateActorFromUuidBuilder_ == null) { @@ -9731,7 +5894,7 @@ public final class RemoteProtocol { } else { replicateActorFromUuidBuilder_.setMessage(value); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return this; } public Builder setReplicateActorFromUuid( @@ -9742,12 +5905,12 @@ public final class RemoteProtocol { } else { replicateActorFromUuidBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return this; } public Builder mergeReplicateActorFromUuid(akka.remote.RemoteProtocol.UuidProtocol value) { if (replicateActorFromUuidBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010) && + if (((bitField0_ & 0x00000008) == 0x00000008) && replicateActorFromUuid_ != akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance()) { replicateActorFromUuid_ = akka.remote.RemoteProtocol.UuidProtocol.newBuilder(replicateActorFromUuid_).mergeFrom(value).buildPartial(); @@ -9758,7 +5921,7 @@ public final class RemoteProtocol { } else { replicateActorFromUuidBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return this; } public Builder clearReplicateActorFromUuid() { @@ -9768,11 +5931,11 @@ public final class RemoteProtocol { } else { replicateActorFromUuidBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000008); return this; } public akka.remote.RemoteProtocol.UuidProtocol.Builder getReplicateActorFromUuidBuilder() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; onChanged(); return getReplicateActorFromUuidFieldBuilder().getBuilder(); } @@ -9784,7 +5947,7 @@ public final class RemoteProtocol { } } private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> + akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> getReplicateActorFromUuidFieldBuilder() { if (replicateActorFromUuidBuilder_ == null) { replicateActorFromUuidBuilder_ = new com.google.protobuf.SingleFieldBuilder< @@ -9796,35 +5959,32 @@ public final class RemoteProtocol { } return replicateActorFromUuidBuilder_; } - + // @@protoc_insertion_point(builder_scope:RemoteSystemDaemonMessageProtocol) } - + static { defaultInstance = new RemoteSystemDaemonMessageProtocol(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:RemoteSystemDaemonMessageProtocol) } - + public interface DurableMailboxMessageProtocolOrBuilder extends com.google.protobuf.MessageOrBuilder { - - // required string ownerActorAddress = 1; - boolean hasOwnerActorAddress(); - String getOwnerActorAddress(); - - // optional string senderActorAddress = 2; - boolean hasSenderActorAddress(); - String getSenderActorAddress(); - - // optional .UuidProtocol futureUuid = 3; - boolean hasFutureUuid(); - akka.remote.RemoteProtocol.UuidProtocol getFutureUuid(); - akka.remote.RemoteProtocol.UuidProtocolOrBuilder getFutureUuidOrBuilder(); - - // required bytes message = 4; + + // required .ActorRefProtocol recipient = 1; + boolean hasRecipient(); + akka.remote.RemoteProtocol.ActorRefProtocol getRecipient(); + akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getRecipientOrBuilder(); + + // optional .ActorRefProtocol sender = 2; + boolean hasSender(); + akka.remote.RemoteProtocol.ActorRefProtocol getSender(); + akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getSenderOrBuilder(); + + // required bytes message = 3; boolean hasMessage(); com.google.protobuf.ByteString getMessage(); } @@ -9836,126 +5996,74 @@ public final class RemoteProtocol { super(builder); } private DurableMailboxMessageProtocol(boolean noInit) {} - + private static final DurableMailboxMessageProtocol defaultInstance; public static DurableMailboxMessageProtocol getDefaultInstance() { return defaultInstance; } - + public DurableMailboxMessageProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return akka.remote.RemoteProtocol.internal_static_DurableMailboxMessageProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_DurableMailboxMessageProtocol_fieldAccessorTable; } - + private int bitField0_; - // required string ownerActorAddress = 1; - public static final int OWNERACTORADDRESS_FIELD_NUMBER = 1; - private java.lang.Object ownerActorAddress_; - public boolean hasOwnerActorAddress() { + // required .ActorRefProtocol recipient = 1; + public static final int RECIPIENT_FIELD_NUMBER = 1; + private akka.remote.RemoteProtocol.ActorRefProtocol recipient_; + public boolean hasRecipient() { return ((bitField0_ & 0x00000001) == 0x00000001); } - public String getOwnerActorAddress() { - java.lang.Object ref = ownerActorAddress_; - if (ref instanceof String) { - return (String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); - if (com.google.protobuf.Internal.isValidUtf8(bs)) { - ownerActorAddress_ = s; - } - return s; - } + public akka.remote.RemoteProtocol.ActorRefProtocol getRecipient() { + return recipient_; } - private com.google.protobuf.ByteString getOwnerActorAddressBytes() { - java.lang.Object ref = ownerActorAddress_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((String) ref); - ownerActorAddress_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getRecipientOrBuilder() { + return recipient_; } - - // optional string senderActorAddress = 2; - public static final int SENDERACTORADDRESS_FIELD_NUMBER = 2; - private java.lang.Object senderActorAddress_; - public boolean hasSenderActorAddress() { + + // optional .ActorRefProtocol sender = 2; + public static final int SENDER_FIELD_NUMBER = 2; + private akka.remote.RemoteProtocol.ActorRefProtocol sender_; + public boolean hasSender() { return ((bitField0_ & 0x00000002) == 0x00000002); } - public String getSenderActorAddress() { - java.lang.Object ref = senderActorAddress_; - if (ref instanceof String) { - return (String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - String s = bs.toStringUtf8(); - if (com.google.protobuf.Internal.isValidUtf8(bs)) { - senderActorAddress_ = s; - } - return s; - } + public akka.remote.RemoteProtocol.ActorRefProtocol getSender() { + return sender_; } - private com.google.protobuf.ByteString getSenderActorAddressBytes() { - java.lang.Object ref = senderActorAddress_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((String) ref); - senderActorAddress_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getSenderOrBuilder() { + return sender_; } - - // optional .UuidProtocol futureUuid = 3; - public static final int FUTUREUUID_FIELD_NUMBER = 3; - private akka.remote.RemoteProtocol.UuidProtocol futureUuid_; - public boolean hasFutureUuid() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - public akka.remote.RemoteProtocol.UuidProtocol getFutureUuid() { - return futureUuid_; - } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getFutureUuidOrBuilder() { - return futureUuid_; - } - - // required bytes message = 4; - public static final int MESSAGE_FIELD_NUMBER = 4; + + // required bytes message = 3; + public static final int MESSAGE_FIELD_NUMBER = 3; private com.google.protobuf.ByteString message_; public boolean hasMessage() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000004) == 0x00000004); } public com.google.protobuf.ByteString getMessage() { return message_; } - + private void initFields() { - ownerActorAddress_ = ""; - senderActorAddress_ = ""; - futureUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); + recipient_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); + sender_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); message_ = com.google.protobuf.ByteString.EMPTY; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - - if (!hasOwnerActorAddress()) { + + if (!hasRecipient()) { memoizedIsInitialized = 0; return false; } @@ -9963,8 +6071,12 @@ public final class RemoteProtocol { memoizedIsInitialized = 0; return false; } - if (hasFutureUuid()) { - if (!getFutureUuid().isInitialized()) { + if (!getRecipient().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + if (hasSender()) { + if (!getSender().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -9972,59 +6084,52 @@ public final class RemoteProtocol { memoizedIsInitialized = 1; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getOwnerActorAddressBytes()); + output.writeMessage(1, recipient_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getSenderActorAddressBytes()); + output.writeMessage(2, sender_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeMessage(3, futureUuid_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeBytes(4, message_); + output.writeBytes(3, message_); } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getOwnerActorAddressBytes()); + .computeMessageSize(1, recipient_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getSenderActorAddressBytes()); + .computeMessageSize(2, sender_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, futureUuid_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(4, message_); + .computeBytesSize(3, message_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; } - + private static final long serialVersionUID = 0L; @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - + public static akka.remote.RemoteProtocol.DurableMailboxMessageProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -10091,14 +6196,14 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(akka.remote.RemoteProtocol.DurableMailboxMessageProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + @java.lang.Override protected Builder newBuilderForType( com.google.protobuf.GeneratedMessage.BuilderParent parent) { @@ -10112,60 +6217,63 @@ public final class RemoteProtocol { getDescriptor() { return akka.remote.RemoteProtocol.internal_static_DurableMailboxMessageProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return akka.remote.RemoteProtocol.internal_static_DurableMailboxMessageProtocol_fieldAccessorTable; } - + // Construct using akka.remote.RemoteProtocol.DurableMailboxMessageProtocol.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + + private Builder(BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getFutureUuidFieldBuilder(); + getRecipientFieldBuilder(); + getSenderFieldBuilder(); } } private static Builder create() { return new Builder(); } - + public Builder clear() { super.clear(); - ownerActorAddress_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); - senderActorAddress_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); - if (futureUuidBuilder_ == null) { - futureUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); + if (recipientBuilder_ == null) { + recipient_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); } else { - futureUuidBuilder_.clear(); + recipientBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000001); + if (senderBuilder_ == null) { + sender_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); + } else { + senderBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); message_ = com.google.protobuf.ByteString.EMPTY; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000004); return this; } - + public Builder clone() { return create().mergeFrom(buildPartial()); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return akka.remote.RemoteProtocol.DurableMailboxMessageProtocol.getDescriptor(); } - + public akka.remote.RemoteProtocol.DurableMailboxMessageProtocol getDefaultInstanceForType() { return akka.remote.RemoteProtocol.DurableMailboxMessageProtocol.getDefaultInstance(); } - + public akka.remote.RemoteProtocol.DurableMailboxMessageProtocol build() { akka.remote.RemoteProtocol.DurableMailboxMessageProtocol result = buildPartial(); if (!result.isInitialized()) { @@ -10173,7 +6281,7 @@ public final class RemoteProtocol { } return result; } - + private akka.remote.RemoteProtocol.DurableMailboxMessageProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { akka.remote.RemoteProtocol.DurableMailboxMessageProtocol result = buildPartial(); @@ -10183,7 +6291,7 @@ public final class RemoteProtocol { } return result; } - + public akka.remote.RemoteProtocol.DurableMailboxMessageProtocol buildPartial() { akka.remote.RemoteProtocol.DurableMailboxMessageProtocol result = new akka.remote.RemoteProtocol.DurableMailboxMessageProtocol(this); int from_bitField0_ = bitField0_; @@ -10191,28 +6299,28 @@ public final class RemoteProtocol { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.ownerActorAddress_ = ownerActorAddress_; + if (recipientBuilder_ == null) { + result.recipient_ = recipient_; + } else { + result.recipient_ = recipientBuilder_.build(); + } if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.senderActorAddress_ = senderActorAddress_; + if (senderBuilder_ == null) { + result.sender_ = sender_; + } else { + result.sender_ = senderBuilder_.build(); + } if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - if (futureUuidBuilder_ == null) { - result.futureUuid_ = futureUuid_; - } else { - result.futureUuid_ = futureUuidBuilder_.build(); - } - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; - } result.message_ = message_; result.bitField0_ = to_bitField0_; onBuilt(); return result; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof akka.remote.RemoteProtocol.DurableMailboxMessageProtocol) { return mergeFrom((akka.remote.RemoteProtocol.DurableMailboxMessageProtocol)other); @@ -10221,17 +6329,14 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(akka.remote.RemoteProtocol.DurableMailboxMessageProtocol other) { if (other == akka.remote.RemoteProtocol.DurableMailboxMessageProtocol.getDefaultInstance()) return this; - if (other.hasOwnerActorAddress()) { - setOwnerActorAddress(other.getOwnerActorAddress()); + if (other.hasRecipient()) { + mergeRecipient(other.getRecipient()); } - if (other.hasSenderActorAddress()) { - setSenderActorAddress(other.getSenderActorAddress()); - } - if (other.hasFutureUuid()) { - mergeFutureUuid(other.getFutureUuid()); + if (other.hasSender()) { + mergeSender(other.getSender()); } if (other.hasMessage()) { setMessage(other.getMessage()); @@ -10239,25 +6344,29 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public final boolean isInitialized() { - if (!hasOwnerActorAddress()) { - + if (!hasRecipient()) { + return false; } if (!hasMessage()) { - + return false; } - if (hasFutureUuid()) { - if (!getFutureUuid().isInitialized()) { - + if (!getRecipient().isInitialized()) { + + return false; + } + if (hasSender()) { + if (!getSender().isInitialized()) { + return false; } } return true; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -10282,201 +6391,218 @@ public final class RemoteProtocol { break; } case 10: { - bitField0_ |= 0x00000001; - ownerActorAddress_ = input.readBytes(); + akka.remote.RemoteProtocol.ActorRefProtocol.Builder subBuilder = akka.remote.RemoteProtocol.ActorRefProtocol.newBuilder(); + if (hasRecipient()) { + subBuilder.mergeFrom(getRecipient()); + } + input.readMessage(subBuilder, extensionRegistry); + setRecipient(subBuilder.buildPartial()); break; } case 18: { - bitField0_ |= 0x00000002; - senderActorAddress_ = input.readBytes(); + akka.remote.RemoteProtocol.ActorRefProtocol.Builder subBuilder = akka.remote.RemoteProtocol.ActorRefProtocol.newBuilder(); + if (hasSender()) { + subBuilder.mergeFrom(getSender()); + } + input.readMessage(subBuilder, extensionRegistry); + setSender(subBuilder.buildPartial()); break; } case 26: { - akka.remote.RemoteProtocol.UuidProtocol.Builder subBuilder = akka.remote.RemoteProtocol.UuidProtocol.newBuilder(); - if (hasFutureUuid()) { - subBuilder.mergeFrom(getFutureUuid()); - } - input.readMessage(subBuilder, extensionRegistry); - setFutureUuid(subBuilder.buildPartial()); - break; - } - case 34: { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; message_ = input.readBytes(); break; } } } } - + private int bitField0_; - - // required string ownerActorAddress = 1; - private java.lang.Object ownerActorAddress_ = ""; - public boolean hasOwnerActorAddress() { + + // required .ActorRefProtocol recipient = 1; + private akka.remote.RemoteProtocol.ActorRefProtocol recipient_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder> recipientBuilder_; + public boolean hasRecipient() { return ((bitField0_ & 0x00000001) == 0x00000001); } - public String getOwnerActorAddress() { - java.lang.Object ref = ownerActorAddress_; - if (!(ref instanceof String)) { - String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); - ownerActorAddress_ = s; - return s; + public akka.remote.RemoteProtocol.ActorRefProtocol getRecipient() { + if (recipientBuilder_ == null) { + return recipient_; } else { - return (String) ref; + return recipientBuilder_.getMessage(); } } - public Builder setOwnerActorAddress(String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - ownerActorAddress_ = value; - onChanged(); - return this; - } - public Builder clearOwnerActorAddress() { - bitField0_ = (bitField0_ & ~0x00000001); - ownerActorAddress_ = getDefaultInstance().getOwnerActorAddress(); - onChanged(); - return this; - } - void setOwnerActorAddress(com.google.protobuf.ByteString value) { - bitField0_ |= 0x00000001; - ownerActorAddress_ = value; - onChanged(); - } - - // optional string senderActorAddress = 2; - private java.lang.Object senderActorAddress_ = ""; - public boolean hasSenderActorAddress() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - public String getSenderActorAddress() { - java.lang.Object ref = senderActorAddress_; - if (!(ref instanceof String)) { - String s = ((com.google.protobuf.ByteString) ref).toStringUtf8(); - senderActorAddress_ = s; - return s; - } else { - return (String) ref; - } - } - public Builder setSenderActorAddress(String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - senderActorAddress_ = value; - onChanged(); - return this; - } - public Builder clearSenderActorAddress() { - bitField0_ = (bitField0_ & ~0x00000002); - senderActorAddress_ = getDefaultInstance().getSenderActorAddress(); - onChanged(); - return this; - } - void setSenderActorAddress(com.google.protobuf.ByteString value) { - bitField0_ |= 0x00000002; - senderActorAddress_ = value; - onChanged(); - } - - // optional .UuidProtocol futureUuid = 3; - private akka.remote.RemoteProtocol.UuidProtocol futureUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> futureUuidBuilder_; - public boolean hasFutureUuid() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - public akka.remote.RemoteProtocol.UuidProtocol getFutureUuid() { - if (futureUuidBuilder_ == null) { - return futureUuid_; - } else { - return futureUuidBuilder_.getMessage(); - } - } - public Builder setFutureUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (futureUuidBuilder_ == null) { + public Builder setRecipient(akka.remote.RemoteProtocol.ActorRefProtocol value) { + if (recipientBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - futureUuid_ = value; + recipient_ = value; onChanged(); } else { - futureUuidBuilder_.setMessage(value); + recipientBuilder_.setMessage(value); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; return this; } - public Builder setFutureUuid( - akka.remote.RemoteProtocol.UuidProtocol.Builder builderForValue) { - if (futureUuidBuilder_ == null) { - futureUuid_ = builderForValue.build(); + public Builder setRecipient( + akka.remote.RemoteProtocol.ActorRefProtocol.Builder builderForValue) { + if (recipientBuilder_ == null) { + recipient_ = builderForValue.build(); onChanged(); } else { - futureUuidBuilder_.setMessage(builderForValue.build()); + recipientBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; return this; } - public Builder mergeFutureUuid(akka.remote.RemoteProtocol.UuidProtocol value) { - if (futureUuidBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004) && - futureUuid_ != akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance()) { - futureUuid_ = - akka.remote.RemoteProtocol.UuidProtocol.newBuilder(futureUuid_).mergeFrom(value).buildPartial(); + public Builder mergeRecipient(akka.remote.RemoteProtocol.ActorRefProtocol value) { + if (recipientBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + recipient_ != akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance()) { + recipient_ = + akka.remote.RemoteProtocol.ActorRefProtocol.newBuilder(recipient_).mergeFrom(value).buildPartial(); } else { - futureUuid_ = value; + recipient_ = value; } onChanged(); } else { - futureUuidBuilder_.mergeFrom(value); + recipientBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000001; return this; } - public Builder clearFutureUuid() { - if (futureUuidBuilder_ == null) { - futureUuid_ = akka.remote.RemoteProtocol.UuidProtocol.getDefaultInstance(); + public Builder clearRecipient() { + if (recipientBuilder_ == null) { + recipient_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); onChanged(); } else { - futureUuidBuilder_.clear(); + recipientBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000001); return this; } - public akka.remote.RemoteProtocol.UuidProtocol.Builder getFutureUuidBuilder() { - bitField0_ |= 0x00000004; + public akka.remote.RemoteProtocol.ActorRefProtocol.Builder getRecipientBuilder() { + bitField0_ |= 0x00000001; onChanged(); - return getFutureUuidFieldBuilder().getBuilder(); + return getRecipientFieldBuilder().getBuilder(); } - public akka.remote.RemoteProtocol.UuidProtocolOrBuilder getFutureUuidOrBuilder() { - if (futureUuidBuilder_ != null) { - return futureUuidBuilder_.getMessageOrBuilder(); + public akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getRecipientOrBuilder() { + if (recipientBuilder_ != null) { + return recipientBuilder_.getMessageOrBuilder(); } else { - return futureUuid_; + return recipient_; } } private com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder> - getFutureUuidFieldBuilder() { - if (futureUuidBuilder_ == null) { - futureUuidBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.remote.RemoteProtocol.UuidProtocol, akka.remote.RemoteProtocol.UuidProtocol.Builder, akka.remote.RemoteProtocol.UuidProtocolOrBuilder>( - futureUuid_, + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder> + getRecipientFieldBuilder() { + if (recipientBuilder_ == null) { + recipientBuilder_ = new com.google.protobuf.SingleFieldBuilder< + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder>( + recipient_, getParentForChildren(), isClean()); - futureUuid_ = null; + recipient_ = null; } - return futureUuidBuilder_; + return recipientBuilder_; } - - // required bytes message = 4; + + // optional .ActorRefProtocol sender = 2; + private akka.remote.RemoteProtocol.ActorRefProtocol sender_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder> senderBuilder_; + public boolean hasSender() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + public akka.remote.RemoteProtocol.ActorRefProtocol getSender() { + if (senderBuilder_ == null) { + return sender_; + } else { + return senderBuilder_.getMessage(); + } + } + public Builder setSender(akka.remote.RemoteProtocol.ActorRefProtocol value) { + if (senderBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + sender_ = value; + onChanged(); + } else { + senderBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + return this; + } + public Builder setSender( + akka.remote.RemoteProtocol.ActorRefProtocol.Builder builderForValue) { + if (senderBuilder_ == null) { + sender_ = builderForValue.build(); + onChanged(); + } else { + senderBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + return this; + } + public Builder mergeSender(akka.remote.RemoteProtocol.ActorRefProtocol value) { + if (senderBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + sender_ != akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance()) { + sender_ = + akka.remote.RemoteProtocol.ActorRefProtocol.newBuilder(sender_).mergeFrom(value).buildPartial(); + } else { + sender_ = value; + } + onChanged(); + } else { + senderBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000002; + return this; + } + public Builder clearSender() { + if (senderBuilder_ == null) { + sender_ = akka.remote.RemoteProtocol.ActorRefProtocol.getDefaultInstance(); + onChanged(); + } else { + senderBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + public akka.remote.RemoteProtocol.ActorRefProtocol.Builder getSenderBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getSenderFieldBuilder().getBuilder(); + } + public akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder getSenderOrBuilder() { + if (senderBuilder_ != null) { + return senderBuilder_.getMessageOrBuilder(); + } else { + return sender_; + } + } + private com.google.protobuf.SingleFieldBuilder< + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder> + getSenderFieldBuilder() { + if (senderBuilder_ == null) { + senderBuilder_ = new com.google.protobuf.SingleFieldBuilder< + akka.remote.RemoteProtocol.ActorRefProtocol, akka.remote.RemoteProtocol.ActorRefProtocol.Builder, akka.remote.RemoteProtocol.ActorRefProtocolOrBuilder>( + sender_, + getParentForChildren(), + isClean()); + sender_ = null; + } + return senderBuilder_; + } + + // required bytes message = 3; private com.google.protobuf.ByteString message_ = com.google.protobuf.ByteString.EMPTY; public boolean hasMessage() { - return ((bitField0_ & 0x00000008) == 0x00000008); + return ((bitField0_ & 0x00000004) == 0x00000004); } public com.google.protobuf.ByteString getMessage() { return message_; @@ -10485,29 +6611,29 @@ public final class RemoteProtocol { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; message_ = value; onChanged(); return this; } public Builder clearMessage() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000004); message_ = getDefaultInstance().getMessage(); onChanged(); return this; } - + // @@protoc_insertion_point(builder_scope:DurableMailboxMessageProtocol) } - + static { defaultInstance = new DurableMailboxMessageProtocol(true); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:DurableMailboxMessageProtocol) } - + private static com.google.protobuf.Descriptors.Descriptor internal_static_AkkaRemoteProtocol_descriptor; private static @@ -10524,30 +6650,15 @@ public final class RemoteProtocol { com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_RemoteControlProtocol_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_RemoteActorRefProtocol_descriptor; + internal_static_ActorRefProtocol_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_RemoteActorRefProtocol_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_SerializedActorRefProtocol_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_SerializedActorRefProtocol_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_SerializedTypedActorRefProtocol_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_SerializedTypedActorRefProtocol_fieldAccessorTable; + internal_static_ActorRefProtocol_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_MessageProtocol_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_MessageProtocol_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_ActorInfoProtocol_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_ActorInfoProtocol_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_UuidProtocol_descriptor; private static @@ -10558,11 +6669,6 @@ public final class RemoteProtocol { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_MetadataEntryProtocol_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_LifeCycleProtocol_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_LifeCycleProtocol_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_AddressProtocol_descriptor; private static @@ -10583,7 +6689,7 @@ public final class RemoteProtocol { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_DurableMailboxMessageProtocol_fieldAccessorTable; - + public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; @@ -10595,68 +6701,42 @@ public final class RemoteProtocol { "\n\024RemoteProtocol.proto\"j\n\022AkkaRemoteProt" + "ocol\022\'\n\007message\030\001 \001(\0132\026.RemoteMessagePro" + "tocol\022+\n\013instruction\030\002 \001(\0132\026.RemoteContr" + - "olProtocol\"\257\002\n\025RemoteMessageProtocol\022\033\n\004" + - "uuid\030\001 \002(\0132\r.UuidProtocol\022%\n\tactorInfo\030\002" + - " \002(\0132\022.ActorInfoProtocol\022\016\n\006oneWay\030\003 \002(\010" + - "\022!\n\007message\030\004 \001(\0132\020.MessageProtocol\022%\n\te" + - "xception\030\005 \001(\0132\022.ExceptionProtocol\022%\n\016su" + - "pervisorUuid\030\006 \001(\0132\r.UuidProtocol\022\'\n\006sen" + - "der\030\007 \001(\0132\027.RemoteActorRefProtocol\022(\n\010me", - "tadata\030\010 \003(\0132\026.MetadataEntryProtocol\"J\n\025" + - "RemoteControlProtocol\022\016\n\006cookie\030\001 \001(\t\022!\n" + - "\013commandType\030\002 \002(\0162\014.CommandType\"U\n\026Remo" + - "teActorRefProtocol\022\017\n\007address\030\001 \002(\t\022\031\n\021i" + - "netSocketAddress\030\002 \002(\014\022\017\n\007timeout\030\003 \001(\004\"" + - "\277\003\n\032SerializedActorRefProtocol\022\033\n\004uuid\030\001" + - " \002(\0132\r.UuidProtocol\022\017\n\007address\030\002 \002(\t\022\026\n\016" + - "actorClassname\030\003 \002(\t\022\025\n\ractorInstance\030\004 " + - "\001(\014\022\033\n\023serializerClassname\030\005 \001(\t\022\017\n\007time" + - "out\030\006 \001(\004\022\026\n\016receiveTimeout\030\007 \001(\004\022%\n\tlif", - "eCycle\030\010 \001(\0132\022.LifeCycleProtocol\022+\n\nsupe" + - "rvisor\030\t \001(\0132\027.RemoteActorRefProtocol\022\024\n" + - "\014hotswapStack\030\n \001(\014\0223\n\022replicationStorag" + - "e\030\013 \001(\0162\027.ReplicationStorageType\0225\n\023repl" + - "icationStrategy\030\014 \001(\0162\030.ReplicationStrat" + - "egyType\022(\n\010messages\030\r \003(\0132\026.RemoteMessag" + - "eProtocol\"g\n\037SerializedTypedActorRefProt" + - "ocol\022-\n\010actorRef\030\001 \002(\0132\033.SerializedActor" + - "RefProtocol\022\025\n\rinterfaceName\030\002 \002(\t\";\n\017Me" + - "ssageProtocol\022\017\n\007message\030\001 \002(\014\022\027\n\017messag", - "eManifest\030\002 \001(\014\"R\n\021ActorInfoProtocol\022\033\n\004" + - "uuid\030\001 \002(\0132\r.UuidProtocol\022\017\n\007timeout\030\002 \002" + - "(\004\022\017\n\007address\030\003 \001(\t\")\n\014UuidProtocol\022\014\n\004h" + - "igh\030\001 \002(\004\022\013\n\003low\030\002 \002(\004\"3\n\025MetadataEntryP" + - "rotocol\022\013\n\003key\030\001 \002(\t\022\r\n\005value\030\002 \002(\014\"6\n\021L" + - "ifeCycleProtocol\022!\n\tlifeCycle\030\001 \002(\0162\016.Li" + - "feCycleType\"1\n\017AddressProtocol\022\020\n\010hostna" + - "me\030\001 \002(\t\022\014\n\004port\030\002 \002(\r\"7\n\021ExceptionProto" + - "col\022\021\n\tclassname\030\001 \002(\t\022\017\n\007message\030\002 \002(\t\"" + - "\320\001\n!RemoteSystemDaemonMessageProtocol\0223\n", - "\013messageType\030\001 \002(\0162\036.RemoteSystemDaemonM" + - "essageType\022 \n\tactorUuid\030\002 \001(\0132\r.UuidProt" + - "ocol\022\024\n\014actorAddress\030\003 \001(\t\022\017\n\007payload\030\005 " + - "\001(\014\022-\n\026replicateActorFromUuid\030\006 \001(\0132\r.Uu" + - "idProtocol\"\212\001\n\035DurableMailboxMessageProt" + - "ocol\022\031\n\021ownerActorAddress\030\001 \002(\t\022\032\n\022sende" + - "rActorAddress\030\002 \001(\t\022!\n\nfutureUuid\030\003 \001(\0132" + - "\r.UuidProtocol\022\017\n\007message\030\004 \002(\014*(\n\013Comma" + - "ndType\022\013\n\007CONNECT\020\001\022\014\n\010SHUTDOWN\020\002*K\n\026Rep" + - "licationStorageType\022\r\n\tTRANSIENT\020\001\022\023\n\017TR", - "ANSACTION_LOG\020\002\022\r\n\tDATA_GRID\020\003*>\n\027Replic" + - "ationStrategyType\022\021\n\rWRITE_THROUGH\020\001\022\020\n\014" + - "WRITE_BEHIND\020\002*]\n\027SerializationSchemeTyp" + - "e\022\010\n\004JAVA\020\001\022\013\n\007SBINARY\020\002\022\016\n\nSCALA_JSON\020\003" + - "\022\r\n\tJAVA_JSON\020\004\022\014\n\010PROTOBUF\020\005*-\n\rLifeCyc" + - "leType\022\r\n\tPERMANENT\020\001\022\r\n\tTEMPORARY\020\002*\261\002\n" + - "\035RemoteSystemDaemonMessageType\022\010\n\004STOP\020\001" + - "\022\007\n\003USE\020\002\022\013\n\007RELEASE\020\003\022\022\n\016MAKE_AVAILABLE" + - "\020\004\022\024\n\020MAKE_UNAVAILABLE\020\005\022\016\n\nDISCONNECT\020\006" + - "\022\r\n\tRECONNECT\020\007\022\n\n\006RESIGN\020\010\022\n\n\006GOSSIP\020\t\022", - "\016\n\nGOSSIP_ACK\020\n\022\031\n\025FAIL_OVER_CONNECTIONS" + - "\020\024\022\026\n\022FUNCTION_FUN0_UNIT\020\025\022\025\n\021FUNCTION_F" + - "UN0_ANY\020\026\022\032\n\026FUNCTION_FUN1_ARG_UNIT\020\027\022\031\n" + - "\025FUNCTION_FUN1_ARG_ANY\020\030B\017\n\013akka.remoteH" + - "\001" + "olProtocol\"\324\001\n\025RemoteMessageProtocol\022$\n\t" + + "recipient\030\001 \002(\0132\021.ActorRefProtocol\022!\n\007me" + + "ssage\030\002 \001(\0132\020.MessageProtocol\022%\n\texcepti" + + "on\030\003 \001(\0132\022.ExceptionProtocol\022!\n\006sender\030\004" + + " \001(\0132\021.ActorRefProtocol\022(\n\010metadata\030\005 \003(" + + "\0132\026.MetadataEntryProtocol\"J\n\025RemoteContr" + + "olProtocol\022\016\n\006cookie\030\001 \001(\t\022!\n\013commandTyp", + "e\030\002 \002(\0162\014.CommandType\"?\n\020ActorRefProtoco" + + "l\022\017\n\007address\030\001 \002(\t\022\014\n\004host\030\002 \002(\t\022\014\n\004port" + + "\030\003 \002(\r\";\n\017MessageProtocol\022\017\n\007message\030\001 \002" + + "(\014\022\027\n\017messageManifest\030\002 \001(\014\")\n\014UuidProto" + + "col\022\014\n\004high\030\001 \002(\004\022\013\n\003low\030\002 \002(\004\"3\n\025Metada" + + "taEntryProtocol\022\013\n\003key\030\001 \002(\t\022\r\n\005value\030\002 " + + "\002(\014\"1\n\017AddressProtocol\022\020\n\010hostname\030\001 \002(\t" + + "\022\014\n\004port\030\002 \002(\r\"7\n\021ExceptionProtocol\022\021\n\tc" + + "lassname\030\001 \002(\t\022\017\n\007message\030\002 \002(\t\"\256\001\n!Remo" + + "teSystemDaemonMessageProtocol\0223\n\013message", + "Type\030\001 \002(\0162\036.RemoteSystemDaemonMessageTy" + + "pe\022\024\n\014actorAddress\030\002 \001(\t\022\017\n\007payload\030\003 \001(" + + "\014\022-\n\026replicateActorFromUuid\030\004 \001(\0132\r.Uuid" + + "Protocol\"y\n\035DurableMailboxMessageProtoco" + + "l\022$\n\trecipient\030\001 \002(\0132\021.ActorRefProtocol\022" + + "!\n\006sender\030\002 \001(\0132\021.ActorRefProtocol\022\017\n\007me" + + "ssage\030\003 \002(\014*(\n\013CommandType\022\013\n\007CONNECT\020\001\022" + + "\014\n\010SHUTDOWN\020\002*K\n\026ReplicationStorageType\022" + + "\r\n\tTRANSIENT\020\001\022\023\n\017TRANSACTION_LOG\020\002\022\r\n\tD" + + "ATA_GRID\020\003*>\n\027ReplicationStrategyType\022\021\n", + "\rWRITE_THROUGH\020\001\022\020\n\014WRITE_BEHIND\020\002*\241\002\n\035R" + + "emoteSystemDaemonMessageType\022\010\n\004STOP\020\001\022\007" + + "\n\003USE\020\002\022\013\n\007RELEASE\020\003\022\022\n\016MAKE_AVAILABLE\020\004" + + "\022\024\n\020MAKE_UNAVAILABLE\020\005\022\016\n\nDISCONNECT\020\006\022\r" + + "\n\tRECONNECT\020\007\022\n\n\006RESIGN\020\010\022\n\n\006GOSSIP\020\t\022\031\n" + + "\025FAIL_OVER_CONNECTIONS\020\024\022\026\n\022FUNCTION_FUN" + + "0_UNIT\020\025\022\025\n\021FUNCTION_FUN0_ANY\020\026\022\032\n\026FUNCT" + + "ION_FUN1_ARG_UNIT\020\027\022\031\n\025FUNCTION_FUN1_ARG" + + "_ANY\020\030B\017\n\013akka.remoteH\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -10676,7 +6756,7 @@ public final class RemoteProtocol { internal_static_RemoteMessageProtocol_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_RemoteMessageProtocol_descriptor, - new java.lang.String[] { "Uuid", "ActorInfo", "OneWay", "Message", "Exception", "SupervisorUuid", "Sender", "Metadata", }, + new java.lang.String[] { "Recipient", "Message", "Exception", "Sender", "Metadata", }, akka.remote.RemoteProtocol.RemoteMessageProtocol.class, akka.remote.RemoteProtocol.RemoteMessageProtocol.Builder.class); internal_static_RemoteControlProtocol_descriptor = @@ -10687,48 +6767,24 @@ public final class RemoteProtocol { new java.lang.String[] { "Cookie", "CommandType", }, akka.remote.RemoteProtocol.RemoteControlProtocol.class, akka.remote.RemoteProtocol.RemoteControlProtocol.Builder.class); - internal_static_RemoteActorRefProtocol_descriptor = + internal_static_ActorRefProtocol_descriptor = getDescriptor().getMessageTypes().get(3); - internal_static_RemoteActorRefProtocol_fieldAccessorTable = new + internal_static_ActorRefProtocol_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_RemoteActorRefProtocol_descriptor, - new java.lang.String[] { "Address", "InetSocketAddress", "Timeout", }, - akka.remote.RemoteProtocol.RemoteActorRefProtocol.class, - akka.remote.RemoteProtocol.RemoteActorRefProtocol.Builder.class); - internal_static_SerializedActorRefProtocol_descriptor = - getDescriptor().getMessageTypes().get(4); - internal_static_SerializedActorRefProtocol_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_SerializedActorRefProtocol_descriptor, - new java.lang.String[] { "Uuid", "Address", "ActorClassname", "ActorInstance", "SerializerClassname", "Timeout", "ReceiveTimeout", "LifeCycle", "Supervisor", "HotswapStack", "ReplicationStorage", "ReplicationStrategy", "Messages", }, - akka.remote.RemoteProtocol.SerializedActorRefProtocol.class, - akka.remote.RemoteProtocol.SerializedActorRefProtocol.Builder.class); - internal_static_SerializedTypedActorRefProtocol_descriptor = - getDescriptor().getMessageTypes().get(5); - internal_static_SerializedTypedActorRefProtocol_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_SerializedTypedActorRefProtocol_descriptor, - new java.lang.String[] { "ActorRef", "InterfaceName", }, - akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol.class, - akka.remote.RemoteProtocol.SerializedTypedActorRefProtocol.Builder.class); + internal_static_ActorRefProtocol_descriptor, + new java.lang.String[] { "Address", "Host", "Port", }, + akka.remote.RemoteProtocol.ActorRefProtocol.class, + akka.remote.RemoteProtocol.ActorRefProtocol.Builder.class); internal_static_MessageProtocol_descriptor = - getDescriptor().getMessageTypes().get(6); + getDescriptor().getMessageTypes().get(4); internal_static_MessageProtocol_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_MessageProtocol_descriptor, new java.lang.String[] { "Message", "MessageManifest", }, akka.remote.RemoteProtocol.MessageProtocol.class, akka.remote.RemoteProtocol.MessageProtocol.Builder.class); - internal_static_ActorInfoProtocol_descriptor = - getDescriptor().getMessageTypes().get(7); - internal_static_ActorInfoProtocol_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_ActorInfoProtocol_descriptor, - new java.lang.String[] { "Uuid", "Timeout", "Address", }, - akka.remote.RemoteProtocol.ActorInfoProtocol.class, - akka.remote.RemoteProtocol.ActorInfoProtocol.Builder.class); internal_static_UuidProtocol_descriptor = - getDescriptor().getMessageTypes().get(8); + getDescriptor().getMessageTypes().get(5); internal_static_UuidProtocol_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_UuidProtocol_descriptor, @@ -10736,23 +6792,15 @@ public final class RemoteProtocol { akka.remote.RemoteProtocol.UuidProtocol.class, akka.remote.RemoteProtocol.UuidProtocol.Builder.class); internal_static_MetadataEntryProtocol_descriptor = - getDescriptor().getMessageTypes().get(9); + getDescriptor().getMessageTypes().get(6); internal_static_MetadataEntryProtocol_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_MetadataEntryProtocol_descriptor, new java.lang.String[] { "Key", "Value", }, akka.remote.RemoteProtocol.MetadataEntryProtocol.class, akka.remote.RemoteProtocol.MetadataEntryProtocol.Builder.class); - internal_static_LifeCycleProtocol_descriptor = - getDescriptor().getMessageTypes().get(10); - internal_static_LifeCycleProtocol_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_LifeCycleProtocol_descriptor, - new java.lang.String[] { "LifeCycle", }, - akka.remote.RemoteProtocol.LifeCycleProtocol.class, - akka.remote.RemoteProtocol.LifeCycleProtocol.Builder.class); internal_static_AddressProtocol_descriptor = - getDescriptor().getMessageTypes().get(11); + getDescriptor().getMessageTypes().get(7); internal_static_AddressProtocol_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_AddressProtocol_descriptor, @@ -10760,7 +6808,7 @@ public final class RemoteProtocol { akka.remote.RemoteProtocol.AddressProtocol.class, akka.remote.RemoteProtocol.AddressProtocol.Builder.class); internal_static_ExceptionProtocol_descriptor = - getDescriptor().getMessageTypes().get(12); + getDescriptor().getMessageTypes().get(8); internal_static_ExceptionProtocol_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_ExceptionProtocol_descriptor, @@ -10768,19 +6816,19 @@ public final class RemoteProtocol { akka.remote.RemoteProtocol.ExceptionProtocol.class, akka.remote.RemoteProtocol.ExceptionProtocol.Builder.class); internal_static_RemoteSystemDaemonMessageProtocol_descriptor = - getDescriptor().getMessageTypes().get(13); + getDescriptor().getMessageTypes().get(9); internal_static_RemoteSystemDaemonMessageProtocol_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_RemoteSystemDaemonMessageProtocol_descriptor, - new java.lang.String[] { "MessageType", "ActorUuid", "ActorAddress", "Payload", "ReplicateActorFromUuid", }, + new java.lang.String[] { "MessageType", "ActorAddress", "Payload", "ReplicateActorFromUuid", }, akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol.class, akka.remote.RemoteProtocol.RemoteSystemDaemonMessageProtocol.Builder.class); internal_static_DurableMailboxMessageProtocol_descriptor = - getDescriptor().getMessageTypes().get(14); + getDescriptor().getMessageTypes().get(10); internal_static_DurableMailboxMessageProtocol_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_DurableMailboxMessageProtocol_descriptor, - new java.lang.String[] { "OwnerActorAddress", "SenderActorAddress", "FutureUuid", "Message", }, + new java.lang.String[] { "Recipient", "Sender", "Message", }, akka.remote.RemoteProtocol.DurableMailboxMessageProtocol.class, akka.remote.RemoteProtocol.DurableMailboxMessageProtocol.Builder.class); return null; @@ -10791,6 +6839,6 @@ public final class RemoteProtocol { new com.google.protobuf.Descriptors.FileDescriptor[] { }, assigner); } - + // @@protoc_insertion_point(outer_class_scope) } diff --git a/akka-remote/src/main/protocol/RemoteProtocol.proto b/akka-remote/src/main/protocol/RemoteProtocol.proto index 7f2b9ce4b4..8dda9e4a11 100644 --- a/akka-remote/src/main/protocol/RemoteProtocol.proto +++ b/akka-remote/src/main/protocol/RemoteProtocol.proto @@ -20,14 +20,11 @@ message AkkaRemoteProtocol { * Defines a remote message. */ message RemoteMessageProtocol { - required UuidProtocol uuid = 1; - required ActorInfoProtocol actorInfo = 2; - required bool oneWay = 3; - optional MessageProtocol message = 4; - optional ExceptionProtocol exception = 5; - optional UuidProtocol supervisorUuid = 6; - optional RemoteActorRefProtocol sender = 7; - repeated MetadataEntryProtocol metadata = 8; + required ActorRefProtocol recipient = 1; + optional MessageProtocol message = 2; + optional ExceptionProtocol exception = 3; + optional ActorRefProtocol sender = 4; + repeated MetadataEntryProtocol metadata = 5; } /** @@ -67,41 +64,10 @@ enum ReplicationStrategyType { * Defines a remote ActorRef that "remembers" and uses its original Actor instance * on the original node. */ -message RemoteActorRefProtocol { +message ActorRefProtocol { required string address = 1; - required bytes inetSocketAddress = 2; - optional uint64 timeout = 3; -} - -/** - * Defines a fully serialized remote ActorRef (with serialized Actor instance) - * that is about to be instantiated on the remote node. It is fully disconnected - * from its original host. - */ -message SerializedActorRefProtocol { - required UuidProtocol uuid = 1; - required string address = 2; - required string actorClassname = 3; - optional bytes actorInstance = 4; - optional string serializerClassname = 5; - optional uint64 timeout = 6; - optional uint64 receiveTimeout = 7; - optional LifeCycleProtocol lifeCycle = 8; - optional RemoteActorRefProtocol supervisor = 9; - optional bytes hotswapStack = 10; - optional ReplicationStorageType replicationStorage = 11; - optional ReplicationStrategyType replicationStrategy = 12; - repeated RemoteMessageProtocol messages = 13; -} - -/** - * Defines a fully serialized remote ActorRef (with serialized typed actor instance) - * that is about to be instantiated on the remote node. It is fully disconnected - * from its original host. - */ -message SerializedTypedActorRefProtocol { - required SerializedActorRefProtocol actorRef = 1; - required string interfaceName = 2; + required string host = 2; + required uint32 port = 3; } /** @@ -112,15 +78,6 @@ message MessageProtocol { optional bytes messageManifest = 2; } -/** - * Defines the actor info. - */ -message ActorInfoProtocol { - required UuidProtocol uuid = 1; - required uint64 timeout = 2; - optional string address = 3; -} - /** * Defines a UUID. */ @@ -137,32 +94,6 @@ message MetadataEntryProtocol { required bytes value = 2; } -/** - * Defines the serialization scheme used to serialize the message and/or Actor instance. - */ -enum SerializationSchemeType { - JAVA = 1; - SBINARY = 2; - SCALA_JSON = 3; - JAVA_JSON = 4; - PROTOBUF = 5; -} - -/** - * Defines the type of the life-cycle of a supervised Actor. - */ -enum LifeCycleType { - PERMANENT = 1; - TEMPORARY = 2; -} - -/** - * Defines the life-cycle of a supervised Actor. - */ -message LifeCycleProtocol { - required LifeCycleType lifeCycle = 1; -} - /** * Defines a remote address. */ @@ -184,10 +115,9 @@ message ExceptionProtocol { */ message RemoteSystemDaemonMessageProtocol { required RemoteSystemDaemonMessageType messageType = 1; - optional UuidProtocol actorUuid = 2; - optional string actorAddress = 3; - optional bytes payload = 5; - optional UuidProtocol replicateActorFromUuid = 6; + optional string actorAddress = 2; + optional bytes payload = 3; + optional UuidProtocol replicateActorFromUuid = 4; } /** @@ -214,8 +144,7 @@ enum RemoteSystemDaemonMessageType { * Defines the durable mailbox message. */ message DurableMailboxMessageProtocol { - required string ownerActorAddress= 1; - optional string senderActorAddress = 2; - optional UuidProtocol futureUuid = 3; - required bytes message = 4; + required ActorRefProtocol recipient= 1; + optional ActorRefProtocol sender = 2; + required bytes message = 3; } diff --git a/akka-remote/src/main/scala/akka/remote/Gossiper.scala b/akka-remote/src/main/scala/akka/remote/Gossiper.scala index 95adec1edf..f834137b88 100644 --- a/akka-remote/src/main/scala/akka/remote/Gossiper.scala +++ b/akka-remote/src/main/scala/akka/remote/Gossiper.scala @@ -109,7 +109,7 @@ class Gossiper(remote: Remote) { private val seeds = Set(address) // FIXME read in list of seeds from config private val scheduler = new DefaultScheduler - private val address = new InetSocketAddress(app.hostname, app.port) + private val address = app.defaultAddress private val nodeFingerprint = address.## private val random = SecureRandom.getInstance("SHA1PRNG") diff --git a/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala b/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala index 333cb6f3dc..eaeeb410ae 100644 --- a/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala +++ b/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala @@ -14,12 +14,12 @@ object MessageSerializer { def deserialize(app: AkkaApplication, messageProtocol: MessageProtocol, classLoader: Option[ClassLoader] = None): AnyRef = { val clazz = loadManifest(classLoader, messageProtocol) app.serialization.deserialize(messageProtocol.getMessage.toByteArray, - clazz, classLoader).fold(x ⇒ throw x, o ⇒ o) + clazz, classLoader).fold(x ⇒ throw x, identity) } def serialize(app: AkkaApplication, message: AnyRef): MessageProtocol = { val builder = MessageProtocol.newBuilder - val bytes = app.serialization.serialize(message).fold(x ⇒ throw x, b ⇒ b) + val bytes = app.serialization.serialize(message).fold(x ⇒ throw x, identity) builder.setMessage(ByteString.copyFrom(bytes)) builder.setMessageManifest(ByteString.copyFromUtf8(message.getClass.getName)) builder.build diff --git a/akka-remote/src/main/scala/akka/remote/Remote.scala b/akka-remote/src/main/scala/akka/remote/Remote.scala index 7e3bb86a78..8ba981798f 100644 --- a/akka-remote/src/main/scala/akka/remote/Remote.scala +++ b/akka-remote/src/main/scala/akka/remote/Remote.scala @@ -13,7 +13,6 @@ import akka.util._ import akka.util.duration._ import akka.util.Helpers._ import akka.actor.DeploymentConfig._ -import akka.serialization.{ Serialization, Serializer, Compression } import akka.serialization.Compression.LZF import akka.remote.RemoteProtocol._ import akka.remote.RemoteProtocol.RemoteSystemDaemonMessageType._ @@ -21,6 +20,7 @@ import akka.remote.RemoteProtocol.RemoteSystemDaemonMessageType._ import java.net.InetSocketAddress import com.eaio.uuid.UUID +import akka.serialization.{ JavaSerializer, Serialization, Serializer, Compression } /** * Remote module - contains remote client and server config, remote server instance, remote daemon, remote dispatchers etc. @@ -37,9 +37,6 @@ class Remote(val app: AkkaApplication) extends RemoteService { val shouldCompressData = config.getBool("akka.remote.use-compression", false) val remoteSystemDaemonAckTimeout = Duration(config.getInt("akka.remote.remote-daemon-ack-timeout", 30), DefaultTimeUnit).toMillis.toInt - val hostname = app.hostname - val port = app.port - val failureDetector = new AccrualFailureDetector(FailureDetectorThreshold, FailureDetectorMaxSampleSize) // val gossiper = new Gossiper(this) @@ -53,8 +50,7 @@ class Remote(val app: AkkaApplication) extends RemoteService { OneForOneStrategy(List(classOf[Exception]), None, None))) // is infinite restart what we want? private[remote] lazy val remoteDaemon = - new LocalActorRef( - app, + app.provider.actorOf( Props(new RemoteSystemDaemon(this)).withDispatcher(dispatcherFactory.newPinnedDispatcher(remoteDaemonServiceName)), remoteDaemonSupervisor, remoteDaemonServiceName, @@ -73,7 +69,6 @@ class Remote(val app: AkkaApplication) extends RemoteService { lazy val server: RemoteSupport = { val remote = new akka.remote.netty.NettyRemoteSupport(app) remote.start(hostname, port) - remote.register(remoteDaemonServiceName, remoteDaemon) app.eventHandler.addListener(eventStream.sender) app.eventHandler.addListener(remoteClientLifeCycleHandler) @@ -83,20 +78,11 @@ class Remote(val app: AkkaApplication) extends RemoteService { remote } - lazy val address = server.address - - def start() { - val triggerLazyServerVal = address.toString - eventHandler.info(this, "Starting remote server on [%s]".format(triggerLazyServerVal)) + def start(): Unit = { + val serverAddress = server.app.defaultAddress //Force init of server + val daemonAddress = remoteDaemon.address //Force init of daemon + eventHandler.info(this, "Starting remote server on [%s] and starting remoteDaemon with address [%s]".format(serverAddress, daemonAddress)) } - - def uuidProtocolToUuid(uuid: UuidProtocol): UUID = new UUID(uuid.getHigh, uuid.getLow) - - def uuidToUuidProtocol(uuid: UUID): UuidProtocol = - UuidProtocol.newBuilder - .setHigh(uuid.getTime) - .setLow(uuid.getClockSeqAndNode) - .build } /** @@ -117,7 +103,7 @@ class RemoteSystemDaemon(remote: Remote) extends Actor { def receive: Actor.Receive = { case message: RemoteSystemDaemonMessageProtocol ⇒ - eventHandler.debug(this, "Received command [\n%s] to RemoteSystemDaemon on [%s]".format(message, nodename)) + eventHandler.debug(this, "Received command [\n%s] to RemoteSystemDaemon on [%s]".format(message.getMessageType, nodename)) message.getMessageType match { case USE ⇒ handleUse(message) @@ -151,16 +137,12 @@ class RemoteSystemDaemon(remote: Remote) extends Actor { case Right(instance) ⇒ instance.asInstanceOf[() ⇒ Actor] } - val actorAddress = message.getActorAddress - val newActorRef = app.actorOf(Props(creator = actorFactory), actorAddress) - - server.register(actorAddress, newActorRef) - + app.actorOf(Props(creator = actorFactory), message.getActorAddress) } else { eventHandler.error(this, "Actor 'address' for actor to instantiate is not defined, ignoring remote system daemon command [%s]".format(message)) } - sender ! Success(address.toString) + sender ! Success(app.defaultAddress) } catch { case error: Throwable ⇒ //FIXME doesn't seem sensible sender ! Failure(error) @@ -237,3 +219,38 @@ class RemoteSystemDaemon(remote: Remote) extends Actor { } } } + +class RemoteMessage(input: RemoteMessageProtocol, remote: RemoteSupport, classLoader: Option[ClassLoader] = None) { + lazy val sender: ActorRef = + if (input.hasSender) + remote.app.provider.deserialize( + SerializedActorRef(input.getSender.getAddress, input.getSender.getHost, input.getSender.getPort)).getOrElse(throw new IllegalStateException("OHNOES")) + else + remote.app.deadLetters + lazy val recipient: ActorRef = remote.app.findActor(input.getRecipient.getAddress) match { + case None ⇒ remote.app.deadLetters + case Some(target) ⇒ target + } + + lazy val payload: Either[Throwable, AnyRef] = + if (input.hasException) Left(parseException()) + else Right(MessageSerializer.deserialize(remote.app, input.getMessage, classLoader)) + + protected def parseException(): Throwable = { + val exception = input.getException + val classname = exception.getClassname + try { + val exceptionClass = + if (classLoader.isDefined) classLoader.get.loadClass(classname) else Class.forName(classname) + exceptionClass + .getConstructor(Array[Class[_]](classOf[String]): _*) + .newInstance(exception.getMessage).asInstanceOf[Throwable] + } catch { + case problem: Exception ⇒ + remote.app.eventHandler.error(problem, remote, problem.getMessage) + CannotInstantiateRemoteExceptionDueToRemoteProtocolParsingErrorException(problem, classname, exception.getMessage) + } + } + + override def toString = "RemoteMessage: " + recipient + "(" + input.getRecipient.getAddress + ") from " + sender +} diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala index 8a34e8b118..84b2e5a71c 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala @@ -22,6 +22,7 @@ import java.net.InetSocketAddress import java.util.concurrent.ConcurrentHashMap import com.google.protobuf.ByteString +import java.util.concurrent.atomic.AtomicBoolean /** * Remote ActorRefProvider. Starts up actor on remote node and creates a RemoteActorRef representing it. @@ -65,14 +66,13 @@ class RemoteActorRefProvider(val app: AkkaApplication) extends ActorRefProvider // case FailureDetectorType.Custom(implClass) ⇒ FailureDetector.createCustomFailureDetector(implClass) // } - val thisHostname = remote.address.getHostName - val thisPort = remote.address.getPort + def isReplicaNode: Boolean = remoteAddresses exists { some ⇒ some.port == app.port && some.hostname == app.hostname } - def isReplicaNode: Boolean = remoteAddresses exists { some ⇒ some.hostname == thisHostname && some.port == thisPort } + //app.eventHandler.debug(this, "%s: Deploy Remote Actor with address [%s] connected to [%s]: isReplica(%s)".format(app.defaultAddress, address, remoteAddresses.mkString, isReplicaNode)) if (isReplicaNode) { // we are on one of the replica node for this remote actor - new LocalActorRef(app, props, supervisor, address, false) + local.actorOf(props, supervisor, address, true) //FIXME systemService = true here to bypass Deploy, should be fixed when create-or-get is replaced by get-or-create } else { // we are on the single "reference" node uses the remote actors on the replica nodes @@ -147,28 +147,38 @@ class RemoteActorRefProvider(val app: AkkaApplication) extends ActorRefProvider } def actorFor(address: String): Option[ActorRef] = actors.get(address) match { - case null ⇒ None + case null ⇒ local.actorFor(address) case actor: ActorRef ⇒ Some(actor) case future: Future[_] ⇒ Some(future.get.asInstanceOf[ActorRef]) } + val optimizeLocal = new AtomicBoolean(true) + def optimizeLocalScoped_?() = optimizeLocal.get + /** * Returns true if the actor was in the provider's cache and evicted successfully, else false. */ private[akka] def evict(address: String): Boolean = actors.remove(address) ne null - private[akka] def serialize(actor: ActorRef): AnyRef = actor match { - case r: RemoteActorRef ⇒ SerializedActorRef(actor.uuid, actor.address, r.remoteAddress.getAddress.getHostAddress, r.remoteAddress.getPort) + private[akka] def serialize(actor: ActorRef): SerializedActorRef = actor match { + case r: RemoteActorRef ⇒ new SerializedActorRef(actor.address, r.remoteAddress) case other ⇒ local.serialize(actor) } - private[akka] def deserialize(actor: SerializedActorRef): Option[ActorRef] = - local.actorFor(actor.address) orElse Some(RemoteActorRef(remote.server, new InetSocketAddress(actor.hostname, actor.port), actor.address, None)) + private[akka] def deserialize(actor: SerializedActorRef): Option[ActorRef] = { + if (optimizeLocalScoped_? && (actor.hostname == app.hostname || actor.hostname == app.defaultAddress.getHostName) && actor.port == app.port) { + local.actorFor(actor.address) + } else { + val remoteInetSocketAddress = new InetSocketAddress(actor.hostname, actor.port) //FIXME Drop the InetSocketAddresses and use RemoteAddress + app.eventHandler.debug(this, "%s: Creating RemoteActorRef with address [%s] connected to [%s]".format(app.defaultAddress, actor.address, remoteInetSocketAddress)) + Some(RemoteActorRef(remote.server, remoteInetSocketAddress, actor.address, None)) //Should it be None here + } + } /** * Using (checking out) actor on a specific node. */ def useActorOnNode(remoteAddress: InetSocketAddress, actorAddress: String, actorFactory: () ⇒ Actor) { - app.eventHandler.debug(this, "Instantiating Actor [%s] on node [%s]".format(actorAddress, remoteAddress)) + app.eventHandler.debug(this, "[%s] Instantiating Actor [%s] on node [%s]".format(app.defaultAddress, actorAddress, remoteAddress)) val actorFactoryBytes = app.serialization.serialize(actorFactory) match { @@ -182,7 +192,7 @@ class RemoteActorRefProvider(val app: AkkaApplication) extends ActorRefProvider .setPayload(ByteString.copyFrom(actorFactoryBytes)) .build() - val connectionFactory = () ⇒ remote.server.actorFor(remote.remoteDaemonServiceName, remoteAddress.getAddress.getHostAddress, remoteAddress.getPort) + val connectionFactory = () ⇒ deserialize(new SerializedActorRef(remote.remoteDaemonServiceName, remoteAddress)).get // try to get the connection for the remote address, if not already there then create it val connection = remoteDaemonConnectionManager.putIfAbsent(remoteAddress, connectionFactory) @@ -234,9 +244,6 @@ private[akka] case class RemoteActorRef private[akka] ( address: String, loader: Option[ClassLoader]) extends ActorRef with ScalaActorRef { - - private[akka] val uuid: Uuid = newUuid - @volatile private var running: Boolean = true @@ -250,9 +257,9 @@ private[akka] case class RemoteActorRef private[akka] ( def ?(message: Any)(implicit timeout: Timeout): Future[Any] = remote.app.provider.ask(message, this, timeout) - def suspend(): Unit = unsupported + def suspend(): Unit = () - def resume(): Unit = unsupported + def resume(): Unit = () def stop() { //FIXME send the cause as well! synchronized { @@ -266,11 +273,11 @@ private[akka] case class RemoteActorRef private[akka] ( @throws(classOf[java.io.ObjectStreamException]) private def writeReplace(): AnyRef = remote.app.provider.serialize(this) - def startsMonitoring(actorRef: ActorRef): ActorRef = unsupported + def startsMonitoring(actorRef: ActorRef): ActorRef = unsupported //FIXME Implement - def stopsMonitoring(actorRef: ActorRef): ActorRef = unsupported + def stopsMonitoring(actorRef: ActorRef): ActorRef = unsupported //FIXME Implement - protected[akka] def restart(cause: Throwable): Unit = unsupported + protected[akka] def restart(cause: Throwable): Unit = () private def unsupported = throw new UnsupportedOperationException("Not supported for RemoteActorRef") } diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala index 66ce5a5334..10b5246596 100644 --- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala +++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala @@ -57,14 +57,13 @@ trait NettyRemoteClientModule extends RemoteClientModule { protected[akka] def send[T](message: Any, senderOption: Option[ActorRef], - remoteAddress: InetSocketAddress, - actorRef: ActorRef, + recipientAddress: InetSocketAddress, + recipient: ActorRef, loader: Option[ClassLoader]): Unit = - withClientFor(remoteAddress, loader) { _.send[T](message, senderOption, remoteAddress, actorRef) } + withClientFor(recipientAddress, loader) { _.send[T](message, senderOption, recipient) } private[akka] def withClientFor[T]( address: InetSocketAddress, loader: Option[ClassLoader])(body: RemoteClient ⇒ T): T = { - // loader.foreach(MessageSerializer.setClassLoader(_)) val key = RemoteAddress(address) lock.readLock.lock try { @@ -158,9 +157,8 @@ abstract class RemoteClient private[akka] ( /** * Converts the message to the wireprotocol and sends the message across the wire */ - def send[T](message: Any, senderOption: Option[ActorRef], remoteAddress: InetSocketAddress, actorRef: ActorRef) { - val messageProtocol = serialization.createRemoteMessageProtocolBuilder(Option(actorRef), Left(actorRef.uuid), actorRef.address, app.AkkaConfig.ActorTimeoutMillis, Right(message), senderOption).build - send(messageProtocol) + def send[T](message: Any, senderOption: Option[ActorRef], recipient: ActorRef) { + send(serialization.createRemoteMessageProtocolBuilder(Left(recipient), Right(message), senderOption).build) } /** @@ -168,7 +166,7 @@ abstract class RemoteClient private[akka] ( */ def send[T](request: RemoteMessageProtocol) { if (isRunning) { //TODO FIXME RACY - app.eventHandler.debug(this, "Sending to connection [%s] message [\n%s]".format(remoteAddress, request)) + app.eventHandler.debug(this, "Sending to connection [%s] message [%s]".format(remoteAddress, new RemoteMessage(request, remoteSupport))) // tell try { @@ -378,10 +376,6 @@ class ActiveRemoteClientHandler( } case arp: AkkaRemoteProtocol if arp.hasMessage ⇒ - val reply = arp.getMessage - val replyUuid = uuidFrom(reply.getActorInfo.getUuid.getHigh, reply.getActorInfo.getUuid.getLow) - app.eventHandler.debug(this, "Remote client received RemoteMessageProtocol[\n%s]\nTrying to map back to future [%s]".format(reply, replyUuid)) - //TODO FIXME DOESN'T DO ANYTHING ANYMORE case other ⇒ @@ -443,54 +437,13 @@ class ActiveRemoteClientHandler( } else app.eventHandler.error(this, "Unexpected exception from downstream in remote client [%s]".format(event)) } - - private def parseException(reply: RemoteMessageProtocol, loader: Option[ClassLoader]): Throwable = { - val exception = reply.getException - val classname = exception.getClassname - try { - val exceptionClass = - if (loader.isDefined) loader.get.loadClass(classname) - else Class.forName(classname) - exceptionClass - .getConstructor(Array[Class[_]](classOf[String]): _*) - .newInstance(exception.getMessage).asInstanceOf[Throwable] - } catch { - case problem: Exception ⇒ - app.eventHandler.error(problem, this, problem.getMessage) - CannotInstantiateRemoteExceptionDueToRemoteProtocolParsingErrorException(problem, classname, exception.getMessage) - } - } } /** * Provides the implementation of the Netty remote support */ class NettyRemoteSupport(_app: AkkaApplication) extends RemoteSupport(_app) with NettyRemoteServerModule with NettyRemoteClientModule { - - // Needed for remote testing and switching on/off under run - val optimizeLocal = new AtomicBoolean(true) - - def optimizeLocalScoped_?() = optimizeLocal.get - - protected[akka] def actorFor(actorAddress: String, host: String, port: Int, loader: Option[ClassLoader]): ActorRef = { - - val homeInetSocketAddress = this.address - if (optimizeLocalScoped_?) { - if ((host == homeInetSocketAddress.getAddress.getHostAddress || - host == homeInetSocketAddress.getHostName) && - port == homeInetSocketAddress.getPort) { - //TODO: switch to InetSocketAddress.equals? - val localRef = findActorByAddressOrUuid(actorAddress, actorAddress) - if (localRef ne null) return localRef //Code significantly simpler with the return statement - } - } - - val remoteInetSocketAddress = new InetSocketAddress(host, port) - app.eventHandler.debug(this, - "Creating RemoteActorRef with address [%s] connected to [%s]" - .format(actorAddress, remoteInetSocketAddress)) - RemoteActorRef(this, remoteInetSocketAddress, actorAddress, loader) - } + override def toString = name } class NettyRemoteServer(app: AkkaApplication, serverModule: NettyRemoteServerModule, val host: String, val port: Int, val loader: Option[ClassLoader]) { @@ -577,7 +530,7 @@ trait NettyRemoteServerModule extends RemoteServerModule { def start(_hostname: String, _port: Int, loader: Option[ClassLoader] = None): RemoteServerModule = guard withGuard { try { _isRunning switchOn { - app.eventHandler.debug(this, "Starting up remote server on %s:s".format(_hostname, _port)) + app.eventHandler.debug(this, "Starting up remote server on [%s:%s]".format(_hostname, _port)) currentServer.set(Some(new NettyRemoteServer(app, this, _hostname, _port, loader))) } @@ -597,85 +550,6 @@ trait NettyRemoteServerModule extends RemoteServerModule { } } } - - /** - * Register RemoteModule Actor by a specific 'id' passed as argument. - *

- * NOTE: If you use this method to register your remote actor then you must unregister the actor by this ID yourself. - */ - def register(id: String, actorRef: ActorRef): Unit = guard withGuard { - if (id.startsWith(UUID_PREFIX)) register(id.substring(UUID_PREFIX.length), actorRef, actorsByUuid) - else register(id, actorRef, actors) - } - - def registerByUuid(actorRef: ActorRef): Unit = guard withGuard { - register(actorRef.uuid.toString, actorRef, actorsByUuid) - } - - private def register[Key](id: Key, actorRef: ActorRef, registry: ConcurrentHashMap[Key, ActorRef]) { - if (_isRunning.isOn) - registry.put(id, actorRef) //TODO change to putIfAbsent - } - - /** - * Register RemoteModule Session Actor by a specific 'id' passed as argument. - *

- * NOTE: If you use this method to register your remote actor then you must unregister the actor by this ID yourself. - */ - def registerPerSession(id: String, factory: ⇒ ActorRef): Unit = synchronized { - registerPerSession(id, () ⇒ factory, actorsFactories) - } - - private def registerPerSession[Key](id: Key, factory: () ⇒ ActorRef, registry: ConcurrentHashMap[Key, () ⇒ ActorRef]) { - if (_isRunning.isOn) - registry.put(id, factory) //TODO change to putIfAbsent - } - - /** - * Unregister RemoteModule Actor that is registered using its 'id' field (not custom ID). - */ - def unregister(actorRef: ActorRef): Unit = guard withGuard { - - if (_isRunning.isOn) { - app.eventHandler.debug(this, "Unregister server side remote actor with id [%s]".format(actorRef.uuid)) - - actors.remove(actorRef.address, actorRef) - actorsByUuid.remove(actorRef.uuid.toString, actorRef) - } - } - - /** - * Unregister RemoteModule Actor by specific 'id'. - *

- * NOTE: You need to call this method if you have registered an actor by a custom ID. - */ - def unregister(id: String): Unit = guard withGuard { - - if (_isRunning.isOn) { - app.eventHandler.debug(this, "Unregister server side remote actor with id [%s]".format(id)) - - if (id.startsWith(UUID_PREFIX)) actorsByUuid.remove(id.substring(UUID_PREFIX.length)) - else { - val actorRef = actors get id - actorsByUuid.remove(actorRef.uuid.toString, actorRef) - actors.remove(id, actorRef) - } - } - } - - /** - * Unregister RemoteModule Actor by specific 'id'. - *

- * NOTE: You need to call this method if you have registered an actor by a custom ID. - */ - def unregisterPerSession(id: String) { - - if (_isRunning.isOn) { - app.eventHandler.info(this, "Unregistering server side remote actor with id [%s]".format(id)) - - actorsFactories.remove(id) - } - } } /** @@ -747,10 +621,6 @@ class RemoteServerHandler( implicit def app = server.app - // applicationLoader.foreach(MessageSerializer.setClassLoader(_)) //TODO: REVISIT: THIS FEELS A BIT DODGY - - val sessionActors = new ChannelLocal[ConcurrentHashMap[String, ActorRef]]() - //Writes the specified message to the specified channel and propagates write errors to listeners private def write(channel: Channel, payload: AkkaRemoteProtocol) { channel.write(payload).addListener( @@ -778,48 +648,26 @@ class RemoteServerHandler( override def channelConnected(ctx: ChannelHandlerContext, event: ChannelStateEvent) = { val clientAddress = getClientAddress(ctx) app.eventHandler.debug(this, "Remote client [%s] connected to [%s]".format(clientAddress, server.name)) - - sessionActors.set(event.getChannel(), new ConcurrentHashMap[String, ActorRef]()) server.notifyListeners(RemoteServerClientConnected(server, clientAddress)) } override def channelDisconnected(ctx: ChannelHandlerContext, event: ChannelStateEvent) = { val clientAddress = getClientAddress(ctx) - app.eventHandler.debug(this, "Remote client [%s] disconnected from [%s]".format(clientAddress, server.name)) - - // stop all session actors - for ( - map ← Option(sessionActors.remove(event.getChannel)); - actor ← collectionAsScalaIterable(map.values) - ) { - try { - actor ! PoisonPill - } catch { - case e: Exception ⇒ app.eventHandler.error(e, this, "Couldn't stop %s".format(actor)) - } - } - server.notifyListeners(RemoteServerClientDisconnected(server, clientAddress)) } override def channelClosed(ctx: ChannelHandlerContext, event: ChannelStateEvent) = { val clientAddress = getClientAddress(ctx) app.eventHandler.debug("Remote client [%s] channel closed from [%s]".format(clientAddress, server.name), this) - server.notifyListeners(RemoteServerClientClosed(server, clientAddress)) } override def messageReceived(ctx: ChannelHandlerContext, event: MessageEvent) = { event.getMessage match { - case null ⇒ - throw new IllegalActorStateException("Message in remote MessageEvent is null [" + event + "]") - - case remote: AkkaRemoteProtocol if remote.hasMessage ⇒ - handleRemoteMessageProtocol(remote.getMessage, event.getChannel) - + case null ⇒ throw new IllegalActorStateException("Message in remote MessageEvent is null [" + event + "]") + case remote: AkkaRemoteProtocol if remote.hasMessage ⇒ handleRemoteMessageProtocol(remote.getMessage, event.getChannel) //case remote: AkkaRemoteProtocol if remote.hasInstruction => RemoteServer cannot receive control messages (yet) - case _ ⇒ //ignore } } @@ -838,101 +686,32 @@ class RemoteServerHandler( } private def handleRemoteMessageProtocol(request: RemoteMessageProtocol, channel: Channel) = try { - app.eventHandler.debug(this, "Received remote message [%s]".format(request)) - dispatchToActor(request, channel) + try { + val remoteMessage = new RemoteMessage(request, server.remoteSupport, applicationLoader) + val recipient = remoteMessage.recipient + + remoteMessage.payload match { + case Left(t) ⇒ throw t + case Right(r) ⇒ r match { + case _: Terminate ⇒ if (UNTRUSTED_MODE) throw new SecurityException("RemoteModule server is operating is untrusted mode, can not stop the actor") else recipient.stop() + case _: AutoReceivedMessage if (UNTRUSTED_MODE) ⇒ throw new SecurityException("RemoteModule server is operating is untrusted mode, can not pass on a AutoReceivedMessage to the remote actor") + case m ⇒ recipient.!(m)(remoteMessage.sender) + } + } + } catch { + case e: SecurityException ⇒ + app.eventHandler.error(e, this, e.getMessage) + write(channel, createErrorReplyMessage(e, request)) + server.notifyListeners(RemoteServerError(e, server)) + } } catch { case e: Exception ⇒ server.notifyListeners(RemoteServerError(e, server)) app.eventHandler.error(e, this, e.getMessage) } - private def dispatchToActor(request: RemoteMessageProtocol, channel: Channel) { - val actorInfo = request.getActorInfo - - app.eventHandler.debug(this, "Dispatching to remote actor [%s]".format(actorInfo.getUuid)) - - val actorRef = - try { - actorOf(actorInfo, channel) - } catch { - case e: SecurityException ⇒ - app.eventHandler.error(e, this, e.getMessage) - write(channel, createErrorReplyMessage(e, request)) - server.notifyListeners(RemoteServerError(e, server)) - return - } - - val sender = if (request.hasSender) serialization.fromProtobufToRemoteActorRef(request.getSender, applicationLoader) else app.deadLetters - - MessageSerializer.deserialize(app, request.getMessage) match { - case _: Terminate ⇒ if (UNTRUSTED_MODE) throw new SecurityException("RemoteModule server is operating is untrusted mode, can not stop the actor") else actorRef.stop() - case _: AutoReceivedMessage if (UNTRUSTED_MODE) ⇒ throw new SecurityException("RemoteModule server is operating is untrusted mode, can not pass on a AutoReceivedMessage to the remote actor") - case m ⇒ actorRef.!(m)(sender) - } - } - - /** - * Creates a new instance of the actor with name, uuid and timeout specified as arguments. - * - * If actor already created then just return it from the registry. - * - * Does not start the actor. - */ - private def actorOf(actorInfo: ActorInfoProtocol, channel: Channel): ActorRef = { - val uuid = actorInfo.getUuid - val address = actorInfo.getAddress - - app.eventHandler.debug(this, - "Looking up a remotely available actor for address [%s] on node [%s]" - .format(address, app.nodename)) - - val byAddress = server.actors.get(address) // try actor-by-address - if (byAddress eq null) { - val byUuid = server.actorsByUuid.get(uuid) // try actor-by-uuid - if (byUuid eq null) { - val bySession = createSessionActor(actorInfo, channel) // try actor-by-session - if (bySession eq null) { - throw new IllegalActorStateException( - "Could not find a remote actor with address [" + address + "] or uuid [" + uuid + "]") - } else bySession - } else byUuid - } else byAddress - } - - /** - * gets the actor from the session, or creates one if there is a factory for it - */ - private def createSessionActor(actorInfo: ActorInfoProtocol, channel: Channel): ActorRef = { - val uuid = actorInfo.getUuid - val address = actorInfo.getAddress - - findSessionActor(address, channel) match { - case null ⇒ // we dont have it in the session either, see if we have a factory for it - server.findActorFactory(address) match { - case null ⇒ null - case factory ⇒ - val actorRef = factory() - sessionActors.get(channel).put(address, actorRef) - actorRef //Start it where's it's created - } - case sessionActor ⇒ sessionActor - } - } - - private def findSessionActor(id: String, channel: Channel): ActorRef = - sessionActors.get(channel) match { - case null ⇒ null - case map ⇒ map get id - } - - private def createErrorReplyMessage(exception: Throwable, request: RemoteMessageProtocol): AkkaRemoteProtocol = { - val actorInfo = request.getActorInfo - val messageBuilder = serialization.createRemoteMessageProtocolBuilder(None, Right(request.getUuid), actorInfo.getAddress, actorInfo.getTimeout, Left(exception), None) - if (request.hasSupervisorUuid) messageBuilder.setSupervisorUuid(request.getSupervisorUuid) - RemoteEncoder.encode(messageBuilder.build) - } - - protected def parseUuid(protocol: UuidProtocol): Uuid = uuidFrom(protocol.getHigh, protocol.getLow) + private def createErrorReplyMessage(exception: Throwable, request: RemoteMessageProtocol): AkkaRemoteProtocol = + RemoteEncoder.encode(serialization.createRemoteMessageProtocolBuilder(Right(request.getSender), Left(exception), None).build) } class DefaultDisposableChannelGroup(name: String) extends DefaultChannelGroup(name) { diff --git a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala index bea53aee16..aedcd5f3ee 100644 --- a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala +++ b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala @@ -6,17 +6,10 @@ package akka.serialization import akka.actor._ import akka.actor.DeploymentConfig._ -import akka.dispatch.Envelope -import akka.util.{ ReflectiveAccess, Duration } -import akka.event.EventHandler import akka.remote._ import RemoteProtocol._ -import akka.AkkaApplication - -import scala.collection.immutable.Stack import java.net.InetSocketAddress -import java.util.{ LinkedList, Collections } import com.google.protobuf.ByteString @@ -24,79 +17,20 @@ import com.eaio.uuid.UUID class RemoteActorSerialization(remote: RemoteSupport) { - /** - * Deserializes a byte array (Array[Byte]) into an RemoteActorRef instance. - */ - def fromBinaryToRemoteActorRef(bytes: Array[Byte]): ActorRef = - fromProtobufToRemoteActorRef(RemoteActorRefProtocol.newBuilder.mergeFrom(bytes).build, None) - - /** - * Deserializes a byte array (Array[Byte]) into an RemoteActorRef instance. - */ - def fromBinaryToRemoteActorRef(bytes: Array[Byte], loader: ClassLoader): ActorRef = - fromProtobufToRemoteActorRef(RemoteActorRefProtocol.newBuilder.mergeFrom(bytes).build, Some(loader)) - - /** - * Deserializes a RemoteActorRefProtocol Protocol Buffers (protobuf) Message into an RemoteActorRef instance. - */ - private[akka] def fromProtobufToRemoteActorRef(protocol: RemoteActorRefProtocol, loader: Option[ClassLoader]): ActorRef = { - remote.app.eventHandler.debug(this, "Deserializing RemoteActorRefProtocol to RemoteActorRef:\n %s".format(protocol)) - - val ref = RemoteActorRef( - remote, - JavaSerializer.fromBinary(protocol.getInetSocketAddress.toByteArray, Some(classOf[InetSocketAddress]), loader).asInstanceOf[InetSocketAddress], - protocol.getAddress, - loader) - - remote.app.eventHandler.debug(this, "Newly deserialized RemoteActorRef has uuid: %s".format(ref.uuid)) - - ref - } - /** * Serializes the ActorRef instance into a Protocol Buffers (protobuf) Message. */ - def toRemoteActorRefProtocol(actor: ActorRef): RemoteActorRefProtocol = { - val remoteAddress = actor match { - case ar: RemoteActorRef ⇒ - ar.remoteAddress - case ar: ActorRef ⇒ - remote.register(ar) //FIXME stop doing this and delegate to provider.actorFor in the NettyRemoting - remote.app.defaultAddress //FIXME Shouldn't this be the _current_ address of the remoting? - } - - remote.app.eventHandler.debug(this, "Register serialized Actor [%s] as remote @ [%s]".format(actor.uuid, remoteAddress)) - - RemoteActorRefProtocol.newBuilder - .setInetSocketAddress(ByteString.copyFrom(JavaSerializer.toBinary(remoteAddress))) - .setAddress(actor.address) - .setTimeout(remote.app.AkkaConfig.ActorTimeoutMillis) - .build + def toRemoteActorRefProtocol(actor: ActorRef): ActorRefProtocol = { + val rep = remote.app.provider.serialize(actor) + ActorRefProtocol.newBuilder.setAddress(rep.address).setHost(rep.hostname).setPort(rep.port).build } def createRemoteMessageProtocolBuilder( - actorRef: Option[ActorRef], - replyUuid: Either[Uuid, UuidProtocol], - actorAddress: String, - timeout: Long, + recipient: Either[ActorRef, ActorRefProtocol], message: Either[Throwable, Any], senderOption: Option[ActorRef]): RemoteMessageProtocol.Builder = { - val uuidProtocol = replyUuid match { - case Left(uid) ⇒ UuidProtocol.newBuilder.setHigh(uid.getTime).setLow(uid.getClockSeqAndNode).build - case Right(protocol) ⇒ protocol - } - - val actorInfoBuilder = ActorInfoProtocol.newBuilder.setUuid(uuidProtocol).setAddress(actorAddress).setTimeout(timeout) - - val actorInfo = actorInfoBuilder.build - val messageBuilder = RemoteMessageProtocol.newBuilder - .setUuid({ - val messageUuid = newUuid - UuidProtocol.newBuilder.setHigh(messageUuid.getTime).setLow(messageUuid.getClockSeqAndNode).build - }) - .setActorInfo(actorInfo) - .setOneWay(true) + val messageBuilder = RemoteMessageProtocol.newBuilder.setRecipient(recipient.fold(toRemoteActorRefProtocol _, identity)) message match { case Right(message) ⇒ @@ -108,8 +42,7 @@ class RemoteActorSerialization(remote: RemoteSupport) { .build) } - if (senderOption.isDefined) - messageBuilder.setSender(toRemoteActorRefProtocol(senderOption.get)) + if (senderOption.isDefined) messageBuilder.setSender(toRemoteActorRefProtocol(senderOption.get)) messageBuilder }