.clustered.replication
// --------------------------------
- val state =
- if (clusteredConfig.getBool("stateless", false)) Stateless
- else Stateful
+ clusteredConfig.getSection("replication") match {
+ case None ⇒
+ Some(Deploy(address, router, format, Clustered(home, replicas, Transient)))
- Some(Deploy(address, router, format, Clustered(home, replicas, state)))
+ case Some(replicationConfig) ⇒
+ val storage = replicationConfig.getString("storage", "transaction-log") match {
+ case "transaction-log" ⇒ TransactionLog
+ case "data-grid" ⇒ DataGrid
+ case unknown ⇒
+ throw new ConfigurationException("Config option [" + addressPath +
+ ".clustered.replication.storage] needs to be either [\"transaction-log\"] or [\"data-grid\"] - was [" +
+ unknown + "]")
+ }
+ val strategy = replicationConfig.getString("strategy", "write-through") match {
+ case "write-through" ⇒ WriteThrough
+ case "write-behind" ⇒ WriteBehind
+ case unknown ⇒
+ throw new ConfigurationException("Config option [" + addressPath +
+ ".clustered.replication.strategy] needs to be either [\"write-through\"] or [\"write-behind\"] - was [" +
+ unknown + "]")
+ }
+ Some(Deploy(address, router, format, Clustered(home, replicas, Replication(storage, strategy))))
+ }
}
}
}
@@ -415,7 +465,8 @@ object Address {
def validate(address: String) {
if (validAddressPattern.matcher(address).matches) true
else {
- val e = new IllegalArgumentException("Address [" + address + "] is not valid, need to follow pattern [0-9a-zA-Z\\-\\_\\$]+")
+ val e = new IllegalArgumentException(
+ "Address [" + address + "] is not valid, need to follow pattern [0-9a-zA-Z\\-\\_\\$]+")
EventHandler.error(e, this, e.getMessage)
throw e
}
diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index 4e97855026..0ba0e44d5c 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
@@ -5,7 +5,7 @@ package akka.actor
*/
import akka.japi.{ Creator, Option ⇒ JOption }
-import akka.actor.Actor.{ actorOf, futureToAnyOptionAsTypedOption }
+import akka.actor.Actor._
import akka.dispatch.{ MessageDispatcher, Dispatchers, Future, FutureTimeoutException }
import java.lang.reflect.{ InvocationTargetException, Method, InvocationHandler, Proxy }
import akka.util.{ Duration }
@@ -47,7 +47,7 @@ object TypedActor {
actor ! m
null
case m if m.returnsFuture_? ⇒
- actor !!! m
+ actor ? m
case m if m.returnsJOption_? || m.returnsOption_? ⇒
val f = actor ? m
try { f.await } catch { case _: FutureTimeoutException ⇒ }
@@ -57,7 +57,7 @@ object TypedActor {
case Some(Left(ex)) ⇒ throw ex
}
case m ⇒
- (actor !!! m).get
+ (actor ? m).get.asInstanceOf[AnyRef]
}
}
}
diff --git a/akka-actor/src/main/scala/akka/cluster/ClusterInterface.scala b/akka-actor/src/main/scala/akka/cluster/ClusterInterface.scala
index 81b0add205..82155ebc90 100644
--- a/akka-actor/src/main/scala/akka/cluster/ClusterInterface.scala
+++ b/akka-actor/src/main/scala/akka/cluster/ClusterInterface.scala
@@ -7,6 +7,7 @@ package akka.cluster
import akka.remoteinterface.RemoteSupport
import akka.serialization.Serializer
import akka.actor._
+import DeploymentConfig._
import akka.dispatch.Future
import akka.config.Config
import akka.util._
@@ -179,6 +180,13 @@ trait ClusterNode {
*/
def store[T <: Actor](address: String, actorClass: Class[T], format: Serializer): ClusterNode
+ /**
+ * Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store[T <: Actor](address: String, actorClass: Class[T], replicationScheme: ReplicationScheme, format: Serializer): ClusterNode
+
/**
* Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
* with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
@@ -186,6 +194,13 @@ trait ClusterNode {
*/
def store[T <: Actor](address: String, actorClass: Class[T], replicationFactor: Int, format: Serializer): ClusterNode
+ /**
+ * Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store[T <: Actor](address: String, actorClass: Class[T], replicationFactor: Int, replicationScheme: ReplicationScheme, format: Serializer): ClusterNode
+
/**
* Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
* with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
@@ -193,6 +208,13 @@ trait ClusterNode {
*/
def store[T <: Actor](address: String, actorClass: Class[T], serializeMailbox: Boolean, format: Serializer): ClusterNode
+ /**
+ * Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store[T <: Actor](address: String, actorClass: Class[T], replicationScheme: ReplicationScheme, serializeMailbox: Boolean, format: Serializer): ClusterNode
+
/**
* Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
* with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
@@ -200,6 +222,13 @@ trait ClusterNode {
*/
def store[T <: Actor](address: String, actorClass: Class[T], replicationFactor: Int, serializeMailbox: Boolean, format: Serializer): ClusterNode
+ /**
+ * Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store[T <: Actor](address: String, actorClass: Class[T], replicationFactor: Int, replicationScheme: ReplicationScheme, serializeMailbox: Boolean, format: Serializer): ClusterNode
+
/**
* Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
* with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
@@ -207,6 +236,13 @@ trait ClusterNode {
*/
def store(actorRef: ActorRef, format: Serializer): ClusterNode
+ /**
+ * Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store(actorRef: ActorRef, replicationScheme: ReplicationScheme, format: Serializer): ClusterNode
+
/**
* Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
* with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
@@ -214,6 +250,13 @@ trait ClusterNode {
*/
def store(actorRef: ActorRef, replicationFactor: Int, format: Serializer): ClusterNode
+ /**
+ * Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store(actorRef: ActorRef, replicationFactor: Int, replicationScheme: ReplicationScheme, format: Serializer): ClusterNode
+
/**
* Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
* with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
@@ -221,11 +264,23 @@ trait ClusterNode {
*/
def store(actorRef: ActorRef, serializeMailbox: Boolean, format: Serializer): ClusterNode
+ /**
+ * Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store(actorRef: ActorRef, replicationScheme: ReplicationScheme, serializeMailbox: Boolean, format: Serializer): ClusterNode
+
/**
* Needed to have reflection through structural typing work.
*/
def store(actorRef: ActorRef, replicationFactor: Int, serializeMailbox: Boolean, format: AnyRef): ClusterNode
+ /**
+ * Needed to have reflection through structural typing work.
+ */
+ def store(actorRef: ActorRef, replicationFactor: Int, replicationScheme: ReplicationScheme, serializeMailbox: Boolean, format: AnyRef): ClusterNode
+
/**
* Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
* with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
@@ -233,6 +288,13 @@ trait ClusterNode {
*/
def store(actorRef: ActorRef, replicationFactor: Int, serializeMailbox: Boolean, format: Serializer): ClusterNode
+ /**
+ * Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store(actorRef: ActorRef, replicationFactor: Int, replicationScheme: ReplicationScheme, serializeMailbox: Boolean, format: Serializer): ClusterNode
+
/**
* Removes actor with uuid from the cluster.
*/
@@ -262,13 +324,13 @@ trait ClusterNode {
* Checks out an actor for use on this node, e.g. checked out as a 'LocalActorRef' but it makes it available
* for remote access through lookup by its UUID.
*/
- def use[T <: Actor](actorAddress: String): Option[LocalActorRef]
+ def use[T <: Actor](actorAddress: String): Option[ActorRef]
/**
* Checks out an actor for use on this node, e.g. checked out as a 'LocalActorRef' but it makes it available
* for remote access through lookup by its UUID.
*/
- def use[T <: Actor](actorAddress: String, format: Serializer): Option[LocalActorRef]
+ def use[T <: Actor](actorAddress: String, format: Serializer): Option[ActorRef]
/**
* Using (checking out) all actors with a specific UUID on all nodes in the cluster.
diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
index 9e7cb8e754..d00b579610 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
@@ -110,6 +110,8 @@ class Dispatcher(
*/
protected def getMailbox(receiver: ActorRef) = receiver.mailbox.asInstanceOf[MessageQueue with ExecutableMailbox]
+ def mailboxIsEmpty(actorRef: ActorRef): Boolean = getMailbox(actorRef).isEmpty
+
override def mailboxSize(actorRef: ActorRef) = getMailbox(actorRef).size
def createMailbox(actorRef: ActorRef): AnyRef = mailboxType match {
diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index 4e8e908049..3e8bd0515b 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -278,7 +278,7 @@ sealed trait Future[+T] {
* continuation until the result is available.
*
* If this Future is untyped (a Future[Nothing]), a type parameter must be explicitly provided or
- * execution will fail. The normal result of getting a Future from an ActorRef using !!! will return
+ * execution will fail. The normal result of getting a Future from an ActorRef using ? will return
* an untyped Future.
*/
def apply[A >: T](): A @cps[Future[Any]] = shift(this flatMap (_: A ⇒ Future[Any]))
@@ -419,9 +419,9 @@ sealed trait Future[+T] {
* Example:
*
* val future1 = for {
- * a <- actor !!! Req("Hello") collect { case Res(x: Int) => x }
- * b <- actor !!! Req(a) collect { case Res(x: String) => x }
- * c <- actor !!! Req(7) collect { case Res(x: String) => x }
+ * a <- actor ? Req("Hello") collect { case Res(x: Int) => x }
+ * b <- actor ? Req(a) collect { case Res(x: String) => x }
+ * c <- actor ? Req(7) collect { case Res(x: String) => x }
* } yield b + "-" + c
*
*/
@@ -484,9 +484,9 @@ sealed trait Future[+T] {
* Example:
*
* val future1 = for {
- * a: Int <- actor !!! "Hello" // returns 5
- * b: String <- actor !!! a // returns "10"
- * c: String <- actor !!! 7 // returns "14"
+ * a: Int <- actor ? "Hello" // returns 5
+ * b: String <- actor ? a // returns "10"
+ * c: String <- actor ? 7 // returns "14"
* } yield b + "-" + c
*
*/
@@ -540,9 +540,9 @@ sealed trait Future[+T] {
* Example:
*
* val future1 = for {
- * a: Int <- actor !!! "Hello" // returns 5
- * b: String <- actor !!! a // returns "10"
- * c: String <- actor !!! 7 // returns "14"
+ * a: Int <- actor ? "Hello" // returns 5
+ * b: String <- actor ? a // returns "10"
+ * c: String <- actor ? 7 // returns "14"
* } yield b + "-" + c
*
*/
diff --git a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
index d109d274d4..b5c50ea939 100644
--- a/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
@@ -234,6 +234,11 @@ trait MessageDispatcher {
*/
def mailboxSize(actorRef: ActorRef): Int
+ /**
+ * Returns the "current" emptiness status of the mailbox for the specified actor
+ */
+ def mailboxIsEmpty(actorRef: ActorRef): Boolean
+
/**
* Returns the amount of futures queued for execution
*/
diff --git a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
index f260cf39b4..b1c0f6e747 100644
--- a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
@@ -154,7 +154,7 @@ class MonitorableThreadFactory(val name: String) extends ThreadFactory {
* @author Jonas Bonér
*/
object MonitorableThread {
- val DEFAULT_NAME = "MonitorableThread"
+ val DEFAULT_NAME = "MonitorableThread".intern
// FIXME use MonitorableThread.created and MonitorableThread.alive in monitoring
val created = new AtomicInteger
diff --git a/akka-actor/src/main/scala/akka/package.scala b/akka-actor/src/main/scala/akka/package.scala
new file mode 100644
index 0000000000..269e3e068e
--- /dev/null
+++ b/akka-actor/src/main/scala/akka/package.scala
@@ -0,0 +1,39 @@
+/**
+ * Copyright (C) 2009-2011 Scalable Solutions AB
+ */
+
+import akka.dispatch.{ FutureTimeoutException, Future }
+import akka.util.Helpers.{ narrow, narrowSilently }
+
+package object akka {
+ /**
+ * Implicitly converts the given Option[Any] to a AnyOptionAsTypedOption which offers the method as[T]
+ * to convert an Option[Any] to an Option[T].
+ */
+ implicit def toAnyOptionAsTypedOption(anyOption: Option[Any]) = new AnyOptionAsTypedOption(anyOption)
+
+ /**
+ * Implicitly converts the given Future[_] to a AnyOptionAsTypedOption which offers the method as[T]
+ * to convert an Option[Any] to an Option[T].
+ * This means that the following code is equivalent:
+ * (actor ? "foo").as[Int] (Recommended)
+ */
+ implicit def futureToAnyOptionAsTypedOption(anyFuture: Future[_]) = new AnyOptionAsTypedOption({
+ try { anyFuture.await } catch { case t: FutureTimeoutException ⇒ }
+ anyFuture.resultOrException
+ })
+
+ private[akka] class AnyOptionAsTypedOption(anyOption: Option[Any]) {
+ /**
+ * Convenience helper to cast the given Option of Any to an Option of the given type. Will throw a ClassCastException
+ * if the actual type is not assignable from the given one.
+ */
+ def as[T]: Option[T] = narrow[T](anyOption)
+
+ /**
+ * Convenience helper to cast the given Option of Any to an Option of the given type. Will swallow a possible
+ * ClassCastException and return None in that case.
+ */
+ def asSilently[T: Manifest]: Option[T] = narrowSilently[T](anyOption)
+ }
+}
diff --git a/akka-actor/src/main/scala/akka/routing/Pool.scala b/akka-actor/src/main/scala/akka/routing/Pool.scala
index 097f2d720a..249d087ed6 100644
--- a/akka-actor/src/main/scala/akka/routing/Pool.scala
+++ b/akka-actor/src/main/scala/akka/routing/Pool.scala
@@ -117,7 +117,7 @@ trait SmallestMailboxSelector {
var take = if (partialFill) math.min(selectionCount, delegates.length) else selectionCount
while (take > 0) {
- set = delegates.sortWith(_.mailboxSize < _.mailboxSize).take(take) ++ set //Question, doesn't this risk selecting the same actor multiple times?
+ set = delegates.sortWith((a, b) ⇒ a.dispatcher.mailboxSize(a) < b.dispatcher.mailboxSize(b)).take(take) ++ set //Question, doesn't this risk selecting the same actor multiple times?
take -= set.size
}
@@ -188,7 +188,7 @@ trait BoundedCapacitor {
trait MailboxPressureCapacitor {
def pressureThreshold: Int
def pressure(delegates: Seq[ActorRef]): Int =
- delegates count { _.mailboxSize > pressureThreshold }
+ delegates count { a ⇒ a.dispatcher.mailboxSize(a) > pressureThreshold }
}
/**
diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala
index 454760594a..e707e23f23 100644
--- a/akka-actor/src/main/scala/akka/routing/Routing.scala
+++ b/akka-actor/src/main/scala/akka/routing/Routing.scala
@@ -206,7 +206,7 @@ case class SmallestMailboxFirstIterator(val items: Seq[ActorRef]) extends Infini
def this(items: java.util.List[ActorRef]) = this(items.toList)
def hasNext = items != Nil
- def next = items.reduceLeft((a1, a2) ⇒ if (a1.mailboxSize < a2.mailboxSize) a1 else a2)
+ def next = items.reduceLeft((a1, a2) ⇒ if (a1.dispatcher.mailboxSize(a1) < a2.dispatcher.mailboxSize(a2)) a1 else a2)
override def exists(f: ActorRef ⇒ Boolean): Boolean = items.exists(f)
}
diff --git a/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala b/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
index fc873a4228..42fd88a78f 100644
--- a/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
+++ b/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
@@ -8,7 +8,7 @@ import akka.dispatch.{ Future, Promise, MessageInvocation }
import akka.config.{ Config, ModuleNotAvailableException }
import akka.remoteinterface.RemoteSupport
import akka.actor._
-import DeploymentConfig.Deploy
+import DeploymentConfig.{ Deploy, ReplicationScheme, ReplicationStrategy }
import akka.event.EventHandler
import akka.serialization.Format
import akka.cluster.ClusterNode
@@ -62,6 +62,13 @@ object ReflectiveAccess {
None
}
+ lazy val transactionLogInstance: Option[TransactionLogObject] = getObjectFor("akka.cluster.TransactionLog$") match {
+ case Right(value) ⇒ Some(value)
+ case Left(exception) ⇒
+ EventHandler.debug(this, exception.toString)
+ None
+ }
+
lazy val node: ClusterNode = {
ensureEnabled()
clusterInstance.get.node
@@ -72,6 +79,11 @@ object ReflectiveAccess {
clusterDeployerInstance.get
}
+ lazy val transactionLog: TransactionLogObject = {
+ ensureEnabled()
+ transactionLogInstance.get
+ }
+
type ClusterDeployer = {
def init(deployments: List[Deploy])
def shutdown()
@@ -94,6 +106,35 @@ object ReflectiveAccess {
def toBinary(obj: AnyRef): Array[Byte]
def fromBinary(bytes: Array[Byte], clazz: Option[Class[_]]): AnyRef
}
+
+ type TransactionLogObject = {
+ def newLogFor(
+ id: String,
+ isAsync: Boolean,
+ replicationScheme: ReplicationScheme,
+ format: Serializer): TransactionLog
+
+ def logFor(
+ id: String,
+ isAsync: Boolean,
+ replicationScheme: ReplicationScheme,
+ format: Serializer): TransactionLog
+
+ def shutdown()
+ }
+
+ type TransactionLog = {
+ def recordEntry(messageHandle: MessageInvocation, actorRef: ActorRef)
+ def recordEntry(entry: Array[Byte])
+ def recordSnapshot(snapshot: Array[Byte])
+ def entries: Vector[Array[Byte]]
+ def entriesFromLatestSnapshot: Tuple2[Array[Byte], Vector[Array[Byte]]]
+ def entriesInRange(from: Long, to: Long): Vector[Array[Byte]]
+ def latestEntryId: Long
+ def latestSnapshotId: Long
+ def delete()
+ def close()
+ }
}
/**
diff --git a/akka-camel-typed/src/test/scala/akka/camel/TypedConsumerPublishRequestorTest.scala b/akka-camel-typed/src/test/scala/akka/camel/TypedConsumerPublishRequestorTest.scala
index cc4ff0f0cf..03c727834b 100644
--- a/akka-camel-typed/src/test/scala/akka/camel/TypedConsumerPublishRequestorTest.scala
+++ b/akka-camel-typed/src/test/scala/akka/camel/TypedConsumerPublishRequestorTest.scala
@@ -40,10 +40,10 @@ class TypedConsumerPublishRequestorTest extends JUnitSuite {
@Test
def shouldReceiveOneConsumerMethodRegisteredEvent = {
Actor.registry.addListener(requestor)
- val latch = (publisher !! SetExpectedTestMessageCount(1)).as[CountDownLatch].get
+ val latch = (publisher ? SetExpectedTestMessageCount(1)).as[CountDownLatch].get
val obj = TypedActor.typedActorOf(classOf[SampleTypedSingleConsumer], classOf[SampleTypedSingleConsumerImpl], defaultConfiguration)
assert(latch.await(5000, TimeUnit.MILLISECONDS))
- val event = (publisher !! GetRetainedMessage).as[ConsumerMethodRegistered].get
+ val event = (publisher ? GetRetainedMessage).as[ConsumerMethodRegistered].get
assert(event.endpointUri === "direct:foo")
assert(event.typedActor === obj)
assert(event.methodName === "foo")
@@ -52,11 +52,11 @@ class TypedConsumerPublishRequestorTest extends JUnitSuite {
@Test
def shouldReceiveOneConsumerMethodUnregisteredEvent = {
val obj = TypedActor.typedActorOf(classOf[SampleTypedSingleConsumer], classOf[SampleTypedSingleConsumerImpl], defaultConfiguration)
- val latch = (publisher !! SetExpectedTestMessageCount(1)).as[CountDownLatch].get
+ val latch = (publisher ? SetExpectedTestMessageCount(1)).as[CountDownLatch].get
Actor.registry.addListener(requestor)
TypedActor.stop(obj)
assert(latch.await(5000, TimeUnit.MILLISECONDS))
- val event = (publisher !! GetRetainedMessage).as[ConsumerMethodUnregistered].get
+ val event = (publisher ? GetRetainedMessage).as[ConsumerMethodUnregistered].get
assert(event.endpointUri === "direct:foo")
assert(event.typedActor === obj)
assert(event.methodName === "foo")
@@ -65,23 +65,23 @@ class TypedConsumerPublishRequestorTest extends JUnitSuite {
@Test
def shouldReceiveThreeConsumerMethodRegisteredEvents = {
Actor.registry.addListener(requestor)
- val latch = (publisher !! SetExpectedTestMessageCount(3)).as[CountDownLatch].get
+ val latch = (publisher ? SetExpectedTestMessageCount(3)).as[CountDownLatch].get
val obj = TypedActor.typedActorOf(classOf[SampleTypedConsumer], classOf[SampleTypedConsumerImpl], defaultConfiguration)
assert(latch.await(5000, TimeUnit.MILLISECONDS))
val request = GetRetainedMessages(_.isInstanceOf[ConsumerMethodRegistered])
- val events = (publisher !! request).as[List[ConsumerMethodRegistered]].get
+ val events = (publisher ? request).as[List[ConsumerMethodRegistered]].get
assert(events.map(_.method.getName).sortWith(_ < _) === List("m2", "m3", "m4"))
}
@Test
def shouldReceiveThreeConsumerMethodUnregisteredEvents = {
val obj = TypedActor.typedActorOf(classOf[SampleTypedConsumer], classOf[SampleTypedConsumerImpl], defaultConfiguration)
- val latch = (publisher !! SetExpectedTestMessageCount(3)).as[CountDownLatch].get
+ val latch = (publisher ? SetExpectedTestMessageCount(3)).as[CountDownLatch].get
Actor.registry.addListener(requestor)
TypedActor.stop(obj)
assert(latch.await(5000, TimeUnit.MILLISECONDS))
val request = GetRetainedMessages(_.isInstanceOf[ConsumerMethodUnregistered])
- val events = (publisher !! request).as[List[ConsumerMethodUnregistered]].get
+ val events = (publisher ? request).as[List[ConsumerMethodUnregistered]].get
assert(events.map(_.method.getName).sortWith(_ < _) === List("m2", "m3", "m4"))
}
}
diff --git a/akka-cluster/src/main/java/akka/cluster/ClusterProtocol.java b/akka-cluster/src/main/java/akka/cluster/ClusterProtocol.java
index ebf240b200..840e89c015 100644
--- a/akka-cluster/src/main/java/akka/cluster/ClusterProtocol.java
+++ b/akka-cluster/src/main/java/akka/cluster/ClusterProtocol.java
@@ -26,6 +26,21 @@ public final class ClusterProtocol {
FUNCTION_FUN1_ARG_ANY(13, 14),
;
+ public static final int START_VALUE = 1;
+ public static final int STOP_VALUE = 2;
+ public static final int USE_VALUE = 3;
+ public static final int RELEASE_VALUE = 4;
+ public static final int MAKE_AVAILABLE_VALUE = 5;
+ public static final int MAKE_UNAVAILABLE_VALUE = 6;
+ public static final int DISCONNECT_VALUE = 7;
+ public static final int RECONNECT_VALUE = 8;
+ public static final int RESIGN_VALUE = 9;
+ public static final int FAIL_OVER_CONNECTIONS_VALUE = 10;
+ public static final int FUNCTION_FUN0_UNIT_VALUE = 11;
+ public static final int FUNCTION_FUN0_ANY_VALUE = 12;
+ public static final int FUNCTION_FUN1_ARG_UNIT_VALUE = 13;
+ public static final int FUNCTION_FUN1_ARG_ANY_VALUE = 14;
+
public final int getNumber() { return value; }
@@ -57,8 +72,8 @@ public final class ClusterProtocol {
internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap() {
public RemoteDaemonMessageType findValueByNumber(int number) {
- return RemoteDaemonMessageType.valueOf(number)
- ; }
+ return RemoteDaemonMessageType.valueOf(number);
+ }
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
@@ -77,6 +92,7 @@ public final class ClusterProtocol {
private static final RemoteDaemonMessageType[] VALUES = {
START, STOP, USE, RELEASE, MAKE_AVAILABLE, MAKE_UNAVAILABLE, DISCONNECT, RECONNECT, RESIGN, FAIL_OVER_CONNECTIONS, FUNCTION_FUN0_UNIT, FUNCTION_FUN0_ANY, FUNCTION_FUN1_ARG_UNIT, FUNCTION_FUN1_ARG_ANY,
};
+
public static RemoteDaemonMessageType valueOf(
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
@@ -85,25 +101,44 @@ public final class ClusterProtocol {
}
return VALUES[desc.getIndex()];
}
+
private final int index;
private final int value;
+
private RemoteDaemonMessageType(int index, int value) {
this.index = index;
this.value = value;
}
- static {
- akka.cluster.ClusterProtocol.getDescriptor();
- }
-
// @@protoc_insertion_point(enum_scope:RemoteDaemonMessageType)
}
+ public interface RemoteDaemonMessageProtocolOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required .RemoteDaemonMessageType messageType = 1;
+ boolean hasMessageType();
+ akka.cluster.ClusterProtocol.RemoteDaemonMessageType getMessageType();
+
+ // optional .UuidProtocol actorUuid = 2;
+ boolean hasActorUuid();
+ akka.cluster.ClusterProtocol.UuidProtocol getActorUuid();
+ akka.cluster.ClusterProtocol.UuidProtocolOrBuilder getActorUuidOrBuilder();
+
+ // optional string actorAddress = 3;
+ boolean hasActorAddress();
+ String getActorAddress();
+
+ // optional bytes payload = 5;
+ boolean hasPayload();
+ com.google.protobuf.ByteString getPayload();
+ }
public static final class RemoteDaemonMessageProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements RemoteDaemonMessageProtocolOrBuilder {
// Use RemoteDaemonMessageProtocol.newBuilder() to construct.
- private RemoteDaemonMessageProtocol() {
- initFields();
+ private RemoteDaemonMessageProtocol(Builder builder) {
+ super(builder);
}
private RemoteDaemonMessageProtocol(boolean noInit) {}
@@ -126,60 +161,111 @@ public final class ClusterProtocol {
return akka.cluster.ClusterProtocol.internal_static_RemoteDaemonMessageProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required .RemoteDaemonMessageType messageType = 1;
public static final int MESSAGETYPE_FIELD_NUMBER = 1;
- private boolean hasMessageType;
private akka.cluster.ClusterProtocol.RemoteDaemonMessageType messageType_;
- public boolean hasMessageType() { return hasMessageType; }
- public akka.cluster.ClusterProtocol.RemoteDaemonMessageType getMessageType() { return messageType_; }
+ public boolean hasMessageType() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public akka.cluster.ClusterProtocol.RemoteDaemonMessageType getMessageType() {
+ return messageType_;
+ }
// optional .UuidProtocol actorUuid = 2;
public static final int ACTORUUID_FIELD_NUMBER = 2;
- private boolean hasActorUuid;
private akka.cluster.ClusterProtocol.UuidProtocol actorUuid_;
- public boolean hasActorUuid() { return hasActorUuid; }
- public akka.cluster.ClusterProtocol.UuidProtocol getActorUuid() { return actorUuid_; }
+ public boolean hasActorUuid() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public akka.cluster.ClusterProtocol.UuidProtocol getActorUuid() {
+ return actorUuid_;
+ }
+ public akka.cluster.ClusterProtocol.UuidProtocolOrBuilder getActorUuidOrBuilder() {
+ return actorUuid_;
+ }
// optional string actorAddress = 3;
public static final int ACTORADDRESS_FIELD_NUMBER = 3;
- private boolean hasActorAddress;
- private java.lang.String actorAddress_ = "";
- public boolean hasActorAddress() { return hasActorAddress; }
- public java.lang.String getActorAddress() { return actorAddress_; }
+ private java.lang.Object actorAddress_;
+ public boolean hasActorAddress() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ 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) ref;
+ String s = bs.toStringUtf8();
+ if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+ actorAddress_ = s;
+ }
+ return s;
+ }
+ }
+ private com.google.protobuf.ByteString getActorAddressBytes() {
+ java.lang.Object ref = actorAddress_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+ actorAddress_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
// optional bytes payload = 5;
public static final int PAYLOAD_FIELD_NUMBER = 5;
- private boolean hasPayload;
- private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
- public boolean hasPayload() { return hasPayload; }
- public com.google.protobuf.ByteString getPayload() { return payload_; }
+ private com.google.protobuf.ByteString payload_;
+ public boolean hasPayload() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ public com.google.protobuf.ByteString getPayload() {
+ return payload_;
+ }
private void initFields() {
messageType_ = akka.cluster.ClusterProtocol.RemoteDaemonMessageType.START;
actorUuid_ = akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance();
+ actorAddress_ = "";
+ payload_ = com.google.protobuf.ByteString.EMPTY;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasMessageType) return false;
- if (hasActorUuid()) {
- if (!getActorUuid().isInitialized()) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasMessageType()) {
+ memoizedIsInitialized = 0;
+ return false;
}
+ if (hasActorUuid()) {
+ if (!getActorUuid().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ }
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasMessageType()) {
- output.writeEnum(1, getMessageType().getNumber());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeEnum(1, messageType_.getNumber());
}
- if (hasActorUuid()) {
- output.writeMessage(2, getActorUuid());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeMessage(2, actorUuid_);
}
- if (hasActorAddress()) {
- output.writeString(3, getActorAddress());
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeBytes(3, getActorAddressBytes());
}
- if (hasPayload()) {
- output.writeBytes(5, getPayload());
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeBytes(5, payload_);
}
getUnknownFields().writeTo(output);
}
@@ -190,27 +276,34 @@ public final class ClusterProtocol {
if (size != -1) return size;
size = 0;
- if (hasMessageType()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(1, getMessageType().getNumber());
+ .computeEnumSize(1, messageType_.getNumber());
}
- if (hasActorUuid()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(2, getActorUuid());
+ .computeMessageSize(2, actorUuid_);
}
- if (hasActorAddress()) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(3, getActorAddress());
+ .computeBytesSize(3, getActorAddressBytes());
}
- if (hasPayload()) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(5, getPayload());
+ .computeBytesSize(5, payload_);
}
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.cluster.ClusterProtocol.RemoteDaemonMessageProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -285,34 +378,62 @@ public final class ClusterProtocol {
}
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 {
- private akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol result;
-
- // Construct using akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.cluster.ClusterProtocol.internal_static_RemoteDaemonMessageProtocol_descriptor;
}
- protected akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.cluster.ClusterProtocol.internal_static_RemoteDaemonMessageProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ getActorUuidFieldBuilder();
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
+ super.clear();
+ messageType_ = akka.cluster.ClusterProtocol.RemoteDaemonMessageType.START;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ if (actorUuidBuilder_ == null) {
+ actorUuid_ = akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance();
+ } else {
+ actorUuidBuilder_.clear();
}
- result = new akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol();
+ bitField0_ = (bitField0_ & ~0x00000002);
+ actorAddress_ = "";
+ bitField0_ = (bitField0_ & ~0x00000004);
+ payload_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -324,33 +445,51 @@ public final class ClusterProtocol {
return akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol result = new akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.cluster.ClusterProtocol.RemoteDaemonMessageProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.messageType_ = messageType_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ if (actorUuidBuilder_ == null) {
+ result.actorUuid_ = actorUuid_;
+ } else {
+ result.actorUuid_ = actorUuidBuilder_.build();
+ }
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.actorAddress_ = actorAddress_;
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000008;
+ }
+ result.payload_ = payload_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -380,6 +519,20 @@ public final class ClusterProtocol {
return this;
}
+ public final boolean isInitialized() {
+ if (!hasMessageType()) {
+
+ return false;
+ }
+ if (hasActorUuid()) {
+ if (!getActorUuid().isInitialized()) {
+
+ return false;
+ }
+ }
+ return true;
+ }
+
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -392,11 +545,13 @@ public final class ClusterProtocol {
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;
@@ -407,7 +562,8 @@ public final class ClusterProtocol {
if (value == null) {
unknownFields.mergeVarintField(1, rawValue);
} else {
- setMessageType(value);
+ bitField0_ |= 0x00000001;
+ messageType_ = value;
}
break;
}
@@ -421,115 +577,192 @@ public final class ClusterProtocol {
break;
}
case 26: {
- setActorAddress(input.readString());
+ bitField0_ |= 0x00000004;
+ actorAddress_ = input.readBytes();
break;
}
case 42: {
- setPayload(input.readBytes());
+ bitField0_ |= 0x00000008;
+ payload_ = input.readBytes();
break;
}
}
}
}
+ private int bitField0_;
// required .RemoteDaemonMessageType messageType = 1;
+ private akka.cluster.ClusterProtocol.RemoteDaemonMessageType messageType_ = akka.cluster.ClusterProtocol.RemoteDaemonMessageType.START;
public boolean hasMessageType() {
- return result.hasMessageType();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
public akka.cluster.ClusterProtocol.RemoteDaemonMessageType getMessageType() {
- return result.getMessageType();
+ return messageType_;
}
public Builder setMessageType(akka.cluster.ClusterProtocol.RemoteDaemonMessageType value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasMessageType = true;
- result.messageType_ = value;
+ bitField0_ |= 0x00000001;
+ messageType_ = value;
+ onChanged();
return this;
}
public Builder clearMessageType() {
- result.hasMessageType = false;
- result.messageType_ = akka.cluster.ClusterProtocol.RemoteDaemonMessageType.START;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ messageType_ = akka.cluster.ClusterProtocol.RemoteDaemonMessageType.START;
+ onChanged();
return this;
}
// optional .UuidProtocol actorUuid = 2;
+ private akka.cluster.ClusterProtocol.UuidProtocol actorUuid_ = akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.cluster.ClusterProtocol.UuidProtocol, akka.cluster.ClusterProtocol.UuidProtocol.Builder, akka.cluster.ClusterProtocol.UuidProtocolOrBuilder> actorUuidBuilder_;
public boolean hasActorUuid() {
- return result.hasActorUuid();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public akka.cluster.ClusterProtocol.UuidProtocol getActorUuid() {
- return result.getActorUuid();
+ if (actorUuidBuilder_ == null) {
+ return actorUuid_;
+ } else {
+ return actorUuidBuilder_.getMessage();
+ }
}
public Builder setActorUuid(akka.cluster.ClusterProtocol.UuidProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (actorUuidBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ actorUuid_ = value;
+ onChanged();
+ } else {
+ actorUuidBuilder_.setMessage(value);
}
- result.hasActorUuid = true;
- result.actorUuid_ = value;
+ bitField0_ |= 0x00000002;
return this;
}
- public Builder setActorUuid(akka.cluster.ClusterProtocol.UuidProtocol.Builder builderForValue) {
- result.hasActorUuid = true;
- result.actorUuid_ = builderForValue.build();
+ public Builder setActorUuid(
+ akka.cluster.ClusterProtocol.UuidProtocol.Builder builderForValue) {
+ if (actorUuidBuilder_ == null) {
+ actorUuid_ = builderForValue.build();
+ onChanged();
+ } else {
+ actorUuidBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000002;
return this;
}
public Builder mergeActorUuid(akka.cluster.ClusterProtocol.UuidProtocol value) {
- if (result.hasActorUuid() &&
- result.actorUuid_ != akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance()) {
- result.actorUuid_ =
- akka.cluster.ClusterProtocol.UuidProtocol.newBuilder(result.actorUuid_).mergeFrom(value).buildPartial();
+ if (actorUuidBuilder_ == null) {
+ if (((bitField0_ & 0x00000002) == 0x00000002) &&
+ actorUuid_ != akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance()) {
+ actorUuid_ =
+ akka.cluster.ClusterProtocol.UuidProtocol.newBuilder(actorUuid_).mergeFrom(value).buildPartial();
+ } else {
+ actorUuid_ = value;
+ }
+ onChanged();
} else {
- result.actorUuid_ = value;
+ actorUuidBuilder_.mergeFrom(value);
}
- result.hasActorUuid = true;
+ bitField0_ |= 0x00000002;
return this;
}
public Builder clearActorUuid() {
- result.hasActorUuid = false;
- result.actorUuid_ = akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance();
+ if (actorUuidBuilder_ == null) {
+ actorUuid_ = akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ actorUuidBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
+ public akka.cluster.ClusterProtocol.UuidProtocol.Builder getActorUuidBuilder() {
+ bitField0_ |= 0x00000002;
+ onChanged();
+ return getActorUuidFieldBuilder().getBuilder();
+ }
+ public akka.cluster.ClusterProtocol.UuidProtocolOrBuilder getActorUuidOrBuilder() {
+ if (actorUuidBuilder_ != null) {
+ return actorUuidBuilder_.getMessageOrBuilder();
+ } else {
+ return actorUuid_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.cluster.ClusterProtocol.UuidProtocol, akka.cluster.ClusterProtocol.UuidProtocol.Builder, akka.cluster.ClusterProtocol.UuidProtocolOrBuilder>
+ getActorUuidFieldBuilder() {
+ if (actorUuidBuilder_ == null) {
+ actorUuidBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.cluster.ClusterProtocol.UuidProtocol, akka.cluster.ClusterProtocol.UuidProtocol.Builder, akka.cluster.ClusterProtocol.UuidProtocolOrBuilder>(
+ actorUuid_,
+ getParentForChildren(),
+ isClean());
+ actorUuid_ = null;
+ }
+ return actorUuidBuilder_;
+ }
// optional string actorAddress = 3;
+ private java.lang.Object actorAddress_ = "";
public boolean hasActorAddress() {
- return result.hasActorAddress();
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
- public java.lang.String getActorAddress() {
- return result.getActorAddress();
+ public String getActorAddress() {
+ java.lang.Object ref = actorAddress_;
+ if (!(ref instanceof String)) {
+ String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+ actorAddress_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
}
- public Builder setActorAddress(java.lang.String value) {
+ public Builder setActorAddress(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasActorAddress = true;
- result.actorAddress_ = value;
+ bitField0_ |= 0x00000004;
+ actorAddress_ = value;
+ onChanged();
return this;
}
public Builder clearActorAddress() {
- result.hasActorAddress = false;
- result.actorAddress_ = getDefaultInstance().getActorAddress();
+ bitField0_ = (bitField0_ & ~0x00000004);
+ actorAddress_ = getDefaultInstance().getActorAddress();
+ onChanged();
return this;
}
+ void setActorAddress(com.google.protobuf.ByteString value) {
+ bitField0_ |= 0x00000004;
+ actorAddress_ = value;
+ onChanged();
+ }
// optional bytes payload = 5;
+ private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
public boolean hasPayload() {
- return result.hasPayload();
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
public com.google.protobuf.ByteString getPayload() {
- return result.getPayload();
+ return payload_;
}
public Builder setPayload(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasPayload = true;
- result.payload_ = value;
+ bitField0_ |= 0x00000008;
+ payload_ = value;
+ onChanged();
return this;
}
public Builder clearPayload() {
- result.hasPayload = false;
- result.payload_ = getDefaultInstance().getPayload();
+ bitField0_ = (bitField0_ & ~0x00000008);
+ payload_ = getDefaultInstance().getPayload();
+ onChanged();
return this;
}
@@ -538,18 +771,38 @@ public final class ClusterProtocol {
static {
defaultInstance = new RemoteDaemonMessageProtocol(true);
- akka.cluster.ClusterProtocol.internalForceInit();
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:RemoteDaemonMessageProtocol)
}
+ 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.cluster.ClusterProtocol.UuidProtocol getFutureUuid();
+ akka.cluster.ClusterProtocol.UuidProtocolOrBuilder getFutureUuidOrBuilder();
+
+ // required bytes message = 4;
+ boolean hasMessage();
+ com.google.protobuf.ByteString getMessage();
+ }
public static final class DurableMailboxMessageProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements DurableMailboxMessageProtocolOrBuilder {
// Use DurableMailboxMessageProtocol.newBuilder() to construct.
- private DurableMailboxMessageProtocol() {
- initFields();
+ private DurableMailboxMessageProtocol(Builder builder) {
+ super(builder);
}
private DurableMailboxMessageProtocol(boolean noInit) {}
@@ -572,60 +825,137 @@ public final class ClusterProtocol {
return akka.cluster.ClusterProtocol.internal_static_DurableMailboxMessageProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required string ownerActorAddress = 1;
public static final int OWNERACTORADDRESS_FIELD_NUMBER = 1;
- private boolean hasOwnerActorAddress;
- private java.lang.String ownerActorAddress_ = "";
- public boolean hasOwnerActorAddress() { return hasOwnerActorAddress; }
- public java.lang.String getOwnerActorAddress() { return ownerActorAddress_; }
+ private java.lang.Object ownerActorAddress_;
+ public boolean hasOwnerActorAddress() {
+ 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;
+ }
+ }
+ 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;
+ }
+ }
// optional string senderActorAddress = 2;
public static final int SENDERACTORADDRESS_FIELD_NUMBER = 2;
- private boolean hasSenderActorAddress;
- private java.lang.String senderActorAddress_ = "";
- public boolean hasSenderActorAddress() { return hasSenderActorAddress; }
- public java.lang.String getSenderActorAddress() { return senderActorAddress_; }
+ private java.lang.Object senderActorAddress_;
+ public boolean hasSenderActorAddress() {
+ 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;
+ }
+ }
+ 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;
+ }
+ }
// optional .UuidProtocol futureUuid = 3;
public static final int FUTUREUUID_FIELD_NUMBER = 3;
- private boolean hasFutureUuid;
private akka.cluster.ClusterProtocol.UuidProtocol futureUuid_;
- public boolean hasFutureUuid() { return hasFutureUuid; }
- public akka.cluster.ClusterProtocol.UuidProtocol getFutureUuid() { return futureUuid_; }
+ public boolean hasFutureUuid() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ public akka.cluster.ClusterProtocol.UuidProtocol getFutureUuid() {
+ return futureUuid_;
+ }
+ public akka.cluster.ClusterProtocol.UuidProtocolOrBuilder getFutureUuidOrBuilder() {
+ return futureUuid_;
+ }
// required bytes message = 4;
public static final int MESSAGE_FIELD_NUMBER = 4;
- private boolean hasMessage;
- private com.google.protobuf.ByteString message_ = com.google.protobuf.ByteString.EMPTY;
- public boolean hasMessage() { return hasMessage; }
- public com.google.protobuf.ByteString getMessage() { return message_; }
+ private com.google.protobuf.ByteString message_;
+ public boolean hasMessage() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ public com.google.protobuf.ByteString getMessage() {
+ return message_;
+ }
private void initFields() {
+ ownerActorAddress_ = "";
+ senderActorAddress_ = "";
futureUuid_ = akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance();
+ message_ = com.google.protobuf.ByteString.EMPTY;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasOwnerActorAddress) return false;
- if (!hasMessage) return false;
- if (hasFutureUuid()) {
- if (!getFutureUuid().isInitialized()) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasOwnerActorAddress()) {
+ memoizedIsInitialized = 0;
+ return false;
}
+ if (!hasMessage()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (hasFutureUuid()) {
+ if (!getFutureUuid().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ }
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasOwnerActorAddress()) {
- output.writeString(1, getOwnerActorAddress());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeBytes(1, getOwnerActorAddressBytes());
}
- if (hasSenderActorAddress()) {
- output.writeString(2, getSenderActorAddress());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeBytes(2, getSenderActorAddressBytes());
}
- if (hasFutureUuid()) {
- output.writeMessage(3, getFutureUuid());
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeMessage(3, futureUuid_);
}
- if (hasMessage()) {
- output.writeBytes(4, getMessage());
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeBytes(4, message_);
}
getUnknownFields().writeTo(output);
}
@@ -636,27 +966,34 @@ public final class ClusterProtocol {
if (size != -1) return size;
size = 0;
- if (hasOwnerActorAddress()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(1, getOwnerActorAddress());
+ .computeBytesSize(1, getOwnerActorAddressBytes());
}
- if (hasSenderActorAddress()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(2, getSenderActorAddress());
+ .computeBytesSize(2, getSenderActorAddressBytes());
}
- if (hasFutureUuid()) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(3, getFutureUuid());
+ .computeMessageSize(3, futureUuid_);
}
- if (hasMessage()) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(4, getMessage());
+ .computeBytesSize(4, 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.cluster.ClusterProtocol.DurableMailboxMessageProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -731,34 +1068,62 @@ public final class ClusterProtocol {
}
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 {
- private akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol result;
-
- // Construct using akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.cluster.ClusterProtocol.DurableMailboxMessageProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.cluster.ClusterProtocol.internal_static_DurableMailboxMessageProtocol_descriptor;
}
- protected akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.cluster.ClusterProtocol.internal_static_DurableMailboxMessageProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ getFutureUuidFieldBuilder();
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
+ super.clear();
+ ownerActorAddress_ = "";
+ bitField0_ = (bitField0_ & ~0x00000001);
+ senderActorAddress_ = "";
+ bitField0_ = (bitField0_ & ~0x00000002);
+ if (futureUuidBuilder_ == null) {
+ futureUuid_ = akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance();
+ } else {
+ futureUuidBuilder_.clear();
}
- result = new akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol();
+ bitField0_ = (bitField0_ & ~0x00000004);
+ message_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -770,33 +1135,51 @@ public final class ClusterProtocol {
return akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol result = new akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.cluster.ClusterProtocol.DurableMailboxMessageProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.ownerActorAddress_ = ownerActorAddress_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.senderActorAddress_ = senderActorAddress_;
+ 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) {
@@ -826,6 +1209,24 @@ public final class ClusterProtocol {
return this;
}
+ public final boolean isInitialized() {
+ if (!hasOwnerActorAddress()) {
+
+ return false;
+ }
+ if (!hasMessage()) {
+
+ return false;
+ }
+ if (hasFutureUuid()) {
+ if (!getFutureUuid().isInitialized()) {
+
+ return false;
+ }
+ }
+ return true;
+ }
+
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -838,21 +1239,25 @@ public final class ClusterProtocol {
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: {
- setOwnerActorAddress(input.readString());
+ bitField0_ |= 0x00000001;
+ ownerActorAddress_ = input.readBytes();
break;
}
case 18: {
- setSenderActorAddress(input.readString());
+ bitField0_ |= 0x00000002;
+ senderActorAddress_ = input.readBytes();
break;
}
case 26: {
@@ -865,111 +1270,199 @@ public final class ClusterProtocol {
break;
}
case 34: {
- setMessage(input.readBytes());
+ bitField0_ |= 0x00000008;
+ message_ = input.readBytes();
break;
}
}
}
}
+ private int bitField0_;
// required string ownerActorAddress = 1;
+ private java.lang.Object ownerActorAddress_ = "";
public boolean hasOwnerActorAddress() {
- return result.hasOwnerActorAddress();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
- public java.lang.String getOwnerActorAddress() {
- return result.getOwnerActorAddress();
+ public String getOwnerActorAddress() {
+ java.lang.Object ref = ownerActorAddress_;
+ if (!(ref instanceof String)) {
+ String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+ ownerActorAddress_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
}
- public Builder setOwnerActorAddress(java.lang.String value) {
+ public Builder setOwnerActorAddress(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasOwnerActorAddress = true;
- result.ownerActorAddress_ = value;
+ bitField0_ |= 0x00000001;
+ ownerActorAddress_ = value;
+ onChanged();
return this;
}
public Builder clearOwnerActorAddress() {
- result.hasOwnerActorAddress = false;
- result.ownerActorAddress_ = getDefaultInstance().getOwnerActorAddress();
+ 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 result.hasSenderActorAddress();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
- public java.lang.String getSenderActorAddress() {
- return result.getSenderActorAddress();
+ 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(java.lang.String value) {
+ public Builder setSenderActorAddress(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasSenderActorAddress = true;
- result.senderActorAddress_ = value;
+ bitField0_ |= 0x00000002;
+ senderActorAddress_ = value;
+ onChanged();
return this;
}
public Builder clearSenderActorAddress() {
- result.hasSenderActorAddress = false;
- result.senderActorAddress_ = getDefaultInstance().getSenderActorAddress();
+ 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.cluster.ClusterProtocol.UuidProtocol futureUuid_ = akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.cluster.ClusterProtocol.UuidProtocol, akka.cluster.ClusterProtocol.UuidProtocol.Builder, akka.cluster.ClusterProtocol.UuidProtocolOrBuilder> futureUuidBuilder_;
public boolean hasFutureUuid() {
- return result.hasFutureUuid();
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
public akka.cluster.ClusterProtocol.UuidProtocol getFutureUuid() {
- return result.getFutureUuid();
+ if (futureUuidBuilder_ == null) {
+ return futureUuid_;
+ } else {
+ return futureUuidBuilder_.getMessage();
+ }
}
public Builder setFutureUuid(akka.cluster.ClusterProtocol.UuidProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (futureUuidBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ futureUuid_ = value;
+ onChanged();
+ } else {
+ futureUuidBuilder_.setMessage(value);
}
- result.hasFutureUuid = true;
- result.futureUuid_ = value;
+ bitField0_ |= 0x00000004;
return this;
}
- public Builder setFutureUuid(akka.cluster.ClusterProtocol.UuidProtocol.Builder builderForValue) {
- result.hasFutureUuid = true;
- result.futureUuid_ = builderForValue.build();
+ public Builder setFutureUuid(
+ akka.cluster.ClusterProtocol.UuidProtocol.Builder builderForValue) {
+ if (futureUuidBuilder_ == null) {
+ futureUuid_ = builderForValue.build();
+ onChanged();
+ } else {
+ futureUuidBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000004;
return this;
}
public Builder mergeFutureUuid(akka.cluster.ClusterProtocol.UuidProtocol value) {
- if (result.hasFutureUuid() &&
- result.futureUuid_ != akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance()) {
- result.futureUuid_ =
- akka.cluster.ClusterProtocol.UuidProtocol.newBuilder(result.futureUuid_).mergeFrom(value).buildPartial();
+ if (futureUuidBuilder_ == null) {
+ if (((bitField0_ & 0x00000004) == 0x00000004) &&
+ futureUuid_ != akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance()) {
+ futureUuid_ =
+ akka.cluster.ClusterProtocol.UuidProtocol.newBuilder(futureUuid_).mergeFrom(value).buildPartial();
+ } else {
+ futureUuid_ = value;
+ }
+ onChanged();
} else {
- result.futureUuid_ = value;
+ futureUuidBuilder_.mergeFrom(value);
}
- result.hasFutureUuid = true;
+ bitField0_ |= 0x00000004;
return this;
}
public Builder clearFutureUuid() {
- result.hasFutureUuid = false;
- result.futureUuid_ = akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance();
+ if (futureUuidBuilder_ == null) {
+ futureUuid_ = akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ futureUuidBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
+ public akka.cluster.ClusterProtocol.UuidProtocol.Builder getFutureUuidBuilder() {
+ bitField0_ |= 0x00000004;
+ onChanged();
+ return getFutureUuidFieldBuilder().getBuilder();
+ }
+ public akka.cluster.ClusterProtocol.UuidProtocolOrBuilder getFutureUuidOrBuilder() {
+ if (futureUuidBuilder_ != null) {
+ return futureUuidBuilder_.getMessageOrBuilder();
+ } else {
+ return futureUuid_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.cluster.ClusterProtocol.UuidProtocol, akka.cluster.ClusterProtocol.UuidProtocol.Builder, akka.cluster.ClusterProtocol.UuidProtocolOrBuilder>
+ getFutureUuidFieldBuilder() {
+ if (futureUuidBuilder_ == null) {
+ futureUuidBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.cluster.ClusterProtocol.UuidProtocol, akka.cluster.ClusterProtocol.UuidProtocol.Builder, akka.cluster.ClusterProtocol.UuidProtocolOrBuilder>(
+ futureUuid_,
+ getParentForChildren(),
+ isClean());
+ futureUuid_ = null;
+ }
+ return futureUuidBuilder_;
+ }
// required bytes message = 4;
+ private com.google.protobuf.ByteString message_ = com.google.protobuf.ByteString.EMPTY;
public boolean hasMessage() {
- return result.hasMessage();
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
public com.google.protobuf.ByteString getMessage() {
- return result.getMessage();
+ return message_;
}
public Builder setMessage(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasMessage = true;
- result.message_ = value;
+ bitField0_ |= 0x00000008;
+ message_ = value;
+ onChanged();
return this;
}
public Builder clearMessage() {
- result.hasMessage = false;
- result.message_ = getDefaultInstance().getMessage();
+ bitField0_ = (bitField0_ & ~0x00000008);
+ message_ = getDefaultInstance().getMessage();
+ onChanged();
return this;
}
@@ -978,18 +1471,29 @@ public final class ClusterProtocol {
static {
defaultInstance = new DurableMailboxMessageProtocol(true);
- akka.cluster.ClusterProtocol.internalForceInit();
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:DurableMailboxMessageProtocol)
}
+ public interface UuidProtocolOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required uint64 high = 1;
+ boolean hasHigh();
+ long getHigh();
+
+ // required uint64 low = 2;
+ boolean hasLow();
+ long getLow();
+ }
public static final class UuidProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements UuidProtocolOrBuilder {
// Use UuidProtocol.newBuilder() to construct.
- private UuidProtocol() {
- initFields();
+ private UuidProtocol(Builder builder) {
+ super(builder);
}
private UuidProtocol(boolean noInit) {}
@@ -1012,36 +1516,56 @@ public final class ClusterProtocol {
return akka.cluster.ClusterProtocol.internal_static_UuidProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required uint64 high = 1;
public static final int HIGH_FIELD_NUMBER = 1;
- private boolean hasHigh;
- private long high_ = 0L;
- public boolean hasHigh() { return hasHigh; }
- public long getHigh() { return high_; }
+ private long high_;
+ public boolean hasHigh() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public long getHigh() {
+ return high_;
+ }
// required uint64 low = 2;
public static final int LOW_FIELD_NUMBER = 2;
- private boolean hasLow;
- private long low_ = 0L;
- public boolean hasLow() { return hasLow; }
- public long getLow() { return low_; }
+ private long low_;
+ public boolean hasLow() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public long getLow() {
+ return low_;
+ }
private void initFields() {
+ high_ = 0L;
+ low_ = 0L;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasHigh) return false;
- if (!hasLow) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasHigh()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!hasLow()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasHigh()) {
- output.writeUInt64(1, getHigh());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeUInt64(1, high_);
}
- if (hasLow()) {
- output.writeUInt64(2, getLow());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeUInt64(2, low_);
}
getUnknownFields().writeTo(output);
}
@@ -1052,19 +1576,26 @@ public final class ClusterProtocol {
if (size != -1) return size;
size = 0;
- if (hasHigh()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(1, getHigh());
+ .computeUInt64Size(1, high_);
}
- if (hasLow()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(2, getLow());
+ .computeUInt64Size(2, low_);
}
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.cluster.ClusterProtocol.UuidProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1139,34 +1670,53 @@ public final class ClusterProtocol {
}
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 {
- private akka.cluster.ClusterProtocol.UuidProtocol result;
-
- // Construct using akka.cluster.ClusterProtocol.UuidProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.cluster.ClusterProtocol.UuidProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.cluster.ClusterProtocol.UuidProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.cluster.ClusterProtocol.internal_static_UuidProtocol_descriptor;
}
- protected akka.cluster.ClusterProtocol.UuidProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.cluster.ClusterProtocol.internal_static_UuidProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.cluster.ClusterProtocol.UuidProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
- }
- result = new akka.cluster.ClusterProtocol.UuidProtocol();
+ super.clear();
+ high_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ low_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -1178,33 +1728,39 @@ public final class ClusterProtocol {
return akka.cluster.ClusterProtocol.UuidProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.cluster.ClusterProtocol.UuidProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.cluster.ClusterProtocol.UuidProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.cluster.ClusterProtocol.UuidProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.cluster.ClusterProtocol.UuidProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.cluster.ClusterProtocol.UuidProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.cluster.ClusterProtocol.UuidProtocol result = new akka.cluster.ClusterProtocol.UuidProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.cluster.ClusterProtocol.UuidProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.high_ = high_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.low_ = low_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1228,6 +1784,18 @@ public final class ClusterProtocol {
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)
@@ -1240,61 +1808,72 @@ public final class ClusterProtocol {
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: {
- setHigh(input.readUInt64());
+ bitField0_ |= 0x00000001;
+ high_ = input.readUInt64();
break;
}
case 16: {
- setLow(input.readUInt64());
+ bitField0_ |= 0x00000002;
+ low_ = input.readUInt64();
break;
}
}
}
}
+ private int bitField0_;
// required uint64 high = 1;
+ private long high_ ;
public boolean hasHigh() {
- return result.hasHigh();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
public long getHigh() {
- return result.getHigh();
+ return high_;
}
public Builder setHigh(long value) {
- result.hasHigh = true;
- result.high_ = value;
+ bitField0_ |= 0x00000001;
+ high_ = value;
+ onChanged();
return this;
}
public Builder clearHigh() {
- result.hasHigh = false;
- result.high_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ high_ = 0L;
+ onChanged();
return this;
}
// required uint64 low = 2;
+ private long low_ ;
public boolean hasLow() {
- return result.hasLow();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public long getLow() {
- return result.getLow();
+ return low_;
}
public Builder setLow(long value) {
- result.hasLow = true;
- result.low_ = value;
+ bitField0_ |= 0x00000002;
+ low_ = value;
+ onChanged();
return this;
}
public Builder clearLow() {
- result.hasLow = false;
- result.low_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ low_ = 0L;
+ onChanged();
return this;
}
@@ -1303,7 +1882,6 @@ public final class ClusterProtocol {
static {
defaultInstance = new UuidProtocol(true);
- akka.cluster.ClusterProtocol.internalForceInit();
defaultInstance.initFields();
}
@@ -1390,7 +1968,5 @@ public final class ClusterProtocol {
}, assigner);
}
- public static void internalForceInit() {}
-
// @@protoc_insertion_point(outer_class_scope)
}
diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
index 37bff63270..cc9fbfaf2f 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala
@@ -29,6 +29,7 @@ import Helpers._
import akka.actor._
import Actor._
import Status._
+import DeploymentConfig.{ ReplicationScheme, ReplicationStrategy, Transient, WriteThrough, WriteBehind }
import akka.event.EventHandler
import akka.dispatch.{ Dispatchers, Future }
import akka.remoteinterface._
@@ -463,7 +464,15 @@ class DefaultClusterNode private[akka] (
* available durable store.
*/
def store[T <: Actor](address: String, actorClass: Class[T], format: Serializer): ClusterNode =
- store(Actor.actorOf(actorClass, address).start, 0, false, format)
+ store(Actor.actorOf(actorClass, address).start, 0, Transient, false, format)
+
+ /**
+ * Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store[T <: Actor](address: String, actorClass: Class[T], replicationScheme: ReplicationScheme, format: Serializer): ClusterNode =
+ store(Actor.actorOf(actorClass, address).start, 0, replicationScheme, false, format)
/**
* Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
@@ -471,7 +480,15 @@ class DefaultClusterNode private[akka] (
* available durable store.
*/
def store[T <: Actor](address: String, actorClass: Class[T], replicationFactor: Int, format: Serializer): ClusterNode =
- store(Actor.actorOf(actorClass, address).start, replicationFactor, false, format)
+ store(Actor.actorOf(actorClass, address).start, replicationFactor, Transient, false, format)
+
+ /**
+ * Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store[T <: Actor](address: String, actorClass: Class[T], replicationFactor: Int, replicationScheme: ReplicationScheme, format: Serializer): ClusterNode =
+ store(Actor.actorOf(actorClass, address).start, replicationFactor, replicationScheme, false, format)
/**
* Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
@@ -479,7 +496,15 @@ class DefaultClusterNode private[akka] (
* available durable store.
*/
def store[T <: Actor](address: String, actorClass: Class[T], serializeMailbox: Boolean, format: Serializer): ClusterNode =
- store(Actor.actorOf(actorClass, address).start, 0, serializeMailbox, format)
+ store(Actor.actorOf(actorClass, address).start, 0, Transient, serializeMailbox, format)
+
+ /**
+ * Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store[T <: Actor](address: String, actorClass: Class[T], replicationScheme: ReplicationScheme, serializeMailbox: Boolean, format: Serializer): ClusterNode =
+ store(Actor.actorOf(actorClass, address).start, 0, replicationScheme, serializeMailbox, format)
/**
* Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
@@ -487,7 +512,15 @@ class DefaultClusterNode private[akka] (
* available durable store.
*/
def store[T <: Actor](address: String, actorClass: Class[T], replicationFactor: Int, serializeMailbox: Boolean, format: Serializer): ClusterNode =
- store(Actor.actorOf(actorClass, address).start, replicationFactor, serializeMailbox, format)
+ store(Actor.actorOf(actorClass, address).start, replicationFactor, Transient, serializeMailbox, format)
+
+ /**
+ * Clusters an actor of a specific type. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store[T <: Actor](address: String, actorClass: Class[T], replicationFactor: Int, replicationScheme: ReplicationScheme, serializeMailbox: Boolean, format: Serializer): ClusterNode =
+ store(Actor.actorOf(actorClass, address).start, replicationFactor, replicationScheme, serializeMailbox, format)
/**
* Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
@@ -495,7 +528,15 @@ class DefaultClusterNode private[akka] (
* available durable store.
*/
def store(actorRef: ActorRef, format: Serializer): ClusterNode =
- store(actorRef, 0, false, format)
+ store(actorRef, 0, Transient, false, format)
+
+ /**
+ * Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store(actorRef: ActorRef, replicationScheme: ReplicationScheme, format: Serializer): ClusterNode =
+ store(actorRef, 0, replicationScheme, false, format)
/**
* Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
@@ -503,7 +544,15 @@ class DefaultClusterNode private[akka] (
* available durable store.
*/
def store(actorRef: ActorRef, replicationFactor: Int, format: Serializer): ClusterNode =
- store(actorRef, replicationFactor, false, format)
+ store(actorRef, replicationFactor, Transient, false, format)
+
+ /**
+ * Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store(actorRef: ActorRef, replicationFactor: Int, replicationScheme: ReplicationScheme, format: Serializer): ClusterNode =
+ store(actorRef, replicationFactor, replicationScheme, false, format)
/**
* Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
@@ -511,20 +560,47 @@ class DefaultClusterNode private[akka] (
* available durable store.
*/
def store(actorRef: ActorRef, serializeMailbox: Boolean, format: Serializer): ClusterNode =
- store(actorRef, 0, serializeMailbox, format)
-
- /**
- * Needed to have reflection through structural typing work.
- */
- def store(actorRef: ActorRef, replicationFactor: Int, serializeMailbox: Boolean, format: AnyRef): ClusterNode =
- store(actorRef, replicationFactor, serializeMailbox, format.asInstanceOf[Serializer])
+ store(actorRef, 0, Transient, serializeMailbox, format)
/**
* Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
* with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
* available durable store.
*/
- def store(actorRef: ActorRef, replicationFactor: Int, serializeMailbox: Boolean, format: Serializer): ClusterNode = if (isConnected.isOn) {
+ def store(actorRef: ActorRef, replicationFactor: Int, serializeMailbox: Boolean, format: Serializer): ClusterNode =
+ store(actorRef, replicationFactor, Transient, serializeMailbox, format)
+
+ /**
+ * Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store(actorRef: ActorRef, replicationScheme: ReplicationScheme, serializeMailbox: Boolean, format: Serializer): ClusterNode =
+ store(actorRef, 0, replicationScheme, serializeMailbox, format)
+
+ /**
+ * Needed to have reflection through structural typing work.
+ */
+ def store(actorRef: ActorRef, replicationFactor: Int, replicationScheme: ReplicationScheme, serializeMailbox: Boolean, format: AnyRef): ClusterNode =
+ store(actorRef, replicationFactor, replicationScheme, serializeMailbox, format.asInstanceOf[Serializer])
+
+ /**
+ * Needed to have reflection through structural typing work.
+ */
+ def store(actorRef: ActorRef, replicationFactor: Int, serializeMailbox: Boolean, format: AnyRef): ClusterNode =
+ store(actorRef, replicationFactor, Transient, serializeMailbox, format)
+
+ /**
+ * Clusters an actor with UUID. If the actor is already clustered then the clustered version will be updated
+ * with the actor passed in as argument. You can use this to save off snapshots of the actor to a highly
+ * available durable store.
+ */
+ def store(
+ actorRef: ActorRef,
+ replicationFactor: Int,
+ replicationScheme: ReplicationScheme,
+ serializeMailbox: Boolean,
+ format: Serializer): ClusterNode = if (isConnected.isOn) {
import akka.serialization.ActorSerialization._
@@ -535,12 +611,14 @@ class DefaultClusterNode private[akka] (
EventHandler.debug(this,
"Storing actor [%s] with UUID [%s] in cluster".format(actorRef.address, uuid))
- val actorBytes = if (shouldCompressData) LZF.compress(toBinary(actorRef, serializeMailbox)(format))
- else toBinary(actorRef)(format)
+ val actorBytes =
+ if (shouldCompressData) LZF.compress(toBinary(actorRef, serializeMailbox, replicationScheme)(format))
+ else toBinary(actorRef, serializeMailbox, replicationScheme)(format)
+
val actorRegistryPath = actorRegistryPathFor(uuid)
// create UUID -> Array[Byte] for actor registry
- if (zkClient.exists(actorRegistryPath)) zkClient.writeData(actorRegistryPath, actorBytes) // FIXME check for size and warn if too big
+ if (zkClient.exists(actorRegistryPath)) zkClient.writeData(actorRegistryPath, actorBytes) // FIXME Store actor bytes in Data Grid not ZooKeeper
else {
zkClient.retryUntilConnected(new Callable[Either[String, Exception]]() {
def call: Either[String, Exception] = {
@@ -587,12 +665,10 @@ class DefaultClusterNode private[akka] (
.build
replicaConnectionsForReplicationFactor(replicationFactor) foreach { connection ⇒
- (connection !! (command, remoteDaemonAckTimeout)) match {
+ (connection ? (command, remoteDaemonAckTimeout)).as[Status] match {
case Some(Success) ⇒
- EventHandler.debug(this,
- "Replica for [%s] successfully created on [%s]"
- .format(actorRef.address, connection))
+ EventHandler.debug(this, "Replica for [%s] successfully created".format(actorRef.address))
case Some(Failure(cause)) ⇒
EventHandler.error(cause, this, cause.toString)
@@ -616,8 +692,9 @@ class DefaultClusterNode private[akka] (
releaseActorOnAllNodes(uuid)
locallyCheckedOutActors.remove(uuid)
+
// warning: ordering matters here
- ignore[ZkNoNodeException](zkClient.deleteRecursive(actorAddressToUuidsPathFor(actorAddressForUuid(uuid)))) // remove ADDRESS to UUID mapping
+ ignore[ZkNoNodeException](zkClient.deleteRecursive(actorAddressToUuidsPathFor(actorAddressForUuid(uuid)))) // FIXME remove ADDRESS to UUID mapping?
ignore[ZkNoNodeException](zkClient.deleteRecursive(actorAtNodePathFor(nodeAddress.nodeName, uuid)))
ignore[ZkNoNodeException](zkClient.deleteRecursive(actorRegistryPathFor(uuid)))
ignore[ZkNoNodeException](zkClient.deleteRecursive(actorLocationsPathFor(uuid)))
@@ -662,20 +739,17 @@ class DefaultClusterNode private[akka] (
* Checks out an actor for use on this node, e.g. checked out as a 'LocalActorRef' but it makes it available
* for remote access through lookup by its UUID.
*/
- def use[T <: Actor](actorAddress: String): Option[LocalActorRef] = use(actorAddress, formatForActor(actorAddress))
+ def use[T <: Actor](actorAddress: String): Option[ActorRef] = use(actorAddress, formatForActor(actorAddress))
/**
* Checks out an actor for use on this node, e.g. checked out as a 'LocalActorRef' but it makes it available
* for remote access through lookup by its UUID.
*/
- def use[T <: Actor](actorAddress: String, format: Serializer): Option[LocalActorRef] = if (isConnected.isOn) {
+ def use[T <: Actor](actorAddress: String, format: Serializer): Option[ActorRef] = if (isConnected.isOn) {
import akka.serialization.ActorSerialization._
actorUuidsForActorAddress(actorAddress) map { uuid ⇒
- EventHandler.debug(this,
- "Checking out actor with UUID [%s] to be used on node [%s] as local actor"
- .format(uuid, nodeAddress.nodeName))
ignore[ZkNodeExistsException](zkClient.createPersistent(actorAtNodePathFor(nodeAddress.nodeName, uuid), true))
ignore[ZkNodeExistsException](zkClient.createEphemeral(actorLocationsPathFor(uuid, nodeAddress)))
@@ -697,12 +771,12 @@ class DefaultClusterNode private[akka] (
}) match {
case Left(bytes) ⇒
locallyCheckedOutActors += (uuid -> bytes)
- // FIXME switch to ReplicatedActorRef here
- // val actor = new ReplicatedActorRef(fromBinary[T](bytes, remoteServerAddress)(format))
val actor = fromBinary[T](bytes, remoteServerAddress)(format)
- // remoteService.register(UUID_PREFIX + uuid, actor) // FIXME is Actor.remote.register(UUID, ..) correct here?
+ EventHandler.debug(this,
+ "Checking out actor [%s] to be used on node [%s] as local actor"
+ .format(actor, nodeAddress.nodeName))
actor.start()
- actor.asInstanceOf[LocalActorRef]
+ actor
case Right(exception) ⇒ throw exception
}
} headOption // FIXME should not be an array at all coming here but an Option[ActorRef]
@@ -715,14 +789,15 @@ class DefaultClusterNode private[akka] (
isConnected ifOn {
EventHandler.debug(this,
"Using (checking out) all actors with UUID [%s] on all nodes in cluster".format(uuid))
+
val command = RemoteDaemonMessageProtocol.newBuilder
.setMessageType(USE)
.setActorUuid(uuidToUuidProtocol(uuid))
.build
+
membershipNodes foreach { node ⇒
replicaConnections.get(node) foreach {
- case (_, connection) ⇒
- connection ! command
+ case (_, connection) ⇒ connection ! command
}
}
}
@@ -786,8 +861,8 @@ class DefaultClusterNode private[akka] (
def ref(actorAddress: String, router: RouterType): ActorRef = if (isConnected.isOn) {
val addresses = addressesForActor(actorAddress)
EventHandler.debug(this,
- "Checking out cluster actor ref with address [%s] and router [%s] connected to [\n\t%s]"
- .format(actorAddress, router, addresses.mkString("\n\t")))
+ "Checking out cluster actor ref with address [%s] and router [%s] on [%s] connected to [\n\t%s]"
+ .format(actorAddress, router, remoteServerAddress, addresses.map(_._2).mkString("\n\t")))
val actorRef = Router newRouter (router, addresses, actorAddress, Actor.TIMEOUT)
addresses foreach { case (_, address) ⇒ clusterActorRefs.put(address, actorRef) }
@@ -981,7 +1056,7 @@ class DefaultClusterNode private[akka] (
.setMessageType(FUNCTION_FUN0_ANY)
.setPayload(ByteString.copyFrom(Serializers.Java.toBinary(f)))
.build
- val results = replicaConnectionsForReplicationFactor(replicationFactor) map (_ !!! message)
+ val results = replicaConnectionsForReplicationFactor(replicationFactor) map (_ ? message)
results.toList.asInstanceOf[List[Future[Any]]]
}
@@ -1007,7 +1082,7 @@ class DefaultClusterNode private[akka] (
.setMessageType(FUNCTION_FUN1_ARG_ANY)
.setPayload(ByteString.copyFrom(Serializers.Java.toBinary((f, arg))))
.build
- val results = replicaConnectionsForReplicationFactor(replicationFactor) map (_ !!! message)
+ val results = replicaConnectionsForReplicationFactor(replicationFactor) map (_ ? message)
results.toList.asInstanceOf[List[Future[Any]]]
}
@@ -1230,7 +1305,7 @@ class DefaultClusterNode private[akka] (
homeAddress.setAccessible(true)
homeAddress.set(actor, Some(remoteServerAddress))
- remoteService.register(uuid, actor) // FIXME is Actor.remote.register(UUID, ..) correct here?
+ remoteService.register(actorAddress, actor)
}
}
@@ -1473,8 +1548,6 @@ object RemoteClusterDaemon {
val computeGridDispatcher = Dispatchers.newDispatcher("akka:cloud:cluster:compute-grid").build
}
-// FIXME supervise RemoteClusterDaemon
-
/**
* @author Jonas Bonér
*/
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
index 5698ac7be0..494fa42fe1 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
@@ -6,12 +6,17 @@ package akka.cluster
import Cluster._
import akka.actor._
-import akka.actor.Actor._
+import Actor._
+import akka.dispatch._
+import akka.util._
+import ReflectiveAccess._
+import ClusterModule._
import akka.event.EventHandler
import akka.dispatch.Future
import java.net.InetSocketAddress
import java.util.concurrent.atomic.AtomicReference
+import java.util.{ Map ⇒ JMap }
import com.eaio.uuid.UUID
@@ -20,21 +25,20 @@ import com.eaio.uuid.UUID
*/
class ClusterActorRef private[akka] (
inetSocketAddresses: Array[Tuple2[UUID, InetSocketAddress]],
- actorAddress: String,
- timeout: Long,
- val replicationStrategy: ReplicationStrategy)
- extends RemoteActorRef(null, actorAddress, timeout, None) { // FIXME UGLY HACK - should not extend RemoteActorRef
- this: ClusterActorRef with Router.Router ⇒
+ val address: String,
+ _timeout: Long)
+ extends ActorRef with ScalaActorRef { this: Router.Router ⇒
- EventHandler.debug(this,
- "Creating a ClusterActorRef for actor with address [%s] with connections [\n\t%s]"
- .format(actorAddress, inetSocketAddresses.mkString("\n\t")))
+ timeout = _timeout
private[akka] val inetSocketAddressToActorRefMap = new AtomicReference[Map[InetSocketAddress, ActorRef]](
(Map[InetSocketAddress, ActorRef]() /: inetSocketAddresses) {
- case (map, (uuid, inetSocketAddress)) ⇒ map + (inetSocketAddress -> createRemoteActorRef(actorAddress, inetSocketAddress))
+ case (map, (uuid, inetSocketAddress)) ⇒ map + (inetSocketAddress -> createRemoteActorRef(address, inetSocketAddress))
})
+ ClusterModule.ensureEnabled()
+ start()
+
def connections: Map[InetSocketAddress, ActorRef] = inetSocketAddressToActorRefMap.get
override def postMessageToMailbox(message: Any, channel: UntypedChannel): Unit = {
@@ -68,4 +72,53 @@ class ClusterActorRef private[akka] (
private def createRemoteActorRef(actorAddress: String, inetSocketAddress: InetSocketAddress) = {
RemoteActorRef(inetSocketAddress, actorAddress, Actor.TIMEOUT, None)
}
+
+ def start(): ActorRef = synchronized {
+ _status = ActorRefInternals.RUNNING
+ this
+ }
+
+ def stop() {
+ synchronized {
+ if (_status == ActorRefInternals.RUNNING) {
+ _status = ActorRefInternals.SHUTDOWN
+ postMessageToMailbox(RemoteActorSystemMessage.Stop, None)
+ }
+ }
+ }
+
+ // ==== NOT SUPPORTED ====
+ // FIXME move these methods and the same ones in RemoteActorRef to a base class - now duplicated
+ def dispatcher_=(md: MessageDispatcher) {
+ unsupported
+ }
+ def dispatcher: MessageDispatcher = unsupported
+ def link(actorRef: ActorRef) {
+ unsupported
+ }
+ def unlink(actorRef: ActorRef) {
+ unsupported
+ }
+ def startLink(actorRef: ActorRef): ActorRef = unsupported
+ def supervisor: Option[ActorRef] = unsupported
+ def linkedActors: JMap[Uuid, ActorRef] = unsupported
+ protected[akka] def mailbox: AnyRef = unsupported
+ protected[akka] def mailbox_=(value: AnyRef): AnyRef = unsupported
+ protected[akka] def handleTrapExit(dead: ActorRef, reason: Throwable) {
+ unsupported
+ }
+ protected[akka] def restart(reason: Throwable, maxNrOfRetries: Option[Int], withinTimeRange: Option[Int]) {
+ unsupported
+ }
+ protected[akka] def restartLinkedActors(reason: Throwable, maxNrOfRetries: Option[Int], withinTimeRange: Option[Int]) {
+ unsupported
+ }
+ protected[akka] def invoke(messageHandle: MessageInvocation) {
+ unsupported
+ }
+ protected[akka] def supervisor_=(sup: Option[ActorRef]) {
+ unsupported
+ }
+ protected[akka] def actorInstance: AtomicReference[Actor] = unsupported
+ private def unsupported = throw new UnsupportedOperationException("Not supported for RemoteActorRef")
}
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterDeployer.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterDeployer.scala
index 19b89628a1..070a52d96b 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterDeployer.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterDeployer.scala
@@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicReference
/**
* A ClusterDeployer is responsible for deploying a Deploy.
*
- * big question is: what does Deploy mean?
+ * FIXME Document: what does Deploy mean?
*
* @author Jonas Bonér
*/
@@ -35,11 +35,16 @@ object ClusterDeployer {
val clusterName = Cluster.name
val nodeName = Config.nodename
val clusterPath = "/%s" format clusterName
- val clusterDeploymentLockPath = clusterPath + "/deployment-lock"
+
val deploymentPath = clusterPath + "/deployment"
- val baseNodes = List(clusterPath, clusterDeploymentLockPath, deploymentPath)
val deploymentAddressPath = deploymentPath + "/%s"
+ val deploymentCoordinationPath = clusterPath + "/deployment-coordination"
+ val deploymentInProgressLockPath = deploymentCoordinationPath + "/in-progress"
+ val isDeploymentCompletedInClusterLockPath = deploymentCoordinationPath + "/completed" // should not be part of baseNodes
+
+ val baseNodes = List(clusterPath, deploymentPath, deploymentCoordinationPath, deploymentInProgressLockPath)
+
private val isConnected = new Switch(false)
private val deploymentCompleted = new CountDownLatch(1)
@@ -49,7 +54,7 @@ object ClusterDeployer {
Cluster.connectionTimeout,
Cluster.defaultSerializer)
- private val clusterDeploymentLockListener = new LockListener {
+ private val deploymentInProgressLockListener = new LockListener {
def lockAcquired() {
EventHandler.debug(this, "Clustered deployment started")
}
@@ -60,13 +65,11 @@ object ClusterDeployer {
}
}
- private val deploymentLock = new WriteLock(
- zkClient.connection.getZookeeper, clusterDeploymentLockPath, null, clusterDeploymentLockListener) {
- private val ownerIdField = classOf[WriteLock].getDeclaredField("ownerId")
- ownerIdField.setAccessible(true)
-
- def leader: String = ownerIdField.get(this).asInstanceOf[String]
- }
+ private val deploymentInProgressLock = new WriteLock(
+ zkClient.connection.getZookeeper,
+ deploymentInProgressLockPath,
+ null,
+ deploymentInProgressLockListener)
private val systemDeployments: List[Deploy] = Nil
@@ -79,6 +82,7 @@ object ClusterDeployer {
deployment ← zkClient.readData(deploymentAddressPath.format(child)).asInstanceOf[Deploy]
} zkClient.delete(deploymentAddressPath.format(deployment.address))
+ invalidateDeploymentInCluster()
} catch {
case e: Exception ⇒
handleError(new DeploymentException("Could not undeploy all deployment data in ZooKeeper due to: " + e))
@@ -124,8 +128,6 @@ object ClusterDeployer {
}
private[akka] def init(deployments: List[Deploy]) {
- println("===============================================================")
- println("------------ INIT 1")
isConnected switchOn {
EventHandler.info(this, "Initializing cluster deployer")
@@ -141,31 +143,21 @@ object ClusterDeployer {
}
}
- println("------------ INIT 2")
val allDeployments = deployments ::: systemDeployments
- ///===========================================================
- // FIXME need a flag 'deploymentDone' in ZK and to wrap the deployment in 'if (!deploymentDone) { .. }', since now the deployment is only protected by lock during the actual deployment, if node comes in later then deployment is repeated on that node again
- ///===========================================================
+ if (!isDeploymentCompletedInCluster) {
+ if (deploymentInProgressLock.lock()) {
+ // try to be the one doing the clustered deployment
+ EventHandler.info(this, "Deploying to cluster [\n" + allDeployments.mkString("\n\t") + "\n]")
+ allDeployments foreach (deploy(_)) // deploy
+ markDeploymentCompletedInCluster()
+ deploymentInProgressLock.unlock() // signal deployment complete
- if (deploymentLock.lock()) {
- println("------------ INIT 3")
- // try to be the one doing the clustered deployment
- EventHandler.info(this, "Deploying to cluster [\n" + allDeployments.mkString("\n\t") + "\n]")
-
- println("------------ INIT 4")
- allDeployments foreach (deploy(_)) // deploy
- println("------------ INIT 5")
-
- // FIXME need to set deployment done flag
-
- deploymentLock.unlock() // signal deployment complete
- } else {
- println("------------ INIT WAITING")
- deploymentCompleted.await() // wait until deployment is completed by other "master" node
+ } else {
+ deploymentCompleted.await() // wait until deployment is completed by other "master" node
+ }
}
- println("------------ INIT 6")
// fetch clustered deployments and deploy them locally
fetchDeploymentsFromCluster foreach (LocalDeployer.deploy(_))
}
@@ -183,14 +175,29 @@ object ClusterDeployer {
zkClient.writeData(path, deployment)
} catch {
case e: NullPointerException ⇒
- handleError(new DeploymentException("Could not store deployment data [" + deployment + "] in ZooKeeper since client session is closed"))
+ handleError(new DeploymentException(
+ "Could not store deployment data [" + deployment +
+ "] in ZooKeeper since client session is closed"))
case e: Exception ⇒
- handleError(new DeploymentException("Could not store deployment data [" + deployment + "] in ZooKeeper due to: " + e))
+ handleError(new DeploymentException(
+ "Could not store deployment data [" +
+ deployment + "] in ZooKeeper due to: " + e))
}
}
}
}
+ private def markDeploymentCompletedInCluster() {
+ ignore[ZkNodeExistsException](zkClient.create(isDeploymentCompletedInClusterLockPath, null, CreateMode.PERSISTENT))
+ }
+
+ private def isDeploymentCompletedInCluster = zkClient.exists(isDeploymentCompletedInClusterLockPath)
+
+ // FIXME in future - add watch to this path to be able to trigger redeployment, and use this method to trigger redeployment
+ private def invalidateDeploymentInCluster() {
+ ignore[ZkNoNodeException](zkClient.delete(isDeploymentCompletedInClusterLockPath))
+ }
+
private def ensureRunning[T](body: ⇒ T): T = {
if (isConnected.isOn) body
else throw new IllegalStateException("ClusterDeployer is not running")
diff --git a/akka-cluster/src/main/scala/akka/cluster/ReplicatedClusterRef.scala b/akka-cluster/src/main/scala/akka/cluster/ReplicatedClusterRef.scala
deleted file mode 100644
index b9ea77043c..0000000000
--- a/akka-cluster/src/main/scala/akka/cluster/ReplicatedClusterRef.scala
+++ /dev/null
@@ -1,104 +0,0 @@
-package akka.cluster
-
-/**
- * Copyright (C) 2009-2011 Scalable Solutions AB
- */
-import Cluster._
-
-import akka.actor._
-import akka.remote.MessageSerializer
-import akka.event.EventHandler
-import akka.config.Supervision._
-import akka.dispatch._
-
-import java.net.InetSocketAddress
-import java.util.concurrent.atomic.AtomicReference
-import java.util.{ Map ⇒ JMap }
-
-/**
- * @author Jonas Bonér
- */
-trait Replicable { this: Actor ⇒
-}
-
-/**
- * @author Jonas Bonér
- */
-sealed trait ReplicationStrategy
-
-object ReplicationStrategy {
- case object Transient extends ReplicationStrategy
- case object WriteThrough extends ReplicationStrategy
- case object WriteBehind extends ReplicationStrategy
-}
-
-/**
- * @author Jonas Bonér
- */
-class ReplicatedActorRef private[akka] (actorRef: ActorRef, val address: String) extends ActorRef with ScalaActorRef {
-
- private lazy val txLog = {
- EventHandler.debug(this, "Creating a ReplicatedActorRef for Actor [%s]".format(address))
- TransactionLog.newLogFor(uuid.toString)
- }
-
- def invoke(messageHandle: MessageInvocation) {
- actorRef.invoke(messageHandle)
- txLog.recordEntry(MessageSerializer.serialize(messageHandle.message).toByteArray)
- }
-
- def start(): ActorRef = {
- EventHandler.debug(this, "Starting ReplicatedActorRef for Actor [%s] with transaction log [%s]"
- .format(address, txLog.logId))
- actorRef.start()
- }
-
- def stop() {
- txLog.delete()
- actorRef.stop()
- }
-
- override def setFaultHandler(handler: FaultHandlingStrategy) {
- actorRef.setFaultHandler(handler)
- }
- override def getFaultHandler: FaultHandlingStrategy = actorRef.getFaultHandler()
- override def setLifeCycle(lifeCycle: LifeCycle) {
- actorRef.setLifeCycle(lifeCycle)
- }
- override def getLifeCycle: LifeCycle = actorRef.getLifeCycle
- def dispatcher_=(md: MessageDispatcher) {
- actorRef.dispatcher_=(md)
- }
- def dispatcher: MessageDispatcher = actorRef.dispatcher
- def link(actorRef: ActorRef) {
- actorRef.link(actorRef)
- }
- def unlink(actorRef: ActorRef) {
- actorRef.unlink(actorRef)
- }
- def startLink(actorRef: ActorRef): ActorRef = actorRef.startLink(actorRef)
- def supervisor: Option[ActorRef] = actorRef.supervisor
- def linkedActors: JMap[Uuid, ActorRef] = actorRef.linkedActors
- protected[akka] def postMessageToMailbox(message: Any, channel: UntypedChannel) {
- actorRef.postMessageToMailbox(message, channel)
- }
- protected[akka] def postMessageToMailboxAndCreateFutureResultWithTimeout(
- message: Any,
- timeout: Long,
- channel: UntypedChannel): Future[Any] = actorRef.postMessageToMailboxAndCreateFutureResultWithTimeout(message, timeout, channel)
- protected[akka] def actorInstance: AtomicReference[Actor] = actorRef.actorInstance
- protected[akka] def supervisor_=(sup: Option[ActorRef]) {
- actorRef.supervisor_=(sup)
- }
- protected[akka] def mailbox: AnyRef = actorRef.mailbox
- protected[akka] def mailbox_=(value: AnyRef): AnyRef = actorRef.mailbox_=(value)
- protected[akka] def handleTrapExit(dead: ActorRef, reason: Throwable) {
- actorRef.handleTrapExit(dead, reason)
- }
- protected[akka] def restart(reason: Throwable, maxNrOfRetries: Option[Int], withinTimeRange: Option[Int]) {
- actorRef.restart(reason, maxNrOfRetries, withinTimeRange)
- }
- protected[akka] def restartLinkedActors(reason: Throwable, maxNrOfRetries: Option[Int], withinTimeRange: Option[Int]) {
- actorRef.restartLinkedActors(reason, maxNrOfRetries, withinTimeRange)
- }
-}
diff --git a/akka-cluster/src/main/scala/akka/cluster/Routing.scala b/akka-cluster/src/main/scala/akka/cluster/Routing.scala
index 1bde759ca6..838efc729f 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Routing.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Routing.scala
@@ -27,12 +27,11 @@ object Router {
routerType: RouterType,
inetSocketAddresses: Array[Tuple2[UUID, InetSocketAddress]],
actorAddress: String,
- timeout: Long,
- replicationStrategy: ReplicationStrategy = ReplicationStrategy.WriteThrough): ClusterActorRef = {
+ timeout: Long): ClusterActorRef = {
routerType match {
- case Direct ⇒ new ClusterActorRef(inetSocketAddresses, actorAddress, timeout, replicationStrategy) with Direct
- case Random ⇒ new ClusterActorRef(inetSocketAddresses, actorAddress, timeout, replicationStrategy) with Random
- case RoundRobin ⇒ new ClusterActorRef(inetSocketAddresses, actorAddress, timeout, replicationStrategy) with RoundRobin
+ case Direct ⇒ new ClusterActorRef(inetSocketAddresses, actorAddress, timeout) with Direct
+ case Random ⇒ new ClusterActorRef(inetSocketAddresses, actorAddress, timeout) with Random
+ case RoundRobin ⇒ new ClusterActorRef(inetSocketAddresses, actorAddress, timeout) with RoundRobin
case LeastCPU ⇒ sys.error("Router LeastCPU not supported yet")
case LeastRAM ⇒ sys.error("Router LeastRAM not supported yet")
case LeastMessages ⇒ sys.error("Router LeastMessages not supported yet")
@@ -57,7 +56,7 @@ object Router {
}
def route[T](message: Any, timeout: Long)(implicit sender: Option[ActorRef]): Future[T] = next match {
- case Some(actor) ⇒ actor.!!!(message, timeout)(sender)
+ case Some(actor) ⇒ actor.?(message, timeout)(sender).asInstanceOf[Future[T]]
case _ ⇒ throwNoConnectionsError()
}
diff --git a/akka-cluster/src/main/scala/akka/cluster/Storage.scala b/akka-cluster/src/main/scala/akka/cluster/Storage.scala
old mode 100644
new mode 100755
index 7c39863f56..32519e56d7
--- a/akka-cluster/src/main/scala/akka/cluster/Storage.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Storage.scala
@@ -5,9 +5,8 @@ import akka.AkkaException
import org.apache.zookeeper.{ KeeperException, CreateMode }
import org.apache.zookeeper.data.Stat
import java.util.concurrent.ConcurrentHashMap
-import org.apache.zookeeper.KeeperException.NoNodeException
-import java.lang.UnsupportedOperationException
import annotation.tailrec
+import java.lang.{ UnsupportedOperationException, RuntimeException }
/**
* Simple abstraction to store an Array of bytes based on some String key.
@@ -15,36 +14,37 @@ import annotation.tailrec
* Nothing is being said about ACID, transactions etc. It depends on the implementation
* of this Storage interface of what is and isn't done on the lowest level.
*
- * TODO: Perhaps add a version to the store to prevent lost updates using optimistic locking.
- * (This is supported by ZooKeeper).
+ * The amount of data that is allowed to be insert/updated is implementation specific. The InMemoryStorage
+ * has no limits, but the ZooKeeperStorage has a maximum size of 1 mb.
+ *
* TODO: Class is up for better names.
* TODO: Instead of a String as key, perhaps also a byte-array.
*/
trait Storage {
/**
- * Loads the given entry.
+ * Loads the VersionedData for the given key.
*
- * @param key: the key of the data to load.
- * @return the VersionedData for the given key.
- * @throws NoNodeExistsException if the data with the given key doesn't exist.
+ * @param key: the key of the VersionedData to load.
+ * @return the VersionedData for the given entry.
+ * @throws MissingDataException if the entry with the given key doesn't exist.
* @throws StorageException if anything goes wrong while accessing the storage
*/
def load(key: String): VersionedData
/**
- * Loads the data for the given key and version.
+ * Loads the VersionedData for the given key and version.
*
- * @param key: the key of the data to load
- * @param version the version of the data to load
- * @throws NoNodeExistsException if the data with the given key doesn't exist.
- * @throws VersioningMismatchStorageException if the version of the data is not the same as the given data.
+ * @param key: the key of the VersionedData to load
+ * @param version the version of the VersionedData to load
+ * @throws MissingDataException if the data with the given key doesn't exist.
+ * @throws VersioningException if the version of the data is not the same as the given data.
* @throws StorageException if anything goes wrong while accessing the storage
*/
def load(key: String, version: Long): VersionedData
/**
- * Checks if a value with the given key exists.
+ * Checks if a VersionedData with the given key exists.
*
* @param key the key to check the existence for.
* @return true if exists, false if not.
@@ -57,19 +57,34 @@ trait Storage {
*
* @param key the key of the Data to insert.
* @param bytes the data to insert.
- * @return the version of the inserted data
- * @throws NodeExistsException when a Node with the given Key already exists.
+ * @return the VersionedData
+ * @throws DataExistsException when VersionedData with the given Key already exists.
* @throws StorageException if anything goes wrong while accessing the storage
*/
def insert(key: String, bytes: Array[Byte]): VersionedData
/**
- * Stores a array of bytes based on some key.
+ * Inserts the data if there is no data for that key, or overwrites it if it is there.
*
- * @throws MissingNodeException when the Node with the given key doesn't exist.
+ * This is the method you want to call if you just want to save something and don't
+ * care about any lost update issues.
+ *
+ * @param key the key of the data
+ * @param bytes the data to insert
+ * @return the VersionedData that was stored.
* @throws StorageException if anything goes wrong while accessing the storage
*/
- def update(key: String, bytes: Array[Byte]): VersionedData
+ def insertOrOverwrite(key: String, bytes: Array[Byte]): VersionedData
+
+ /**
+ * Overwrites the current data for the given key.
+ *
+ * @param key the key of the data to overwrite
+ * @param bytes the data to insert.
+ * @throws ` when the entry with the given key doesn't exist.
+ * @throws StorageException if anything goes wrong while accessing the storage
+ */
+ def overwrite(key: String, bytes: Array[Byte]): VersionedData
/**
* @throws StorageException if anything goes wrong while accessing the storage
@@ -98,17 +113,17 @@ class StorageException(msg: String = null, cause: java.lang.Throwable = null) ex
* *
* A StorageException thrown when an operation is done on a non existing node.
*/
-class MissingNodeException(msg: String = null, cause: java.lang.Throwable = null) extends StorageException(msg, cause)
+class MissingDataException(msg: String = null, cause: java.lang.Throwable = null) extends StorageException(msg, cause)
/**
* A StorageException thrown when an operation is done on an existing node, but no node was expected.
*/
-class NodeExistsException(msg: String = null, cause: java.lang.Throwable = null) extends StorageException(msg, cause)
+class DataExistsException(msg: String = null, cause: java.lang.Throwable = null) extends StorageException(msg, cause)
/**
* A StorageException thrown when an operation causes an optimistic locking failure.
*/
-class VersioningMismatchStorageException(msg: String = null, cause: java.lang.Throwable = null) extends StorageException(msg, cause)
+class VersioningException(msg: String = null, cause: java.lang.Throwable = null) extends StorageException(msg, cause)
/**
* A Storage implementation based on ZooKeeper.
@@ -117,59 +132,89 @@ class VersioningMismatchStorageException(msg: String = null, cause: java.lang.Th
* - so everything is written or nothing is written
* - is isolated, so threadsafe,
* but it will not participate in any transactions.
- * //todo: unclear, is only a single connection used in the JVM??
*
*/
class ZooKeeperStorage(zkClient: AkkaZkClient) extends Storage {
def load(key: String) = try {
- val arrayOfBytes: Array[Byte] = zkClient.connection.readData(key, new Stat, false)
- //Some(arrayOfBytes)
- throw new UnsupportedOperationException()
+ val stat = new Stat
+ val arrayOfBytes = zkClient.connection.readData(key, stat, false)
+ new VersionedData(arrayOfBytes, stat.getVersion)
} catch {
- //todo: improved error messaged
- case e: KeeperException.NoNodeException ⇒ throw new MissingNodeException("Failed to load key", e)
- case e: KeeperException ⇒ throw new StorageException("failed to load key " + key, e)
+ case e: KeeperException.NoNodeException ⇒ throw new MissingDataException(
+ String.format("Failed to load key [%s]: no data was found", key), e)
+ case e: KeeperException ⇒ throw new StorageException(
+ String.format("Failed to load key [%s]", key), e)
}
- def load(key: String, version: Long) = {
- throw new UnsupportedOperationException()
+ def load(key: String, expectedVersion: Long) = try {
+ val stat = new Stat
+ val arrayOfBytes = zkClient.connection.readData(key, stat, false)
+
+ if (stat.getVersion != expectedVersion) throw new VersioningException(
+ "Failed to update key [" + key + "]: version mismatch, expected [" + expectedVersion + "]" +
+ " but found [" + stat.getVersion + "]")
+
+ new VersionedData(arrayOfBytes, stat.getVersion)
+ } catch {
+ case e: KeeperException.NoNodeException ⇒ throw new MissingDataException(
+ String.format("Failed to load key [%s]: no data was found", key), e)
+ case e: KeeperException ⇒ throw new StorageException(
+ String.format("Failed to load key [%s]", key), e)
+ }
+
+ def insertOrOverwrite(key: String, bytes: Array[Byte]) = {
+ try {
+ throw new UnsupportedOperationException()
+ } catch {
+ case e: KeeperException.NodeExistsException ⇒ throw new DataExistsException(
+ String.format("Failed to insert key [%s]: an entry already exists with the same key", key), e)
+ case e: KeeperException ⇒ throw new StorageException(
+ String.format("Failed to insert key [%s]", key), e)
+ }
}
def insert(key: String, bytes: Array[Byte]): VersionedData = {
try {
- zkClient.connection.create(key, bytes, CreateMode.PERSISTENT);
- throw new UnsupportedOperationException()
+ zkClient.connection.create(key, bytes, CreateMode.PERSISTENT)
+ //todo: how to get hold of the reference.
+ val version: Long = 0
+ new VersionedData(bytes, version)
} catch {
- //todo: improved error messaged
- case e: KeeperException.NodeExistsException ⇒ throw new NodeExistsException("failed to insert key " + key, e)
- case e: KeeperException ⇒ throw new StorageException("failed to insert key " + key, e)
+ case e: KeeperException.NodeExistsException ⇒ throw new DataExistsException(
+ String.format("Failed to insert key [%s]: an entry already exists with the same key", key), e)
+ case e: KeeperException ⇒ throw new StorageException(
+ String.format("Failed to insert key [%s]", key), e)
}
}
def exists(key: String) = try {
zkClient.connection.exists(key, false)
} catch {
- //todo: improved error messaged
- case e: KeeperException ⇒ throw new StorageException("failed to check for existance on key " + key, e)
+ case e: KeeperException ⇒ throw new StorageException(
+ String.format("Failed to check existance for key [%s]", key), e)
}
- def update(key: String, versionedData: VersionedData) = try {
- zkClient.connection.writeData(key, versionedData.data, versionedData.version.asInstanceOf[Int])
- } catch {
- //todo: improved error messaged
- case e: KeeperException.BadVersionException ⇒ throw new VersioningMismatchStorageException()
- case e: KeeperException ⇒ throw new StorageException("failed to check for existance on key " + key, e)
+ def update(key: String, versionedData: VersionedData) {
+ try {
+ zkClient.connection.writeData(key, versionedData.data, versionedData.version.asInstanceOf[Int])
+ } catch {
+ case e: KeeperException.BadVersionException ⇒ throw new VersioningException(
+ String.format("Failed to update key [%s]: version mismatch", key), e)
+ case e: KeeperException ⇒ throw new StorageException(
+ String.format("Failed to update key [%s]", key), e)
+ }
}
- def update(key: String, bytes: Array[Byte]): VersionedData = {
+ def overwrite(key: String, bytes: Array[Byte]): VersionedData = {
try {
zkClient.connection.writeData(key, bytes)
throw new RuntimeException()
} catch {
- //todo: improved error messaged
- case e: KeeperException.NoNodeException ⇒ throw new MissingNodeException("failed to update key ", e)
- case e: KeeperException ⇒ throw new StorageException("failed to update key ", e)
+ case e: KeeperException.NoNodeException ⇒ throw new MissingDataException(
+ String.format("Failed to overwrite key [%s]: a previous entry already exists", key), e)
+ case e: KeeperException ⇒ throw new StorageException(
+ String.format("Failed to overwrite key [%s]", key), e)
}
}
}
@@ -188,8 +233,8 @@ final class InMemoryStorage extends Storage {
def load(key: String) = {
val result = map.get(key)
- if (result == null) throw new MissingNodeException(
- String.format("Failed to load data for key [%s]: no data was found", key))
+ if (result == null) throw new MissingDataException(
+ String.format("Failed to load key [%s]: no data was found", key))
result
}
@@ -197,8 +242,8 @@ final class InMemoryStorage extends Storage {
def load(key: String, expectedVersion: Long) = {
val result = load(key)
- if (result.version != expectedVersion) throw new VersioningMismatchStorageException(
- "Failed to load data for key [" + key + "]: version mismatch, expected [" + result.version + "] " +
+ if (result.version != expectedVersion) throw new VersioningException(
+ "Failed to load key [" + key + "]: version mismatch, expected [" + result.version + "] " +
"but found [" + expectedVersion + "]")
result
@@ -211,7 +256,7 @@ final class InMemoryStorage extends Storage {
val result = new VersionedData(bytes, version)
val previous = map.putIfAbsent(key, result)
- if (previous != null) throw new NodeExistsException(
+ if (previous != null) throw new DataExistsException(
String.format("Failed to insert key [%s]: the key already has been inserted previously", key))
result
@@ -221,23 +266,36 @@ final class InMemoryStorage extends Storage {
def update(key: String, updatedData: VersionedData) {
val currentData = map.get(key)
- if (currentData == null) throw new MissingNodeException(
- String.format("Failed to update data for key [%s], no previous entry exist", key))
+ if (currentData == null) throw new MissingDataException(
+ String.format("Failed to update key [%s], no previous entry exist", key))
val expectedVersion = currentData.version + 1
- if (expectedVersion != updatedData.version) throw new VersioningMismatchStorageException(
- "Failed to update data for key [" + key + "]: version mismatch, expected [" + expectedVersion + "]" +
+ if (expectedVersion != updatedData.version) throw new VersioningException(
+ "Failed to update key [" + key + "]: version mismatch, expected [" + expectedVersion + "]" +
" but found [" + updatedData.version + "]")
if (!map.replace(key, currentData, updatedData)) update(key, updatedData)
}
- def update(key: String, bytes: Array[Byte]): VersionedData = {
- if (map.get(key) == null) throw new NoNodeException(
- String.format("Failed to update key [%s]: no previous insert of this key exists", key))
+ @tailrec
+ def overwrite(key: String, bytes: Array[Byte]): VersionedData = {
+ val currentData = map.get(key)
- //smap.put(key, bytes)
- throw new UnsupportedOperationException()
+ if (currentData == null) throw new MissingDataException(
+ String.format("Failed to overwrite key [%s], no previous entry exist", key))
+
+ val newData = currentData.createUpdate(bytes)
+ if (map.replace(key, currentData, newData)) newData else overwrite(key, bytes)
+ }
+
+ def insertOrOverwrite(key: String, bytes: Array[Byte]): VersionedData = {
+ val version = InMemoryStorage.InitialVersion
+ val result = new VersionedData(bytes, version)
+
+ val previous = map.putIfAbsent(key, result)
+
+ if (previous == null) result
+ else overwrite(key, bytes)
}
}
diff --git a/akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala b/akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala
index f5c96250b4..281d2f91e5 100644
--- a/akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala
@@ -9,16 +9,23 @@ import org.apache.zookeeper.CreateMode
import org.I0Itec.zkclient.exception._
+import akka.AkkaException
import akka.config._
import Config._
import akka.util._
+import akka.actor._
+import DeploymentConfig.{ ReplicationScheme, ReplicationStrategy, Transient, WriteThrough, WriteBehind }
import akka.event.EventHandler
-import akka.dispatch.{ DefaultPromise, Promise }
-import akka.AkkaException
-
+import akka.dispatch.{ DefaultPromise, Promise, MessageInvocation }
+import akka.remote.MessageSerializer
+import akka.serialization.ActorSerialization._
import akka.cluster.zookeeper._
+import akka.serialization.{ Serializer, Compression }
+import Compression.LZF
+import akka.serialization.ActorSerialization._
import java.util.Enumeration
+import java.util.concurrent.atomic.AtomicLong
// FIXME allow user to choose dynamically between 'async' and 'sync' tx logging (asyncAddEntry(byte[] data, AddCallback cb, Object ctx))
// FIXME clean up old entries in log after doing a snapshot
@@ -41,25 +48,47 @@ class ReplicationException(message: String) extends AkkaException(message)
*
* @author Jonas Bonér
*/
-class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync: Boolean) {
+class TransactionLog private (
+ ledger: LedgerHandle,
+ val id: String,
+ val isAsync: Boolean,
+ replicationScheme: ReplicationScheme,
+ format: Serializer) {
import TransactionLog._
val logId = ledger.getId
val txLogPath = transactionLogNode + "/" + id
val snapshotPath = txLogPath + "/snapshot"
+ val nrOfEntries = new AtomicLong(0)
private val isOpen = new Switch(true)
+ /**
+ * TODO document method
+ */
+ def recordEntry(messageHandle: MessageInvocation, actorRef: ActorRef) {
+ if (nrOfEntries.incrementAndGet % snapshotFrequency == 0) {
+ val snapshot =
+ // FIXME ReplicationStrategy Transient is always used
+ if (Cluster.shouldCompressData) LZF.compress(toBinary(actorRef, false, replicationScheme)(format))
+ else toBinary(actorRef, false, replicationScheme)(format)
+ recordSnapshot(snapshot)
+ }
+ recordEntry(MessageSerializer.serialize(messageHandle.message).toByteArray)
+ }
+
/**
* TODO document method
*/
def recordEntry(entry: Array[Byte]) {
if (isOpen.isOn) {
+ val bytes = if (Cluster.shouldCompressData) LZF.compress(entry)
+ else entry
try {
if (isAsync) {
ledger.asyncAddEntry(
- entry,
+ bytes,
new AsyncCallback.AddCallback {
def addComplete(
returnCode: Int,
@@ -73,7 +102,7 @@ class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync:
},
null)
} else {
- handleReturnCode(ledger.addEntry(entry))
+ handleReturnCode(ledger.addEntry(bytes))
val entryId = ledger.getLastAddPushed
EventHandler.debug(this, "Writing entry [%s] to log [%s]".format(entryId, logId))
}
@@ -88,10 +117,12 @@ class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync:
*/
def recordSnapshot(snapshot: Array[Byte]) {
if (isOpen.isOn) {
+ val bytes = if (Cluster.shouldCompressData) LZF.compress(snapshot)
+ else snapshot
try {
if (isAsync) {
ledger.asyncAddEntry(
- snapshot,
+ bytes,
new AsyncCallback.AddCallback {
def addComplete(
returnCode: Int,
@@ -104,7 +135,7 @@ class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync:
},
null)
} else {
- handleReturnCode(ledger.addEntry(snapshot))
+ handleReturnCode(ledger.addEntry(bytes))
storeSnapshotMetaDataInZooKeeper(ledger.getLastAddPushed)
}
} catch {
@@ -121,7 +152,7 @@ class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync:
/**
* TODO document method
*/
- def entriesFromLatestSnapshot: Tuple2[Array[Byte], Vector[Array[Byte]]] = {
+ def toByteArraysLatestSnapshot: (Array[Byte], Vector[Array[Byte]]) = {
val snapshotId = latestSnapshotId
EventHandler.debug(this,
"Reading entries from snapshot id [%s] for log [%s]".format(snapshotId, logId))
@@ -133,9 +164,9 @@ class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync:
*/
def entriesInRange(from: Long, to: Long): Vector[Array[Byte]] = if (isOpen.isOn) {
try {
- if (from < 0) throw new IllegalArgumentException("'from' can't be negative [" + from + "]")
- if (to < 0) throw new IllegalArgumentException("'to' can't be negative [" + from + "]")
- if (to < from) throw new IllegalArgumentException("'to' can't be smaller than 'from' [" + from + "," + to + "]")
+ if (from < 0) throw new IllegalArgumentException("'from' index can't be negative [" + from + "]")
+ if (to < 0) throw new IllegalArgumentException("'to' index can't be negative [" + from + "]")
+ if (to < from) throw new IllegalArgumentException("'to' index can't be smaller than 'from' index [" + from + "," + to + "]")
EventHandler.debug(this,
"Reading entries [%s -> %s] for log [%s]".format(from, to, logId))
@@ -150,10 +181,7 @@ class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync:
enumeration: Enumeration[LedgerEntry],
ctx: AnyRef) {
val future = ctx.asInstanceOf[Promise[Vector[Array[Byte]]]]
- var entries = Vector[Array[Byte]]()
- while (enumeration.hasMoreElements) {
- entries = entries :+ enumeration.nextElement.getEntry
- }
+ val entries = toByteArrays(enumeration)
if (returnCode == BKException.Code.OK) future.completeWithResult(entries)
else future.completeWithException(BKException.create(returnCode))
}
@@ -161,12 +189,7 @@ class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync:
future)
await(future)
} else {
- val enumeration = ledger.readEntries(from, to)
- var entries = Vector[Array[Byte]]()
- while (enumeration.hasMoreElements) {
- entries = entries :+ enumeration.nextElement.getEntry
- }
- entries
+ toByteArrays(ledger.readEntries(from, to))
}
} catch {
case e ⇒ handleError(e)
@@ -190,8 +213,7 @@ class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync:
} catch {
case e: ZkNoNodeException ⇒
handleError(new ReplicationException(
- "Transaction log for UUID [" + id +
- "] does not have a snapshot recorded in ZooKeeper"))
+ "Transaction log for UUID [" + id + "] does not have a snapshot recorded in ZooKeeper"))
case e ⇒ handleError(e)
}
}
@@ -208,7 +230,7 @@ class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync:
logId,
new AsyncCallback.DeleteCallback {
def deleteComplete(returnCode: Int, ctx: AnyRef) {
- handleReturnCode(returnCode)
+ (returnCode)
}
},
null)
@@ -248,6 +270,18 @@ class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync:
}
}
+ private def toByteArrays(enumeration: Enumeration[LedgerEntry]): Vector[Array[Byte]] = {
+ var entries = Vector[Array[Byte]]()
+ while (enumeration.hasMoreElements) {
+ val bytes = enumeration.nextElement.getEntry
+ val entry =
+ if (Cluster.shouldCompressData) LZF.uncompress(bytes)
+ else bytes
+ entries = entries :+ entry
+ }
+ entries
+ }
+
private def storeSnapshotMetaDataInZooKeeper(snapshotId: Long) {
if (isOpen.isOn) {
try {
@@ -265,8 +299,7 @@ class TransactionLog private (ledger: LedgerHandle, val id: String, val isAsync:
"Could not store transaction log snapshot meta-data in ZooKeeper for UUID [" +
id + "]"))
}
- EventHandler.debug(this,
- "Writing snapshot [%s] to log [%s]".format(snapshotId, logId))
+ EventHandler.debug(this, "Writing snapshot [%s] to log [%s]".format(snapshotId, logId))
} else transactionClosedError
}
@@ -292,12 +325,13 @@ object TransactionLog {
case "CRC32" ⇒ BookKeeper.DigestType.CRC32
case "MAC" ⇒ BookKeeper.DigestType.MAC
case unknown ⇒ throw new ConfigurationException(
- "akka.cluster.replication.digest-type is invalid [" + unknown + "]")
+ "akka.cluster.replication.digest-type is invalid [" + unknown + "], must be either 'CRC32' or 'MAC'")
}
val password = config.getString("akka.cluster.replication.password", "secret").getBytes("UTF-8")
val ensembleSize = config.getInt("akka.cluster.replication.ensemble-size", 3)
val quorumSize = config.getInt("akka.cluster.replication.quorum-size", 2)
- val timeout = 5000 // FIXME make configurable
+ val snapshotFrequency = config.getInt("akka.cluster.replication.snapshot-frequency", 1000)
+ val timeout = Duration(config.getInt("akka.cluster.replication.timeout", 30), TIME_UNIT).toMillis
private[akka] val transactionLogNode = "/transaction-log-ids"
@@ -333,8 +367,13 @@ object TransactionLog {
(bk, zk)
}
- private[akka] def apply(ledger: LedgerHandle, id: String, isAsync: Boolean = false) =
- new TransactionLog(ledger, id, isAsync)
+ private[akka] def apply(
+ ledger: LedgerHandle,
+ id: String,
+ isAsync: Boolean,
+ replicationScheme: ReplicationScheme,
+ format: Serializer) =
+ new TransactionLog(ledger, id, isAsync, replicationScheme, format)
/**
* Shuts down the transaction log.
@@ -355,7 +394,12 @@ object TransactionLog {
/**
* TODO document method
*/
- def newLogFor(id: String, isAsync: Boolean = false): TransactionLog = {
+ def newLogFor(
+ id: String,
+ isAsync: Boolean,
+ replicationScheme: ReplicationScheme,
+ format: Serializer): TransactionLog = {
+
val txLogPath = transactionLogNode + "/" + id
val ledger = try {
@@ -399,13 +443,18 @@ object TransactionLog {
}
EventHandler.info(this, "Created new transaction log [%s] for UUID [%s]".format(logId, id))
- TransactionLog(ledger, id, isAsync)
+ TransactionLog(ledger, id, isAsync, replicationScheme, format)
}
/**
* TODO document method
*/
- def logFor(id: String, isAsync: Boolean = false): TransactionLog = {
+ def logFor(
+ id: String,
+ isAsync: Boolean,
+ replicationScheme: ReplicationScheme,
+ format: Serializer): TransactionLog = {
+
val txLogPath = transactionLogNode + "/" + id
val logId = try {
@@ -444,7 +493,7 @@ object TransactionLog {
case e ⇒ handleError(e)
}
- TransactionLog(ledger, id, isAsync)
+ TransactionLog(ledger, id, isAsync, replicationScheme, format)
}
private[akka] def await[T](future: Promise[T]): T = {
@@ -489,15 +538,10 @@ object LocalBookKeeperEnsemble {
def shutdown() {
isRunning switchOff {
EventHandler.info(this, "Shutting down LocalBookKeeperEnsemble...")
- println("***************************** 1")
localBookKeeper.bs.foreach(_.shutdown()) // stop bookies
- println("***************************** 2")
localBookKeeper.zkc.close() // stop zk client
- println("***************************** 3")
localBookKeeper.zks.shutdown() // stop zk server
- println("***************************** 4")
localBookKeeper.serverFactory.shutdown() // stop zk NIOServer
- println("***************************** 5")
EventHandler.info(this, "LocalBookKeeperEnsemble shut down successfully")
}
}
diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusteredPingPongSample.scala b/akka-cluster/src/test/scala/akka/cluster/ClusteredPingPongSample.scala
index 4e1b358d89..43ef424aa8 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ClusteredPingPongSample.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ClusteredPingPongSample.scala
@@ -42,7 +42,7 @@ object PingPong {
count += 1
self reply Ball
} else {
- self.sender.foreach(_ !! Stop)
+ self.sender.foreach(s ⇒ (s ? Stop).await)
gameOverLatch.countDown
self.stop
}
diff --git a/akka-cluster/src/test/scala/akka/cluster/InMemoryStorageSpec.scala b/akka-cluster/src/test/scala/akka/cluster/InMemoryStorageSpec.scala
new file mode 100755
index 0000000000..7f3c6a26cd
--- /dev/null
+++ b/akka-cluster/src/test/scala/akka/cluster/InMemoryStorageSpec.scala
@@ -0,0 +1,251 @@
+package akka.cluster
+
+import org.scalatest.matchers.MustMatchers
+import org.scalatest.WordSpec
+import akka.cluster.StorageTestUtils._
+
+class InMemoryStorageSpec extends WordSpec with MustMatchers {
+
+ "unversioned load" must {
+ "throw MissingDataException if non existing key" in {
+ val store = new InMemoryStorage()
+
+ try {
+ store.load("foo")
+ fail()
+ } catch {
+ case e: MissingDataException ⇒
+ }
+ }
+
+ "return VersionedData if key existing" in {
+ val storage = new InMemoryStorage()
+ val key = "somekey"
+ val value = "somevalue".getBytes
+ storage.insert(key, value)
+
+ val result = storage.load(key)
+ //todo: strange that the implicit store is not found
+ assertContent(key, value, result.version)(storage)
+ }
+ }
+
+ "exist" must {
+ "return true if value exists" in {
+ val store = new InMemoryStorage()
+ val key = "somekey"
+ store.insert(key, "somevalue".getBytes)
+ store.exists(key) must be(true)
+ }
+
+ "return false if value not exists" in {
+ val store = new InMemoryStorage()
+ store.exists("somekey") must be(false)
+ }
+ }
+
+ "versioned load" must {
+ "throw MissingDataException if non existing key" in {
+ val store = new InMemoryStorage()
+
+ try {
+ store.load("foo", 1)
+ fail()
+ } catch {
+ case e: MissingDataException ⇒
+ }
+ }
+
+ "return VersionedData if key existing and exact version match" in {
+ val storage = new InMemoryStorage()
+ val key = "somekey"
+ val value = "somevalue".getBytes
+ val stored = storage.insert(key, value)
+
+ val result = storage.load(key, stored.version)
+ assert(result.version == stored.version)
+ assert(result.data == stored.data)
+ }
+
+ "throw VersioningException is version too new" in {
+ val storage = new InMemoryStorage()
+ val key = "somekey"
+ val value = "somevalue".getBytes
+ val stored = storage.insert(key, value)
+
+ try {
+ storage.load(key, stored.version + 1)
+ fail()
+ } catch {
+ case e: VersioningException ⇒
+ }
+ }
+
+ "throw VersioningException is version too old" in {
+ val storage = new InMemoryStorage()
+ val key = "somekey"
+ val value = "somevalue".getBytes
+ val stored = storage.insert(key, value)
+
+ try {
+ storage.load(key, stored.version - 1)
+ fail()
+ } catch {
+ case e: VersioningException ⇒
+ }
+ }
+ }
+
+ "insert" must {
+
+ "place a new value when non previously existed" in {
+ val storage = new InMemoryStorage()
+ val key = "somekey"
+ val oldValue = "oldvalue".getBytes
+ storage.insert(key, oldValue)
+
+ val result = storage.load(key)
+ assertContent(key, oldValue)(storage)
+ assert(InMemoryStorage.InitialVersion == result.version)
+ }
+
+ "throw MissingDataException when there already exists an entry with the same key" in {
+ val storage = new InMemoryStorage()
+ val key = "somekey"
+ val oldValue = "oldvalue".getBytes
+
+ val oldVersionedData = storage.insert(key, oldValue)
+
+ val newValue = "newValue".getBytes
+
+ try {
+ storage.insert(key, newValue)
+ fail()
+ } catch {
+ case e: DataExistsException ⇒
+ }
+
+ //make sure that the old value was not changed
+ assert(oldVersionedData == storage.load(key))
+ }
+ }
+
+ "update" must {
+
+ "throw MissingDataException when no node exists" in {
+ val storage = new InMemoryStorage()
+
+ val key = "somekey"
+
+ try {
+ storage.update(key, new VersionedData("somevalue".getBytes, 1))
+ fail()
+ } catch {
+ case e: MissingDataException ⇒
+ }
+ }
+
+ "replace if previous value exists and no other updates have been done" in {
+ val storage = new InMemoryStorage()
+
+ //do the initial insert
+ val key = "foo"
+ val oldValue = "insert".getBytes
+ val insert = storage.insert(key, oldValue)
+
+ //do the update the will be the cause of the conflict.
+ val updateValue = "update".getBytes
+ val update = insert.createUpdate(updateValue)
+ storage.update(key, update)
+
+ assertContent(key, update.data, update.version)(storage)
+ }
+
+ "throw VersioningException when already overwritten" in {
+ val storage = new InMemoryStorage()
+
+ //do the initial insert
+ val key = "foo"
+ val oldValue = "insert".getBytes
+ val insert = storage.insert(key, oldValue)
+
+ //do the update the will be the cause of the conflict.
+ val otherUpdateValue = "otherupdate".getBytes
+ val otherUpdate = insert.createUpdate(otherUpdateValue)
+ storage.update(key, otherUpdate)
+
+ val update = insert.createUpdate("update".getBytes)
+
+ try {
+ storage.update(key, update)
+ fail()
+ } catch {
+ case e: VersioningException ⇒
+ }
+
+ assertContent(key, otherUpdate.data, otherUpdate.version)(storage)
+ }
+ }
+
+ "overwrite" must {
+
+ "throw MissingDataException when no node exists" in {
+ val storage = new InMemoryStorage()
+ val key = "somekey"
+
+ try {
+ storage.overwrite(key, "somevalue".getBytes)
+ fail()
+ } catch {
+ case e: MissingDataException ⇒
+ }
+
+ storage.exists(key) must be(false)
+ }
+
+ "succeed if previous value exist" in {
+ val storage = new InMemoryStorage()
+ val key = "somekey"
+ val oldValue = "oldvalue".getBytes
+ val newValue: Array[Byte] = "somevalue".getBytes
+
+ val initialInsert: VersionedData = storage.insert(key, oldValue)
+
+ val result: VersionedData = storage.overwrite(key, newValue)
+
+ assert(result.version == initialInsert.version + 1)
+ assert(result.data == newValue)
+ storage.load(key) must be eq (result)
+ }
+ }
+
+ "insertOrOverwrite" must {
+ "insert if nothing was inserted before" in {
+ val storage = new InMemoryStorage()
+ val key = "somekey"
+ val value = "somevalue".getBytes
+
+ val result = storage.insertOrOverwrite(key, value)
+
+ assert(result.version == InMemoryStorage.InitialVersion)
+ assert(result.data == value)
+ storage.load(key) must be eq (result)
+ }
+
+ "overwrite of something existed before" in {
+ val storage = new InMemoryStorage()
+ val key = "somekey"
+ val oldValue = "oldvalue".getBytes
+ val newValue = "somevalue".getBytes
+
+ val initialInsert = storage.insert(key, oldValue)
+
+ val result = storage.insertOrOverwrite(key, newValue)
+
+ assert(result.version == initialInsert.version + 1)
+ assert(result.data == newValue)
+ storage.load(key) must be eq (result)
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/akka-cluster/src/test/scala/akka/cluster/ReplicationSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ReplicationSpec.scala
index 42423a3afc..79b706c9ea 100644
--- a/akka-cluster/src/test/scala/akka/cluster/ReplicationSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/ReplicationSpec.scala
@@ -32,31 +32,31 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
"A Transaction Log" should {
"be able to record entries - synchronous" in {
val uuid = (new UUID).toString
- val txlog = TransactionLog.newLogFor(uuid)
+ val txlog = TransactionLog.newLogFor(uuid, false, null, Format.Default)
val entry = "hello".getBytes("UTF-8")
txlog.recordEntry(entry)
}
"be able to record and delete entries - synchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid)
+ val txlog1 = TransactionLog.newLogFor(uuid, false, null, Format.Default)
val entry = "hello".getBytes("UTF-8")
txlog1.recordEntry(entry)
txlog1.recordEntry(entry)
txlog1.delete
txlog1.close
- intercept[BKNoSuchLedgerExistsException](TransactionLog.logFor(uuid))
+ intercept[BKNoSuchLedgerExistsException](TransactionLog.logFor(uuid, false, null, Format.Default))
}
"be able to record entries and read entries with 'entriesInRange' - synchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid)
+ val txlog1 = TransactionLog.newLogFor(uuid, false, null, Format.Default)
val entry = "hello".getBytes("UTF-8")
txlog1.recordEntry(entry)
txlog1.recordEntry(entry)
txlog1.close
- val txlog2 = TransactionLog.logFor(uuid)
+ val txlog2 = TransactionLog.logFor(uuid, false, null, Format.Default)
val entries = txlog2.entriesInRange(0, 1).map(bytes ⇒ new String(bytes, "UTF-8"))
entries.size must equal(2)
entries(0) must equal("hello")
@@ -66,7 +66,7 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
"be able to record entries and read entries with 'entries' - synchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid)
+ val txlog1 = TransactionLog.newLogFor(uuid, false, null, Format.Default)
val entry = "hello".getBytes("UTF-8")
txlog1.recordEntry(entry)
txlog1.recordEntry(entry)
@@ -74,7 +74,7 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
txlog1.recordEntry(entry)
txlog1.close
- val txlog2 = TransactionLog.logFor(uuid)
+ val txlog2 = TransactionLog.logFor(uuid, false, null, Format.Default)
val entries = txlog2.entries.map(bytes ⇒ new String(bytes, "UTF-8"))
entries.size must equal(4)
entries(0) must equal("hello")
@@ -86,7 +86,7 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
"be able to record a snapshot - synchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid)
+ val txlog1 = TransactionLog.newLogFor(uuid, false, null, Format.Default)
val snapshot = "snapshot".getBytes("UTF-8")
txlog1.recordSnapshot(snapshot)
txlog1.close
@@ -94,7 +94,7 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
"be able to record and read a snapshot and following entries - synchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid)
+ val txlog1 = TransactionLog.newLogFor(uuid, false, null, Format.Default)
val snapshot = "snapshot".getBytes("UTF-8")
txlog1.recordSnapshot(snapshot)
@@ -105,8 +105,8 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
txlog1.recordEntry(entry)
txlog1.close
- val txlog2 = TransactionLog.logFor(uuid)
- val (snapshotAsBytes, entriesAsBytes) = txlog2.entriesFromLatestSnapshot
+ val txlog2 = TransactionLog.logFor(uuid, false, null, Format.Default)
+ val (snapshotAsBytes, entriesAsBytes) = txlog2.toByteArraysLatestSnapshot
new String(snapshotAsBytes, "UTF-8") must equal("snapshot")
val entries = entriesAsBytes.map(bytes ⇒ new String(bytes, "UTF-8"))
@@ -120,7 +120,7 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
"be able to record entries then a snapshot then more entries - and then read from the snapshot and the following entries - synchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid)
+ val txlog1 = TransactionLog.newLogFor(uuid, false, null, Format.Default)
val entry = "hello".getBytes("UTF-8")
txlog1.recordEntry(entry)
@@ -134,8 +134,8 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
txlog1.recordEntry(entry)
txlog1.close
- val txlog2 = TransactionLog.logFor(uuid)
- val (snapshotAsBytes, entriesAsBytes) = txlog2.entriesFromLatestSnapshot
+ val txlog2 = TransactionLog.logFor(uuid, false, null, Format.Default)
+ val (snapshotAsBytes, entriesAsBytes) = txlog2.toByteArraysLatestSnapshot
new String(snapshotAsBytes, "UTF-8") must equal("snapshot")
val entries = entriesAsBytes.map(bytes ⇒ new String(bytes, "UTF-8"))
@@ -149,7 +149,7 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
"A Transaction Log" should {
"be able to record entries - asynchronous" in {
val uuid = (new UUID).toString
- val txlog = TransactionLog.newLogFor(uuid, true)
+ val txlog = TransactionLog.newLogFor(uuid, true, null, Format.Default)
val entry = "hello".getBytes("UTF-8")
txlog.recordEntry(entry)
Thread.sleep(100)
@@ -158,24 +158,24 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
"be able to record and delete entries - asynchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid, true)
+ val txlog1 = TransactionLog.newLogFor(uuid, true, null, Format.Default)
val entry = "hello".getBytes("UTF-8")
txlog1.recordEntry(entry)
txlog1.recordEntry(entry)
txlog1.delete
Thread.sleep(100)
- intercept[BKNoSuchLedgerExistsException](TransactionLog.logFor(uuid, true))
+ intercept[BKNoSuchLedgerExistsException](TransactionLog.logFor(uuid, true, null, Format.Default))
}
"be able to record entries and read entries with 'entriesInRange' - asynchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid, true)
+ val txlog1 = TransactionLog.newLogFor(uuid, true, null, Format.Default)
val entry = "hello".getBytes("UTF-8")
txlog1.recordEntry(entry)
txlog1.recordEntry(entry)
Thread.sleep(100)
txlog1.close
- val txlog2 = TransactionLog.logFor(uuid, true)
+ val txlog2 = TransactionLog.logFor(uuid, true, null, Format.Default)
val entries = txlog2.entriesInRange(0, 1).map(bytes ⇒ new String(bytes, "UTF-8"))
entries.size must equal(2)
entries(0) must equal("hello")
@@ -186,7 +186,7 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
"be able to record entries and read entries with 'entries' - asynchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid, true)
+ val txlog1 = TransactionLog.newLogFor(uuid, true, null, Format.Default)
val entry = "hello".getBytes("UTF-8")
txlog1.recordEntry(entry)
txlog1.recordEntry(entry)
@@ -195,7 +195,7 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
Thread.sleep(100)
txlog1.close
- val txlog2 = TransactionLog.logFor(uuid, true)
+ val txlog2 = TransactionLog.logFor(uuid, true, null, Format.Default)
val entries = txlog2.entries.map(bytes ⇒ new String(bytes, "UTF-8"))
entries.size must equal(4)
entries(0) must equal("hello")
@@ -208,7 +208,7 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
"be able to record a snapshot - asynchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid, true)
+ val txlog1 = TransactionLog.newLogFor(uuid, true, null, Format.Default)
val snapshot = "snapshot".getBytes("UTF-8")
txlog1.recordSnapshot(snapshot)
Thread.sleep(100)
@@ -217,7 +217,7 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
"be able to record and read a snapshot and following entries - asynchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid, true)
+ val txlog1 = TransactionLog.newLogFor(uuid, true, null, Format.Default)
val snapshot = "snapshot".getBytes("UTF-8")
txlog1.recordSnapshot(snapshot)
@@ -229,8 +229,8 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
Thread.sleep(100)
txlog1.close
- val txlog2 = TransactionLog.logFor(uuid, true)
- val (snapshotAsBytes, entriesAsBytes) = txlog2.entriesFromLatestSnapshot
+ val txlog2 = TransactionLog.logFor(uuid, true, null, Format.Default)
+ val (snapshotAsBytes, entriesAsBytes) = txlog2.toByteArraysLatestSnapshot
new String(snapshotAsBytes, "UTF-8") must equal("snapshot")
val entries = entriesAsBytes.map(bytes ⇒ new String(bytes, "UTF-8"))
@@ -245,7 +245,7 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
"be able to record entries then a snapshot then more entries - and then read from the snapshot and the following entries - asynchronous" in {
val uuid = (new UUID).toString
- val txlog1 = TransactionLog.newLogFor(uuid, true)
+ val txlog1 = TransactionLog.newLogFor(uuid, true, null, Format.Default)
val entry = "hello".getBytes("UTF-8")
txlog1.recordEntry(entry)
@@ -258,8 +258,8 @@ class ReplicationSpec extends WordSpec with MustMatchers with BeforeAndAfterAll
Thread.sleep(100)
txlog1.close
- val txlog2 = TransactionLog.logFor(uuid, true)
- val (snapshotAsBytes, entriesAsBytes) = txlog2.entriesFromLatestSnapshot
+ val txlog2 = TransactionLog.logFor(uuid, true, null, Format.Default)
+ val (snapshotAsBytes, entriesAsBytes) = txlog2.toByteArraysLatestSnapshot
new String(snapshotAsBytes, "UTF-8") must equal("snapshot")
val entries = entriesAsBytes.map(bytes ⇒ new String(bytes, "UTF-8"))
entries.size must equal(2)
diff --git a/akka-cluster/src/test/scala/akka/cluster/StorageSpec.scala b/akka-cluster/src/test/scala/akka/cluster/StorageSpec.scala
deleted file mode 100644
index 535313c3a5..0000000000
--- a/akka-cluster/src/test/scala/akka/cluster/StorageSpec.scala
+++ /dev/null
@@ -1,165 +0,0 @@
-package akka.cluster
-
-import org.scalatest.matchers.MustMatchers
-import org.scalatest.WordSpec
-
-class InMemoryStorageSpec extends WordSpec with MustMatchers {
-
- "unversioned load" must {
- "throw MissingNodeException if non existing key" in {
- val store = new InMemoryStorage()
-
- try {
- store.load("foo")
- fail()
- } catch {
- case e: MissingNodeException ⇒
- }
- }
-
- "return VersionedData if key existing" in {
- val storage = new InMemoryStorage()
- val key = "somekey"
- val value = "somevalue".getBytes
- storage.insert(key, value)
-
- val result = storage.load(key)
- //todo: strange that the implicit store is not found
- assertContent(key, value, result.version)(storage)
- }
- }
-
- "exist" must {
- "return true if value exists" in {
- val store = new InMemoryStorage()
- val key = "somekey"
- store.insert(key, "somevalue".getBytes)
- store.exists(key) must be(true)
- }
-
- "return false if value not exists" in {
- val store = new InMemoryStorage()
- store.exists("somekey") must be(false)
- }
- }
-
- "versioned load" must {
- "throw MissingNodeException if non existing key" in {
- val store = new InMemoryStorage()
-
- try {
- store.load("foo", 1)
- fail()
- } catch {
- case e: MissingNodeException ⇒
- }
- }
-
- "return VersionedData if key existing and exact version match" in {
- val storage = new InMemoryStorage()
- val key = "somekey"
- val value = "somevalue".getBytes
- val stored = storage.insert(key, value)
-
- val result = storage.load(key, stored.version)
- assert(result.version == stored.version)
- assert(result.data == stored.data)
- }
-
- "throw VersioningMismatchStorageException is version too new" in {
- val storage = new InMemoryStorage()
- val key = "somekey"
- val value = "somevalue".getBytes
- val stored = storage.insert(key, value)
-
- try {
- storage.load(key, stored.version + 1)
- fail()
- } catch {
- case e: VersioningMismatchStorageException ⇒
- }
- }
-
- "throw VersioningMismatchStorageException is version too old" in {
- val storage = new InMemoryStorage()
- val key = "somekey"
- val value = "somevalue".getBytes
- val stored = storage.insert(key, value)
-
- try {
- storage.load(key, stored.version - 1)
- fail()
- } catch {
- case e: VersioningMismatchStorageException ⇒
- }
- }
- }
-
- "insert" must {
-
- "place a new value when non previously existed" in {
- val storage = new InMemoryStorage()
- val key = "somekey"
- val oldValue = "oldvalue".getBytes
- storage.insert(key, oldValue)
-
- val result = storage.load(key)
- assertContent(key, oldValue)(storage)
- assert(InMemoryStorage.InitialVersion == result.version)
- }
-
- "throw MissingNodeException when there already exists an entry with the same key" in {
- val storage = new InMemoryStorage()
- val key = "somekey"
- val oldValue = "oldvalue".getBytes
-
- val oldVersionedData = storage.insert(key, oldValue)
-
- val newValue = "newValue".getBytes
-
- try {
- storage.insert(key, newValue)
- fail()
- } catch {
- case e: NodeExistsException ⇒
- }
-
- //make sure that the old value was not changed
- assert(oldVersionedData == storage.load(key))
- }
- }
-
- "update with versioning" must {
-
- "throw NoNodeException when no node exists" in {
- val storage = new InMemoryStorage()
-
- val key = "somekey"
-
- try {
- storage.update(key, new VersionedData("somevalue".getBytes, 1))
- fail()
- } catch {
- case e: MissingNodeException ⇒
- }
- }
-
- "throw OptimisticLockException when ..." in {
-
- }
-
- "replace" in {
- }
- }
-
- def assertContent(key: String, expectedData: Array[Byte], expectedVersion: Long)(implicit storage: InMemoryStorage) {
- val found = storage.load(key)
- assert(found.version == expectedVersion)
- assert(expectedData == found.data) //todo: structural equals
- }
-
- def assertContent(key: String, expectedData: Array[Byte])(implicit storage: InMemoryStorage) {
- val found = storage.load(key)
- assert(expectedData == found.data) //todo: structural equals
- }
-}
\ No newline at end of file
diff --git a/akka-cluster/src/test/scala/akka/cluster/StorageTestUtils.scala b/akka-cluster/src/test/scala/akka/cluster/StorageTestUtils.scala
new file mode 100644
index 0000000000..99ceaf0070
--- /dev/null
+++ b/akka-cluster/src/test/scala/akka/cluster/StorageTestUtils.scala
@@ -0,0 +1,15 @@
+package akka.cluster
+
+object StorageTestUtils {
+
+ def assertContent(key: String, expectedData: Array[Byte], expectedVersion: Long)(implicit storage: InMemoryStorage) {
+ val found = storage.load(key)
+ assert(found.version == expectedVersion)
+ assert(expectedData == found.data) //todo: structural equals
+ }
+
+ def assertContent(key: String, expectedData: Array[Byte])(implicit storage: InMemoryStorage) {
+ val found = storage.load(key)
+ assert(expectedData == found.data) //todo: structural equals
+ }
+}
\ No newline at end of file
diff --git a/akka-cluster/src/test/scala/akka/cluster/ZooKeeperStorageSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ZooKeeperStorageSpec.scala
new file mode 100644
index 0000000000..a4bda26c77
--- /dev/null
+++ b/akka-cluster/src/test/scala/akka/cluster/ZooKeeperStorageSpec.scala
@@ -0,0 +1,58 @@
+package akka.cluster
+
+import org.scalatest.matchers.MustMatchers
+import akka.actor.Actor
+import org.scalatest.{ BeforeAndAfterEach, BeforeAndAfterAll, WordSpec }
+import org.I0Itec.zkclient.ZkServer
+import zookeeper.AkkaZkClient
+
+class ZooKeeperStorageSpec extends WordSpec with MustMatchers with BeforeAndAfterAll with BeforeAndAfterEach {
+ val dataPath = "_akka_cluster/data"
+ val logPath = "_akka_cluster/log"
+ var zkServer: ZkServer = _
+ var zkClient: AkkaZkClient = _
+
+ override def beforeAll() {
+ try {
+ zkServer = Cluster.startLocalCluster(dataPath, logPath)
+ Thread.sleep(5000)
+ Actor.cluster.start()
+ zkClient = Cluster.newZkClient()
+ } catch {
+ case e ⇒ e.printStackTrace()
+ }
+ }
+
+ override def afterAll() {
+ zkClient.close()
+ Actor.cluster.shutdown()
+ ClusterDeployer.shutdown()
+ Cluster.shutdownLocalCluster()
+ Actor.registry.local.shutdownAll()
+ }
+
+ "unversioned load" must {
+ "throw MissingDataException if non existing key" in {
+ val store = new ZooKeeperStorage(zkClient)
+
+ //try {
+ // store.load("foo")
+ // fail()
+ //} catch {
+ // case e: MissingDataException ⇒
+ //}
+ }
+
+ /*
+ "return VersionedData if key existing" in {
+ val storage = new InMemoryStorage()
+ val key = "somekey"
+ val value = "somevalue".getBytes
+ storage.insert(key, value)
+
+ val result = storage.load(key)
+ //todo: strange that the implicit store is not found
+ assertContent(key, value, result.version)(storage)
+ } */
+ }
+}
\ No newline at end of file
diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_1_replica/RoundRobin1ReplicaMultiJvmSpec.scala b/akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_1_replica/RoundRobin1ReplicaMultiJvmSpec.scala
index 1f6d60efc3..52f85fead1 100644
--- a/akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_1_replica/RoundRobin1ReplicaMultiJvmSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_1_replica/RoundRobin1ReplicaMultiJvmSpec.scala
@@ -8,9 +8,12 @@ import org.scalatest.WordSpec
import org.scalatest.matchers.MustMatchers
import org.scalatest.BeforeAndAfterAll
+import org.apache.bookkeeper.client.{ BookKeeper, BKException }
+import BKException._
+
import akka.cluster._
import akka.actor._
-import Actor._
+import akka.actor.Actor._
import akka.config.Config
object RoundRobin1ReplicaMultiJvmSpec {
@@ -27,6 +30,9 @@ object RoundRobin1ReplicaMultiJvmSpec {
class RoundRobin1ReplicaMultiJvmNode1 extends WordSpec with MustMatchers with BeforeAndAfterAll {
import RoundRobin1ReplicaMultiJvmSpec._
+ private var bookKeeper: BookKeeper = _
+ private var localBookKeeper: LocalBookKeeper = _
+
"A cluster" must {
"create clustered actor, get a 'local' actor on 'home' node and a 'ref' to actor on remote node" in {
@@ -49,10 +55,13 @@ class RoundRobin1ReplicaMultiJvmNode1 extends WordSpec with MustMatchers with Be
override def beforeAll() = {
Cluster.startLocalCluster()
+ LocalBookKeeperEnsemble.start()
}
override def afterAll() = {
Cluster.shutdownLocalCluster()
+ TransactionLog.shutdown()
+ LocalBookKeeperEnsemble.shutdown()
}
}
@@ -81,7 +90,7 @@ class RoundRobin1ReplicaMultiJvmNode2 extends WordSpec with MustMatchers {
Cluster.barrier("send-message-from-node2-to-node1", NrOfNodes) {
hello must not equal (null)
- val reply = (hello !! "Hello").as[String].getOrElse(fail("Should have recieved reply from node1"))
+ val reply = (hello ? "Hello").as[String].getOrElse(fail("Should have recieved reply from node1"))
reply must equal("World from node [node1]")
}
diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_2_replicas/RoundRobin2ReplicasMultiJvmSpec.scala b/akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_2_replicas/RoundRobin2ReplicasMultiJvmSpec.scala
index 9f3083868b..a65abd2b1c 100644
--- a/akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_2_replicas/RoundRobin2ReplicasMultiJvmSpec.scala
+++ b/akka-cluster/src/test/scala/akka/cluster/routing/roundrobin_2_replicas/RoundRobin2ReplicasMultiJvmSpec.scala
@@ -8,9 +8,12 @@ import org.scalatest.WordSpec
import org.scalatest.matchers.MustMatchers
import org.scalatest.BeforeAndAfterAll
+import org.apache.bookkeeper.client.{ BookKeeper, BKException }
+import BKException._
+
import akka.cluster._
import akka.actor._
-import Actor._
+import akka.actor.Actor._
import akka.config.Config
object RoundRobin2ReplicasMultiJvmSpec {
@@ -28,6 +31,9 @@ object RoundRobin2ReplicasMultiJvmSpec {
class RoundRobin2ReplicasMultiJvmNode1 extends WordSpec with MustMatchers with BeforeAndAfterAll {
import RoundRobin2ReplicasMultiJvmSpec._
+ private var bookKeeper: BookKeeper = _
+ private var localBookKeeper: LocalBookKeeper = _
+
"A cluster" must {
"create clustered actor, get a 'local' actor on 'home' node and a 'ref' to actor on remote node" in {
@@ -52,10 +58,13 @@ class RoundRobin2ReplicasMultiJvmNode1 extends WordSpec with MustMatchers with B
override def beforeAll() = {
Cluster.startLocalCluster()
+ LocalBookKeeperEnsemble.start()
}
override def afterAll() = {
Cluster.shutdownLocalCluster()
+ TransactionLog.shutdown()
+ LocalBookKeeperEnsemble.shutdown()
}
}
@@ -93,14 +102,14 @@ class RoundRobin2ReplicasMultiJvmNode2 extends WordSpec with MustMatchers {
else replies.put(reply, replies(reply) + 1)
}
- count((hello !! "Hello").as[String].getOrElse(fail("Should have recieved reply from node1")))
- count((hello !! "Hello").as[String].getOrElse(fail("Should have recieved reply from node3")))
- count((hello !! "Hello").as[String].getOrElse(fail("Should have recieved reply from node1")))
- count((hello !! "Hello").as[String].getOrElse(fail("Should have recieved reply from node3")))
- count((hello !! "Hello").as[String].getOrElse(fail("Should have recieved reply from node1")))
- count((hello !! "Hello").as[String].getOrElse(fail("Should have recieved reply from node3")))
- count((hello !! "Hello").as[String].getOrElse(fail("Should have recieved reply from node1")))
- count((hello !! "Hello").as[String].getOrElse(fail("Should have recieved reply from node3")))
+ count((hello ? "Hello").as[String].getOrElse(fail("Should have recieved reply from node1")))
+ count((hello ? "Hello").as[String].getOrElse(fail("Should have recieved reply from node3")))
+ count((hello ? "Hello").as[String].getOrElse(fail("Should have recieved reply from node1")))
+ count((hello ? "Hello").as[String].getOrElse(fail("Should have recieved reply from node3")))
+ count((hello ? "Hello").as[String].getOrElse(fail("Should have recieved reply from node1")))
+ count((hello ? "Hello").as[String].getOrElse(fail("Should have recieved reply from node3")))
+ count((hello ? "Hello").as[String].getOrElse(fail("Should have recieved reply from node1")))
+ count((hello ? "Hello").as[String].getOrElse(fail("Should have recieved reply from node3")))
replies("World from node [node1]") must equal(4)
replies("World from node [node3]") must equal(4)
diff --git a/akka-docs/cluster/durable-mailbox.rst b/akka-docs/cluster/durable-mailbox.rst
index 63564825a9..b24e1fea30 100644
--- a/akka-docs/cluster/durable-mailbox.rst
+++ b/akka-docs/cluster/durable-mailbox.rst
@@ -18,8 +18,8 @@ in its mailbox.
.. sidebar:: **IMPORTANT**
None of these mailboxes work with blocking message send, e.g. the message
- send operations that are relying on futures; ``!!``, ``!!!``,
- ``sendRequestReply`` and ``sendRequestReplyFuture``. If the node has crashed
+ send operations that are relying on futures; ``!!``, ``?``,
+ ``sendRequestReply`` and ``ask``. If the node has crashed
and then restarted, the thread that was blocked waiting for the reply is gone
and there is no way we can deliver the message.
diff --git a/akka-docs/disabled/getting-started-first.rst b/akka-docs/disabled/getting-started-first.rst
index 6c955dc7f2..b0817fa22f 100644
--- a/akka-docs/disabled/getting-started-first.rst
+++ b/akka-docs/disabled/getting-started-first.rst
@@ -67,7 +67,7 @@ Here is the master actor:
A couple of things are worth explaining further.
-First, we are passing in a ``java.util.concurrent.CountDownLatch`` to the ``Master`` actor. This latch is only used for plumbing (in this specific tutorial), to have a simple way of letting the outside world knowing when the master can deliver the result and shut down. In more idiomatic Akka code, as we will see in part two of this tutorial series, we would not use a latch but other abstractions and functions like ``Channel``, ``Future`` and ``!!!`` to achive the same thing in a non-blocking way. But for simplicity let's stick to a ``CountDownLatch`` for now.
+First, we are passing in a ``java.util.concurrent.CountDownLatch`` to the ``Master`` actor. This latch is only used for plumbing (in this specific tutorial), to have a simple way of letting the outside world knowing when the master can deliver the result and shut down. In more idiomatic Akka code, as we will see in part two of this tutorial series, we would not use a latch but other abstractions and functions like ``Channel``, ``Future`` and ``?`` to achive the same thing in a non-blocking way. But for simplicity let's stick to a ``CountDownLatch`` for now.
Second, we are adding a couple of life-cycle callback methods; ``preStart`` and ``postStop``. In the ``preStart`` callback we are recording the time when the actor is started and in the ``postStop`` callback we are printing out the result (the approximation of Pi) and the time it took to calculate it. In this call we also invoke ``latch.countDown`` to tell the outside world that we are done.
diff --git a/akka-docs/intro/getting-started-first-java.rst b/akka-docs/intro/getting-started-first-java.rst
index 07c74dde63..57bfd01db9 100644
--- a/akka-docs/intro/getting-started-first-java.rst
+++ b/akka-docs/intro/getting-started-first-java.rst
@@ -435,7 +435,7 @@ Here is the master actor::
A couple of things are worth explaining further.
-First, we are passing in a ``java.util.concurrent.CountDownLatch`` to the ``Master`` actor. This latch is only used for plumbing (in this specific tutorial), to have a simple way of letting the outside world knowing when the master can deliver the result and shut down. In more idiomatic Akka code, as we will see in part two of this tutorial series, we would not use a latch but other abstractions and functions like ``Channel``, ``Future`` and ``!!!`` to achieve the same thing in a non-blocking way. But for simplicity let's stick to a ``CountDownLatch`` for now.
+First, we are passing in a ``java.util.concurrent.CountDownLatch`` to the ``Master`` actor. This latch is only used for plumbing (in this specific tutorial), to have a simple way of letting the outside world knowing when the master can deliver the result and shut down. In more idiomatic Akka code, as we will see in part two of this tutorial series, we would not use a latch but other abstractions and functions like ``Channel``, ``Future`` and ``?`` to achieve the same thing in a non-blocking way. But for simplicity let's stick to a ``CountDownLatch`` for now.
Second, we are adding a couple of life-cycle callback methods; ``preStart`` and ``postStop``. In the ``preStart`` callback we are recording the time when the actor is started and in the ``postStop`` callback we are printing out the result (the approximation of Pi) and the time it took to calculate it. In this call we also invoke ``latch.countDown()`` to tell the outside world that we are done.
diff --git a/akka-docs/intro/getting-started-first-scala-eclipse.rst b/akka-docs/intro/getting-started-first-scala-eclipse.rst
index 3e4da8f619..d9c7356471 100644
--- a/akka-docs/intro/getting-started-first-scala-eclipse.rst
+++ b/akka-docs/intro/getting-started-first-scala-eclipse.rst
@@ -335,7 +335,7 @@ Here is the master actor::
A couple of things are worth explaining further.
-First, we are passing in a ``java.util.concurrent.CountDownLatch`` to the ``Master`` actor. This latch is only used for plumbing (in this specific tutorial), to have a simple way of letting the outside world knowing when the master can deliver the result and shut down. In more idiomatic Akka code, as we will see in part two of this tutorial series, we would not use a latch but other abstractions and functions like ``Channel``, ``Future`` and ``!!!`` to achieve the same thing in a non-blocking way. But for simplicity let's stick to a ``CountDownLatch`` for now.
+First, we are passing in a ``java.util.concurrent.CountDownLatch`` to the ``Master`` actor. This latch is only used for plumbing (in this specific tutorial), to have a simple way of letting the outside world knowing when the master can deliver the result and shut down. In more idiomatic Akka code, as we will see in part two of this tutorial series, we would not use a latch but other abstractions and functions like ``Channel``, ``Future`` and ``?`` to achieve the same thing in a non-blocking way. But for simplicity let's stick to a ``CountDownLatch`` for now.
Second, we are adding a couple of life-cycle callback methods; ``preStart`` and ``postStop``. In the ``preStart`` callback we are recording the time when the actor is started and in the ``postStop`` callback we are printing out the result (the approximation of Pi) and the time it took to calculate it. In this call we also invoke ``latch.countDown`` to tell the outside world that we are done.
diff --git a/akka-docs/intro/getting-started-first-scala.rst b/akka-docs/intro/getting-started-first-scala.rst
index 2873531dfe..05ce8a15ce 100644
--- a/akka-docs/intro/getting-started-first-scala.rst
+++ b/akka-docs/intro/getting-started-first-scala.rst
@@ -329,7 +329,7 @@ Here is the master actor::
A couple of things are worth explaining further.
-First, we are passing in a ``java.util.concurrent.CountDownLatch`` to the ``Master`` actor. This latch is only used for plumbing (in this specific tutorial), to have a simple way of letting the outside world knowing when the master can deliver the result and shut down. In more idiomatic Akka code, as we will see in part two of this tutorial series, we would not use a latch but other abstractions and functions like ``Channel``, ``Future`` and ``!!!`` to achieve the same thing in a non-blocking way. But for simplicity let's stick to a ``CountDownLatch`` for now.
+First, we are passing in a ``java.util.concurrent.CountDownLatch`` to the ``Master`` actor. This latch is only used for plumbing (in this specific tutorial), to have a simple way of letting the outside world knowing when the master can deliver the result and shut down. In more idiomatic Akka code, as we will see in part two of this tutorial series, we would not use a latch but other abstractions and functions like ``Channel``, ``Future`` and ``?`` to achieve the same thing in a non-blocking way. But for simplicity let's stick to a ``CountDownLatch`` for now.
Second, we are adding a couple of life-cycle callback methods; ``preStart`` and ``postStop``. In the ``preStart`` callback we are recording the time when the actor is started and in the ``postStop`` callback we are printing out the result (the approximation of Pi) and the time it took to calculate it. In this call we also invoke ``latch.countDown`` to tell the outside world that we are done.
diff --git a/akka-docs/java/dispatchers.rst b/akka-docs/java/dispatchers.rst
index b67cb1c02e..7f8998c18e 100644
--- a/akka-docs/java/dispatchers.rst
+++ b/akka-docs/java/dispatchers.rst
@@ -13,7 +13,7 @@ The Dispatcher is an important piece that allows you to configure the right sema
Akka supports dispatchers for both event-driven lightweight threads, allowing creation of millions threads on a single workstation, and thread-based Actors, where each dispatcher is bound to a dedicated OS thread.
-The event-based Actors currently consume ~600 bytes per Actor which means that you can create more than 6.5 million Actors on 4 G RAM.
+The event-based Actors currently consume ~600 bytes per Actor which means that you can create more than 6.5 million Actors on 4 GB RAM.
Default dispatcher
------------------
@@ -84,6 +84,7 @@ The 'Dispatcher' binds a set of Actors to a thread pool backed up by a 'Blocking
The event-driven dispatchers **must be shared** between multiple Typed Actors and/or Actors. One best practice is to let each top-level Actor, e.g. the Actors you define in the declarative supervisor config, to get their own dispatcher but reuse the dispatcher for each new Actor that the top-level Actor creates. But you can also share dispatcher between multiple top-level Actors. This is very use-case specific and needs to be tried out on a case by case basis. The important thing is that Akka tries to provide you with the freedom you need to design and implement your system in the most efficient way in regards to performance, throughput and latency.
It comes with many different predefined BlockingQueue configurations:
+
* Bounded LinkedBlockingQueue
* Unbounded LinkedBlockingQueue
* Bounded ArrayBlockingQueue
diff --git a/akka-docs/java/futures.rst b/akka-docs/java/futures.rst
index 660dc6bd05..91fc62cd4d 100644
--- a/akka-docs/java/futures.rst
+++ b/akka-docs/java/futures.rst
@@ -17,11 +17,11 @@ Use with Actors
There are generally two ways of getting a reply from an ``UntypedActor``: the first is by a sent message (``actorRef.sendOneWay(msg);``), which only works if the original sender was an ``UntypedActor``) and the second is through a ``Future``.
-Using the ``ActorRef``\'s ``sendRequestReplyFuture`` method to send a message will return a Future. To wait for and retrieve the actual result the simplest method is:
+Using the ``ActorRef``\'s ``ask`` method to send a message will return a Future. To wait for and retrieve the actual result the simplest method is:
.. code-block:: java
- Future[Object] future = actorRef.sendRequestReplyFuture[Object](msg);
+ Future[Object] future = actorRef.ask[Object](msg);
Object result = future.get(); //Block until result is available, usually bad practice
This will cause the current thread to block and wait for the ``UntypedActor`` to 'complete' the ``Future`` with it's reply. Due to the dynamic nature of Akka's ``UntypedActor``\s this result can be anything. The safest way to deal with this is to specify the result to an ``Object`` as is shown in the above example. You can also use the expected result type instead of ``Any``, but if an unexpected type were to be returned you will get a ``ClassCastException``. For more elegant ways to deal with this and to use the result without blocking, refer to `Functional Futures`_.
diff --git a/akka-docs/java/typed-actors.rst b/akka-docs/java/typed-actors.rst
index daed909727..2eb02f6ebc 100644
--- a/akka-docs/java/typed-actors.rst
+++ b/akka-docs/java/typed-actors.rst
@@ -115,6 +115,7 @@ Methods that return something (e.g. non-void methods) are turned into ‘send-an
User user = service.getUser(username);
Generally it is preferred to use fire-forget messages as much as possible since they will never block, e.g. consume a resource by waiting. But sometimes they are neat to use since they:
+
# Simulates standard Java method dispatch, which is more intuitive for most Java developers
# Are a neat to model request-reply
# Are useful when you need to do things in a defined order
diff --git a/akka-docs/java/untyped-actors.rst b/akka-docs/java/untyped-actors.rst
index 7d6cec6013..db698b1a4f 100644
--- a/akka-docs/java/untyped-actors.rst
+++ b/akka-docs/java/untyped-actors.rst
@@ -109,7 +109,7 @@ Send messages
Messages are sent to an Actor through one of the 'send' methods.
* 'sendOneWay' means “fire-and-forget”, e.g. send a message asynchronously and return immediately.
* 'sendRequestReply' means “send-and-reply-eventually”, e.g. send a message asynchronously and wait for a reply through a Future. Here you can specify a timeout. Using timeouts is very important. If no timeout is specified then the actor’s default timeout (set by the 'getContext().setTimeout(..)' method in the 'ActorRef') is used. This method throws an 'ActorTimeoutException' if the call timed out.
-* 'sendRequestReplyFuture' sends a message asynchronously and returns a 'Future'.
+* 'ask' sends a message asynchronously and returns a 'Future'.
In all these methods you have the option of passing along your 'ActorRef' context variable. Make it a practice of doing so because it will allow the receiver actors to be able to respond to your message, since the sender reference is sent along with the message.
@@ -158,11 +158,11 @@ Here are some examples:
Send-And-Receive-Future
^^^^^^^^^^^^^^^^^^^^^^^
-Using 'sendRequestReplyFuture' will send a message to the receiving Actor asynchronously and will immediately return a 'Future'.
+Using 'ask' will send a message to the receiving Actor asynchronously and will immediately return a 'Future'.
.. code-block:: java
- Future future = actorRef.sendRequestReplyFuture("Hello", getContext(), 1000);
+ Future future = actorRef.ask("Hello", getContext(), 1000);
The 'Future' interface looks like this:
@@ -182,7 +182,7 @@ So the normal way of working with futures is something like this:
.. code-block:: java
- Future future = actorRef.sendRequestReplyFuture("Hello", getContext(), 1000);
+ Future future = actorRef.ask("Hello", getContext(), 1000);
future.await();
if (future.isCompleted()) {
Option resultOption = future.result();
@@ -305,7 +305,7 @@ On this 'Option' you can invoke 'boolean isDefined()' or 'boolean isEmpty()' to
Reply using the sender future
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-If a message was sent with the 'sendRequestReply' or 'sendRequestReplyFuture' methods, which both implements request-reply semantics using Future's, then you either have the option of replying using the 'reply' method as above. This method will then resolve the Future. But you can also get a reference to the Future directly and resolve it yourself or if you would like to store it away to resolve it later, or pass it on to some other Actor to resolve it.
+If a message was sent with the 'sendRequestReply' or 'ask' methods, which both implements request-reply semantics using Future's, then you either have the option of replying using the 'reply' method as above. This method will then resolve the Future. But you can also get a reference to the Future directly and resolve it yourself or if you would like to store it away to resolve it later, or pass it on to some other Actor to resolve it.
The reference to the Future resides in the 'ActorRef' instance and can be retrieved using 'Option getSenderFuture()'.
diff --git a/akka-docs/modules/spring.rst b/akka-docs/modules/spring.rst
index 29bf4632cf..d8ec97b72c 100644
--- a/akka-docs/modules/spring.rst
+++ b/akka-docs/modules/spring.rst
@@ -323,7 +323,7 @@ The Akka configuration can be made available as property placeholders by using a
-
Camel configuration
diff --git a/akka-docs/project/release-notes.rst b/akka-docs/project/release-notes.rst
index 5e6be44ae7..20553a15a8 100644
--- a/akka-docs/project/release-notes.rst
+++ b/akka-docs/project/release-notes.rst
@@ -524,7 +524,7 @@ Release 0.6 - January 5th 2010
- **ADD** - New and much improved docs (Jonas Bonér)
- **ADD** - Enhanced trapping of failures: 'trapExit = List(classOf[..], classOf[..])' (Jonas Bonér)
- **ADD** - Upgraded to Netty 3.2, Protobuf 2.2, ScalaTest 1.0, Jersey 1.1.3, Atmosphere 0.4.1, Cassandra 0.4.1, Configgy 1.4 (Jonas Bonér)
-- **FIX** - Lowered actor memory footprint; now an actor consumes ~600 bytes, which mean that you can create 6.5 million on 4 G RAM (Jonas Bonér)
+- **FIX** - Lowered actor memory footprint; now an actor consumes ~600 bytes, which mean that you can create 6.5 million on 4 GB RAM (Jonas Bonér)
- **FIX** - Remote actors are now defined by their UUID (not class name) (Jonas Bonér)
- **FIX** - Fixed dispatcher bugs (Jonas Bonér)
- **FIX** - Cleaned up Maven scripts and distribution in general (Jonas Bonér)
diff --git a/akka-docs/scala/actors.rst b/akka-docs/scala/actors.rst
index 38076d7b58..2d0f105e0e 100644
--- a/akka-docs/scala/actors.rst
+++ b/akka-docs/scala/actors.rst
@@ -126,7 +126,7 @@ Messages are sent to an Actor through one of the “bang” methods.
* ! means “fire-and-forget”, e.g. send a message asynchronously and return immediately.
* !! means “send-and-reply-eventually”, e.g. send a message asynchronously and wait for a reply through aFuture. Here you can specify a timeout. Using timeouts is very important. If no timeout is specified then the actor’s default timeout (set by the this.timeout variable in the actor) is used. This method returns an ``Option[Any]`` which will be either ``Some(result)`` if returning successfully or None if the call timed out.
-* !!! sends a message asynchronously and returns a ``Future``.
+* ? sends a message asynchronously and returns a ``Future``.
You can check if an Actor can handle a specific message by invoking the ``isDefinedAt`` method:
@@ -180,11 +180,11 @@ Here are some examples:
Send-And-Receive-Future
^^^^^^^^^^^^^^^^^^^^^^^
-Using ``!!!`` will send a message to the receiving Actor asynchronously and will return a 'Future':
+Using ``?`` will send a message to the receiving Actor asynchronously and will return a 'Future':
.. code-block:: scala
- val future = actor !!! "Hello"
+ val future = actor ? "Hello"
See :ref:`futures-scala` for more information.
@@ -329,7 +329,7 @@ The same pattern holds for using the ``senderFuture`` in the section below.
Reply using the sender future
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-If a message was sent with the ``!!`` or ``!!!`` methods, which both implements request-reply semantics using Future's, then you either have the option of replying using the ``reply`` method as above. This method will then resolve the Future. But you can also get a reference to the Future directly and resolve it yourself or if you would like to store it away to resolve it later, or pass it on to some other Actor to resolve it.
+If a message was sent with the ``!!`` or ``?`` methods, which both implements request-reply semantics using Future's, then you either have the option of replying using the ``reply`` method as above. This method will then resolve the Future. But you can also get a reference to the Future directly and resolve it yourself or if you would like to store it away to resolve it later, or pass it on to some other Actor to resolve it.
The reference to the Future resides in the ``senderFuture: Option[Promise[_]]`` member field in the ``ActorRef`` class.
@@ -427,7 +427,7 @@ PoisonPill
You can also send an actor the ``akka.actor.PoisonPill`` message, which will stop the actor when the message is processed.
-If the sender is a ``Future`` (e.g. the message is sent with ``!!`` or ``!!!``), the ``Future`` will be completed with an ``akka.actor.ActorKilledException("PoisonPill")``.
+If the sender is a ``Future`` (e.g. the message is sent with ``!!`` or ``?``), the ``Future`` will be completed with an ``akka.actor.ActorKilledException("PoisonPill")``.
HotSwap
-------
@@ -457,7 +457,7 @@ To hotswap the Actor using ``become``:
.. code-block:: scala
def angry: Receive = {
- case "foo" => self reply "I am already angry!!!"
+ case "foo" => self reply "I am already angry?"
case "bar" => become(happy)
}
diff --git a/akka-docs/scala/dispatchers.rst b/akka-docs/scala/dispatchers.rst
index cc75b5c099..afc7d204ec 100644
--- a/akka-docs/scala/dispatchers.rst
+++ b/akka-docs/scala/dispatchers.rst
@@ -13,7 +13,7 @@ The Dispatcher is an important piece that allows you to configure the right sema
Akka supports dispatchers for both event-driven lightweight threads, allowing creation of millions of threads on a single workstation, and thread-based Actors, where each dispatcher is bound to a dedicated OS thread.
-The event-based Actors currently consume ~600 bytes per Actor which means that you can create more than 6.5 million Actors on 4 G RAM.
+The event-based Actors currently consume ~600 bytes per Actor which means that you can create more than 6.5 million Actors on 4 GB RAM.
Default dispatcher
------------------
diff --git a/akka-docs/scala/futures.rst b/akka-docs/scala/futures.rst
index de58118a4f..a9955d9a50 100644
--- a/akka-docs/scala/futures.rst
+++ b/akka-docs/scala/futures.rst
@@ -17,11 +17,11 @@ Use with Actors
There are generally two ways of getting a reply from an ``Actor``: the first is by a sent message (``actor ! msg``), which only works if the original sender was an ``Actor``) and the second is through a ``Future``.
-Using an ``Actor``\'s ``!!!`` method to send a message will return a Future. To wait for and retrieve the actual result the simplest method is:
+Using an ``Actor``\'s ``?`` method to send a message will return a Future. To wait for and retrieve the actual result the simplest method is:
.. code-block:: scala
- val future = actor !!! msg
+ val future = actor ? msg
val result: Any = future.get()
This will cause the current thread to block and wait for the ``Actor`` to 'complete' the ``Future`` with it's reply. Due to the dynamic nature of Akka's ``Actor``\s this result will be untyped and will default to ``Nothing``. The safest way to deal with this is to cast the result to an ``Any`` as is shown in the above example. You can also use the expected result type instead of ``Any``, but if an unexpected type were to be returned you will get a ``ClassCastException``. For more elegant ways to deal with this and to use the result without blocking, refer to `Functional Futures`_.
@@ -141,13 +141,13 @@ The example for comprehension above is an example of composing ``Future``\s. A c
.. code-block:: scala
- val f1 = actor1 !!! msg1
- val f2 = actor2 !!! msg2
+ val f1 = actor1 ? msg1
+ val f2 = actor2 ? msg2
val a: Int = f1.get()
val b: Int = f2.get()
- val f3 = actor3 !!! (a + b)
+ val f3 = actor3 ? (a + b)
val result: String = f3.get()
@@ -155,13 +155,13 @@ Here we wait for the results from the first 2 ``Actor``\s before sending that re
.. code-block:: scala
- val f1 = actor1 !!! msg1
- val f2 = actor2 !!! msg2
+ val f1 = actor1 ? msg1
+ val f2 = actor2 ? msg2
val f3 = for {
a: Int <- f1
b: Int <- f2
- c: String <- actor3 !!! (a + b)
+ c: String <- actor3 ? (a + b)
} yield c
val result = f3.get()
@@ -173,7 +173,7 @@ This is fine when dealing with a known amount of Actors, but can grow unwieldy i
.. code-block:: scala
// oddActor returns odd numbers sequentially from 1
- val listOfFutures: List[Future[Int]] = List.fill(100)(oddActor !!! GetNext)
+ val listOfFutures: List[Future[Int]] = List.fill(100)(oddActor ? GetNext)
// now we have a Future[List[Int]]
val futureList = Future.sequence(listOfFutures)
@@ -242,7 +242,7 @@ It is also possible to handle an ``Exception`` by returning a different result.
.. code-block:: scala
- val future = actor !!! msg1 recover {
+ val future = actor ? msg1 recover {
case e: ArithmeticException => 0
}
diff --git a/akka-docs/scala/tutorial-chat-server.rst b/akka-docs/scala/tutorial-chat-server.rst
index 17c99a6c35..1319ee9432 100644
--- a/akka-docs/scala/tutorial-chat-server.rst
+++ b/akka-docs/scala/tutorial-chat-server.rst
@@ -72,7 +72,7 @@ The 'actorOf' factory method can be imported like this:
From now on we will assume that it is imported like this and can use it directly.
-Akka Actors are extremely lightweight. Each Actor consume ~600 bytes, which means that you can create 6.5 million on 4 G RAM.
+Akka Actors are extremely lightweight. Each Actor consume ~600 bytes, which means that you can create 6.5 million on 4 GB RAM.
Messages are sent using the '!' operator:
diff --git a/akka-durable-mailboxes/akka-mailboxes-common/src/main/java/akka/actor/mailbox/MailboxProtocol.java b/akka-durable-mailboxes/akka-mailboxes-common/src/main/java/akka/actor/mailbox/MailboxProtocol.java
index 1fcb87781c..bc128610cf 100644
--- a/akka-durable-mailboxes/akka-mailboxes-common/src/main/java/akka/actor/mailbox/MailboxProtocol.java
+++ b/akka-durable-mailboxes/akka-mailboxes-common/src/main/java/akka/actor/mailbox/MailboxProtocol.java
@@ -8,11 +8,32 @@ public final class MailboxProtocol {
public static void registerAllExtensions(
com.google.protobuf.ExtensionRegistry registry) {
}
+ public interface DurableMailboxMessageProtocolOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required string ownerAddress = 1;
+ boolean hasOwnerAddress();
+ String getOwnerAddress();
+
+ // optional string senderAddress = 2;
+ boolean hasSenderAddress();
+ String getSenderAddress();
+
+ // optional .UuidProtocol futureUuid = 3;
+ boolean hasFutureUuid();
+ akka.actor.mailbox.MailboxProtocol.UuidProtocol getFutureUuid();
+ akka.actor.mailbox.MailboxProtocol.UuidProtocolOrBuilder getFutureUuidOrBuilder();
+
+ // required bytes message = 4;
+ boolean hasMessage();
+ com.google.protobuf.ByteString getMessage();
+ }
public static final class DurableMailboxMessageProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements DurableMailboxMessageProtocolOrBuilder {
// Use DurableMailboxMessageProtocol.newBuilder() to construct.
- private DurableMailboxMessageProtocol() {
- initFields();
+ private DurableMailboxMessageProtocol(Builder builder) {
+ super(builder);
}
private DurableMailboxMessageProtocol(boolean noInit) {}
@@ -35,60 +56,137 @@ public final class MailboxProtocol {
return akka.actor.mailbox.MailboxProtocol.internal_static_DurableMailboxMessageProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required string ownerAddress = 1;
public static final int OWNERADDRESS_FIELD_NUMBER = 1;
- private boolean hasOwnerAddress;
- private java.lang.String ownerAddress_ = "";
- public boolean hasOwnerAddress() { return hasOwnerAddress; }
- public java.lang.String getOwnerAddress() { return ownerAddress_; }
+ private java.lang.Object ownerAddress_;
+ public boolean hasOwnerAddress() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public String getOwnerAddress() {
+ java.lang.Object ref = ownerAddress_;
+ 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)) {
+ ownerAddress_ = s;
+ }
+ return s;
+ }
+ }
+ private com.google.protobuf.ByteString getOwnerAddressBytes() {
+ java.lang.Object ref = ownerAddress_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+ ownerAddress_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
// optional string senderAddress = 2;
public static final int SENDERADDRESS_FIELD_NUMBER = 2;
- private boolean hasSenderAddress;
- private java.lang.String senderAddress_ = "";
- public boolean hasSenderAddress() { return hasSenderAddress; }
- public java.lang.String getSenderAddress() { return senderAddress_; }
+ private java.lang.Object senderAddress_;
+ public boolean hasSenderAddress() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public String getSenderAddress() {
+ java.lang.Object ref = senderAddress_;
+ 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)) {
+ senderAddress_ = s;
+ }
+ return s;
+ }
+ }
+ private com.google.protobuf.ByteString getSenderAddressBytes() {
+ java.lang.Object ref = senderAddress_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+ senderAddress_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
// optional .UuidProtocol futureUuid = 3;
public static final int FUTUREUUID_FIELD_NUMBER = 3;
- private boolean hasFutureUuid;
private akka.actor.mailbox.MailboxProtocol.UuidProtocol futureUuid_;
- public boolean hasFutureUuid() { return hasFutureUuid; }
- public akka.actor.mailbox.MailboxProtocol.UuidProtocol getFutureUuid() { return futureUuid_; }
+ public boolean hasFutureUuid() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ public akka.actor.mailbox.MailboxProtocol.UuidProtocol getFutureUuid() {
+ return futureUuid_;
+ }
+ public akka.actor.mailbox.MailboxProtocol.UuidProtocolOrBuilder getFutureUuidOrBuilder() {
+ return futureUuid_;
+ }
// required bytes message = 4;
public static final int MESSAGE_FIELD_NUMBER = 4;
- private boolean hasMessage;
- private com.google.protobuf.ByteString message_ = com.google.protobuf.ByteString.EMPTY;
- public boolean hasMessage() { return hasMessage; }
- public com.google.protobuf.ByteString getMessage() { return message_; }
+ private com.google.protobuf.ByteString message_;
+ public boolean hasMessage() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ public com.google.protobuf.ByteString getMessage() {
+ return message_;
+ }
private void initFields() {
+ ownerAddress_ = "";
+ senderAddress_ = "";
futureUuid_ = akka.actor.mailbox.MailboxProtocol.UuidProtocol.getDefaultInstance();
+ message_ = com.google.protobuf.ByteString.EMPTY;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasOwnerAddress) return false;
- if (!hasMessage) return false;
- if (hasFutureUuid()) {
- if (!getFutureUuid().isInitialized()) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasOwnerAddress()) {
+ memoizedIsInitialized = 0;
+ return false;
}
+ if (!hasMessage()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (hasFutureUuid()) {
+ if (!getFutureUuid().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ }
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasOwnerAddress()) {
- output.writeString(1, getOwnerAddress());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeBytes(1, getOwnerAddressBytes());
}
- if (hasSenderAddress()) {
- output.writeString(2, getSenderAddress());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeBytes(2, getSenderAddressBytes());
}
- if (hasFutureUuid()) {
- output.writeMessage(3, getFutureUuid());
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeMessage(3, futureUuid_);
}
- if (hasMessage()) {
- output.writeBytes(4, getMessage());
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeBytes(4, message_);
}
getUnknownFields().writeTo(output);
}
@@ -99,27 +197,34 @@ public final class MailboxProtocol {
if (size != -1) return size;
size = 0;
- if (hasOwnerAddress()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(1, getOwnerAddress());
+ .computeBytesSize(1, getOwnerAddressBytes());
}
- if (hasSenderAddress()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(2, getSenderAddress());
+ .computeBytesSize(2, getSenderAddressBytes());
}
- if (hasFutureUuid()) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(3, getFutureUuid());
+ .computeMessageSize(3, futureUuid_);
}
- if (hasMessage()) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(4, getMessage());
+ .computeBytesSize(4, 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.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -194,34 +299,62 @@ public final class MailboxProtocol {
}
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 {
- private akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol result;
-
- // Construct using akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.actor.mailbox.MailboxProtocol.internal_static_DurableMailboxMessageProtocol_descriptor;
}
- protected akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.actor.mailbox.MailboxProtocol.internal_static_DurableMailboxMessageProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ getFutureUuidFieldBuilder();
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
+ super.clear();
+ ownerAddress_ = "";
+ bitField0_ = (bitField0_ & ~0x00000001);
+ senderAddress_ = "";
+ bitField0_ = (bitField0_ & ~0x00000002);
+ if (futureUuidBuilder_ == null) {
+ futureUuid_ = akka.actor.mailbox.MailboxProtocol.UuidProtocol.getDefaultInstance();
+ } else {
+ futureUuidBuilder_.clear();
}
- result = new akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol();
+ bitField0_ = (bitField0_ & ~0x00000004);
+ message_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -233,33 +366,51 @@ public final class MailboxProtocol {
return akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol result = new akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.actor.mailbox.MailboxProtocol.DurableMailboxMessageProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.ownerAddress_ = ownerAddress_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.senderAddress_ = senderAddress_;
+ 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) {
@@ -289,6 +440,24 @@ public final class MailboxProtocol {
return this;
}
+ public final boolean isInitialized() {
+ if (!hasOwnerAddress()) {
+
+ return false;
+ }
+ if (!hasMessage()) {
+
+ return false;
+ }
+ if (hasFutureUuid()) {
+ if (!getFutureUuid().isInitialized()) {
+
+ return false;
+ }
+ }
+ return true;
+ }
+
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -301,21 +470,25 @@ public final class MailboxProtocol {
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: {
- setOwnerAddress(input.readString());
+ bitField0_ |= 0x00000001;
+ ownerAddress_ = input.readBytes();
break;
}
case 18: {
- setSenderAddress(input.readString());
+ bitField0_ |= 0x00000002;
+ senderAddress_ = input.readBytes();
break;
}
case 26: {
@@ -328,111 +501,199 @@ public final class MailboxProtocol {
break;
}
case 34: {
- setMessage(input.readBytes());
+ bitField0_ |= 0x00000008;
+ message_ = input.readBytes();
break;
}
}
}
}
+ private int bitField0_;
// required string ownerAddress = 1;
+ private java.lang.Object ownerAddress_ = "";
public boolean hasOwnerAddress() {
- return result.hasOwnerAddress();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
- public java.lang.String getOwnerAddress() {
- return result.getOwnerAddress();
+ public String getOwnerAddress() {
+ java.lang.Object ref = ownerAddress_;
+ if (!(ref instanceof String)) {
+ String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+ ownerAddress_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
}
- public Builder setOwnerAddress(java.lang.String value) {
+ public Builder setOwnerAddress(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasOwnerAddress = true;
- result.ownerAddress_ = value;
+ bitField0_ |= 0x00000001;
+ ownerAddress_ = value;
+ onChanged();
return this;
}
public Builder clearOwnerAddress() {
- result.hasOwnerAddress = false;
- result.ownerAddress_ = getDefaultInstance().getOwnerAddress();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ ownerAddress_ = getDefaultInstance().getOwnerAddress();
+ onChanged();
return this;
}
+ void setOwnerAddress(com.google.protobuf.ByteString value) {
+ bitField0_ |= 0x00000001;
+ ownerAddress_ = value;
+ onChanged();
+ }
// optional string senderAddress = 2;
+ private java.lang.Object senderAddress_ = "";
public boolean hasSenderAddress() {
- return result.hasSenderAddress();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
- public java.lang.String getSenderAddress() {
- return result.getSenderAddress();
+ public String getSenderAddress() {
+ java.lang.Object ref = senderAddress_;
+ if (!(ref instanceof String)) {
+ String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+ senderAddress_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
}
- public Builder setSenderAddress(java.lang.String value) {
+ public Builder setSenderAddress(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasSenderAddress = true;
- result.senderAddress_ = value;
+ bitField0_ |= 0x00000002;
+ senderAddress_ = value;
+ onChanged();
return this;
}
public Builder clearSenderAddress() {
- result.hasSenderAddress = false;
- result.senderAddress_ = getDefaultInstance().getSenderAddress();
+ bitField0_ = (bitField0_ & ~0x00000002);
+ senderAddress_ = getDefaultInstance().getSenderAddress();
+ onChanged();
return this;
}
+ void setSenderAddress(com.google.protobuf.ByteString value) {
+ bitField0_ |= 0x00000002;
+ senderAddress_ = value;
+ onChanged();
+ }
// optional .UuidProtocol futureUuid = 3;
+ private akka.actor.mailbox.MailboxProtocol.UuidProtocol futureUuid_ = akka.actor.mailbox.MailboxProtocol.UuidProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.actor.mailbox.MailboxProtocol.UuidProtocol, akka.actor.mailbox.MailboxProtocol.UuidProtocol.Builder, akka.actor.mailbox.MailboxProtocol.UuidProtocolOrBuilder> futureUuidBuilder_;
public boolean hasFutureUuid() {
- return result.hasFutureUuid();
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
public akka.actor.mailbox.MailboxProtocol.UuidProtocol getFutureUuid() {
- return result.getFutureUuid();
+ if (futureUuidBuilder_ == null) {
+ return futureUuid_;
+ } else {
+ return futureUuidBuilder_.getMessage();
+ }
}
public Builder setFutureUuid(akka.actor.mailbox.MailboxProtocol.UuidProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (futureUuidBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ futureUuid_ = value;
+ onChanged();
+ } else {
+ futureUuidBuilder_.setMessage(value);
}
- result.hasFutureUuid = true;
- result.futureUuid_ = value;
+ bitField0_ |= 0x00000004;
return this;
}
- public Builder setFutureUuid(akka.actor.mailbox.MailboxProtocol.UuidProtocol.Builder builderForValue) {
- result.hasFutureUuid = true;
- result.futureUuid_ = builderForValue.build();
+ public Builder setFutureUuid(
+ akka.actor.mailbox.MailboxProtocol.UuidProtocol.Builder builderForValue) {
+ if (futureUuidBuilder_ == null) {
+ futureUuid_ = builderForValue.build();
+ onChanged();
+ } else {
+ futureUuidBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000004;
return this;
}
public Builder mergeFutureUuid(akka.actor.mailbox.MailboxProtocol.UuidProtocol value) {
- if (result.hasFutureUuid() &&
- result.futureUuid_ != akka.actor.mailbox.MailboxProtocol.UuidProtocol.getDefaultInstance()) {
- result.futureUuid_ =
- akka.actor.mailbox.MailboxProtocol.UuidProtocol.newBuilder(result.futureUuid_).mergeFrom(value).buildPartial();
+ if (futureUuidBuilder_ == null) {
+ if (((bitField0_ & 0x00000004) == 0x00000004) &&
+ futureUuid_ != akka.actor.mailbox.MailboxProtocol.UuidProtocol.getDefaultInstance()) {
+ futureUuid_ =
+ akka.actor.mailbox.MailboxProtocol.UuidProtocol.newBuilder(futureUuid_).mergeFrom(value).buildPartial();
+ } else {
+ futureUuid_ = value;
+ }
+ onChanged();
} else {
- result.futureUuid_ = value;
+ futureUuidBuilder_.mergeFrom(value);
}
- result.hasFutureUuid = true;
+ bitField0_ |= 0x00000004;
return this;
}
public Builder clearFutureUuid() {
- result.hasFutureUuid = false;
- result.futureUuid_ = akka.actor.mailbox.MailboxProtocol.UuidProtocol.getDefaultInstance();
+ if (futureUuidBuilder_ == null) {
+ futureUuid_ = akka.actor.mailbox.MailboxProtocol.UuidProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ futureUuidBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
+ public akka.actor.mailbox.MailboxProtocol.UuidProtocol.Builder getFutureUuidBuilder() {
+ bitField0_ |= 0x00000004;
+ onChanged();
+ return getFutureUuidFieldBuilder().getBuilder();
+ }
+ public akka.actor.mailbox.MailboxProtocol.UuidProtocolOrBuilder getFutureUuidOrBuilder() {
+ if (futureUuidBuilder_ != null) {
+ return futureUuidBuilder_.getMessageOrBuilder();
+ } else {
+ return futureUuid_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.actor.mailbox.MailboxProtocol.UuidProtocol, akka.actor.mailbox.MailboxProtocol.UuidProtocol.Builder, akka.actor.mailbox.MailboxProtocol.UuidProtocolOrBuilder>
+ getFutureUuidFieldBuilder() {
+ if (futureUuidBuilder_ == null) {
+ futureUuidBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.actor.mailbox.MailboxProtocol.UuidProtocol, akka.actor.mailbox.MailboxProtocol.UuidProtocol.Builder, akka.actor.mailbox.MailboxProtocol.UuidProtocolOrBuilder>(
+ futureUuid_,
+ getParentForChildren(),
+ isClean());
+ futureUuid_ = null;
+ }
+ return futureUuidBuilder_;
+ }
// required bytes message = 4;
+ private com.google.protobuf.ByteString message_ = com.google.protobuf.ByteString.EMPTY;
public boolean hasMessage() {
- return result.hasMessage();
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
public com.google.protobuf.ByteString getMessage() {
- return result.getMessage();
+ return message_;
}
public Builder setMessage(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasMessage = true;
- result.message_ = value;
+ bitField0_ |= 0x00000008;
+ message_ = value;
+ onChanged();
return this;
}
public Builder clearMessage() {
- result.hasMessage = false;
- result.message_ = getDefaultInstance().getMessage();
+ bitField0_ = (bitField0_ & ~0x00000008);
+ message_ = getDefaultInstance().getMessage();
+ onChanged();
return this;
}
@@ -441,18 +702,29 @@ public final class MailboxProtocol {
static {
defaultInstance = new DurableMailboxMessageProtocol(true);
- akka.actor.mailbox.MailboxProtocol.internalForceInit();
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:DurableMailboxMessageProtocol)
}
+ public interface UuidProtocolOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required uint64 high = 1;
+ boolean hasHigh();
+ long getHigh();
+
+ // required uint64 low = 2;
+ boolean hasLow();
+ long getLow();
+ }
public static final class UuidProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements UuidProtocolOrBuilder {
// Use UuidProtocol.newBuilder() to construct.
- private UuidProtocol() {
- initFields();
+ private UuidProtocol(Builder builder) {
+ super(builder);
}
private UuidProtocol(boolean noInit) {}
@@ -475,36 +747,56 @@ public final class MailboxProtocol {
return akka.actor.mailbox.MailboxProtocol.internal_static_UuidProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required uint64 high = 1;
public static final int HIGH_FIELD_NUMBER = 1;
- private boolean hasHigh;
- private long high_ = 0L;
- public boolean hasHigh() { return hasHigh; }
- public long getHigh() { return high_; }
+ private long high_;
+ public boolean hasHigh() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public long getHigh() {
+ return high_;
+ }
// required uint64 low = 2;
public static final int LOW_FIELD_NUMBER = 2;
- private boolean hasLow;
- private long low_ = 0L;
- public boolean hasLow() { return hasLow; }
- public long getLow() { return low_; }
+ private long low_;
+ public boolean hasLow() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public long getLow() {
+ return low_;
+ }
private void initFields() {
+ high_ = 0L;
+ low_ = 0L;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasHigh) return false;
- if (!hasLow) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasHigh()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!hasLow()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasHigh()) {
- output.writeUInt64(1, getHigh());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeUInt64(1, high_);
}
- if (hasLow()) {
- output.writeUInt64(2, getLow());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeUInt64(2, low_);
}
getUnknownFields().writeTo(output);
}
@@ -515,19 +807,26 @@ public final class MailboxProtocol {
if (size != -1) return size;
size = 0;
- if (hasHigh()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(1, getHigh());
+ .computeUInt64Size(1, high_);
}
- if (hasLow()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(2, getLow());
+ .computeUInt64Size(2, low_);
}
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.actor.mailbox.MailboxProtocol.UuidProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -602,34 +901,53 @@ public final class MailboxProtocol {
}
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 {
- private akka.actor.mailbox.MailboxProtocol.UuidProtocol result;
-
- // Construct using akka.actor.mailbox.MailboxProtocol.UuidProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.actor.mailbox.MailboxProtocol.UuidProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.actor.mailbox.MailboxProtocol.UuidProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.actor.mailbox.MailboxProtocol.internal_static_UuidProtocol_descriptor;
}
- protected akka.actor.mailbox.MailboxProtocol.UuidProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.actor.mailbox.MailboxProtocol.internal_static_UuidProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.actor.mailbox.MailboxProtocol.UuidProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
- }
- result = new akka.actor.mailbox.MailboxProtocol.UuidProtocol();
+ super.clear();
+ high_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ low_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -641,33 +959,39 @@ public final class MailboxProtocol {
return akka.actor.mailbox.MailboxProtocol.UuidProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.actor.mailbox.MailboxProtocol.UuidProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.actor.mailbox.MailboxProtocol.UuidProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.actor.mailbox.MailboxProtocol.UuidProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.actor.mailbox.MailboxProtocol.UuidProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.actor.mailbox.MailboxProtocol.UuidProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.actor.mailbox.MailboxProtocol.UuidProtocol result = new akka.actor.mailbox.MailboxProtocol.UuidProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.actor.mailbox.MailboxProtocol.UuidProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.high_ = high_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.low_ = low_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -691,6 +1015,18 @@ public final class MailboxProtocol {
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)
@@ -703,61 +1039,72 @@ public final class MailboxProtocol {
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: {
- setHigh(input.readUInt64());
+ bitField0_ |= 0x00000001;
+ high_ = input.readUInt64();
break;
}
case 16: {
- setLow(input.readUInt64());
+ bitField0_ |= 0x00000002;
+ low_ = input.readUInt64();
break;
}
}
}
}
+ private int bitField0_;
// required uint64 high = 1;
+ private long high_ ;
public boolean hasHigh() {
- return result.hasHigh();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
public long getHigh() {
- return result.getHigh();
+ return high_;
}
public Builder setHigh(long value) {
- result.hasHigh = true;
- result.high_ = value;
+ bitField0_ |= 0x00000001;
+ high_ = value;
+ onChanged();
return this;
}
public Builder clearHigh() {
- result.hasHigh = false;
- result.high_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ high_ = 0L;
+ onChanged();
return this;
}
// required uint64 low = 2;
+ private long low_ ;
public boolean hasLow() {
- return result.hasLow();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public long getLow() {
- return result.getLow();
+ return low_;
}
public Builder setLow(long value) {
- result.hasLow = true;
- result.low_ = value;
+ bitField0_ |= 0x00000002;
+ low_ = value;
+ onChanged();
return this;
}
public Builder clearLow() {
- result.hasLow = false;
- result.low_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ low_ = 0L;
+ onChanged();
return this;
}
@@ -766,7 +1113,6 @@ public final class MailboxProtocol {
static {
defaultInstance = new UuidProtocol(true);
- akka.actor.mailbox.MailboxProtocol.internalForceInit();
defaultInstance.initFields();
}
@@ -829,7 +1175,5 @@ public final class MailboxProtocol {
}, assigner);
}
- public static void internalForceInit() {}
-
// @@protoc_insertion_point(outer_class_scope)
}
diff --git a/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableDispatcher.scala b/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableDispatcher.scala
index adc3a12beb..de54b3fb16 100644
--- a/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableDispatcher.scala
+++ b/akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableDispatcher.scala
@@ -95,7 +95,7 @@ case class DurableDispatcher(
private[akka] override def dispatch(invocation: MessageInvocation): Unit = {
if (invocation.channel.isInstanceOf[ActorPromise])
- throw new IllegalArgumentException("Durable mailboxes do not support Future-based messages from !! and !!!")
+ throw new IllegalArgumentException("Durable mailboxes do not support Future-based messages from ?")
super.dispatch(invocation)
}
@@ -132,7 +132,7 @@ case class DurablePinnedDispatcher(
private[akka] override def dispatch(invocation: MessageInvocation): Unit = {
if (invocation.channel.isInstanceOf[ActorPromise])
- throw new IllegalArgumentException("Actor has a durable mailbox that does not support !! or !!!")
+ throw new IllegalArgumentException("Actor has a durable mailbox that does not support ?")
super.dispatch(invocation)
}
}
diff --git a/akka-remote/src/main/java/akka/remote/protocol/RemoteProtocol.java b/akka-remote/src/main/java/akka/remote/protocol/RemoteProtocol.java
index 5ebf1f58dd..b643a9a750 100644
--- a/akka-remote/src/main/java/akka/remote/protocol/RemoteProtocol.java
+++ b/akka-remote/src/main/java/akka/remote/protocol/RemoteProtocol.java
@@ -14,6 +14,9 @@ public final class RemoteProtocol {
SHUTDOWN(1, 2),
;
+ public static final int CONNECT_VALUE = 1;
+ public static final int SHUTDOWN_VALUE = 2;
+
public final int getNumber() { return value; }
@@ -33,8 +36,8 @@ public final class RemoteProtocol {
internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap() {
public CommandType findValueByNumber(int number) {
- return CommandType.valueOf(number)
- ; }
+ return CommandType.valueOf(number);
+ }
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
@@ -53,6 +56,7 @@ public final class RemoteProtocol {
private static final CommandType[] VALUES = {
CONNECT, SHUTDOWN,
};
+
public static CommandType valueOf(
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
@@ -61,18 +65,157 @@ 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;
}
- static {
- akka.remote.protocol.RemoteProtocol.getDescriptor();
+ // @@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;
+ case 2: return TRANSACTION_LOG;
+ case 3: return DATA_GRID;
+ default: return null;
+ }
}
- // @@protoc_insertion_point(enum_scope:CommandType)
+ 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 ReplicationStorageType findValueByNumber(int number) {
+ return ReplicationStorageType.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.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(1);
+ }
+
+ private static final ReplicationStorageType[] VALUES = {
+ TRANSIENT, TRANSACTION_LOG, DATA_GRID,
+ };
+
+ public static ReplicationStorageType 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 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;
+ case 2: return WRITE_BEHIND;
+ 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 ReplicationStrategyType findValueByNumber(int number) {
+ return ReplicationStrategyType.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.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(2);
+ }
+
+ private static final ReplicationStrategyType[] VALUES = {
+ WRITE_THROUGH, WRITE_BEHIND,
+ };
+
+ public static ReplicationStrategyType 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 ReplicationStrategyType(int index, int value) {
+ this.index = index;
+ this.value = value;
+ }
+
+ // @@protoc_insertion_point(enum_scope:ReplicationStrategyType)
}
public enum SerializationSchemeType
@@ -84,6 +227,12 @@ public final class RemoteProtocol {
PROTOBUF(4, 5),
;
+ 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 final int getNumber() { return value; }
@@ -106,8 +255,8 @@ public final class RemoteProtocol {
internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap() {
public SerializationSchemeType findValueByNumber(int number) {
- return SerializationSchemeType.valueOf(number)
- ; }
+ return SerializationSchemeType.valueOf(number);
+ }
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
@@ -120,12 +269,13 @@ public final class RemoteProtocol {
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
- return akka.remote.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(1);
+ return akka.remote.protocol.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()) {
@@ -134,17 +284,15 @@ public final class RemoteProtocol {
}
return VALUES[desc.getIndex()];
}
+
private final int index;
private final int value;
+
private SerializationSchemeType(int index, int value) {
this.index = index;
this.value = value;
}
- static {
- akka.remote.protocol.RemoteProtocol.getDescriptor();
- }
-
// @@protoc_insertion_point(enum_scope:SerializationSchemeType)
}
@@ -154,6 +302,9 @@ public final class RemoteProtocol {
TEMPORARY(1, 2),
;
+ public static final int PERMANENT_VALUE = 1;
+ public static final int TEMPORARY_VALUE = 2;
+
public final int getNumber() { return value; }
@@ -173,8 +324,8 @@ public final class RemoteProtocol {
internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap() {
public LifeCycleType findValueByNumber(int number) {
- return LifeCycleType.valueOf(number)
- ; }
+ return LifeCycleType.valueOf(number);
+ }
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
@@ -187,12 +338,13 @@ public final class RemoteProtocol {
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
- return akka.remote.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(2);
+ return akka.remote.protocol.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()) {
@@ -201,25 +353,37 @@ public final class RemoteProtocol {
}
return VALUES[desc.getIndex()];
}
+
private final int index;
private final int value;
+
private LifeCycleType(int index, int value) {
this.index = index;
this.value = value;
}
- static {
- akka.remote.protocol.RemoteProtocol.getDescriptor();
- }
-
// @@protoc_insertion_point(enum_scope:LifeCycleType)
}
+ public interface AkkaRemoteProtocolOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // optional .RemoteMessageProtocol message = 1;
+ boolean hasMessage();
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessage();
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessageOrBuilder();
+
+ // optional .RemoteControlProtocol instruction = 2;
+ boolean hasInstruction();
+ akka.remote.protocol.RemoteProtocol.RemoteControlProtocol getInstruction();
+ akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder getInstructionOrBuilder();
+ }
public static final class AkkaRemoteProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements AkkaRemoteProtocolOrBuilder {
// Use AkkaRemoteProtocol.newBuilder() to construct.
- private AkkaRemoteProtocol() {
- initFields();
+ private AkkaRemoteProtocol(Builder builder) {
+ super(builder);
}
private AkkaRemoteProtocol(boolean noInit) {}
@@ -242,42 +406,66 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_AkkaRemoteProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// optional .RemoteMessageProtocol message = 1;
public static final int MESSAGE_FIELD_NUMBER = 1;
- private boolean hasMessage;
private akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol message_;
- public boolean hasMessage() { return hasMessage; }
- public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessage() { return message_; }
+ public boolean hasMessage() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessage() {
+ return message_;
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessageOrBuilder() {
+ return message_;
+ }
// optional .RemoteControlProtocol instruction = 2;
public static final int INSTRUCTION_FIELD_NUMBER = 2;
- private boolean hasInstruction;
private akka.remote.protocol.RemoteProtocol.RemoteControlProtocol instruction_;
- public boolean hasInstruction() { return hasInstruction; }
- public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol getInstruction() { return instruction_; }
+ public boolean hasInstruction() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol getInstruction() {
+ return instruction_;
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder getInstructionOrBuilder() {
+ return instruction_;
+ }
private void initFields() {
message_ = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
instruction_ = akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
if (hasMessage()) {
- if (!getMessage().isInitialized()) return false;
+ if (!getMessage().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
if (hasInstruction()) {
- if (!getInstruction().isInitialized()) return false;
+ if (!getInstruction().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasMessage()) {
- output.writeMessage(1, getMessage());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeMessage(1, message_);
}
- if (hasInstruction()) {
- output.writeMessage(2, getInstruction());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeMessage(2, instruction_);
}
getUnknownFields().writeTo(output);
}
@@ -288,19 +476,26 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasMessage()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(1, getMessage());
+ .computeMessageSize(1, message_);
}
- if (hasInstruction()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(2, getInstruction());
+ .computeMessageSize(2, instruction_);
}
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.protocol.RemoteProtocol.AkkaRemoteProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -375,34 +570,63 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_AkkaRemoteProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_AkkaRemoteProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ getMessageFieldBuilder();
+ getInstructionFieldBuilder();
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
+ super.clear();
+ if (messageBuilder_ == null) {
+ message_ = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
+ } else {
+ messageBuilder_.clear();
}
- result = new akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ if (instructionBuilder_ == null) {
+ instruction_ = akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
+ } else {
+ instructionBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -414,33 +638,47 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol result = new akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.remote.protocol.RemoteProtocol.AkkaRemoteProtocol returnMe = result;
- result = null;
- return returnMe;
+ if (messageBuilder_ == null) {
+ result.message_ = message_;
+ } else {
+ result.message_ = messageBuilder_.build();
+ }
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ if (instructionBuilder_ == null) {
+ result.instruction_ = instruction_;
+ } else {
+ result.instruction_ = instructionBuilder_.build();
+ }
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -464,6 +702,22 @@ public final class RemoteProtocol {
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)
@@ -476,11 +730,13 @@ public final class RemoteProtocol {
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;
@@ -507,98 +763,252 @@ public final class RemoteProtocol {
}
}
+ private int bitField0_;
// optional .RemoteMessageProtocol message = 1;
+ private akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol message_ = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder> messageBuilder_;
public boolean hasMessage() {
- return result.hasMessage();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessage() {
- return result.getMessage();
+ if (messageBuilder_ == null) {
+ return message_;
+ } else {
+ return messageBuilder_.getMessage();
+ }
}
public Builder setMessage(akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (messageBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ message_ = value;
+ onChanged();
+ } else {
+ messageBuilder_.setMessage(value);
}
- result.hasMessage = true;
- result.message_ = value;
+ bitField0_ |= 0x00000001;
return this;
}
- public Builder setMessage(akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
- result.hasMessage = true;
- result.message_ = builderForValue.build();
+ public Builder setMessage(
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
+ if (messageBuilder_ == null) {
+ message_ = builderForValue.build();
+ onChanged();
+ } else {
+ messageBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000001;
return this;
}
public Builder mergeMessage(akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol value) {
- if (result.hasMessage() &&
- result.message_ != akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance()) {
- result.message_ =
- akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder(result.message_).mergeFrom(value).buildPartial();
+ if (messageBuilder_ == null) {
+ if (((bitField0_ & 0x00000001) == 0x00000001) &&
+ message_ != akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance()) {
+ message_ =
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder(message_).mergeFrom(value).buildPartial();
+ } else {
+ message_ = value;
+ }
+ onChanged();
} else {
- result.message_ = value;
+ messageBuilder_.mergeFrom(value);
}
- result.hasMessage = true;
+ bitField0_ |= 0x00000001;
return this;
}
public Builder clearMessage() {
- result.hasMessage = false;
- result.message_ = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
+ if (messageBuilder_ == null) {
+ message_ = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ messageBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder getMessageBuilder() {
+ bitField0_ |= 0x00000001;
+ onChanged();
+ return getMessageFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessageOrBuilder() {
+ if (messageBuilder_ != null) {
+ return messageBuilder_.getMessageOrBuilder();
+ } else {
+ return message_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder>
+ getMessageFieldBuilder() {
+ if (messageBuilder_ == null) {
+ messageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder>(
+ message_,
+ getParentForChildren(),
+ isClean());
+ message_ = null;
+ }
+ return messageBuilder_;
+ }
// optional .RemoteControlProtocol instruction = 2;
+ private akka.remote.protocol.RemoteProtocol.RemoteControlProtocol instruction_ = akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteControlProtocol, akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder> instructionBuilder_;
public boolean hasInstruction() {
- return result.hasInstruction();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol getInstruction() {
- return result.getInstruction();
+ if (instructionBuilder_ == null) {
+ return instruction_;
+ } else {
+ return instructionBuilder_.getMessage();
+ }
}
public Builder setInstruction(akka.remote.protocol.RemoteProtocol.RemoteControlProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (instructionBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ instruction_ = value;
+ onChanged();
+ } else {
+ instructionBuilder_.setMessage(value);
}
- result.hasInstruction = true;
- result.instruction_ = value;
+ bitField0_ |= 0x00000002;
return this;
}
- public Builder setInstruction(akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder builderForValue) {
- result.hasInstruction = true;
- result.instruction_ = builderForValue.build();
+ public Builder setInstruction(
+ akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder builderForValue) {
+ if (instructionBuilder_ == null) {
+ instruction_ = builderForValue.build();
+ onChanged();
+ } else {
+ instructionBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000002;
return this;
}
public Builder mergeInstruction(akka.remote.protocol.RemoteProtocol.RemoteControlProtocol value) {
- if (result.hasInstruction() &&
- result.instruction_ != akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance()) {
- result.instruction_ =
- akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.newBuilder(result.instruction_).mergeFrom(value).buildPartial();
+ if (instructionBuilder_ == null) {
+ if (((bitField0_ & 0x00000002) == 0x00000002) &&
+ instruction_ != akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance()) {
+ instruction_ =
+ akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.newBuilder(instruction_).mergeFrom(value).buildPartial();
+ } else {
+ instruction_ = value;
+ }
+ onChanged();
} else {
- result.instruction_ = value;
+ instructionBuilder_.mergeFrom(value);
}
- result.hasInstruction = true;
+ bitField0_ |= 0x00000002;
return this;
}
public Builder clearInstruction() {
- result.hasInstruction = false;
- result.instruction_ = akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
+ if (instructionBuilder_ == null) {
+ instruction_ = akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ instructionBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder getInstructionBuilder() {
+ bitField0_ |= 0x00000002;
+ onChanged();
+ return getInstructionFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder getInstructionOrBuilder() {
+ if (instructionBuilder_ != null) {
+ return instructionBuilder_.getMessageOrBuilder();
+ } else {
+ return instruction_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteControlProtocol, akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder>
+ getInstructionFieldBuilder() {
+ if (instructionBuilder_ == null) {
+ instructionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteControlProtocol, akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder>(
+ instruction_,
+ getParentForChildren(),
+ isClean());
+ instruction_ = null;
+ }
+ return instructionBuilder_;
+ }
// @@protoc_insertion_point(builder_scope:AkkaRemoteProtocol)
}
static {
defaultInstance = new AkkaRemoteProtocol(true);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:AkkaRemoteProtocol)
}
+ public interface RemoteMessageProtocolOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required .UuidProtocol uuid = 1;
+ boolean hasUuid();
+ akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid();
+ akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder();
+
+ // required .ActorInfoProtocol actorInfo = 2;
+ boolean hasActorInfo();
+ akka.remote.protocol.RemoteProtocol.ActorInfoProtocol getActorInfo();
+ akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder();
+
+ // required bool oneWay = 3;
+ boolean hasOneWay();
+ boolean getOneWay();
+
+ // optional .MessageProtocol message = 4;
+ boolean hasMessage();
+ akka.remote.protocol.RemoteProtocol.MessageProtocol getMessage();
+ akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder getMessageOrBuilder();
+
+ // optional .ExceptionProtocol exception = 5;
+ boolean hasException();
+ akka.remote.protocol.RemoteProtocol.ExceptionProtocol getException();
+ akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder getExceptionOrBuilder();
+
+ // optional .UuidProtocol supervisorUuid = 6;
+ boolean hasSupervisorUuid();
+ akka.remote.protocol.RemoteProtocol.UuidProtocol getSupervisorUuid();
+ akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder();
+
+ // optional .RemoteActorRefProtocol sender = 7;
+ boolean hasSender();
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSender();
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder();
+
+ // repeated .MetadataEntryProtocol metadata = 8;
+ java.util.List
+ getMetadataList();
+ akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol getMetadata(int index);
+ int getMetadataCount();
+ java.util.List
+ getMetadataOrBuilderList();
+ akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder getMetadataOrBuilder(
+ int index);
+ }
public static final class RemoteMessageProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements RemoteMessageProtocolOrBuilder {
// Use RemoteMessageProtocol.newBuilder() to construct.
- private RemoteMessageProtocol() {
- initFields();
+ private RemoteMessageProtocol(Builder builder) {
+ super(builder);
}
private RemoteMessageProtocol(boolean noInit) {}
@@ -621,125 +1031,211 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_RemoteMessageProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required .UuidProtocol uuid = 1;
public static final int UUID_FIELD_NUMBER = 1;
- private boolean hasUuid;
private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_;
- public boolean hasUuid() { return hasUuid; }
- public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() { return uuid_; }
+ public boolean hasUuid() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
+ return uuid_;
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+ return uuid_;
+ }
// required .ActorInfoProtocol actorInfo = 2;
public static final int ACTORINFO_FIELD_NUMBER = 2;
- private boolean hasActorInfo;
private akka.remote.protocol.RemoteProtocol.ActorInfoProtocol actorInfo_;
- public boolean hasActorInfo() { return hasActorInfo; }
- public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol getActorInfo() { return actorInfo_; }
+ public boolean hasActorInfo() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol getActorInfo() {
+ return actorInfo_;
+ }
+ public akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder() {
+ return actorInfo_;
+ }
// required bool oneWay = 3;
public static final int ONEWAY_FIELD_NUMBER = 3;
- private boolean hasOneWay;
- private boolean oneWay_ = false;
- public boolean hasOneWay() { return hasOneWay; }
- public boolean getOneWay() { return oneWay_; }
+ 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;
- private boolean hasMessage;
private akka.remote.protocol.RemoteProtocol.MessageProtocol message_;
- public boolean hasMessage() { return hasMessage; }
- public akka.remote.protocol.RemoteProtocol.MessageProtocol getMessage() { return message_; }
+ public boolean hasMessage() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ public akka.remote.protocol.RemoteProtocol.MessageProtocol getMessage() {
+ return message_;
+ }
+ public akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder getMessageOrBuilder() {
+ return message_;
+ }
// optional .ExceptionProtocol exception = 5;
public static final int EXCEPTION_FIELD_NUMBER = 5;
- private boolean hasException;
private akka.remote.protocol.RemoteProtocol.ExceptionProtocol exception_;
- public boolean hasException() { return hasException; }
- public akka.remote.protocol.RemoteProtocol.ExceptionProtocol getException() { return exception_; }
+ public boolean hasException() {
+ return ((bitField0_ & 0x00000010) == 0x00000010);
+ }
+ public akka.remote.protocol.RemoteProtocol.ExceptionProtocol getException() {
+ return exception_;
+ }
+ public akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder getExceptionOrBuilder() {
+ return exception_;
+ }
// optional .UuidProtocol supervisorUuid = 6;
public static final int SUPERVISORUUID_FIELD_NUMBER = 6;
- private boolean hasSupervisorUuid;
private akka.remote.protocol.RemoteProtocol.UuidProtocol supervisorUuid_;
- public boolean hasSupervisorUuid() { return hasSupervisorUuid; }
- public akka.remote.protocol.RemoteProtocol.UuidProtocol getSupervisorUuid() { return supervisorUuid_; }
+ public boolean hasSupervisorUuid() {
+ return ((bitField0_ & 0x00000020) == 0x00000020);
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocol getSupervisorUuid() {
+ return supervisorUuid_;
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder() {
+ return supervisorUuid_;
+ }
// optional .RemoteActorRefProtocol sender = 7;
public static final int SENDER_FIELD_NUMBER = 7;
- private boolean hasSender;
private akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol sender_;
- public boolean hasSender() { return hasSender; }
- public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSender() { return sender_; }
+ public boolean hasSender() {
+ return ((bitField0_ & 0x00000040) == 0x00000040);
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSender() {
+ return sender_;
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder() {
+ return sender_;
+ }
// repeated .MetadataEntryProtocol metadata = 8;
public static final int METADATA_FIELD_NUMBER = 8;
- private java.util.List metadata_ =
- java.util.Collections.emptyList();
+ private java.util.List metadata_;
public java.util.List getMetadataList() {
return metadata_;
}
- public int getMetadataCount() { return metadata_.size(); }
+ public java.util.List
+ getMetadataOrBuilderList() {
+ return metadata_;
+ }
+ public int getMetadataCount() {
+ return metadata_.size();
+ }
public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol getMetadata(int index) {
return metadata_.get(index);
}
+ public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder getMetadataOrBuilder(
+ int index) {
+ return metadata_.get(index);
+ }
private void initFields() {
uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
actorInfo_ = akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
+ oneWay_ = false;
message_ = akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
exception_ = akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
supervisorUuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
sender_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+ metadata_ = java.util.Collections.emptyList();
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasUuid) return false;
- if (!hasActorInfo) return false;
- if (!hasOneWay) return false;
- if (!getUuid().isInitialized()) return false;
- if (!getActorInfo().isInitialized()) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasUuid()) {
+ 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()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
if (hasMessage()) {
- if (!getMessage().isInitialized()) return false;
+ if (!getMessage().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
if (hasException()) {
- if (!getException().isInitialized()) return false;
+ if (!getException().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
if (hasSupervisorUuid()) {
- if (!getSupervisorUuid().isInitialized()) return false;
+ if (!getSupervisorUuid().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
if (hasSender()) {
- if (!getSender().isInitialized()) return false;
+ if (!getSender().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
- for (akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol element : getMetadataList()) {
- if (!element.isInitialized()) return false;
+ for (int i = 0; i < getMetadataCount(); i++) {
+ if (!getMetadata(i).isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasUuid()) {
- output.writeMessage(1, getUuid());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeMessage(1, uuid_);
}
- if (hasActorInfo()) {
- output.writeMessage(2, getActorInfo());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeMessage(2, actorInfo_);
}
- if (hasOneWay()) {
- output.writeBool(3, getOneWay());
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeBool(3, oneWay_);
}
- if (hasMessage()) {
- output.writeMessage(4, getMessage());
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeMessage(4, message_);
}
- if (hasException()) {
- output.writeMessage(5, getException());
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ output.writeMessage(5, exception_);
}
- if (hasSupervisorUuid()) {
- output.writeMessage(6, getSupervisorUuid());
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ output.writeMessage(6, supervisorUuid_);
}
- if (hasSender()) {
- output.writeMessage(7, getSender());
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ output.writeMessage(7, sender_);
}
- for (akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol element : getMetadataList()) {
- output.writeMessage(8, element);
+ for (int i = 0; i < metadata_.size(); i++) {
+ output.writeMessage(8, metadata_.get(i));
}
getUnknownFields().writeTo(output);
}
@@ -750,43 +1246,50 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasUuid()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(1, getUuid());
+ .computeMessageSize(1, uuid_);
}
- if (hasActorInfo()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(2, getActorInfo());
+ .computeMessageSize(2, actorInfo_);
}
- if (hasOneWay()) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeBoolSize(3, getOneWay());
+ .computeBoolSize(3, oneWay_);
}
- if (hasMessage()) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(4, getMessage());
+ .computeMessageSize(4, message_);
}
- if (hasException()) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(5, getException());
+ .computeMessageSize(5, exception_);
}
- if (hasSupervisorUuid()) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(6, getSupervisorUuid());
+ .computeMessageSize(6, supervisorUuid_);
}
- if (hasSender()) {
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(7, getSender());
+ .computeMessageSize(7, sender_);
}
- for (akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol element : getMetadataList()) {
+ for (int i = 0; i < metadata_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(8, element);
+ .computeMessageSize(8, 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.protocol.RemoteProtocol.RemoteMessageProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -861,34 +1364,100 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_RemoteMessageProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_RemoteMessageProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ getUuidFieldBuilder();
+ getActorInfoFieldBuilder();
+ getMessageFieldBuilder();
+ getExceptionFieldBuilder();
+ getSupervisorUuidFieldBuilder();
+ getSenderFieldBuilder();
+ getMetadataFieldBuilder();
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
+ super.clear();
+ if (uuidBuilder_ == null) {
+ uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ } else {
+ uuidBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000001);
+ if (actorInfoBuilder_ == null) {
+ actorInfo_ = akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
+ } else {
+ actorInfoBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000002);
+ oneWay_ = false;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ if (messageBuilder_ == null) {
+ message_ = akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
+ } else {
+ messageBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
+ if (exceptionBuilder_ == null) {
+ exception_ = akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
+ } else {
+ exceptionBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000010);
+ if (supervisorUuidBuilder_ == null) {
+ supervisorUuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ } else {
+ supervisorUuidBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000020);
+ if (senderBuilder_ == null) {
+ sender_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+ } else {
+ senderBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000040);
+ if (metadataBuilder_ == null) {
+ metadata_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000080);
+ } else {
+ metadataBuilder_.clear();
}
- result = new akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol();
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -900,37 +1469,92 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol result = new akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- if (result.metadata_ != java.util.Collections.EMPTY_LIST) {
- result.metadata_ =
- java.util.Collections.unmodifiableList(result.metadata_);
+ if (uuidBuilder_ == null) {
+ result.uuid_ = uuid_;
+ } else {
+ result.uuid_ = uuidBuilder_.build();
}
- akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol returnMe = result;
- result = null;
- return returnMe;
+ 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 (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 (senderBuilder_ == null) {
+ result.sender_ = sender_;
+ } else {
+ result.sender_ = senderBuilder_.build();
+ }
+ if (metadataBuilder_ == null) {
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ metadata_ = java.util.Collections.unmodifiableList(metadata_);
+ bitField0_ = (bitField0_ & ~0x00000080);
+ }
+ result.metadata_ = metadata_;
+ } else {
+ result.metadata_ = metadataBuilder_.build();
+ }
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -965,16 +1589,90 @@ public final class RemoteProtocol {
if (other.hasSender()) {
mergeSender(other.getSender());
}
- if (!other.metadata_.isEmpty()) {
- if (result.metadata_.isEmpty()) {
- result.metadata_ = new java.util.ArrayList();
+ if (metadataBuilder_ == null) {
+ if (!other.metadata_.isEmpty()) {
+ if (metadata_.isEmpty()) {
+ metadata_ = other.metadata_;
+ bitField0_ = (bitField0_ & ~0x00000080);
+ } else {
+ ensureMetadataIsMutable();
+ metadata_.addAll(other.metadata_);
+ }
+ onChanged();
+ }
+ } else {
+ if (!other.metadata_.isEmpty()) {
+ if (metadataBuilder_.isEmpty()) {
+ metadataBuilder_.dispose();
+ metadataBuilder_ = null;
+ metadata_ = other.metadata_;
+ bitField0_ = (bitField0_ & ~0x00000080);
+ metadataBuilder_ =
+ com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+ getMetadataFieldBuilder() : null;
+ } else {
+ metadataBuilder_.addAllMessages(other.metadata_);
+ }
}
- result.metadata_.addAll(other.metadata_);
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
+ public final boolean isInitialized() {
+ if (!hasUuid()) {
+
+ return false;
+ }
+ if (!hasActorInfo()) {
+
+ return false;
+ }
+ if (!hasOneWay()) {
+
+ return false;
+ }
+ if (!getUuid().isInitialized()) {
+
+ return false;
+ }
+ if (!getActorInfo().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)
@@ -987,11 +1685,13 @@ public final class RemoteProtocol {
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;
@@ -1015,7 +1715,8 @@ public final class RemoteProtocol {
break;
}
case 24: {
- setOneWay(input.readBool());
+ bitField0_ |= 0x00000004;
+ oneWay_ = input.readBool();
break;
}
case 34: {
@@ -1064,315 +1765,783 @@ public final class RemoteProtocol {
}
}
+ private int bitField0_;
// required .UuidProtocol uuid = 1;
+ private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_;
public boolean hasUuid() {
- return result.hasUuid();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
- return result.getUuid();
+ if (uuidBuilder_ == null) {
+ return uuid_;
+ } else {
+ return uuidBuilder_.getMessage();
+ }
}
public Builder setUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (uuidBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ uuid_ = value;
+ onChanged();
+ } else {
+ uuidBuilder_.setMessage(value);
}
- result.hasUuid = true;
- result.uuid_ = value;
+ bitField0_ |= 0x00000001;
return this;
}
- public Builder setUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
- result.hasUuid = true;
- result.uuid_ = builderForValue.build();
+ public Builder setUuid(
+ akka.remote.protocol.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.protocol.RemoteProtocol.UuidProtocol value) {
- if (result.hasUuid() &&
- result.uuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
- result.uuid_ =
- akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(result.uuid_).mergeFrom(value).buildPartial();
+ if (uuidBuilder_ == null) {
+ if (((bitField0_ & 0x00000001) == 0x00000001) &&
+ uuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
+ uuid_ =
+ akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial();
+ } else {
+ uuid_ = value;
+ }
+ onChanged();
} else {
- result.uuid_ = value;
+ uuidBuilder_.mergeFrom(value);
}
- result.hasUuid = true;
+ bitField0_ |= 0x00000001;
return this;
}
public Builder clearUuid() {
- result.hasUuid = false;
- result.uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ if (uuidBuilder_ == null) {
+ uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ uuidBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() {
+ bitField0_ |= 0x00000001;
+ onChanged();
+ return getUuidFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+ if (uuidBuilder_ != null) {
+ return uuidBuilder_.getMessageOrBuilder();
+ } else {
+ return uuid_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>
+ getUuidFieldBuilder() {
+ if (uuidBuilder_ == null) {
+ uuidBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
+ uuid_,
+ getParentForChildren(),
+ isClean());
+ uuid_ = null;
+ }
+ return uuidBuilder_;
+ }
// required .ActorInfoProtocol actorInfo = 2;
+ private akka.remote.protocol.RemoteProtocol.ActorInfoProtocol actorInfo_ = akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.ActorInfoProtocol, akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder, akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder> actorInfoBuilder_;
public boolean hasActorInfo() {
- return result.hasActorInfo();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol getActorInfo() {
- return result.getActorInfo();
+ if (actorInfoBuilder_ == null) {
+ return actorInfo_;
+ } else {
+ return actorInfoBuilder_.getMessage();
+ }
}
public Builder setActorInfo(akka.remote.protocol.RemoteProtocol.ActorInfoProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (actorInfoBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ actorInfo_ = value;
+ onChanged();
+ } else {
+ actorInfoBuilder_.setMessage(value);
}
- result.hasActorInfo = true;
- result.actorInfo_ = value;
+ bitField0_ |= 0x00000002;
return this;
}
- public Builder setActorInfo(akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder builderForValue) {
- result.hasActorInfo = true;
- result.actorInfo_ = builderForValue.build();
+ public Builder setActorInfo(
+ akka.remote.protocol.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.protocol.RemoteProtocol.ActorInfoProtocol value) {
- if (result.hasActorInfo() &&
- result.actorInfo_ != akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance()) {
- result.actorInfo_ =
- akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.newBuilder(result.actorInfo_).mergeFrom(value).buildPartial();
+ if (actorInfoBuilder_ == null) {
+ if (((bitField0_ & 0x00000002) == 0x00000002) &&
+ actorInfo_ != akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance()) {
+ actorInfo_ =
+ akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.newBuilder(actorInfo_).mergeFrom(value).buildPartial();
+ } else {
+ actorInfo_ = value;
+ }
+ onChanged();
} else {
- result.actorInfo_ = value;
+ actorInfoBuilder_.mergeFrom(value);
}
- result.hasActorInfo = true;
+ bitField0_ |= 0x00000002;
return this;
}
public Builder clearActorInfo() {
- result.hasActorInfo = false;
- result.actorInfo_ = akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
+ if (actorInfoBuilder_ == null) {
+ actorInfo_ = akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ actorInfoBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder getActorInfoBuilder() {
+ bitField0_ |= 0x00000002;
+ onChanged();
+ return getActorInfoFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder getActorInfoOrBuilder() {
+ if (actorInfoBuilder_ != null) {
+ return actorInfoBuilder_.getMessageOrBuilder();
+ } else {
+ return actorInfo_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.ActorInfoProtocol, akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder, akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder>
+ getActorInfoFieldBuilder() {
+ if (actorInfoBuilder_ == null) {
+ actorInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.ActorInfoProtocol, akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.Builder, akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder>(
+ actorInfo_,
+ getParentForChildren(),
+ isClean());
+ actorInfo_ = null;
+ }
+ return actorInfoBuilder_;
+ }
// required bool oneWay = 3;
+ private boolean oneWay_ ;
public boolean hasOneWay() {
- return result.hasOneWay();
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
public boolean getOneWay() {
- return result.getOneWay();
+ return oneWay_;
}
public Builder setOneWay(boolean value) {
- result.hasOneWay = true;
- result.oneWay_ = value;
+ bitField0_ |= 0x00000004;
+ oneWay_ = value;
+ onChanged();
return this;
}
public Builder clearOneWay() {
- result.hasOneWay = false;
- result.oneWay_ = false;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ oneWay_ = false;
+ onChanged();
return this;
}
// optional .MessageProtocol message = 4;
+ private akka.remote.protocol.RemoteProtocol.MessageProtocol message_ = akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.MessageProtocol, akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder> messageBuilder_;
public boolean hasMessage() {
- return result.hasMessage();
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
public akka.remote.protocol.RemoteProtocol.MessageProtocol getMessage() {
- return result.getMessage();
+ if (messageBuilder_ == null) {
+ return message_;
+ } else {
+ return messageBuilder_.getMessage();
+ }
}
public Builder setMessage(akka.remote.protocol.RemoteProtocol.MessageProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (messageBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ message_ = value;
+ onChanged();
+ } else {
+ messageBuilder_.setMessage(value);
}
- result.hasMessage = true;
- result.message_ = value;
+ bitField0_ |= 0x00000008;
return this;
}
- public Builder setMessage(akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder builderForValue) {
- result.hasMessage = true;
- result.message_ = builderForValue.build();
+ public Builder setMessage(
+ akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder builderForValue) {
+ if (messageBuilder_ == null) {
+ message_ = builderForValue.build();
+ onChanged();
+ } else {
+ messageBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000008;
return this;
}
public Builder mergeMessage(akka.remote.protocol.RemoteProtocol.MessageProtocol value) {
- if (result.hasMessage() &&
- result.message_ != akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance()) {
- result.message_ =
- akka.remote.protocol.RemoteProtocol.MessageProtocol.newBuilder(result.message_).mergeFrom(value).buildPartial();
+ if (messageBuilder_ == null) {
+ if (((bitField0_ & 0x00000008) == 0x00000008) &&
+ message_ != akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance()) {
+ message_ =
+ akka.remote.protocol.RemoteProtocol.MessageProtocol.newBuilder(message_).mergeFrom(value).buildPartial();
+ } else {
+ message_ = value;
+ }
+ onChanged();
} else {
- result.message_ = value;
+ messageBuilder_.mergeFrom(value);
}
- result.hasMessage = true;
+ bitField0_ |= 0x00000008;
return this;
}
public Builder clearMessage() {
- result.hasMessage = false;
- result.message_ = akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
+ if (messageBuilder_ == null) {
+ message_ = akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ messageBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder getMessageBuilder() {
+ bitField0_ |= 0x00000008;
+ onChanged();
+ return getMessageFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder getMessageOrBuilder() {
+ if (messageBuilder_ != null) {
+ return messageBuilder_.getMessageOrBuilder();
+ } else {
+ return message_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.MessageProtocol, akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder>
+ getMessageFieldBuilder() {
+ if (messageBuilder_ == null) {
+ messageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.MessageProtocol, akka.remote.protocol.RemoteProtocol.MessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder>(
+ message_,
+ getParentForChildren(),
+ isClean());
+ message_ = null;
+ }
+ return messageBuilder_;
+ }
// optional .ExceptionProtocol exception = 5;
+ private akka.remote.protocol.RemoteProtocol.ExceptionProtocol exception_ = akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.ExceptionProtocol, akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder, akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder> exceptionBuilder_;
public boolean hasException() {
- return result.hasException();
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
public akka.remote.protocol.RemoteProtocol.ExceptionProtocol getException() {
- return result.getException();
+ if (exceptionBuilder_ == null) {
+ return exception_;
+ } else {
+ return exceptionBuilder_.getMessage();
+ }
}
public Builder setException(akka.remote.protocol.RemoteProtocol.ExceptionProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (exceptionBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ exception_ = value;
+ onChanged();
+ } else {
+ exceptionBuilder_.setMessage(value);
}
- result.hasException = true;
- result.exception_ = value;
+ bitField0_ |= 0x00000010;
return this;
}
- public Builder setException(akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder builderForValue) {
- result.hasException = true;
- result.exception_ = builderForValue.build();
+ public Builder setException(
+ akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder builderForValue) {
+ if (exceptionBuilder_ == null) {
+ exception_ = builderForValue.build();
+ onChanged();
+ } else {
+ exceptionBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000010;
return this;
}
public Builder mergeException(akka.remote.protocol.RemoteProtocol.ExceptionProtocol value) {
- if (result.hasException() &&
- result.exception_ != akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance()) {
- result.exception_ =
- akka.remote.protocol.RemoteProtocol.ExceptionProtocol.newBuilder(result.exception_).mergeFrom(value).buildPartial();
+ if (exceptionBuilder_ == null) {
+ if (((bitField0_ & 0x00000010) == 0x00000010) &&
+ exception_ != akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance()) {
+ exception_ =
+ akka.remote.protocol.RemoteProtocol.ExceptionProtocol.newBuilder(exception_).mergeFrom(value).buildPartial();
+ } else {
+ exception_ = value;
+ }
+ onChanged();
} else {
- result.exception_ = value;
+ exceptionBuilder_.mergeFrom(value);
}
- result.hasException = true;
+ bitField0_ |= 0x00000010;
return this;
}
public Builder clearException() {
- result.hasException = false;
- result.exception_ = akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
+ if (exceptionBuilder_ == null) {
+ exception_ = akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ exceptionBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder getExceptionBuilder() {
+ bitField0_ |= 0x00000010;
+ onChanged();
+ return getExceptionFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder getExceptionOrBuilder() {
+ if (exceptionBuilder_ != null) {
+ return exceptionBuilder_.getMessageOrBuilder();
+ } else {
+ return exception_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.ExceptionProtocol, akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder, akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder>
+ getExceptionFieldBuilder() {
+ if (exceptionBuilder_ == null) {
+ exceptionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.ExceptionProtocol, akka.remote.protocol.RemoteProtocol.ExceptionProtocol.Builder, akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder>(
+ exception_,
+ getParentForChildren(),
+ isClean());
+ exception_ = null;
+ }
+ return exceptionBuilder_;
+ }
// optional .UuidProtocol supervisorUuid = 6;
+ private akka.remote.protocol.RemoteProtocol.UuidProtocol supervisorUuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> supervisorUuidBuilder_;
public boolean hasSupervisorUuid() {
- return result.hasSupervisorUuid();
+ return ((bitField0_ & 0x00000020) == 0x00000020);
}
public akka.remote.protocol.RemoteProtocol.UuidProtocol getSupervisorUuid() {
- return result.getSupervisorUuid();
+ if (supervisorUuidBuilder_ == null) {
+ return supervisorUuid_;
+ } else {
+ return supervisorUuidBuilder_.getMessage();
+ }
}
public Builder setSupervisorUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (supervisorUuidBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ supervisorUuid_ = value;
+ onChanged();
+ } else {
+ supervisorUuidBuilder_.setMessage(value);
}
- result.hasSupervisorUuid = true;
- result.supervisorUuid_ = value;
+ bitField0_ |= 0x00000020;
return this;
}
- public Builder setSupervisorUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
- result.hasSupervisorUuid = true;
- result.supervisorUuid_ = builderForValue.build();
+ public Builder setSupervisorUuid(
+ akka.remote.protocol.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.protocol.RemoteProtocol.UuidProtocol value) {
- if (result.hasSupervisorUuid() &&
- result.supervisorUuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
- result.supervisorUuid_ =
- akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(result.supervisorUuid_).mergeFrom(value).buildPartial();
+ if (supervisorUuidBuilder_ == null) {
+ if (((bitField0_ & 0x00000020) == 0x00000020) &&
+ supervisorUuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
+ supervisorUuid_ =
+ akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(supervisorUuid_).mergeFrom(value).buildPartial();
+ } else {
+ supervisorUuid_ = value;
+ }
+ onChanged();
} else {
- result.supervisorUuid_ = value;
+ supervisorUuidBuilder_.mergeFrom(value);
}
- result.hasSupervisorUuid = true;
+ bitField0_ |= 0x00000020;
return this;
}
public Builder clearSupervisorUuid() {
- result.hasSupervisorUuid = false;
- result.supervisorUuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ if (supervisorUuidBuilder_ == null) {
+ supervisorUuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ supervisorUuidBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000020);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder getSupervisorUuidBuilder() {
+ bitField0_ |= 0x00000020;
+ onChanged();
+ return getSupervisorUuidFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getSupervisorUuidOrBuilder() {
+ if (supervisorUuidBuilder_ != null) {
+ return supervisorUuidBuilder_.getMessageOrBuilder();
+ } else {
+ return supervisorUuid_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>
+ getSupervisorUuidFieldBuilder() {
+ if (supervisorUuidBuilder_ == null) {
+ supervisorUuidBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
+ supervisorUuid_,
+ getParentForChildren(),
+ isClean());
+ supervisorUuid_ = null;
+ }
+ return supervisorUuidBuilder_;
+ }
// optional .RemoteActorRefProtocol sender = 7;
+ private akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol sender_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder> senderBuilder_;
public boolean hasSender() {
- return result.hasSender();
+ return ((bitField0_ & 0x00000040) == 0x00000040);
}
public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSender() {
- return result.getSender();
+ if (senderBuilder_ == null) {
+ return sender_;
+ } else {
+ return senderBuilder_.getMessage();
+ }
}
public Builder setSender(akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (senderBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ sender_ = value;
+ onChanged();
+ } else {
+ senderBuilder_.setMessage(value);
}
- result.hasSender = true;
- result.sender_ = value;
+ bitField0_ |= 0x00000040;
return this;
}
- public Builder setSender(akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder builderForValue) {
- result.hasSender = true;
- result.sender_ = builderForValue.build();
+ public Builder setSender(
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder builderForValue) {
+ if (senderBuilder_ == null) {
+ sender_ = builderForValue.build();
+ onChanged();
+ } else {
+ senderBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000040;
return this;
}
public Builder mergeSender(akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
- if (result.hasSender() &&
- result.sender_ != akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) {
- result.sender_ =
- akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder(result.sender_).mergeFrom(value).buildPartial();
+ if (senderBuilder_ == null) {
+ if (((bitField0_ & 0x00000040) == 0x00000040) &&
+ sender_ != akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) {
+ sender_ =
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder(sender_).mergeFrom(value).buildPartial();
+ } else {
+ sender_ = value;
+ }
+ onChanged();
} else {
- result.sender_ = value;
+ senderBuilder_.mergeFrom(value);
}
- result.hasSender = true;
+ bitField0_ |= 0x00000040;
return this;
}
public Builder clearSender() {
- result.hasSender = false;
- result.sender_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+ if (senderBuilder_ == null) {
+ sender_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ senderBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000040);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder getSenderBuilder() {
+ bitField0_ |= 0x00000040;
+ onChanged();
+ return getSenderFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSenderOrBuilder() {
+ if (senderBuilder_ != null) {
+ return senderBuilder_.getMessageOrBuilder();
+ } else {
+ return sender_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder>
+ getSenderFieldBuilder() {
+ if (senderBuilder_ == null) {
+ senderBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder>(
+ sender_,
+ getParentForChildren(),
+ isClean());
+ sender_ = null;
+ }
+ return senderBuilder_;
+ }
// repeated .MetadataEntryProtocol metadata = 8;
+ private java.util.List metadata_ =
+ java.util.Collections.emptyList();
+ private void ensureMetadataIsMutable() {
+ if (!((bitField0_ & 0x00000080) == 0x00000080)) {
+ metadata_ = new java.util.ArrayList(metadata_);
+ bitField0_ |= 0x00000080;
+ }
+ }
+
+ private com.google.protobuf.RepeatedFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder> metadataBuilder_;
+
public java.util.List getMetadataList() {
- return java.util.Collections.unmodifiableList(result.metadata_);
+ if (metadataBuilder_ == null) {
+ return java.util.Collections.unmodifiableList(metadata_);
+ } else {
+ return metadataBuilder_.getMessageList();
+ }
}
public int getMetadataCount() {
- return result.getMetadataCount();
+ if (metadataBuilder_ == null) {
+ return metadata_.size();
+ } else {
+ return metadataBuilder_.getCount();
+ }
}
public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol getMetadata(int index) {
- return result.getMetadata(index);
- }
- public Builder setMetadata(int index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (metadataBuilder_ == null) {
+ return metadata_.get(index);
+ } else {
+ return metadataBuilder_.getMessage(index);
+ }
+ }
+ public Builder setMetadata(
+ int index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol value) {
+ if (metadataBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureMetadataIsMutable();
+ metadata_.set(index, value);
+ onChanged();
+ } else {
+ metadataBuilder_.setMessage(index, value);
}
- result.metadata_.set(index, value);
return this;
}
- public Builder setMetadata(int index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder builderForValue) {
- result.metadata_.set(index, builderForValue.build());
+ public Builder setMetadata(
+ int index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder builderForValue) {
+ if (metadataBuilder_ == null) {
+ ensureMetadataIsMutable();
+ metadata_.set(index, builderForValue.build());
+ onChanged();
+ } else {
+ metadataBuilder_.setMessage(index, builderForValue.build());
+ }
return this;
}
public Builder addMetadata(akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (metadataBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureMetadataIsMutable();
+ metadata_.add(value);
+ onChanged();
+ } else {
+ metadataBuilder_.addMessage(value);
}
- if (result.metadata_.isEmpty()) {
- result.metadata_ = new java.util.ArrayList();
- }
- result.metadata_.add(value);
return this;
}
- public Builder addMetadata(akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder builderForValue) {
- if (result.metadata_.isEmpty()) {
- result.metadata_ = new java.util.ArrayList();
+ public Builder addMetadata(
+ int index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol value) {
+ if (metadataBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureMetadataIsMutable();
+ metadata_.add(index, value);
+ onChanged();
+ } else {
+ metadataBuilder_.addMessage(index, value);
+ }
+ return this;
+ }
+ public Builder addMetadata(
+ akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder builderForValue) {
+ if (metadataBuilder_ == null) {
+ ensureMetadataIsMutable();
+ metadata_.add(builderForValue.build());
+ onChanged();
+ } else {
+ metadataBuilder_.addMessage(builderForValue.build());
+ }
+ return this;
+ }
+ public Builder addMetadata(
+ int index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder builderForValue) {
+ if (metadataBuilder_ == null) {
+ ensureMetadataIsMutable();
+ metadata_.add(index, builderForValue.build());
+ onChanged();
+ } else {
+ metadataBuilder_.addMessage(index, builderForValue.build());
}
- result.metadata_.add(builderForValue.build());
return this;
}
public Builder addAllMetadata(
java.lang.Iterable values) {
- if (result.metadata_.isEmpty()) {
- result.metadata_ = new java.util.ArrayList();
+ if (metadataBuilder_ == null) {
+ ensureMetadataIsMutable();
+ super.addAll(values, metadata_);
+ onChanged();
+ } else {
+ metadataBuilder_.addAllMessages(values);
}
- super.addAll(values, result.metadata_);
return this;
}
public Builder clearMetadata() {
- result.metadata_ = java.util.Collections.emptyList();
+ if (metadataBuilder_ == null) {
+ metadata_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000080);
+ onChanged();
+ } else {
+ metadataBuilder_.clear();
+ }
return this;
}
+ public Builder removeMetadata(int index) {
+ if (metadataBuilder_ == null) {
+ ensureMetadataIsMutable();
+ metadata_.remove(index);
+ onChanged();
+ } else {
+ metadataBuilder_.remove(index);
+ }
+ return this;
+ }
+ public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder getMetadataBuilder(
+ int index) {
+ return getMetadataFieldBuilder().getBuilder(index);
+ }
+ public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder getMetadataOrBuilder(
+ int index) {
+ if (metadataBuilder_ == null) {
+ return metadata_.get(index); } else {
+ return metadataBuilder_.getMessageOrBuilder(index);
+ }
+ }
+ public java.util.List
+ getMetadataOrBuilderList() {
+ if (metadataBuilder_ != null) {
+ return metadataBuilder_.getMessageOrBuilderList();
+ } else {
+ return java.util.Collections.unmodifiableList(metadata_);
+ }
+ }
+ public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder addMetadataBuilder() {
+ return getMetadataFieldBuilder().addBuilder(
+ akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance());
+ }
+ public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder addMetadataBuilder(
+ int index) {
+ return getMetadataFieldBuilder().addBuilder(
+ index, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance());
+ }
+ public java.util.List
+ getMetadataBuilderList() {
+ return getMetadataFieldBuilder().getBuilderList();
+ }
+ private com.google.protobuf.RepeatedFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder>
+ getMetadataFieldBuilder() {
+ if (metadataBuilder_ == null) {
+ metadataBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.Builder, akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder>(
+ metadata_,
+ ((bitField0_ & 0x00000080) == 0x00000080),
+ getParentForChildren(),
+ isClean());
+ metadata_ = null;
+ }
+ return metadataBuilder_;
+ }
// @@protoc_insertion_point(builder_scope:RemoteMessageProtocol)
}
static {
defaultInstance = new RemoteMessageProtocol(true);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
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.protocol.RemoteProtocol.CommandType getCommandType();
+ }
public static final class RemoteControlProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements RemoteControlProtocolOrBuilder {
// Use RemoteControlProtocol.newBuilder() to construct.
- private RemoteControlProtocol() {
- initFields();
+ private RemoteControlProtocol(Builder builder) {
+ super(builder);
}
private RemoteControlProtocol(boolean noInit) {}
@@ -1395,36 +2564,74 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_RemoteControlProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// optional string cookie = 1;
public static final int COOKIE_FIELD_NUMBER = 1;
- private boolean hasCookie;
- private java.lang.String cookie_ = "";
- public boolean hasCookie() { return hasCookie; }
- public java.lang.String getCookie() { return cookie_; }
+ private java.lang.Object cookie_;
+ public boolean hasCookie() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public String getCookie() {
+ java.lang.Object ref = cookie_;
+ 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)) {
+ cookie_ = s;
+ }
+ return s;
+ }
+ }
+ private com.google.protobuf.ByteString getCookieBytes() {
+ java.lang.Object ref = cookie_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+ cookie_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
// required .CommandType commandType = 2;
public static final int COMMANDTYPE_FIELD_NUMBER = 2;
- private boolean hasCommandType;
private akka.remote.protocol.RemoteProtocol.CommandType commandType_;
- public boolean hasCommandType() { return hasCommandType; }
- public akka.remote.protocol.RemoteProtocol.CommandType getCommandType() { return commandType_; }
+ public boolean hasCommandType() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public akka.remote.protocol.RemoteProtocol.CommandType getCommandType() {
+ return commandType_;
+ }
private void initFields() {
+ cookie_ = "";
commandType_ = akka.remote.protocol.RemoteProtocol.CommandType.CONNECT;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasCommandType) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasCommandType()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasCookie()) {
- output.writeString(1, getCookie());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeBytes(1, getCookieBytes());
}
- if (hasCommandType()) {
- output.writeEnum(2, getCommandType().getNumber());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeEnum(2, commandType_.getNumber());
}
getUnknownFields().writeTo(output);
}
@@ -1435,19 +2642,26 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasCookie()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(1, getCookie());
+ .computeBytesSize(1, getCookieBytes());
}
- if (hasCommandType()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(2, getCommandType().getNumber());
+ .computeEnumSize(2, commandType_.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.protocol.RemoteProtocol.RemoteControlProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1522,34 +2736,53 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.RemoteControlProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.RemoteControlProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.RemoteControlProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_RemoteControlProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.RemoteControlProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_RemoteControlProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
- }
- result = new akka.remote.protocol.RemoteProtocol.RemoteControlProtocol();
+ super.clear();
+ cookie_ = "";
+ bitField0_ = (bitField0_ & ~0x00000001);
+ commandType_ = akka.remote.protocol.RemoteProtocol.CommandType.CONNECT;
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -1561,33 +2794,39 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.RemoteControlProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.RemoteControlProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.RemoteControlProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.RemoteControlProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.RemoteControlProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.RemoteControlProtocol result = new akka.remote.protocol.RemoteProtocol.RemoteControlProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.remote.protocol.RemoteProtocol.RemoteControlProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.cookie_ = cookie_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.commandType_ = commandType_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1611,6 +2850,14 @@ public final class RemoteProtocol {
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)
@@ -1623,17 +2870,20 @@ public final class RemoteProtocol {
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: {
- setCookie(input.readString());
+ bitField0_ |= 0x00000001;
+ cookie_ = input.readBytes();
break;
}
case 16: {
@@ -1642,7 +2892,8 @@ public final class RemoteProtocol {
if (value == null) {
unknownFields.mergeVarintField(2, rawValue);
} else {
- setCommandType(value);
+ bitField0_ |= 0x00000002;
+ commandType_ = value;
}
break;
}
@@ -1650,46 +2901,65 @@ public final class RemoteProtocol {
}
}
+ private int bitField0_;
// optional string cookie = 1;
+ private java.lang.Object cookie_ = "";
public boolean hasCookie() {
- return result.hasCookie();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
- public java.lang.String getCookie() {
- return result.getCookie();
+ public String getCookie() {
+ java.lang.Object ref = cookie_;
+ if (!(ref instanceof String)) {
+ String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+ cookie_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
}
- public Builder setCookie(java.lang.String value) {
+ public Builder setCookie(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasCookie = true;
- result.cookie_ = value;
+ bitField0_ |= 0x00000001;
+ cookie_ = value;
+ onChanged();
return this;
}
public Builder clearCookie() {
- result.hasCookie = false;
- result.cookie_ = getDefaultInstance().getCookie();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ cookie_ = getDefaultInstance().getCookie();
+ onChanged();
return this;
}
+ void setCookie(com.google.protobuf.ByteString value) {
+ bitField0_ |= 0x00000001;
+ cookie_ = value;
+ onChanged();
+ }
// required .CommandType commandType = 2;
+ private akka.remote.protocol.RemoteProtocol.CommandType commandType_ = akka.remote.protocol.RemoteProtocol.CommandType.CONNECT;
public boolean hasCommandType() {
- return result.hasCommandType();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public akka.remote.protocol.RemoteProtocol.CommandType getCommandType() {
- return result.getCommandType();
+ return commandType_;
}
public Builder setCommandType(akka.remote.protocol.RemoteProtocol.CommandType value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasCommandType = true;
- result.commandType_ = value;
+ bitField0_ |= 0x00000002;
+ commandType_ = value;
+ onChanged();
return this;
}
public Builder clearCommandType() {
- result.hasCommandType = false;
- result.commandType_ = akka.remote.protocol.RemoteProtocol.CommandType.CONNECT;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ commandType_ = akka.remote.protocol.RemoteProtocol.CommandType.CONNECT;
+ onChanged();
return this;
}
@@ -1698,18 +2968,33 @@ public final class RemoteProtocol {
static {
defaultInstance = new RemoteControlProtocol(true);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:RemoteControlProtocol)
}
+ public interface RemoteActorRefProtocolOrBuilder
+ 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();
+ }
public static final class RemoteActorRefProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements RemoteActorRefProtocolOrBuilder {
// Use RemoteActorRefProtocol.newBuilder() to construct.
- private RemoteActorRefProtocol() {
- initFields();
+ private RemoteActorRefProtocol(Builder builder) {
+ super(builder);
}
private RemoteActorRefProtocol(boolean noInit) {}
@@ -1732,46 +3017,92 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required string address = 1;
public static final int ADDRESS_FIELD_NUMBER = 1;
- private boolean hasAddress;
- private java.lang.String address_ = "";
- public boolean hasAddress() { return hasAddress; }
- public java.lang.String getAddress() { return address_; }
+ private java.lang.Object address_;
+ public boolean hasAddress() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ 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 bytes inetSocketAddress = 2;
public static final int INETSOCKETADDRESS_FIELD_NUMBER = 2;
- private boolean hasInetSocketAddress;
- private com.google.protobuf.ByteString inetSocketAddress_ = com.google.protobuf.ByteString.EMPTY;
- public boolean hasInetSocketAddress() { return hasInetSocketAddress; }
- public com.google.protobuf.ByteString getInetSocketAddress() { return inetSocketAddress_; }
+ private com.google.protobuf.ByteString inetSocketAddress_;
+ public boolean hasInetSocketAddress() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public com.google.protobuf.ByteString getInetSocketAddress() {
+ return inetSocketAddress_;
+ }
// optional uint64 timeout = 3;
public static final int TIMEOUT_FIELD_NUMBER = 3;
- private boolean hasTimeout;
- private long timeout_ = 0L;
- public boolean hasTimeout() { return hasTimeout; }
- public long getTimeout() { return timeout_; }
+ private long timeout_;
+ public boolean hasTimeout() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ public long getTimeout() {
+ return timeout_;
+ }
private void initFields() {
+ address_ = "";
+ inetSocketAddress_ = com.google.protobuf.ByteString.EMPTY;
+ timeout_ = 0L;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasAddress) return false;
- if (!hasInetSocketAddress) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasAddress()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!hasInetSocketAddress()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasAddress()) {
- output.writeString(1, getAddress());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeBytes(1, getAddressBytes());
}
- if (hasInetSocketAddress()) {
- output.writeBytes(2, getInetSocketAddress());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeBytes(2, inetSocketAddress_);
}
- if (hasTimeout()) {
- output.writeUInt64(3, getTimeout());
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeUInt64(3, timeout_);
}
getUnknownFields().writeTo(output);
}
@@ -1782,23 +3113,30 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasAddress()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(1, getAddress());
+ .computeBytesSize(1, getAddressBytes());
}
- if (hasInetSocketAddress()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(2, getInetSocketAddress());
+ .computeBytesSize(2, inetSocketAddress_);
}
- if (hasTimeout()) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(3, getTimeout());
+ .computeUInt64Size(3, timeout_);
}
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.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1873,34 +3211,55 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
- }
- result = new akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol();
+ super.clear();
+ address_ = "";
+ bitField0_ = (bitField0_ & ~0x00000001);
+ inetSocketAddress_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ timeout_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -1912,33 +3271,43 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol result = new akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.address_ = address_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.inetSocketAddress_ = inetSocketAddress_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.timeout_ = timeout_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1965,6 +3334,18 @@ public final class RemoteProtocol {
return this;
}
+ public final boolean isInitialized() {
+ if (!hasAddress()) {
+
+ return false;
+ }
+ if (!hasInetSocketAddress()) {
+
+ return false;
+ }
+ return true;
+ }
+
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1977,89 +3358,116 @@ public final class RemoteProtocol {
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: {
- setAddress(input.readString());
+ bitField0_ |= 0x00000001;
+ address_ = input.readBytes();
break;
}
case 18: {
- setInetSocketAddress(input.readBytes());
+ bitField0_ |= 0x00000002;
+ inetSocketAddress_ = input.readBytes();
break;
}
case 24: {
- setTimeout(input.readUInt64());
+ bitField0_ |= 0x00000004;
+ timeout_ = input.readUInt64();
break;
}
}
}
}
+ private int bitField0_;
// required string address = 1;
+ private java.lang.Object address_ = "";
public boolean hasAddress() {
- return result.hasAddress();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
- public java.lang.String getAddress() {
- return result.getAddress();
+ 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(java.lang.String value) {
+ public Builder setAddress(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasAddress = true;
- result.address_ = value;
+ bitField0_ |= 0x00000001;
+ address_ = value;
+ onChanged();
return this;
}
public Builder clearAddress() {
- result.hasAddress = false;
- result.address_ = getDefaultInstance().getAddress();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ address_ = getDefaultInstance().getAddress();
+ onChanged();
return this;
}
+ void setAddress(com.google.protobuf.ByteString value) {
+ bitField0_ |= 0x00000001;
+ address_ = value;
+ onChanged();
+ }
// required bytes inetSocketAddress = 2;
+ private com.google.protobuf.ByteString inetSocketAddress_ = com.google.protobuf.ByteString.EMPTY;
public boolean hasInetSocketAddress() {
- return result.hasInetSocketAddress();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public com.google.protobuf.ByteString getInetSocketAddress() {
- return result.getInetSocketAddress();
+ return inetSocketAddress_;
}
public Builder setInetSocketAddress(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasInetSocketAddress = true;
- result.inetSocketAddress_ = value;
+ bitField0_ |= 0x00000002;
+ inetSocketAddress_ = value;
+ onChanged();
return this;
}
public Builder clearInetSocketAddress() {
- result.hasInetSocketAddress = false;
- result.inetSocketAddress_ = getDefaultInstance().getInetSocketAddress();
+ bitField0_ = (bitField0_ & ~0x00000002);
+ inetSocketAddress_ = getDefaultInstance().getInetSocketAddress();
+ onChanged();
return this;
}
// optional uint64 timeout = 3;
+ private long timeout_ ;
public boolean hasTimeout() {
- return result.hasTimeout();
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
public long getTimeout() {
- return result.getTimeout();
+ return timeout_;
}
public Builder setTimeout(long value) {
- result.hasTimeout = true;
- result.timeout_ = value;
+ bitField0_ |= 0x00000004;
+ timeout_ = value;
+ onChanged();
return this;
}
public Builder clearTimeout() {
- result.hasTimeout = false;
- result.timeout_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ timeout_ = 0L;
+ onChanged();
return this;
}
@@ -2068,18 +3476,82 @@ public final class RemoteProtocol {
static {
defaultInstance = new RemoteActorRefProtocol(true);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:RemoteActorRefProtocol)
}
+ public interface SerializedActorRefProtocolOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required .UuidProtocol uuid = 1;
+ boolean hasUuid();
+ akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid();
+ akka.remote.protocol.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.protocol.RemoteProtocol.LifeCycleProtocol getLifeCycle();
+ akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder();
+
+ // optional .RemoteActorRefProtocol supervisor = 9;
+ boolean hasSupervisor();
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSupervisor();
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder();
+
+ // optional bytes hotswapStack = 10;
+ boolean hasHotswapStack();
+ com.google.protobuf.ByteString getHotswapStack();
+
+ // optional .ReplicationStorageType replicationStorage = 11;
+ boolean hasReplicationStorage();
+ akka.remote.protocol.RemoteProtocol.ReplicationStorageType getReplicationStorage();
+
+ // optional .ReplicationStrategyType replicationStrategy = 12;
+ boolean hasReplicationStrategy();
+ akka.remote.protocol.RemoteProtocol.ReplicationStrategyType getReplicationStrategy();
+
+ // repeated .RemoteMessageProtocol messages = 13;
+ java.util.List
+ getMessagesList();
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessages(int index);
+ int getMessagesCount();
+ java.util.List
+ getMessagesOrBuilderList();
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessagesOrBuilder(
+ int index);
+ }
public static final class SerializedActorRefProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements SerializedActorRefProtocolOrBuilder {
// Use SerializedActorRefProtocol.newBuilder() to construct.
- private SerializedActorRefProtocol() {
- initFields();
+ private SerializedActorRefProtocol(Builder builder) {
+ super(builder);
}
private SerializedActorRefProtocol(boolean noInit) {}
@@ -2102,145 +3574,322 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required .UuidProtocol uuid = 1;
public static final int UUID_FIELD_NUMBER = 1;
- private boolean hasUuid;
private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_;
- public boolean hasUuid() { return hasUuid; }
- public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() { return uuid_; }
+ public boolean hasUuid() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
+ return uuid_;
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+ return uuid_;
+ }
// required string address = 2;
public static final int ADDRESS_FIELD_NUMBER = 2;
- private boolean hasAddress;
- private java.lang.String address_ = "";
- public boolean hasAddress() { return hasAddress; }
- public java.lang.String getAddress() { return address_; }
+ 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 boolean hasActorClassname;
- private java.lang.String actorClassname_ = "";
- public boolean hasActorClassname() { return hasActorClassname; }
- public java.lang.String getActorClassname() { return actorClassname_; }
+ 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 boolean hasActorInstance;
- private com.google.protobuf.ByteString actorInstance_ = com.google.protobuf.ByteString.EMPTY;
- public boolean hasActorInstance() { return hasActorInstance; }
- public com.google.protobuf.ByteString getActorInstance() { return actorInstance_; }
+ 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 boolean hasSerializerClassname;
- private java.lang.String serializerClassname_ = "";
- public boolean hasSerializerClassname() { return hasSerializerClassname; }
- public java.lang.String getSerializerClassname() { return serializerClassname_; }
+ 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 boolean hasTimeout;
- private long timeout_ = 0L;
- public boolean hasTimeout() { return hasTimeout; }
- public long getTimeout() { return timeout_; }
+ 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 boolean hasReceiveTimeout;
- private long receiveTimeout_ = 0L;
- public boolean hasReceiveTimeout() { return hasReceiveTimeout; }
- public long getReceiveTimeout() { return receiveTimeout_; }
+ 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 boolean hasLifeCycle;
private akka.remote.protocol.RemoteProtocol.LifeCycleProtocol lifeCycle_;
- public boolean hasLifeCycle() { return hasLifeCycle; }
- public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol getLifeCycle() { return lifeCycle_; }
+ public boolean hasLifeCycle() {
+ return ((bitField0_ & 0x00000080) == 0x00000080);
+ }
+ public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol getLifeCycle() {
+ return lifeCycle_;
+ }
+ public akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder() {
+ return lifeCycle_;
+ }
// optional .RemoteActorRefProtocol supervisor = 9;
public static final int SUPERVISOR_FIELD_NUMBER = 9;
- private boolean hasSupervisor;
private akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol supervisor_;
- public boolean hasSupervisor() { return hasSupervisor; }
- public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSupervisor() { return supervisor_; }
+ public boolean hasSupervisor() {
+ return ((bitField0_ & 0x00000100) == 0x00000100);
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSupervisor() {
+ return supervisor_;
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder() {
+ return supervisor_;
+ }
// optional bytes hotswapStack = 10;
public static final int HOTSWAPSTACK_FIELD_NUMBER = 10;
- private boolean hasHotswapStack;
- private com.google.protobuf.ByteString hotswapStack_ = com.google.protobuf.ByteString.EMPTY;
- public boolean hasHotswapStack() { return hasHotswapStack; }
- public com.google.protobuf.ByteString getHotswapStack() { return hotswapStack_; }
+ private com.google.protobuf.ByteString hotswapStack_;
+ public boolean hasHotswapStack() {
+ return ((bitField0_ & 0x00000200) == 0x00000200);
+ }
+ public com.google.protobuf.ByteString getHotswapStack() {
+ return hotswapStack_;
+ }
- // repeated .RemoteMessageProtocol messages = 11;
- public static final int MESSAGES_FIELD_NUMBER = 11;
- private java.util.List messages_ =
- java.util.Collections.emptyList();
+ // optional .ReplicationStorageType replicationStorage = 11;
+ public static final int REPLICATIONSTORAGE_FIELD_NUMBER = 11;
+ private akka.remote.protocol.RemoteProtocol.ReplicationStorageType replicationStorage_;
+ public boolean hasReplicationStorage() {
+ return ((bitField0_ & 0x00000400) == 0x00000400);
+ }
+ public akka.remote.protocol.RemoteProtocol.ReplicationStorageType getReplicationStorage() {
+ return replicationStorage_;
+ }
+
+ // optional .ReplicationStrategyType replicationStrategy = 12;
+ public static final int REPLICATIONSTRATEGY_FIELD_NUMBER = 12;
+ private akka.remote.protocol.RemoteProtocol.ReplicationStrategyType replicationStrategy_;
+ public boolean hasReplicationStrategy() {
+ return ((bitField0_ & 0x00000800) == 0x00000800);
+ }
+ public akka.remote.protocol.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 int getMessagesCount() { return messages_.size(); }
+ public java.util.List
+ getMessagesOrBuilderList() {
+ return messages_;
+ }
+ public int getMessagesCount() {
+ return messages_.size();
+ }
public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessages(int index) {
return messages_.get(index);
}
+ public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder getMessagesOrBuilder(
+ int index) {
+ return messages_.get(index);
+ }
private void initFields() {
uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ address_ = "";
+ actorClassname_ = "";
+ actorInstance_ = com.google.protobuf.ByteString.EMPTY;
+ serializerClassname_ = "";
+ timeout_ = 0L;
+ receiveTimeout_ = 0L;
lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
supervisor_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+ hotswapStack_ = com.google.protobuf.ByteString.EMPTY;
+ replicationStorage_ = akka.remote.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
+ replicationStrategy_ = akka.remote.protocol.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH;
+ messages_ = java.util.Collections.emptyList();
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasUuid) return false;
- if (!hasAddress) return false;
- if (!hasActorClassname) return false;
- if (!getUuid().isInitialized()) return false;
+ 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()) return false;
+ if (!getLifeCycle().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
if (hasSupervisor()) {
- if (!getSupervisor().isInitialized()) return false;
+ if (!getSupervisor().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
}
- for (akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol element : getMessagesList()) {
- if (!element.isInitialized()) 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 (hasUuid()) {
- output.writeMessage(1, getUuid());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeMessage(1, uuid_);
}
- if (hasAddress()) {
- output.writeString(2, getAddress());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeBytes(2, getAddressBytes());
}
- if (hasActorClassname()) {
- output.writeString(3, getActorClassname());
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeBytes(3, getActorClassnameBytes());
}
- if (hasActorInstance()) {
- output.writeBytes(4, getActorInstance());
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeBytes(4, actorInstance_);
}
- if (hasSerializerClassname()) {
- output.writeString(5, getSerializerClassname());
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ output.writeBytes(5, getSerializerClassnameBytes());
}
- if (hasTimeout()) {
- output.writeUInt64(6, getTimeout());
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ output.writeUInt64(6, timeout_);
}
- if (hasReceiveTimeout()) {
- output.writeUInt64(7, getReceiveTimeout());
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ output.writeUInt64(7, receiveTimeout_);
}
- if (hasLifeCycle()) {
- output.writeMessage(8, getLifeCycle());
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
+ output.writeMessage(8, lifeCycle_);
}
- if (hasSupervisor()) {
- output.writeMessage(9, getSupervisor());
+ if (((bitField0_ & 0x00000100) == 0x00000100)) {
+ output.writeMessage(9, supervisor_);
}
- if (hasHotswapStack()) {
- output.writeBytes(10, getHotswapStack());
+ if (((bitField0_ & 0x00000200) == 0x00000200)) {
+ output.writeBytes(10, hotswapStack_);
}
- for (akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol element : getMessagesList()) {
- output.writeMessage(11, element);
+ 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);
}
@@ -2251,55 +3900,70 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasUuid()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(1, getUuid());
+ .computeMessageSize(1, uuid_);
}
- if (hasAddress()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(2, getAddress());
+ .computeBytesSize(2, getAddressBytes());
}
- if (hasActorClassname()) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(3, getActorClassname());
+ .computeBytesSize(3, getActorClassnameBytes());
}
- if (hasActorInstance()) {
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(4, getActorInstance());
+ .computeBytesSize(4, actorInstance_);
}
- if (hasSerializerClassname()) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(5, getSerializerClassname());
+ .computeBytesSize(5, getSerializerClassnameBytes());
}
- if (hasTimeout()) {
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(6, getTimeout());
+ .computeUInt64Size(6, timeout_);
}
- if (hasReceiveTimeout()) {
+ if (((bitField0_ & 0x00000040) == 0x00000040)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(7, getReceiveTimeout());
+ .computeUInt64Size(7, receiveTimeout_);
}
- if (hasLifeCycle()) {
+ if (((bitField0_ & 0x00000080) == 0x00000080)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(8, getLifeCycle());
+ .computeMessageSize(8, lifeCycle_);
}
- if (hasSupervisor()) {
+ if (((bitField0_ & 0x00000100) == 0x00000100)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(9, getSupervisor());
+ .computeMessageSize(9, supervisor_);
}
- if (hasHotswapStack()) {
+ if (((bitField0_ & 0x00000200) == 0x00000200)) {
size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(10, getHotswapStack());
+ .computeBytesSize(10, hotswapStack_);
}
- for (akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol element : getMessagesList()) {
+ if (((bitField0_ & 0x00000400) == 0x00000400)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(11, element);
+ .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.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -2374,34 +4038,95 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(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() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
+ super.clear();
+ if (uuidBuilder_ == null) {
+ uuid_ = akka.remote.protocol.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.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
+ } else {
+ lifeCycleBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000080);
+ if (supervisorBuilder_ == null) {
+ supervisor_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+ } else {
+ supervisorBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000100);
+ hotswapStack_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000200);
+ replicationStorage_ = akka.remote.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
+ bitField0_ = (bitField0_ & ~0x00000400);
+ replicationStrategy_ = akka.remote.protocol.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH;
+ bitField0_ = (bitField0_ & ~0x00000800);
+ if (messagesBuilder_ == null) {
+ messages_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00001000);
+ } else {
+ messagesBuilder_.clear();
}
- result = new akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol();
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -2413,37 +4138,100 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol result = new akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- if (result.messages_ != java.util.Collections.EMPTY_LIST) {
- result.messages_ =
- java.util.Collections.unmodifiableList(result.messages_);
+ if (uuidBuilder_ == null) {
+ result.uuid_ = uuid_;
+ } else {
+ result.uuid_ = uuidBuilder_.build();
}
- akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol returnMe = result;
- result = null;
- return returnMe;
+ 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) {
@@ -2487,16 +4275,80 @@ public final class RemoteProtocol {
if (other.hasHotswapStack()) {
setHotswapStack(other.getHotswapStack());
}
- if (!other.messages_.isEmpty()) {
- if (result.messages_.isEmpty()) {
- result.messages_ = new java.util.ArrayList();
+ 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_);
+ }
}
- result.messages_.addAll(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)
@@ -2509,11 +4361,13 @@ public final class RemoteProtocol {
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;
@@ -2528,27 +4382,33 @@ public final class RemoteProtocol {
break;
}
case 18: {
- setAddress(input.readString());
+ bitField0_ |= 0x00000002;
+ address_ = input.readBytes();
break;
}
case 26: {
- setActorClassname(input.readString());
+ bitField0_ |= 0x00000004;
+ actorClassname_ = input.readBytes();
break;
}
case 34: {
- setActorInstance(input.readBytes());
+ bitField0_ |= 0x00000008;
+ actorInstance_ = input.readBytes();
break;
}
case 42: {
- setSerializerClassname(input.readString());
+ bitField0_ |= 0x00000010;
+ serializerClassname_ = input.readBytes();
break;
}
case 48: {
- setTimeout(input.readUInt64());
+ bitField0_ |= 0x00000020;
+ timeout_ = input.readUInt64();
break;
}
case 56: {
- setReceiveTimeout(input.readUInt64());
+ bitField0_ |= 0x00000040;
+ receiveTimeout_ = input.readUInt64();
break;
}
case 66: {
@@ -2570,10 +4430,33 @@ public final class RemoteProtocol {
break;
}
case 82: {
- setHotswapStack(input.readBytes());
+ bitField0_ |= 0x00000200;
+ hotswapStack_ = input.readBytes();
break;
}
- case 90: {
+ case 88: {
+ int rawValue = input.readEnum();
+ akka.remote.protocol.RemoteProtocol.ReplicationStorageType value = akka.remote.protocol.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.protocol.RemoteProtocol.ReplicationStrategyType value = akka.remote.protocol.RemoteProtocol.ReplicationStrategyType.valueOf(rawValue);
+ if (value == null) {
+ unknownFields.mergeVarintField(12, rawValue);
+ } else {
+ bitField0_ |= 0x00000800;
+ replicationStrategy_ = value;
+ }
+ break;
+ }
+ case 106: {
akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder subBuilder = akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.newBuilder();
input.readMessage(subBuilder, extensionRegistry);
addMessages(subBuilder.buildPartial());
@@ -2583,327 +4466,739 @@ public final class RemoteProtocol {
}
}
+ private int bitField0_;
// required .UuidProtocol uuid = 1;
+ private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_;
public boolean hasUuid() {
- return result.hasUuid();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
- return result.getUuid();
+ if (uuidBuilder_ == null) {
+ return uuid_;
+ } else {
+ return uuidBuilder_.getMessage();
+ }
}
public Builder setUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (uuidBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ uuid_ = value;
+ onChanged();
+ } else {
+ uuidBuilder_.setMessage(value);
}
- result.hasUuid = true;
- result.uuid_ = value;
+ bitField0_ |= 0x00000001;
return this;
}
- public Builder setUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
- result.hasUuid = true;
- result.uuid_ = builderForValue.build();
+ public Builder setUuid(
+ akka.remote.protocol.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.protocol.RemoteProtocol.UuidProtocol value) {
- if (result.hasUuid() &&
- result.uuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
- result.uuid_ =
- akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(result.uuid_).mergeFrom(value).buildPartial();
+ if (uuidBuilder_ == null) {
+ if (((bitField0_ & 0x00000001) == 0x00000001) &&
+ uuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
+ uuid_ =
+ akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial();
+ } else {
+ uuid_ = value;
+ }
+ onChanged();
} else {
- result.uuid_ = value;
+ uuidBuilder_.mergeFrom(value);
}
- result.hasUuid = true;
+ bitField0_ |= 0x00000001;
return this;
}
public Builder clearUuid() {
- result.hasUuid = false;
- result.uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ if (uuidBuilder_ == null) {
+ uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ uuidBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() {
+ bitField0_ |= 0x00000001;
+ onChanged();
+ return getUuidFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+ if (uuidBuilder_ != null) {
+ return uuidBuilder_.getMessageOrBuilder();
+ } else {
+ return uuid_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>
+ getUuidFieldBuilder() {
+ if (uuidBuilder_ == null) {
+ uuidBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
+ uuid_,
+ getParentForChildren(),
+ isClean());
+ uuid_ = null;
+ }
+ return uuidBuilder_;
+ }
// required string address = 2;
+ private java.lang.Object address_ = "";
public boolean hasAddress() {
- return result.hasAddress();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
- public java.lang.String getAddress() {
- return result.getAddress();
+ 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(java.lang.String value) {
+ public Builder setAddress(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasAddress = true;
- result.address_ = value;
+ bitField0_ |= 0x00000002;
+ address_ = value;
+ onChanged();
return this;
}
public Builder clearAddress() {
- result.hasAddress = false;
- result.address_ = getDefaultInstance().getAddress();
+ 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 result.hasActorClassname();
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
- public java.lang.String getActorClassname() {
- return result.getActorClassname();
+ 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(java.lang.String value) {
+ public Builder setActorClassname(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasActorClassname = true;
- result.actorClassname_ = value;
+ bitField0_ |= 0x00000004;
+ actorClassname_ = value;
+ onChanged();
return this;
}
public Builder clearActorClassname() {
- result.hasActorClassname = false;
- result.actorClassname_ = getDefaultInstance().getActorClassname();
+ 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 result.hasActorInstance();
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
public com.google.protobuf.ByteString getActorInstance() {
- return result.getActorInstance();
+ return actorInstance_;
}
public Builder setActorInstance(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasActorInstance = true;
- result.actorInstance_ = value;
+ bitField0_ |= 0x00000008;
+ actorInstance_ = value;
+ onChanged();
return this;
}
public Builder clearActorInstance() {
- result.hasActorInstance = false;
- result.actorInstance_ = getDefaultInstance().getActorInstance();
+ bitField0_ = (bitField0_ & ~0x00000008);
+ actorInstance_ = getDefaultInstance().getActorInstance();
+ onChanged();
return this;
}
// optional string serializerClassname = 5;
+ private java.lang.Object serializerClassname_ = "";
public boolean hasSerializerClassname() {
- return result.hasSerializerClassname();
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
- public java.lang.String getSerializerClassname() {
- return result.getSerializerClassname();
+ 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(java.lang.String value) {
+ public Builder setSerializerClassname(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasSerializerClassname = true;
- result.serializerClassname_ = value;
+ bitField0_ |= 0x00000010;
+ serializerClassname_ = value;
+ onChanged();
return this;
}
public Builder clearSerializerClassname() {
- result.hasSerializerClassname = false;
- result.serializerClassname_ = getDefaultInstance().getSerializerClassname();
+ 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 result.hasTimeout();
+ return ((bitField0_ & 0x00000020) == 0x00000020);
}
public long getTimeout() {
- return result.getTimeout();
+ return timeout_;
}
public Builder setTimeout(long value) {
- result.hasTimeout = true;
- result.timeout_ = value;
+ bitField0_ |= 0x00000020;
+ timeout_ = value;
+ onChanged();
return this;
}
public Builder clearTimeout() {
- result.hasTimeout = false;
- result.timeout_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000020);
+ timeout_ = 0L;
+ onChanged();
return this;
}
// optional uint64 receiveTimeout = 7;
+ private long receiveTimeout_ ;
public boolean hasReceiveTimeout() {
- return result.hasReceiveTimeout();
+ return ((bitField0_ & 0x00000040) == 0x00000040);
}
public long getReceiveTimeout() {
- return result.getReceiveTimeout();
+ return receiveTimeout_;
}
public Builder setReceiveTimeout(long value) {
- result.hasReceiveTimeout = true;
- result.receiveTimeout_ = value;
+ bitField0_ |= 0x00000040;
+ receiveTimeout_ = value;
+ onChanged();
return this;
}
public Builder clearReceiveTimeout() {
- result.hasReceiveTimeout = false;
- result.receiveTimeout_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000040);
+ receiveTimeout_ = 0L;
+ onChanged();
return this;
}
// optional .LifeCycleProtocol lifeCycle = 8;
+ private akka.remote.protocol.RemoteProtocol.LifeCycleProtocol lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.LifeCycleProtocol, akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder, akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder> lifeCycleBuilder_;
public boolean hasLifeCycle() {
- return result.hasLifeCycle();
+ return ((bitField0_ & 0x00000080) == 0x00000080);
}
public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol getLifeCycle() {
- return result.getLifeCycle();
+ if (lifeCycleBuilder_ == null) {
+ return lifeCycle_;
+ } else {
+ return lifeCycleBuilder_.getMessage();
+ }
}
public Builder setLifeCycle(akka.remote.protocol.RemoteProtocol.LifeCycleProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (lifeCycleBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ lifeCycle_ = value;
+ onChanged();
+ } else {
+ lifeCycleBuilder_.setMessage(value);
}
- result.hasLifeCycle = true;
- result.lifeCycle_ = value;
+ bitField0_ |= 0x00000080;
return this;
}
- public Builder setLifeCycle(akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder builderForValue) {
- result.hasLifeCycle = true;
- result.lifeCycle_ = builderForValue.build();
+ public Builder setLifeCycle(
+ akka.remote.protocol.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.protocol.RemoteProtocol.LifeCycleProtocol value) {
- if (result.hasLifeCycle() &&
- result.lifeCycle_ != akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance()) {
- result.lifeCycle_ =
- akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.newBuilder(result.lifeCycle_).mergeFrom(value).buildPartial();
+ if (lifeCycleBuilder_ == null) {
+ if (((bitField0_ & 0x00000080) == 0x00000080) &&
+ lifeCycle_ != akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance()) {
+ lifeCycle_ =
+ akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.newBuilder(lifeCycle_).mergeFrom(value).buildPartial();
+ } else {
+ lifeCycle_ = value;
+ }
+ onChanged();
} else {
- result.lifeCycle_ = value;
+ lifeCycleBuilder_.mergeFrom(value);
}
- result.hasLifeCycle = true;
+ bitField0_ |= 0x00000080;
return this;
}
public Builder clearLifeCycle() {
- result.hasLifeCycle = false;
- result.lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
+ if (lifeCycleBuilder_ == null) {
+ lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ lifeCycleBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000080);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder getLifeCycleBuilder() {
+ bitField0_ |= 0x00000080;
+ onChanged();
+ return getLifeCycleFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder getLifeCycleOrBuilder() {
+ if (lifeCycleBuilder_ != null) {
+ return lifeCycleBuilder_.getMessageOrBuilder();
+ } else {
+ return lifeCycle_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.LifeCycleProtocol, akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder, akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder>
+ getLifeCycleFieldBuilder() {
+ if (lifeCycleBuilder_ == null) {
+ lifeCycleBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.LifeCycleProtocol, akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.Builder, akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder>(
+ lifeCycle_,
+ getParentForChildren(),
+ isClean());
+ lifeCycle_ = null;
+ }
+ return lifeCycleBuilder_;
+ }
// optional .RemoteActorRefProtocol supervisor = 9;
+ private akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol supervisor_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder> supervisorBuilder_;
public boolean hasSupervisor() {
- return result.hasSupervisor();
+ return ((bitField0_ & 0x00000100) == 0x00000100);
}
public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSupervisor() {
- return result.getSupervisor();
+ if (supervisorBuilder_ == null) {
+ return supervisor_;
+ } else {
+ return supervisorBuilder_.getMessage();
+ }
}
public Builder setSupervisor(akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (supervisorBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ supervisor_ = value;
+ onChanged();
+ } else {
+ supervisorBuilder_.setMessage(value);
}
- result.hasSupervisor = true;
- result.supervisor_ = value;
+ bitField0_ |= 0x00000100;
return this;
}
- public Builder setSupervisor(akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder builderForValue) {
- result.hasSupervisor = true;
- result.supervisor_ = builderForValue.build();
+ public Builder setSupervisor(
+ akka.remote.protocol.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.protocol.RemoteProtocol.RemoteActorRefProtocol value) {
- if (result.hasSupervisor() &&
- result.supervisor_ != akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) {
- result.supervisor_ =
- akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder(result.supervisor_).mergeFrom(value).buildPartial();
+ if (supervisorBuilder_ == null) {
+ if (((bitField0_ & 0x00000100) == 0x00000100) &&
+ supervisor_ != akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) {
+ supervisor_ =
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder(supervisor_).mergeFrom(value).buildPartial();
+ } else {
+ supervisor_ = value;
+ }
+ onChanged();
} else {
- result.supervisor_ = value;
+ supervisorBuilder_.mergeFrom(value);
}
- result.hasSupervisor = true;
+ bitField0_ |= 0x00000100;
return this;
}
public Builder clearSupervisor() {
- result.hasSupervisor = false;
- result.supervisor_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+ if (supervisorBuilder_ == null) {
+ supervisor_ = akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ supervisorBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000100);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder getSupervisorBuilder() {
+ bitField0_ |= 0x00000100;
+ onChanged();
+ return getSupervisorFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder getSupervisorOrBuilder() {
+ if (supervisorBuilder_ != null) {
+ return supervisorBuilder_.getMessageOrBuilder();
+ } else {
+ return supervisor_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocolOrBuilder>
+ getSupervisorFieldBuilder() {
+ if (supervisorBuilder_ == null) {
+ supervisorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol, akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.Builder, akka.remote.protocol.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 result.hasHotswapStack();
+ return ((bitField0_ & 0x00000200) == 0x00000200);
}
public com.google.protobuf.ByteString getHotswapStack() {
- return result.getHotswapStack();
+ return hotswapStack_;
}
public Builder setHotswapStack(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasHotswapStack = true;
- result.hotswapStack_ = value;
+ bitField0_ |= 0x00000200;
+ hotswapStack_ = value;
+ onChanged();
return this;
}
public Builder clearHotswapStack() {
- result.hasHotswapStack = false;
- result.hotswapStack_ = getDefaultInstance().getHotswapStack();
+ bitField0_ = (bitField0_ & ~0x00000200);
+ hotswapStack_ = getDefaultInstance().getHotswapStack();
+ onChanged();
return this;
}
- // repeated .RemoteMessageProtocol messages = 11;
- public java.util.List getMessagesList() {
- return java.util.Collections.unmodifiableList(result.messages_);
+ // optional .ReplicationStorageType replicationStorage = 11;
+ private akka.remote.protocol.RemoteProtocol.ReplicationStorageType replicationStorage_ = akka.remote.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
+ public boolean hasReplicationStorage() {
+ return ((bitField0_ & 0x00000400) == 0x00000400);
}
- public int getMessagesCount() {
- return result.getMessagesCount();
+ public akka.remote.protocol.RemoteProtocol.ReplicationStorageType getReplicationStorage() {
+ return replicationStorage_;
}
- public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol getMessages(int index) {
- return result.getMessages(index);
- }
- public Builder setMessages(int index, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol value) {
+ public Builder setReplicationStorage(akka.remote.protocol.RemoteProtocol.ReplicationStorageType value) {
if (value == null) {
throw new NullPointerException();
}
- result.messages_.set(index, value);
+ bitField0_ |= 0x00000400;
+ replicationStorage_ = value;
+ onChanged();
return this;
}
- public Builder setMessages(int index, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
- result.messages_.set(index, builderForValue.build());
+ public Builder clearReplicationStorage() {
+ bitField0_ = (bitField0_ & ~0x00000400);
+ replicationStorage_ = akka.remote.protocol.RemoteProtocol.ReplicationStorageType.TRANSIENT;
+ onChanged();
+ return this;
+ }
+
+ // optional .ReplicationStrategyType replicationStrategy = 12;
+ private akka.remote.protocol.RemoteProtocol.ReplicationStrategyType replicationStrategy_ = akka.remote.protocol.RemoteProtocol.ReplicationStrategyType.WRITE_THROUGH;
+ public boolean hasReplicationStrategy() {
+ return ((bitField0_ & 0x00000800) == 0x00000800);
+ }
+ public akka.remote.protocol.RemoteProtocol.ReplicationStrategyType getReplicationStrategy() {
+ return replicationStrategy_;
+ }
+ public Builder setReplicationStrategy(akka.remote.protocol.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.protocol.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.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.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.protocol.RemoteProtocol.RemoteMessageProtocol getMessages(int index) {
+ if (messagesBuilder_ == null) {
+ return messages_.get(index);
+ } else {
+ return messagesBuilder_.getMessage(index);
+ }
+ }
+ public Builder setMessages(
+ int index, akka.remote.protocol.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.protocol.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.protocol.RemoteProtocol.RemoteMessageProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (messagesBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureMessagesIsMutable();
+ messages_.add(value);
+ onChanged();
+ } else {
+ messagesBuilder_.addMessage(value);
}
- if (result.messages_.isEmpty()) {
- result.messages_ = new java.util.ArrayList();
- }
- result.messages_.add(value);
return this;
}
- public Builder addMessages(akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
- if (result.messages_.isEmpty()) {
- result.messages_ = new java.util.ArrayList();
+ public Builder addMessages(
+ int index, akka.remote.protocol.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.protocol.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.protocol.RemoteProtocol.RemoteMessageProtocol.Builder builderForValue) {
+ if (messagesBuilder_ == null) {
+ ensureMessagesIsMutable();
+ messages_.add(index, builderForValue.build());
+ onChanged();
+ } else {
+ messagesBuilder_.addMessage(index, builderForValue.build());
}
- result.messages_.add(builderForValue.build());
return this;
}
public Builder addAllMessages(
java.lang.Iterable values) {
- if (result.messages_.isEmpty()) {
- result.messages_ = new java.util.ArrayList();
+ if (messagesBuilder_ == null) {
+ ensureMessagesIsMutable();
+ super.addAll(values, messages_);
+ onChanged();
+ } else {
+ messagesBuilder_.addAllMessages(values);
}
- super.addAll(values, result.messages_);
return this;
}
public Builder clearMessages() {
- result.messages_ = java.util.Collections.emptyList();
+ 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.protocol.RemoteProtocol.RemoteMessageProtocol.Builder getMessagesBuilder(
+ int index) {
+ return getMessagesFieldBuilder().getBuilder(index);
+ }
+ public akka.remote.protocol.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.protocol.RemoteProtocol.RemoteMessageProtocol.Builder addMessagesBuilder() {
+ return getMessagesFieldBuilder().addBuilder(
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance());
+ }
+ public akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder addMessagesBuilder(
+ int index) {
+ return getMessagesFieldBuilder().addBuilder(
+ index, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.getDefaultInstance());
+ }
+ public java.util.List
+ getMessagesBuilderList() {
+ return getMessagesFieldBuilder().getBuilderList();
+ }
+ private com.google.protobuf.RepeatedFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder>
+ getMessagesFieldBuilder() {
+ if (messagesBuilder_ == null) {
+ messagesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocol.Builder, akka.remote.protocol.RemoteProtocol.RemoteMessageProtocolOrBuilder>(
+ messages_,
+ ((bitField0_ & 0x00001000) == 0x00001000),
+ getParentForChildren(),
+ isClean());
+ messages_ = null;
+ }
+ return messagesBuilder_;
+ }
// @@protoc_insertion_point(builder_scope:SerializedActorRefProtocol)
}
static {
defaultInstance = new SerializedActorRefProtocol(true);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:SerializedActorRefProtocol)
}
+ public interface SerializedTypedActorRefProtocolOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required .SerializedActorRefProtocol actorRef = 1;
+ boolean hasActorRef();
+ akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol getActorRef();
+ akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder();
+
+ // required string interfaceName = 2;
+ boolean hasInterfaceName();
+ String getInterfaceName();
+ }
public static final class SerializedTypedActorRefProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements SerializedTypedActorRefProtocolOrBuilder {
// Use SerializedTypedActorRefProtocol.newBuilder() to construct.
- private SerializedTypedActorRefProtocol() {
- initFields();
+ private SerializedTypedActorRefProtocol(Builder builder) {
+ super(builder);
}
private SerializedTypedActorRefProtocol(boolean noInit) {}
@@ -2926,38 +5221,85 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required .SerializedActorRefProtocol actorRef = 1;
public static final int ACTORREF_FIELD_NUMBER = 1;
- private boolean hasActorRef;
private akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol actorRef_;
- public boolean hasActorRef() { return hasActorRef; }
- public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol getActorRef() { return actorRef_; }
+ public boolean hasActorRef() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol getActorRef() {
+ return actorRef_;
+ }
+ public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder() {
+ return actorRef_;
+ }
// required string interfaceName = 2;
public static final int INTERFACENAME_FIELD_NUMBER = 2;
- private boolean hasInterfaceName;
- private java.lang.String interfaceName_ = "";
- public boolean hasInterfaceName() { return hasInterfaceName; }
- public java.lang.String getInterfaceName() { return interfaceName_; }
+ 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.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
+ interfaceName_ = "";
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasActorRef) return false;
- if (!hasInterfaceName) return false;
- if (!getActorRef().isInitialized()) return false;
+ 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 (hasActorRef()) {
- output.writeMessage(1, getActorRef());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeMessage(1, actorRef_);
}
- if (hasInterfaceName()) {
- output.writeString(2, getInterfaceName());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeBytes(2, getInterfaceNameBytes());
}
getUnknownFields().writeTo(output);
}
@@ -2968,19 +5310,26 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasActorRef()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(1, getActorRef());
+ .computeMessageSize(1, actorRef_);
}
- if (hasInterfaceName()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(2, getInterfaceName());
+ .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.protocol.RemoteProtocol.SerializedTypedActorRefProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -3055,34 +5404,58 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_SerializedTypedActorRefProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(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() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
+ super.clear();
+ if (actorRefBuilder_ == null) {
+ actorRef_ = akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
+ } else {
+ actorRefBuilder_.clear();
}
- result = new akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ interfaceName_ = "";
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -3094,33 +5467,43 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol result = new akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.remote.protocol.RemoteProtocol.SerializedTypedActorRefProtocol returnMe = result;
- result = null;
- return returnMe;
+ 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) {
@@ -3144,6 +5527,22 @@ public final class RemoteProtocol {
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)
@@ -3156,11 +5555,13 @@ public final class RemoteProtocol {
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;
@@ -3175,89 +5576,174 @@ public final class RemoteProtocol {
break;
}
case 18: {
- setInterfaceName(input.readString());
+ bitField0_ |= 0x00000002;
+ interfaceName_ = input.readBytes();
break;
}
}
}
}
+ private int bitField0_;
// required .SerializedActorRefProtocol actorRef = 1;
+ private akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol actorRef_ = akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder> actorRefBuilder_;
public boolean hasActorRef() {
- return result.hasActorRef();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol getActorRef() {
- return result.getActorRef();
+ if (actorRefBuilder_ == null) {
+ return actorRef_;
+ } else {
+ return actorRefBuilder_.getMessage();
+ }
}
public Builder setActorRef(akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (actorRefBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ actorRef_ = value;
+ onChanged();
+ } else {
+ actorRefBuilder_.setMessage(value);
}
- result.hasActorRef = true;
- result.actorRef_ = value;
+ bitField0_ |= 0x00000001;
return this;
}
- public Builder setActorRef(akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder builderForValue) {
- result.hasActorRef = true;
- result.actorRef_ = builderForValue.build();
+ public Builder setActorRef(
+ akka.remote.protocol.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.protocol.RemoteProtocol.SerializedActorRefProtocol value) {
- if (result.hasActorRef() &&
- result.actorRef_ != akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance()) {
- result.actorRef_ =
- akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.newBuilder(result.actorRef_).mergeFrom(value).buildPartial();
+ if (actorRefBuilder_ == null) {
+ if (((bitField0_ & 0x00000001) == 0x00000001) &&
+ actorRef_ != akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance()) {
+ actorRef_ =
+ akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.newBuilder(actorRef_).mergeFrom(value).buildPartial();
+ } else {
+ actorRef_ = value;
+ }
+ onChanged();
} else {
- result.actorRef_ = value;
+ actorRefBuilder_.mergeFrom(value);
}
- result.hasActorRef = true;
+ bitField0_ |= 0x00000001;
return this;
}
public Builder clearActorRef() {
- result.hasActorRef = false;
- result.actorRef_ = akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
+ if (actorRefBuilder_ == null) {
+ actorRef_ = akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ actorRefBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder getActorRefBuilder() {
+ bitField0_ |= 0x00000001;
+ onChanged();
+ return getActorRefFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder getActorRefOrBuilder() {
+ if (actorRefBuilder_ != null) {
+ return actorRefBuilder_.getMessageOrBuilder();
+ } else {
+ return actorRef_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder>
+ getActorRefFieldBuilder() {
+ if (actorRefBuilder_ == null) {
+ actorRefBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder, akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocolOrBuilder>(
+ actorRef_,
+ getParentForChildren(),
+ isClean());
+ actorRef_ = null;
+ }
+ return actorRefBuilder_;
+ }
// required string interfaceName = 2;
+ private java.lang.Object interfaceName_ = "";
public boolean hasInterfaceName() {
- return result.hasInterfaceName();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
- public java.lang.String getInterfaceName() {
- return result.getInterfaceName();
+ 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(java.lang.String value) {
+ public Builder setInterfaceName(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasInterfaceName = true;
- result.interfaceName_ = value;
+ bitField0_ |= 0x00000002;
+ interfaceName_ = value;
+ onChanged();
return this;
}
public Builder clearInterfaceName() {
- result.hasInterfaceName = false;
- result.interfaceName_ = getDefaultInstance().getInterfaceName();
+ 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);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:SerializedTypedActorRefProtocol)
}
+ public interface MessageProtocolOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required .SerializationSchemeType serializationScheme = 1;
+ boolean hasSerializationScheme();
+ akka.remote.protocol.RemoteProtocol.SerializationSchemeType getSerializationScheme();
+
+ // required bytes message = 2;
+ boolean hasMessage();
+ com.google.protobuf.ByteString getMessage();
+
+ // optional bytes messageManifest = 3;
+ boolean hasMessageManifest();
+ com.google.protobuf.ByteString getMessageManifest();
+ }
public static final class MessageProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements MessageProtocolOrBuilder {
// Use MessageProtocol.newBuilder() to construct.
- private MessageProtocol() {
- initFields();
+ private MessageProtocol(Builder builder) {
+ super(builder);
}
private MessageProtocol(boolean noInit) {}
@@ -3280,47 +5766,70 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_MessageProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required .SerializationSchemeType serializationScheme = 1;
public static final int SERIALIZATIONSCHEME_FIELD_NUMBER = 1;
- private boolean hasSerializationScheme;
private akka.remote.protocol.RemoteProtocol.SerializationSchemeType serializationScheme_;
- public boolean hasSerializationScheme() { return hasSerializationScheme; }
- public akka.remote.protocol.RemoteProtocol.SerializationSchemeType getSerializationScheme() { return serializationScheme_; }
+ public boolean hasSerializationScheme() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public akka.remote.protocol.RemoteProtocol.SerializationSchemeType getSerializationScheme() {
+ return serializationScheme_;
+ }
// required bytes message = 2;
public static final int MESSAGE_FIELD_NUMBER = 2;
- private boolean hasMessage;
- private com.google.protobuf.ByteString message_ = com.google.protobuf.ByteString.EMPTY;
- public boolean hasMessage() { return hasMessage; }
- public com.google.protobuf.ByteString getMessage() { return message_; }
+ private com.google.protobuf.ByteString message_;
+ public boolean hasMessage() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public com.google.protobuf.ByteString getMessage() {
+ return message_;
+ }
// optional bytes messageManifest = 3;
public static final int MESSAGEMANIFEST_FIELD_NUMBER = 3;
- private boolean hasMessageManifest;
- private com.google.protobuf.ByteString messageManifest_ = com.google.protobuf.ByteString.EMPTY;
- public boolean hasMessageManifest() { return hasMessageManifest; }
- public com.google.protobuf.ByteString getMessageManifest() { return messageManifest_; }
+ private com.google.protobuf.ByteString messageManifest_;
+ public boolean hasMessageManifest() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ public com.google.protobuf.ByteString getMessageManifest() {
+ return messageManifest_;
+ }
private void initFields() {
serializationScheme_ = akka.remote.protocol.RemoteProtocol.SerializationSchemeType.JAVA;
+ message_ = com.google.protobuf.ByteString.EMPTY;
+ messageManifest_ = com.google.protobuf.ByteString.EMPTY;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasSerializationScheme) return false;
- if (!hasMessage) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasSerializationScheme()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!hasMessage()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasSerializationScheme()) {
- output.writeEnum(1, getSerializationScheme().getNumber());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeEnum(1, serializationScheme_.getNumber());
}
- if (hasMessage()) {
- output.writeBytes(2, getMessage());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeBytes(2, message_);
}
- if (hasMessageManifest()) {
- output.writeBytes(3, getMessageManifest());
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeBytes(3, messageManifest_);
}
getUnknownFields().writeTo(output);
}
@@ -3331,23 +5840,30 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasSerializationScheme()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(1, getSerializationScheme().getNumber());
+ .computeEnumSize(1, serializationScheme_.getNumber());
}
- if (hasMessage()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(2, getMessage());
+ .computeBytesSize(2, message_);
}
- if (hasMessageManifest()) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(3, getMessageManifest());
+ .computeBytesSize(3, messageManifest_);
}
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.protocol.RemoteProtocol.MessageProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -3422,34 +5938,55 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.MessageProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.MessageProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.MessageProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.MessageProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_MessageProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.MessageProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_MessageProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.MessageProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
- }
- result = new akka.remote.protocol.RemoteProtocol.MessageProtocol();
+ super.clear();
+ serializationScheme_ = akka.remote.protocol.RemoteProtocol.SerializationSchemeType.JAVA;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ message_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ messageManifest_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -3461,33 +5998,43 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.MessageProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.MessageProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.MessageProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.MessageProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.MessageProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.MessageProtocol result = new akka.remote.protocol.RemoteProtocol.MessageProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.remote.protocol.RemoteProtocol.MessageProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.serializationScheme_ = serializationScheme_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.message_ = message_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.messageManifest_ = messageManifest_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -3514,6 +6061,18 @@ public final class RemoteProtocol {
return this;
}
+ public final boolean isInitialized() {
+ if (!hasSerializationScheme()) {
+
+ return false;
+ }
+ if (!hasMessage()) {
+
+ return false;
+ }
+ return true;
+ }
+
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3526,11 +6085,13 @@ public final class RemoteProtocol {
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;
@@ -3541,83 +6102,96 @@ public final class RemoteProtocol {
if (value == null) {
unknownFields.mergeVarintField(1, rawValue);
} else {
- setSerializationScheme(value);
+ bitField0_ |= 0x00000001;
+ serializationScheme_ = value;
}
break;
}
case 18: {
- setMessage(input.readBytes());
+ bitField0_ |= 0x00000002;
+ message_ = input.readBytes();
break;
}
case 26: {
- setMessageManifest(input.readBytes());
+ bitField0_ |= 0x00000004;
+ messageManifest_ = input.readBytes();
break;
}
}
}
}
+ private int bitField0_;
// required .SerializationSchemeType serializationScheme = 1;
+ private akka.remote.protocol.RemoteProtocol.SerializationSchemeType serializationScheme_ = akka.remote.protocol.RemoteProtocol.SerializationSchemeType.JAVA;
public boolean hasSerializationScheme() {
- return result.hasSerializationScheme();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
public akka.remote.protocol.RemoteProtocol.SerializationSchemeType getSerializationScheme() {
- return result.getSerializationScheme();
+ return serializationScheme_;
}
public Builder setSerializationScheme(akka.remote.protocol.RemoteProtocol.SerializationSchemeType value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasSerializationScheme = true;
- result.serializationScheme_ = value;
+ bitField0_ |= 0x00000001;
+ serializationScheme_ = value;
+ onChanged();
return this;
}
public Builder clearSerializationScheme() {
- result.hasSerializationScheme = false;
- result.serializationScheme_ = akka.remote.protocol.RemoteProtocol.SerializationSchemeType.JAVA;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ serializationScheme_ = akka.remote.protocol.RemoteProtocol.SerializationSchemeType.JAVA;
+ onChanged();
return this;
}
// required bytes message = 2;
+ private com.google.protobuf.ByteString message_ = com.google.protobuf.ByteString.EMPTY;
public boolean hasMessage() {
- return result.hasMessage();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public com.google.protobuf.ByteString getMessage() {
- return result.getMessage();
+ return message_;
}
public Builder setMessage(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasMessage = true;
- result.message_ = value;
+ bitField0_ |= 0x00000002;
+ message_ = value;
+ onChanged();
return this;
}
public Builder clearMessage() {
- result.hasMessage = false;
- result.message_ = getDefaultInstance().getMessage();
+ bitField0_ = (bitField0_ & ~0x00000002);
+ message_ = getDefaultInstance().getMessage();
+ onChanged();
return this;
}
// optional bytes messageManifest = 3;
+ private com.google.protobuf.ByteString messageManifest_ = com.google.protobuf.ByteString.EMPTY;
public boolean hasMessageManifest() {
- return result.hasMessageManifest();
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
public com.google.protobuf.ByteString getMessageManifest() {
- return result.getMessageManifest();
+ return messageManifest_;
}
public Builder setMessageManifest(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasMessageManifest = true;
- result.messageManifest_ = value;
+ bitField0_ |= 0x00000004;
+ messageManifest_ = value;
+ onChanged();
return this;
}
public Builder clearMessageManifest() {
- result.hasMessageManifest = false;
- result.messageManifest_ = getDefaultInstance().getMessageManifest();
+ bitField0_ = (bitField0_ & ~0x00000004);
+ messageManifest_ = getDefaultInstance().getMessageManifest();
+ onChanged();
return this;
}
@@ -3626,18 +6200,34 @@ public final class RemoteProtocol {
static {
defaultInstance = new MessageProtocol(true);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:MessageProtocol)
}
+ public interface ActorInfoProtocolOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required .UuidProtocol uuid = 1;
+ boolean hasUuid();
+ akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid();
+ akka.remote.protocol.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 {
+ com.google.protobuf.GeneratedMessage
+ implements ActorInfoProtocolOrBuilder {
// Use ActorInfoProtocol.newBuilder() to construct.
- private ActorInfoProtocol() {
- initFields();
+ private ActorInfoProtocol(Builder builder) {
+ super(builder);
}
private ActorInfoProtocol(boolean noInit) {}
@@ -3660,48 +6250,99 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required .UuidProtocol uuid = 1;
public static final int UUID_FIELD_NUMBER = 1;
- private boolean hasUuid;
private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_;
- public boolean hasUuid() { return hasUuid; }
- public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() { return uuid_; }
+ public boolean hasUuid() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
+ return uuid_;
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+ return uuid_;
+ }
// required uint64 timeout = 2;
public static final int TIMEOUT_FIELD_NUMBER = 2;
- private boolean hasTimeout;
- private long timeout_ = 0L;
- public boolean hasTimeout() { return hasTimeout; }
- public long getTimeout() { return timeout_; }
+ 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 boolean hasAddress;
- private java.lang.String address_ = "";
- public boolean hasAddress() { return hasAddress; }
- public java.lang.String getAddress() { return address_; }
+ 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.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ timeout_ = 0L;
+ address_ = "";
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasUuid) return false;
- if (!hasTimeout) return false;
- if (!getUuid().isInitialized()) return false;
+ 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 (hasUuid()) {
- output.writeMessage(1, getUuid());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeMessage(1, uuid_);
}
- if (hasTimeout()) {
- output.writeUInt64(2, getTimeout());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeUInt64(2, timeout_);
}
- if (hasAddress()) {
- output.writeString(3, getAddress());
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeBytes(3, getAddressBytes());
}
getUnknownFields().writeTo(output);
}
@@ -3712,23 +6353,30 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasUuid()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(1, getUuid());
+ .computeMessageSize(1, uuid_);
}
- if (hasTimeout()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(2, getTimeout());
+ .computeUInt64Size(2, timeout_);
}
- if (hasAddress()) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(3, getAddress());
+ .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.protocol.RemoteProtocol.ActorInfoProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -3803,34 +6451,60 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.ActorInfoProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.ActorInfoProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.ActorInfoProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.ActorInfoProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(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() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
+ super.clear();
+ if (uuidBuilder_ == null) {
+ uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ } else {
+ uuidBuilder_.clear();
}
- result = new akka.remote.protocol.RemoteProtocol.ActorInfoProtocol();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ timeout_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ address_ = "";
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -3842,33 +6516,47 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.ActorInfoProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.ActorInfoProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.ActorInfoProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.ActorInfoProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.ActorInfoProtocol result = new akka.remote.protocol.RemoteProtocol.ActorInfoProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.remote.protocol.RemoteProtocol.ActorInfoProtocol returnMe = result;
- result = null;
- return returnMe;
+ 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) {
@@ -3895,6 +6583,22 @@ public final class RemoteProtocol {
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)
@@ -3907,11 +6611,13 @@ public final class RemoteProtocol {
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;
@@ -3926,111 +6632,196 @@ public final class RemoteProtocol {
break;
}
case 16: {
- setTimeout(input.readUInt64());
+ bitField0_ |= 0x00000002;
+ timeout_ = input.readUInt64();
break;
}
case 26: {
- setAddress(input.readString());
+ bitField0_ |= 0x00000004;
+ address_ = input.readBytes();
break;
}
}
}
}
+ private int bitField0_;
// required .UuidProtocol uuid = 1;
+ private akka.remote.protocol.RemoteProtocol.UuidProtocol uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder> uuidBuilder_;
public boolean hasUuid() {
- return result.hasUuid();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
public akka.remote.protocol.RemoteProtocol.UuidProtocol getUuid() {
- return result.getUuid();
+ if (uuidBuilder_ == null) {
+ return uuid_;
+ } else {
+ return uuidBuilder_.getMessage();
+ }
}
public Builder setUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol value) {
- if (value == null) {
- throw new NullPointerException();
+ if (uuidBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ uuid_ = value;
+ onChanged();
+ } else {
+ uuidBuilder_.setMessage(value);
}
- result.hasUuid = true;
- result.uuid_ = value;
+ bitField0_ |= 0x00000001;
return this;
}
- public Builder setUuid(akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder builderForValue) {
- result.hasUuid = true;
- result.uuid_ = builderForValue.build();
+ public Builder setUuid(
+ akka.remote.protocol.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.protocol.RemoteProtocol.UuidProtocol value) {
- if (result.hasUuid() &&
- result.uuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
- result.uuid_ =
- akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(result.uuid_).mergeFrom(value).buildPartial();
+ if (uuidBuilder_ == null) {
+ if (((bitField0_ & 0x00000001) == 0x00000001) &&
+ uuid_ != akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance()) {
+ uuid_ =
+ akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder(uuid_).mergeFrom(value).buildPartial();
+ } else {
+ uuid_ = value;
+ }
+ onChanged();
} else {
- result.uuid_ = value;
+ uuidBuilder_.mergeFrom(value);
}
- result.hasUuid = true;
+ bitField0_ |= 0x00000001;
return this;
}
public Builder clearUuid() {
- result.hasUuid = false;
- result.uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ if (uuidBuilder_ == null) {
+ uuid_ = akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
+ onChanged();
+ } else {
+ uuidBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
+ public akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder getUuidBuilder() {
+ bitField0_ |= 0x00000001;
+ onChanged();
+ return getUuidFieldBuilder().getBuilder();
+ }
+ public akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder getUuidOrBuilder() {
+ if (uuidBuilder_ != null) {
+ return uuidBuilder_.getMessageOrBuilder();
+ } else {
+ return uuid_;
+ }
+ }
+ private com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>
+ getUuidFieldBuilder() {
+ if (uuidBuilder_ == null) {
+ uuidBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ akka.remote.protocol.RemoteProtocol.UuidProtocol, akka.remote.protocol.RemoteProtocol.UuidProtocol.Builder, akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder>(
+ uuid_,
+ getParentForChildren(),
+ isClean());
+ uuid_ = null;
+ }
+ return uuidBuilder_;
+ }
// required uint64 timeout = 2;
+ private long timeout_ ;
public boolean hasTimeout() {
- return result.hasTimeout();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public long getTimeout() {
- return result.getTimeout();
+ return timeout_;
}
public Builder setTimeout(long value) {
- result.hasTimeout = true;
- result.timeout_ = value;
+ bitField0_ |= 0x00000002;
+ timeout_ = value;
+ onChanged();
return this;
}
public Builder clearTimeout() {
- result.hasTimeout = false;
- result.timeout_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ timeout_ = 0L;
+ onChanged();
return this;
}
// optional string address = 3;
+ private java.lang.Object address_ = "";
public boolean hasAddress() {
- return result.hasAddress();
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
- public java.lang.String getAddress() {
- return result.getAddress();
+ 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(java.lang.String value) {
+ public Builder setAddress(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasAddress = true;
- result.address_ = value;
+ bitField0_ |= 0x00000004;
+ address_ = value;
+ onChanged();
return this;
}
public Builder clearAddress() {
- result.hasAddress = false;
- result.address_ = getDefaultInstance().getAddress();
+ 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);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
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();
+ }
public static final class UuidProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements UuidProtocolOrBuilder {
// Use UuidProtocol.newBuilder() to construct.
- private UuidProtocol() {
- initFields();
+ private UuidProtocol(Builder builder) {
+ super(builder);
}
private UuidProtocol(boolean noInit) {}
@@ -4053,36 +6844,56 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_UuidProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required uint64 high = 1;
public static final int HIGH_FIELD_NUMBER = 1;
- private boolean hasHigh;
- private long high_ = 0L;
- public boolean hasHigh() { return hasHigh; }
- public long getHigh() { return high_; }
+ private long high_;
+ public boolean hasHigh() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public long getHigh() {
+ return high_;
+ }
// required uint64 low = 2;
public static final int LOW_FIELD_NUMBER = 2;
- private boolean hasLow;
- private long low_ = 0L;
- public boolean hasLow() { return hasLow; }
- public long getLow() { return low_; }
+ private long low_;
+ public boolean hasLow() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public long getLow() {
+ return low_;
+ }
private void initFields() {
+ high_ = 0L;
+ low_ = 0L;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasHigh) return false;
- if (!hasLow) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasHigh()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!hasLow()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasHigh()) {
- output.writeUInt64(1, getHigh());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeUInt64(1, high_);
}
- if (hasLow()) {
- output.writeUInt64(2, getLow());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeUInt64(2, low_);
}
getUnknownFields().writeTo(output);
}
@@ -4093,19 +6904,26 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasHigh()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(1, getHigh());
+ .computeUInt64Size(1, high_);
}
- if (hasLow()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt64Size(2, getLow());
+ .computeUInt64Size(2, low_);
}
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.protocol.RemoteProtocol.UuidProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -4180,34 +6998,53 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.UuidProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.UuidProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.UuidProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_UuidProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.UuidProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_UuidProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.UuidProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
- }
- result = new akka.remote.protocol.RemoteProtocol.UuidProtocol();
+ super.clear();
+ high_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ low_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -4219,33 +7056,39 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.UuidProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.UuidProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.UuidProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.UuidProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.UuidProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.UuidProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.UuidProtocol result = new akka.remote.protocol.RemoteProtocol.UuidProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.remote.protocol.RemoteProtocol.UuidProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.high_ = high_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.low_ = low_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -4269,6 +7112,18 @@ public final class RemoteProtocol {
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)
@@ -4281,61 +7136,72 @@ public final class RemoteProtocol {
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: {
- setHigh(input.readUInt64());
+ bitField0_ |= 0x00000001;
+ high_ = input.readUInt64();
break;
}
case 16: {
- setLow(input.readUInt64());
+ bitField0_ |= 0x00000002;
+ low_ = input.readUInt64();
break;
}
}
}
}
+ private int bitField0_;
// required uint64 high = 1;
+ private long high_ ;
public boolean hasHigh() {
- return result.hasHigh();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
public long getHigh() {
- return result.getHigh();
+ return high_;
}
public Builder setHigh(long value) {
- result.hasHigh = true;
- result.high_ = value;
+ bitField0_ |= 0x00000001;
+ high_ = value;
+ onChanged();
return this;
}
public Builder clearHigh() {
- result.hasHigh = false;
- result.high_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ high_ = 0L;
+ onChanged();
return this;
}
// required uint64 low = 2;
+ private long low_ ;
public boolean hasLow() {
- return result.hasLow();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public long getLow() {
- return result.getLow();
+ return low_;
}
public Builder setLow(long value) {
- result.hasLow = true;
- result.low_ = value;
+ bitField0_ |= 0x00000002;
+ low_ = value;
+ onChanged();
return this;
}
public Builder clearLow() {
- result.hasLow = false;
- result.low_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ low_ = 0L;
+ onChanged();
return this;
}
@@ -4344,18 +7210,29 @@ public final class RemoteProtocol {
static {
defaultInstance = new UuidProtocol(true);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
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();
+ }
public static final class MetadataEntryProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements MetadataEntryProtocolOrBuilder {
// Use MetadataEntryProtocol.newBuilder() to construct.
- private MetadataEntryProtocol() {
- initFields();
+ private MetadataEntryProtocol(Builder builder) {
+ super(builder);
}
private MetadataEntryProtocol(boolean noInit) {}
@@ -4378,36 +7255,78 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_MetadataEntryProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required string key = 1;
public static final int KEY_FIELD_NUMBER = 1;
- private boolean hasKey;
- private java.lang.String key_ = "";
- public boolean hasKey() { return hasKey; }
- public java.lang.String getKey() { return key_; }
+ private java.lang.Object key_;
+ public boolean hasKey() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public String getKey() {
+ java.lang.Object ref = key_;
+ 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)) {
+ key_ = s;
+ }
+ return s;
+ }
+ }
+ private com.google.protobuf.ByteString getKeyBytes() {
+ java.lang.Object ref = key_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+ key_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
// required bytes value = 2;
public static final int VALUE_FIELD_NUMBER = 2;
- private boolean hasValue;
- private com.google.protobuf.ByteString value_ = com.google.protobuf.ByteString.EMPTY;
- public boolean hasValue() { return hasValue; }
- public com.google.protobuf.ByteString getValue() { return value_; }
+ private com.google.protobuf.ByteString value_;
+ public boolean hasValue() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public com.google.protobuf.ByteString getValue() {
+ return value_;
+ }
private void initFields() {
+ key_ = "";
+ value_ = com.google.protobuf.ByteString.EMPTY;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasKey) return false;
- if (!hasValue) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasKey()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!hasValue()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasKey()) {
- output.writeString(1, getKey());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeBytes(1, getKeyBytes());
}
- if (hasValue()) {
- output.writeBytes(2, getValue());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeBytes(2, value_);
}
getUnknownFields().writeTo(output);
}
@@ -4418,19 +7337,26 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasKey()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(1, getKey());
+ .computeBytesSize(1, getKeyBytes());
}
- if (hasValue()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeBytesSize(2, getValue());
+ .computeBytesSize(2, value_);
}
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.protocol.RemoteProtocol.MetadataEntryProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -4505,34 +7431,53 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.MetadataEntryProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_MetadataEntryProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_MetadataEntryProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
- }
- result = new akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol();
+ super.clear();
+ key_ = "";
+ bitField0_ = (bitField0_ & ~0x00000001);
+ value_ = com.google.protobuf.ByteString.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -4544,33 +7489,39 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol result = new akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.remote.protocol.RemoteProtocol.MetadataEntryProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.key_ = key_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.value_ = value_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -4594,6 +7545,18 @@ public final class RemoteProtocol {
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)
@@ -4606,67 +7569,90 @@ public final class RemoteProtocol {
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: {
- setKey(input.readString());
+ bitField0_ |= 0x00000001;
+ key_ = input.readBytes();
break;
}
case 18: {
- setValue(input.readBytes());
+ bitField0_ |= 0x00000002;
+ value_ = input.readBytes();
break;
}
}
}
}
+ private int bitField0_;
// required string key = 1;
+ private java.lang.Object key_ = "";
public boolean hasKey() {
- return result.hasKey();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
- public java.lang.String getKey() {
- return result.getKey();
+ public String getKey() {
+ java.lang.Object ref = key_;
+ if (!(ref instanceof String)) {
+ String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+ key_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
}
- public Builder setKey(java.lang.String value) {
+ public Builder setKey(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasKey = true;
- result.key_ = value;
+ bitField0_ |= 0x00000001;
+ key_ = value;
+ onChanged();
return this;
}
public Builder clearKey() {
- result.hasKey = false;
- result.key_ = getDefaultInstance().getKey();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ key_ = getDefaultInstance().getKey();
+ onChanged();
return this;
}
+ void setKey(com.google.protobuf.ByteString value) {
+ bitField0_ |= 0x00000001;
+ key_ = value;
+ onChanged();
+ }
// required bytes value = 2;
+ private com.google.protobuf.ByteString value_ = com.google.protobuf.ByteString.EMPTY;
public boolean hasValue() {
- return result.hasValue();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public com.google.protobuf.ByteString getValue() {
- return result.getValue();
+ return value_;
}
public Builder setValue(com.google.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasValue = true;
- result.value_ = value;
+ bitField0_ |= 0x00000002;
+ value_ = value;
+ onChanged();
return this;
}
public Builder clearValue() {
- result.hasValue = false;
- result.value_ = getDefaultInstance().getValue();
+ bitField0_ = (bitField0_ & ~0x00000002);
+ value_ = getDefaultInstance().getValue();
+ onChanged();
return this;
}
@@ -4675,18 +7661,25 @@ public final class RemoteProtocol {
static {
defaultInstance = new MetadataEntryProtocol(true);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
defaultInstance.initFields();
}
// @@protoc_insertion_point(class_scope:MetadataEntryProtocol)
}
+ public interface LifeCycleProtocolOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required .LifeCycleType lifeCycle = 1;
+ boolean hasLifeCycle();
+ akka.remote.protocol.RemoteProtocol.LifeCycleType getLifeCycle();
+ }
public static final class LifeCycleProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements LifeCycleProtocolOrBuilder {
// Use LifeCycleProtocol.newBuilder() to construct.
- private LifeCycleProtocol() {
- initFields();
+ private LifeCycleProtocol(Builder builder) {
+ super(builder);
}
private LifeCycleProtocol(boolean noInit) {}
@@ -4709,26 +7702,38 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required .LifeCycleType lifeCycle = 1;
public static final int LIFECYCLE_FIELD_NUMBER = 1;
- private boolean hasLifeCycle;
private akka.remote.protocol.RemoteProtocol.LifeCycleType lifeCycle_;
- public boolean hasLifeCycle() { return hasLifeCycle; }
- public akka.remote.protocol.RemoteProtocol.LifeCycleType getLifeCycle() { return lifeCycle_; }
+ public boolean hasLifeCycle() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public akka.remote.protocol.RemoteProtocol.LifeCycleType getLifeCycle() {
+ return lifeCycle_;
+ }
private void initFields() {
lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasLifeCycle) return false;
+ 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 (hasLifeCycle()) {
- output.writeEnum(1, getLifeCycle().getNumber());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeEnum(1, lifeCycle_.getNumber());
}
getUnknownFields().writeTo(output);
}
@@ -4739,15 +7744,22 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasLifeCycle()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(1, getLifeCycle().getNumber());
+ .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.protocol.RemoteProtocol.LifeCycleProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -4822,34 +7834,51 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.LifeCycleProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.LifeCycleProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.LifeCycleProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.LifeCycleProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
- }
- result = new akka.remote.protocol.RemoteProtocol.LifeCycleProtocol();
+ super.clear();
+ lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
+ bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -4861,33 +7890,35 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.LifeCycleProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.LifeCycleProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.LifeCycleProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.LifeCycleProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.LifeCycleProtocol result = new akka.remote.protocol.RemoteProtocol.LifeCycleProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.remote.protocol.RemoteProtocol.LifeCycleProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.lifeCycle_ = lifeCycle_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -4908,6 +7939,14 @@ public final class RemoteProtocol {
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)
@@ -4920,11 +7959,13 @@ public final class RemoteProtocol {
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;
@@ -4935,7 +7976,8 @@ public final class RemoteProtocol {
if (value == null) {
unknownFields.mergeVarintField(1, rawValue);
} else {
- setLifeCycle(value);
+ bitField0_ |= 0x00000001;
+ lifeCycle_ = value;
}
break;
}
@@ -4943,25 +7985,29 @@ public final class RemoteProtocol {
}
}
+ private int bitField0_;
// required .LifeCycleType lifeCycle = 1;
+ private akka.remote.protocol.RemoteProtocol.LifeCycleType lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
public boolean hasLifeCycle() {
- return result.hasLifeCycle();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
public akka.remote.protocol.RemoteProtocol.LifeCycleType getLifeCycle() {
- return result.getLifeCycle();
+ return lifeCycle_;
}
public Builder setLifeCycle(akka.remote.protocol.RemoteProtocol.LifeCycleType value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasLifeCycle = true;
- result.lifeCycle_ = value;
+ bitField0_ |= 0x00000001;
+ lifeCycle_ = value;
+ onChanged();
return this;
}
public Builder clearLifeCycle() {
- result.hasLifeCycle = false;
- result.lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ lifeCycle_ = akka.remote.protocol.RemoteProtocol.LifeCycleType.PERMANENT;
+ onChanged();
return this;
}
@@ -4970,18 +8016,29 @@ public final class RemoteProtocol {
static {
defaultInstance = new LifeCycleProtocol(true);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
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();
+ }
public static final class AddressProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements AddressProtocolOrBuilder {
// Use AddressProtocol.newBuilder() to construct.
- private AddressProtocol() {
- initFields();
+ private AddressProtocol(Builder builder) {
+ super(builder);
}
private AddressProtocol(boolean noInit) {}
@@ -5004,36 +8061,78 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_AddressProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required string hostname = 1;
public static final int HOSTNAME_FIELD_NUMBER = 1;
- private boolean hasHostname;
- private java.lang.String hostname_ = "";
- public boolean hasHostname() { return hasHostname; }
- public java.lang.String getHostname() { return hostname_; }
+ private java.lang.Object hostname_;
+ public boolean hasHostname() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public String getHostname() {
+ java.lang.Object ref = hostname_;
+ 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)) {
+ hostname_ = s;
+ }
+ return s;
+ }
+ }
+ private com.google.protobuf.ByteString getHostnameBytes() {
+ java.lang.Object ref = hostname_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+ hostname_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
// required uint32 port = 2;
public static final int PORT_FIELD_NUMBER = 2;
- private boolean hasPort;
- private int port_ = 0;
- public boolean hasPort() { return hasPort; }
- public int getPort() { return port_; }
+ private int port_;
+ public boolean hasPort() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public int getPort() {
+ return port_;
+ }
private void initFields() {
+ hostname_ = "";
+ port_ = 0;
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasHostname) return false;
- if (!hasPort) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasHostname()) {
+ 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();
- if (hasHostname()) {
- output.writeString(1, getHostname());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeBytes(1, getHostnameBytes());
}
- if (hasPort()) {
- output.writeUInt32(2, getPort());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeUInt32(2, port_);
}
getUnknownFields().writeTo(output);
}
@@ -5044,19 +8143,26 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasHostname()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(1, getHostname());
+ .computeBytesSize(1, getHostnameBytes());
}
- if (hasPort()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(2, getPort());
+ .computeUInt32Size(2, 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.protocol.RemoteProtocol.AddressProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -5131,34 +8237,53 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.AddressProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.AddressProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.AddressProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.AddressProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_AddressProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.AddressProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_AddressProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.AddressProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
- }
- result = new akka.remote.protocol.RemoteProtocol.AddressProtocol();
+ super.clear();
+ hostname_ = "";
+ bitField0_ = (bitField0_ & ~0x00000001);
+ port_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -5170,33 +8295,39 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.AddressProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.AddressProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.AddressProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.AddressProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.AddressProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.AddressProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.AddressProtocol result = new akka.remote.protocol.RemoteProtocol.AddressProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.remote.protocol.RemoteProtocol.AddressProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.hostname_ = hostname_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.port_ = port_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -5220,6 +8351,18 @@ public final class RemoteProtocol {
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)
@@ -5232,64 +8375,87 @@ public final class RemoteProtocol {
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: {
- setHostname(input.readString());
+ bitField0_ |= 0x00000001;
+ hostname_ = input.readBytes();
break;
}
case 16: {
- setPort(input.readUInt32());
+ bitField0_ |= 0x00000002;
+ port_ = input.readUInt32();
break;
}
}
}
}
+ private int bitField0_;
// required string hostname = 1;
+ private java.lang.Object hostname_ = "";
public boolean hasHostname() {
- return result.hasHostname();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
- public java.lang.String getHostname() {
- return result.getHostname();
+ public String getHostname() {
+ java.lang.Object ref = hostname_;
+ if (!(ref instanceof String)) {
+ String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+ hostname_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
}
- public Builder setHostname(java.lang.String value) {
+ public Builder setHostname(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasHostname = true;
- result.hostname_ = value;
+ bitField0_ |= 0x00000001;
+ hostname_ = value;
+ onChanged();
return this;
}
public Builder clearHostname() {
- result.hasHostname = false;
- result.hostname_ = getDefaultInstance().getHostname();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ hostname_ = getDefaultInstance().getHostname();
+ onChanged();
return this;
}
+ void setHostname(com.google.protobuf.ByteString value) {
+ bitField0_ |= 0x00000001;
+ hostname_ = value;
+ onChanged();
+ }
// required uint32 port = 2;
+ private int port_ ;
public boolean hasPort() {
- return result.hasPort();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
public int getPort() {
- return result.getPort();
+ return port_;
}
public Builder setPort(int value) {
- result.hasPort = true;
- result.port_ = value;
+ bitField0_ |= 0x00000002;
+ port_ = value;
+ onChanged();
return this;
}
public Builder clearPort() {
- result.hasPort = false;
- result.port_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ port_ = 0;
+ onChanged();
return this;
}
@@ -5298,18 +8464,29 @@ public final class RemoteProtocol {
static {
defaultInstance = new AddressProtocol(true);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
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();
+ }
public static final class ExceptionProtocol extends
- com.google.protobuf.GeneratedMessage {
+ com.google.protobuf.GeneratedMessage
+ implements ExceptionProtocolOrBuilder {
// Use ExceptionProtocol.newBuilder() to construct.
- private ExceptionProtocol() {
- initFields();
+ private ExceptionProtocol(Builder builder) {
+ super(builder);
}
private ExceptionProtocol(boolean noInit) {}
@@ -5332,36 +8509,100 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.internal_static_ExceptionProtocol_fieldAccessorTable;
}
+ private int bitField0_;
// required string classname = 1;
public static final int CLASSNAME_FIELD_NUMBER = 1;
- private boolean hasClassname;
- private java.lang.String classname_ = "";
- public boolean hasClassname() { return hasClassname; }
- public java.lang.String getClassname() { return classname_; }
+ private java.lang.Object classname_;
+ public boolean hasClassname() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ public String getClassname() {
+ java.lang.Object ref = classname_;
+ 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)) {
+ classname_ = s;
+ }
+ return s;
+ }
+ }
+ private com.google.protobuf.ByteString getClassnameBytes() {
+ java.lang.Object ref = classname_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+ classname_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
// required string message = 2;
public static final int MESSAGE_FIELD_NUMBER = 2;
- private boolean hasMessage;
- private java.lang.String message_ = "";
- public boolean hasMessage() { return hasMessage; }
- public java.lang.String getMessage() { return message_; }
+ private java.lang.Object message_;
+ public boolean hasMessage() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ public String getMessage() {
+ java.lang.Object ref = message_;
+ 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)) {
+ message_ = s;
+ }
+ return s;
+ }
+ }
+ private com.google.protobuf.ByteString getMessageBytes() {
+ java.lang.Object ref = message_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+ message_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
private void initFields() {
+ classname_ = "";
+ message_ = "";
}
+ private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
- if (!hasClassname) return false;
- if (!hasMessage) return false;
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasClassname()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!hasMessage()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
return true;
}
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- if (hasClassname()) {
- output.writeString(1, getClassname());
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeBytes(1, getClassnameBytes());
}
- if (hasMessage()) {
- output.writeString(2, getMessage());
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeBytes(2, getMessageBytes());
}
getUnknownFields().writeTo(output);
}
@@ -5372,19 +8613,26 @@ public final class RemoteProtocol {
if (size != -1) return size;
size = 0;
- if (hasClassname()) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(1, getClassname());
+ .computeBytesSize(1, getClassnameBytes());
}
- if (hasMessage()) {
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeStringSize(2, getMessage());
+ .computeBytesSize(2, getMessageBytes());
}
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.protocol.RemoteProtocol.ExceptionProtocol parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -5459,34 +8707,53 @@ public final class RemoteProtocol {
}
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 {
- private akka.remote.protocol.RemoteProtocol.ExceptionProtocol result;
-
- // Construct using akka.remote.protocol.RemoteProtocol.ExceptionProtocol.newBuilder()
- private Builder() {}
-
- private static Builder create() {
- Builder builder = new Builder();
- builder.result = new akka.remote.protocol.RemoteProtocol.ExceptionProtocol();
- return builder;
+ com.google.protobuf.GeneratedMessage.Builder
+ implements akka.remote.protocol.RemoteProtocol.ExceptionProtocolOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_ExceptionProtocol_descriptor;
}
- protected akka.remote.protocol.RemoteProtocol.ExceptionProtocol internalGetResult() {
- return result;
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return akka.remote.protocol.RemoteProtocol.internal_static_ExceptionProtocol_fieldAccessorTable;
+ }
+
+ // Construct using akka.remote.protocol.RemoteProtocol.ExceptionProtocol.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
}
public Builder clear() {
- if (result == null) {
- throw new IllegalStateException(
- "Cannot call clear() after build().");
- }
- result = new akka.remote.protocol.RemoteProtocol.ExceptionProtocol();
+ super.clear();
+ classname_ = "";
+ bitField0_ = (bitField0_ & ~0x00000001);
+ message_ = "";
+ bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
public Builder clone() {
- return create().mergeFrom(result);
+ return create().mergeFrom(buildPartial());
}
public com.google.protobuf.Descriptors.Descriptor
@@ -5498,33 +8765,39 @@ public final class RemoteProtocol {
return akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance();
}
- public boolean isInitialized() {
- return result.isInitialized();
- }
public akka.remote.protocol.RemoteProtocol.ExceptionProtocol build() {
- if (result != null && !isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.ExceptionProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
- return buildPartial();
+ return result;
}
private akka.remote.protocol.RemoteProtocol.ExceptionProtocol buildParsed()
throws com.google.protobuf.InvalidProtocolBufferException {
- if (!isInitialized()) {
+ akka.remote.protocol.RemoteProtocol.ExceptionProtocol result = buildPartial();
+ if (!result.isInitialized()) {
throw newUninitializedMessageException(
result).asInvalidProtocolBufferException();
}
- return buildPartial();
+ return result;
}
public akka.remote.protocol.RemoteProtocol.ExceptionProtocol buildPartial() {
- if (result == null) {
- throw new IllegalStateException(
- "build() has already been called on this Builder.");
+ akka.remote.protocol.RemoteProtocol.ExceptionProtocol result = new akka.remote.protocol.RemoteProtocol.ExceptionProtocol(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
}
- akka.remote.protocol.RemoteProtocol.ExceptionProtocol returnMe = result;
- result = null;
- return returnMe;
+ result.classname_ = classname_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.message_ = message_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -5548,6 +8821,18 @@ public final class RemoteProtocol {
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)
@@ -5560,76 +8845,110 @@ public final class RemoteProtocol {
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: {
- setClassname(input.readString());
+ bitField0_ |= 0x00000001;
+ classname_ = input.readBytes();
break;
}
case 18: {
- setMessage(input.readString());
+ bitField0_ |= 0x00000002;
+ message_ = input.readBytes();
break;
}
}
}
}
+ private int bitField0_;
// required string classname = 1;
+ private java.lang.Object classname_ = "";
public boolean hasClassname() {
- return result.hasClassname();
+ return ((bitField0_ & 0x00000001) == 0x00000001);
}
- public java.lang.String getClassname() {
- return result.getClassname();
+ public String getClassname() {
+ java.lang.Object ref = classname_;
+ if (!(ref instanceof String)) {
+ String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+ classname_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
}
- public Builder setClassname(java.lang.String value) {
+ public Builder setClassname(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasClassname = true;
- result.classname_ = value;
+ bitField0_ |= 0x00000001;
+ classname_ = value;
+ onChanged();
return this;
}
public Builder clearClassname() {
- result.hasClassname = false;
- result.classname_ = getDefaultInstance().getClassname();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ classname_ = getDefaultInstance().getClassname();
+ onChanged();
return this;
}
+ void setClassname(com.google.protobuf.ByteString value) {
+ bitField0_ |= 0x00000001;
+ classname_ = value;
+ onChanged();
+ }
// required string message = 2;
+ private java.lang.Object message_ = "";
public boolean hasMessage() {
- return result.hasMessage();
+ return ((bitField0_ & 0x00000002) == 0x00000002);
}
- public java.lang.String getMessage() {
- return result.getMessage();
+ public String getMessage() {
+ java.lang.Object ref = message_;
+ if (!(ref instanceof String)) {
+ String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+ message_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
}
- public Builder setMessage(java.lang.String value) {
+ public Builder setMessage(String value) {
if (value == null) {
throw new NullPointerException();
}
- result.hasMessage = true;
- result.message_ = value;
+ bitField0_ |= 0x00000002;
+ message_ = value;
+ onChanged();
return this;
}
public Builder clearMessage() {
- result.hasMessage = false;
- result.message_ = getDefaultInstance().getMessage();
+ bitField0_ = (bitField0_ & ~0x00000002);
+ message_ = getDefaultInstance().getMessage();
+ onChanged();
return this;
}
+ void setMessage(com.google.protobuf.ByteString value) {
+ bitField0_ |= 0x00000002;
+ message_ = value;
+ onChanged();
+ }
// @@protoc_insertion_point(builder_scope:ExceptionProtocol)
}
static {
defaultInstance = new ExceptionProtocol(true);
- akka.remote.protocol.RemoteProtocol.internalForceInit();
defaultInstance.initFields();
}
@@ -5725,34 +9044,41 @@ public final class RemoteProtocol {
"\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\"" +
- "\323\002\n\032SerializedActorRefProtocol\022\033\n\004uuid\030\001" +
+ "\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\022(\n\010messages\030\013 \003(\0132\026." +
- "RemoteMessageProtocol\"g\n\037SerializedTyped" +
- "ActorRefProtocol\022-\n\010actorRef\030\001 \002(\0132\033.Ser" +
- "ializedActorRefProtocol\022\025\n\rinterfaceName" +
- "\030\002 \002(\t\"r\n\017MessageProtocol\0225\n\023serializati" +
- "onScheme\030\001 \002(\0162\030.SerializationSchemeType" +
- "\022\017\n\007message\030\002 \002(\014\022\027\n\017messageManifest\030\003 \001" +
- "(\014\"R\n\021ActorInfoProtocol\022\033\n\004uuid\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\004high\030\001 \002(\004\022\013\n\003" +
- "low\030\002 \002(\004\"3\n\025MetadataEntryProtocol\022\013\n\003ke" +
- "y\030\001 \002(\t\022\r\n\005value\030\002 \002(\014\"6\n\021LifeCycleProto" +
- "col\022!\n\tlifeCycle\030\001 \002(\0162\016.LifeCycleType\"1" +
- "\n\017AddressProtocol\022\020\n\010hostname\030\001 \002(\t\022\014\n\004p" +
- "ort\030\002 \002(\r\"7\n\021ExceptionProtocol\022\021\n\tclassn" +
- "ame\030\001 \002(\t\022\017\n\007message\030\002 \002(\t*(\n\013CommandTyp" +
- "e\022\013\n\007CONNECT\020\001\022\014\n\010SHUTDOWN\020\002*]\n\027Serializ" +
- "ationSchemeType\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\010PROTOBU" +
- "F\020\005*-\n\rLifeCycleType\022\r\n\tPERMANENT\020\001\022\r\n\tT" +
- "EMPORARY\020\002B\030\n\024akka.remote.protocolH\001"
+ "\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\"r\n\017Me" +
+ "ssageProtocol\0225\n\023serializationScheme\030\001 \002",
+ "(\0162\030.SerializationSchemeType\022\017\n\007message\030" +
+ "\002 \002(\014\022\027\n\017messageManifest\030\003 \001(\014\"R\n\021ActorI" +
+ "nfoProtocol\022\033\n\004uuid\030\001 \002(\0132\r.UuidProtocol" +
+ "\022\017\n\007timeout\030\002 \002(\004\022\017\n\007address\030\003 \001(\t\")\n\014Uu" +
+ "idProtocol\022\014\n\004high\030\001 \002(\004\022\013\n\003low\030\002 \002(\004\"3\n" +
+ "\025MetadataEntryProtocol\022\013\n\003key\030\001 \002(\t\022\r\n\005v" +
+ "alue\030\002 \002(\014\"6\n\021LifeCycleProtocol\022!\n\tlifeC" +
+ "ycle\030\001 \002(\0162\016.LifeCycleType\"1\n\017AddressPro" +
+ "tocol\022\020\n\010hostname\030\001 \002(\t\022\014\n\004port\030\002 \002(\r\"7\n" +
+ "\021ExceptionProtocol\022\021\n\tclassname\030\001 \002(\t\022\017\n",
+ "\007message\030\002 \002(\t*(\n\013CommandType\022\013\n\007CONNECT" +
+ "\020\001\022\014\n\010SHUTDOWN\020\002*K\n\026ReplicationStorageTy" +
+ "pe\022\r\n\tTRANSIENT\020\001\022\023\n\017TRANSACTION_LOG\020\002\022\r" +
+ "\n\tDATA_GRID\020\003*>\n\027ReplicationStrategyType" +
+ "\022\021\n\rWRITE_THROUGH\020\001\022\020\n\014WRITE_BEHIND\020\002*]\n" +
+ "\027SerializationSchemeType\022\010\n\004JAVA\020\001\022\013\n\007SB" +
+ "INARY\020\002\022\016\n\nSCALA_JSON\020\003\022\r\n\tJAVA_JSON\020\004\022\014" +
+ "\n\010PROTOBUF\020\005*-\n\rLifeCycleType\022\r\n\tPERMANE" +
+ "NT\020\001\022\r\n\tTEMPORARY\020\002B\030\n\024akka.remote.proto" +
+ "colH\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -5796,7 +9122,7 @@ public final class RemoteProtocol {
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", "Messages", },
+ new java.lang.String[] { "Uuid", "Address", "ActorClassname", "ActorInstance", "SerializerClassname", "Timeout", "ReceiveTimeout", "LifeCycle", "Supervisor", "HotswapStack", "ReplicationStorage", "ReplicationStrategy", "Messages", },
akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.class,
akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.Builder.class);
internal_static_SerializedTypedActorRefProtocol_descriptor =
@@ -5872,7 +9198,5 @@ public final class RemoteProtocol {
}, assigner);
}
- public static void internalForceInit() {}
-
// @@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 795a58814c..03ea1abc5d 100644
--- a/akka-remote/src/main/protocol/RemoteProtocol.proto
+++ b/akka-remote/src/main/protocol/RemoteProtocol.proto
@@ -46,6 +46,23 @@ enum CommandType {
SHUTDOWN = 2;
}
+/**
+ * Defines the type of the ReplicationStorage
+ */
+enum ReplicationStorageType {
+ TRANSIENT = 1;
+ TRANSACTION_LOG = 2;
+ DATA_GRID = 3;
+}
+
+/**
+ * Defines the type of the ReplicationStrategy
+ */
+enum ReplicationStrategyType {
+ WRITE_THROUGH = 1;
+ WRITE_BEHIND = 2;
+}
+
/**
* Defines a remote ActorRef that "remembers" and uses its original Actor instance
* on the original node.
@@ -72,7 +89,9 @@ message SerializedActorRefProtocol {
optional LifeCycleProtocol lifeCycle = 8;
optional RemoteActorRefProtocol supervisor = 9;
optional bytes hotswapStack = 10;
- repeated RemoteMessageProtocol messages = 11;
+ optional ReplicationStorageType replicationStorage = 11;
+ optional ReplicationStrategyType replicationStrategy = 12;
+ repeated RemoteMessageProtocol messages = 13;
}
/**
diff --git a/akka-remote/src/main/scala/akka/remote/RemoteConfig.scala b/akka-remote/src/main/scala/akka/remote/RemoteConfig.scala
index 0708cffae7..d6803013f2 100644
--- a/akka-remote/src/main/scala/akka/remote/RemoteConfig.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemoteConfig.scala
@@ -9,59 +9,58 @@ import akka.config.Config._
import akka.config.ConfigurationException
object RemoteClientSettings {
- val SECURE_COOKIE: Option[String] = config.getString("akka.remote.secure-cookie", "") match {
+ val SECURE_COOKIE: Option[String] = config.getString("akka.cluster.secure-cookie", "") match {
case "" ⇒ None
case cookie ⇒ Some(cookie)
}
- val RECONNECTION_TIME_WINDOW = Duration(config.getInt("akka.remote.client.reconnection-time-window", 600), TIME_UNIT).toMillis
- val READ_TIMEOUT = Duration(config.getInt("akka.remote.client.read-timeout", 10), TIME_UNIT)
- val RECONNECT_DELAY = Duration(config.getInt("akka.remote.client.reconnect-delay", 5), TIME_UNIT)
- val REAP_FUTURES_DELAY = Duration(config.getInt("akka.remote.client.reap-futures-delay", 5), TIME_UNIT)
- val MESSAGE_FRAME_SIZE = config.getInt("akka.remote.client.message-frame-size", 1048576)
+ val RECONNECTION_TIME_WINDOW = Duration(config.getInt("akka.cluster.client.reconnection-time-window", 600), TIME_UNIT).toMillis
+ val READ_TIMEOUT = Duration(config.getInt("akka.cluster.client.read-timeout", 10), TIME_UNIT)
+ val RECONNECT_DELAY = Duration(config.getInt("akka.cluster.client.reconnect-delay", 5), TIME_UNIT)
+ val REAP_FUTURES_DELAY = Duration(config.getInt("akka.cluster.client.reap-futures-delay", 5), TIME_UNIT)
+ val MESSAGE_FRAME_SIZE = config.getInt("akka.cluster.client.message-frame-size", 1048576)
}
object RemoteServerSettings {
- val isRemotingEnabled = config.getList("akka.enabled-modules").exists(_ == "remote")
- val MESSAGE_FRAME_SIZE = config.getInt("akka.remote.server.message-frame-size", 1048576)
- val SECURE_COOKIE = config.getString("akka.remote.secure-cookie")
+ val isRemotingEnabled = config.getList("akka.enabled-modules").exists(_ == "cluster")
+ val MESSAGE_FRAME_SIZE = config.getInt("akka.cluster.server.message-frame-size", 1048576)
+ val SECURE_COOKIE = config.getString("akka.cluster.secure-cookie")
val REQUIRE_COOKIE = {
- val requireCookie = config.getBool("akka.remote.server.require-cookie", false)
+ val requireCookie = config.getBool("akka.cluster.server.require-cookie", false)
if (isRemotingEnabled && requireCookie && SECURE_COOKIE.isEmpty) throw new ConfigurationException(
- "Configuration option 'akka.remote.server.require-cookie' is turned on but no secure cookie is defined in 'akka.remote.secure-cookie'.")
+ "Configuration option 'akka.cluster.server.require-cookie' is turned on but no secure cookie is defined in 'akka.cluster.secure-cookie'.")
requireCookie
}
- val UNTRUSTED_MODE = config.getBool("akka.remote.server.untrusted-mode", false)
- val HOSTNAME = config.getString("akka.remote.server.hostname", "localhost")
- val PORT = config.getInt("akka.remote.server.port", 2552)
- val CONNECTION_TIMEOUT_MILLIS = Duration(config.getInt("akka.remote.server.connection-timeout", 1), TIME_UNIT)
- val COMPRESSION_SCHEME = config.getString("akka.remote.compression-scheme", "zlib")
+ val UNTRUSTED_MODE = config.getBool("akka.cluster.server.untrusted-mode", false)
+ val PORT = config.getInt("akka.cluster.server.port", 2552)
+ val CONNECTION_TIMEOUT_MILLIS = Duration(config.getInt("akka.cluster.server.connection-timeout", 1), TIME_UNIT)
+ val COMPRESSION_SCHEME = config.getString("akka.cluster.compression-scheme", "zlib")
val ZLIB_COMPRESSION_LEVEL = {
- val level = config.getInt("akka.remote.zlib-compression-level", 6)
+ val level = config.getInt("akka.cluster.zlib-compression-level", 6)
if (level < 1 && level > 9) throw new IllegalArgumentException(
"zlib compression level has to be within 1-9, with 1 being fastest and 9 being the most compressed")
level
}
- val BACKLOG = config.getInt("akka.remote.server.backlog", 4096)
+ val BACKLOG = config.getInt("akka.cluster.server.backlog", 4096)
- val EXECUTION_POOL_KEEPALIVE = Duration(config.getInt("akka.remote.server.execution-pool-keepalive", 60), TIME_UNIT)
+ val EXECUTION_POOL_KEEPALIVE = Duration(config.getInt("akka.cluster.server.execution-pool-keepalive", 60), TIME_UNIT)
val EXECUTION_POOL_SIZE = {
- val sz = config.getInt("akka.remote.server.execution-pool-size", 16)
- if (sz < 1) throw new IllegalArgumentException("akka.remote.server.execution-pool-size is less than 1")
+ val sz = config.getInt("akka.cluster.server.execution-pool-size", 16)
+ if (sz < 1) throw new IllegalArgumentException("akka.cluster.server.execution-pool-size is less than 1")
sz
}
val MAX_CHANNEL_MEMORY_SIZE = {
- val sz = config.getInt("akka.remote.server.max-channel-memory-size", 0)
- if (sz < 0) throw new IllegalArgumentException("akka.remote.server.max-channel-memory-size is less than 0")
+ val sz = config.getInt("akka.cluster.server.max-channel-memory-size", 0)
+ if (sz < 0) throw new IllegalArgumentException("akka.cluster.server.max-channel-memory-size is less than 0")
sz
}
val MAX_TOTAL_MEMORY_SIZE = {
- val sz = config.getInt("akka.remote.server.max-total-memory-size", 0)
- if (sz < 0) throw new IllegalArgumentException("akka.remote.server.max-total-memory-size is less than 0")
+ val sz = config.getInt("akka.cluster.server.max-total-memory-size", 0)
+ if (sz < 0) throw new IllegalArgumentException("akka.cluster.server.max-total-memory-size is less than 0")
sz
}
}
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 e107f45d49..28d476cc9a 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -148,8 +148,8 @@ abstract class RemoteClient private[akka] (
val module: NettyRemoteClientModule,
val remoteAddress: InetSocketAddress) {
- val useTransactionLog = config.getBool("akka.remote.client.buffering.retry-message-send-on-failure", true)
- val transactionLogCapacity = config.getInt("akka.remote.client.buffering.capacity", -1)
+ val useTransactionLog = config.getBool("akka.cluster.client.buffering.retry-message-send-on-failure", true)
+ val transactionLogCapacity = config.getInt("akka.cluster.client.buffering.capacity", -1)
val name = this.getClass.getSimpleName + "@" +
remoteAddress.getAddress.getHostAddress + "::" +
@@ -879,9 +879,13 @@ class RemoteServerHandler(
case _ ⇒ None
}
- private def handleRemoteMessageProtocol(request: RemoteMessageProtocol, channel: Channel) = {
+ private def handleRemoteMessageProtocol(request: RemoteMessageProtocol, channel: Channel) = try {
EventHandler.debug(this, "Received remote message [%s]".format(request))
dispatchToActor(request, channel)
+ } catch {
+ case e: Exception ⇒
+ server.notifyListeners(RemoteServerError(e, server))
+ EventHandler.error(e, this, e.getMessage)
}
private def dispatchToActor(request: RemoteMessageProtocol, channel: Channel) {
diff --git a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
index 8a34a0ec5e..61e9f69a17 100644
--- a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
+++ b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
@@ -4,20 +4,21 @@
package akka.serialization
-import akka.dispatch.MessageInvocation
-import akka.remote.protocol.RemoteProtocol._
-import akka.remote.protocol.RemoteProtocol
-
import akka.config.Supervision._
import akka.actor.{ uuidFrom, newUuid }
import akka.actor._
+import DeploymentConfig._
+import akka.dispatch.MessageInvocation
+import akka.util.ReflectiveAccess
+import akka.remote.{ RemoteClientSettings, MessageSerializer }
+import akka.remote.protocol.RemoteProtocol
+import RemoteProtocol._
import scala.collection.immutable.Stack
-import com.google.protobuf.ByteString
-import akka.util.ReflectiveAccess
import java.net.InetSocketAddress
-import akka.remote.{ RemoteClientSettings, MessageSerializer }
+
+import com.google.protobuf.ByteString
/**
* Module for local actor serialization.
@@ -31,19 +32,30 @@ object ActorSerialization {
def fromBinary[T <: Actor](bytes: Array[Byte])(implicit format: Serializer): ActorRef =
fromBinaryToLocalActorRef(bytes, None, format)
- def toBinary[T <: Actor](a: ActorRef, serializeMailBox: Boolean = true)(implicit format: Serializer): Array[Byte] =
- toSerializedActorRefProtocol(a, format, serializeMailBox).toByteArray
+ def toBinary[T <: Actor](
+ a: ActorRef,
+ serializeMailBox: Boolean = true,
+ replicationScheme: ReplicationScheme = Transient)(implicit format: Serializer): Array[Byte] =
+ toSerializedActorRefProtocol(a, format, serializeMailBox, replicationScheme).toByteArray
// wrapper for implicits to be used by Java
def fromBinaryJ[T <: Actor](bytes: Array[Byte], format: Serializer): ActorRef =
fromBinary(bytes)(format)
// wrapper for implicits to be used by Java
- def toBinaryJ[T <: Actor](a: ActorRef, format: Serializer, srlMailBox: Boolean = true): Array[Byte] =
- toBinary(a, srlMailBox)(format)
+ def toBinaryJ[T <: Actor](
+ a: ActorRef,
+ format: Serializer,
+ srlMailBox: Boolean,
+ replicationScheme: ReplicationScheme): Array[Byte] =
+ toBinary(a, srlMailBox, replicationScheme)(format)
private[akka] def toSerializedActorRefProtocol[T <: Actor](
- actorRef: ActorRef, format: Serializer, serializeMailBox: Boolean = true): SerializedActorRefProtocol = {
+ actorRef: ActorRef,
+ format: Serializer,
+ serializeMailBox: Boolean,
+ replicationScheme: ReplicationScheme): SerializedActorRefProtocol = {
+
val lifeCycleProtocol: Option[LifeCycleProtocol] = {
actorRef.lifeCycle match {
case Permanent ⇒ Some(LifeCycleProtocol.newBuilder.setLifeCycle(LifeCycleType.PERMANENT).build)
@@ -58,6 +70,24 @@ object ActorSerialization {
.setActorClassname(actorRef.actorInstance.get.getClass.getName)
.setTimeout(actorRef.timeout)
+ replicationScheme match {
+ case _: Transient | Transient ⇒
+ builder.setReplicationStorage(ReplicationStorageType.TRANSIENT)
+
+ case Replication(storage, strategy) ⇒
+ val storageType = storage match {
+ case _: TransactionLog | TransactionLog ⇒ ReplicationStorageType.TRANSACTION_LOG
+ case _: DataGrid | DataGrid ⇒ ReplicationStorageType.DATA_GRID
+ }
+ builder.setReplicationStorage(storageType)
+
+ val strategyType = strategy match {
+ case _: WriteBehind | WriteBehind ⇒ ReplicationStrategyType.WRITE_BEHIND
+ case _: WriteThrough | WriteThrough ⇒ ReplicationStrategyType.WRITE_THROUGH
+ }
+ builder.setReplicationStrategy(strategyType)
+ }
+
if (serializeMailBox == true) {
if (actorRef.mailbox eq null) throw new IllegalActorStateException("Can't serialize an actor that has not been started.")
val messages =
@@ -115,6 +145,29 @@ object ActorSerialization {
if (protocol.hasSupervisor) Some(RemoteActorSerialization.fromProtobufToRemoteActorRef(protocol.getSupervisor, loader))
else None
+ import ReplicationStorageType._
+ import ReplicationStrategyType._
+
+ val replicationScheme =
+ if (protocol.hasReplicationStorage) {
+ protocol.getReplicationStorage match {
+ case TRANSIENT ⇒ Transient
+ case store ⇒
+ val storage = store match {
+ case TRANSACTION_LOG ⇒ TransactionLog
+ case DATA_GRID ⇒ DataGrid
+ }
+ val strategy = if (protocol.hasReplicationStrategy) {
+ protocol.getReplicationStrategy match {
+ case WRITE_THROUGH ⇒ WriteThrough
+ case WRITE_BEHIND ⇒ WriteBehind
+ }
+ } else throw new IllegalActorStateException(
+ "Expected replication strategy for replication storage [" + storage + "]")
+ Replication(storage, strategy)
+ }
+ } else Transient
+
val hotswap =
try {
format
@@ -124,7 +177,7 @@ object ActorSerialization {
case e: Exception ⇒ Stack[PartialFunction[Any, Unit]]()
}
- val classLoader = loader.getOrElse(getClass.getClassLoader)
+ val classLoader = loader.getOrElse(this.getClass.getClassLoader)
val factory = () ⇒ {
val actorClass = classLoader.loadClass(protocol.getActorClassname)
@@ -143,7 +196,8 @@ object ActorSerialization {
lifeCycle,
supervisor,
hotswap,
- factory)
+ factory,
+ replicationScheme)
val messages = protocol.getMessagesList.toArray.toList.asInstanceOf[List[RemoteMessageProtocol]]
messages.foreach(message ⇒ ar ! MessageSerializer.deserialize(message.getMessage))
diff --git a/akka-samples/akka-sample-osgi/src/main/scala/OsgiExample.scala b/akka-samples/akka-sample-osgi/src/main/scala/OsgiExample.scala
index 092fcf9d36..5ee3f016a9 100644
--- a/akka-samples/akka-sample-osgi/src/main/scala/OsgiExample.scala
+++ b/akka-samples/akka-sample-osgi/src/main/scala/OsgiExample.scala
@@ -3,8 +3,8 @@
*/
package sample.osgi
-import akka.actor.{ Actor, ActorRegistry }
-import Actor._
+import akka.actor.Actor
+import akka.actor.Actor._
import org.osgi.framework.{ BundleActivator, BundleContext }
@@ -13,7 +13,7 @@ class Activator extends BundleActivator {
def start(context: BundleContext) {
println("Starting the OSGi example ...")
val echo = actorOf[EchoActor].start()
- val answer = (echo !! "OSGi example")
+ val answer = (echo ? "OSGi example").as[String]
println(answer getOrElse "No answer!")
}
diff --git a/akka-slf4j/src/main/scala/akka/event/slf4j/SLF4J.scala b/akka-slf4j/src/main/scala/akka/event/slf4j/SLF4J.scala
index 7a1f9d2c5d..4ab3d1976e 100644
--- a/akka-slf4j/src/main/scala/akka/event/slf4j/SLF4J.scala
+++ b/akka-slf4j/src/main/scala/akka/event/slf4j/SLF4J.scala
@@ -39,7 +39,7 @@ class Slf4jEventHandler extends Actor with Logging {
def receive = {
case Error(cause, instance, message) ⇒
log.error("\n\t[{}]\n\t[{}]\n\t[{}]",
- Array[Any](instance.getClass.getName, message, stackTraceFor(cause)))
+ Array[AnyRef](instance.getClass.getName, message.asInstanceOf[AnyRef], stackTraceFor(cause)))
case Warning(instance, message) ⇒
log.warn("\n\t[{}]\n\t[{}]", instance.getClass.getName, message)
diff --git a/akka-spring/src/test/resources/akka-test.conf b/akka-spring/src/test/resources/akka-test.conf
index bb9c0e347d..a32dc0f338 100644
--- a/akka-spring/src/test/resources/akka-test.conf
+++ b/akka-spring/src/test/resources/akka-test.conf
@@ -25,8 +25,8 @@ akka {
actor {
timeout = 2000 # Default timeout for Future based invocations
- # - Actor: !! && !!!
- # - UntypedActor: sendRequestReply && sendRequestReplyFuture
+ # - Actor: !! && ?
+ # - UntypedActor: sendRequestReply && ask
# - TypedActor: methods with non-void return type
serialize-messages = off # Does a deep clone of (non-primitive) messages to ensure immutability
throughput = 5 # Default throughput for all ExecutorBasedEventDrivenDispatcher, set to 1 for complete fairness
diff --git a/akka-spring/src/test/resources/property-config.xml b/akka-spring/src/test/resources/property-config.xml
index f199df7074..43d36852ed 100644
--- a/akka-spring/src/test/resources/property-config.xml
+++ b/akka-spring/src/test/resources/property-config.xml
@@ -15,7 +15,7 @@ http://akka.io/akka-2.0-SNAPSHOT.xsd">
-
diff --git a/akka-stm/src/main/scala/akka/agent/Agent.scala b/akka-stm/src/main/scala/akka/agent/Agent.scala
index dfa3cfd6b8..7e11fc3670 100644
--- a/akka-stm/src/main/scala/akka/agent/Agent.scala
+++ b/akka-stm/src/main/scala/akka/agent/Agent.scala
@@ -120,7 +120,7 @@ class Agent[T](initialValue: T) {
* within the given timeout
*/
def alter(f: T ⇒ T)(timeout: Long): Future[T] = {
- def dispatch = updater.!!!(Update(f), timeout)
+ def dispatch = updater.?(Update(f))(timeout = timeout).asInstanceOf[Future[T]]
if (Stm.activeTransaction) {
val result = new DefaultPromise[T](timeout)
get //Join xa
@@ -168,7 +168,7 @@ class Agent[T](initialValue: T) {
send((value: T) ⇒ {
suspend
val threadBased = Actor.actorOf(new ThreadBasedAgentUpdater(this)).start()
- result completeWith threadBased.!!!(Update(f), timeout)
+ result completeWith threadBased.?(Update(f))(timeout = timeout).asInstanceOf[Future[T]]
value
})
result
@@ -178,7 +178,7 @@ class Agent[T](initialValue: T) {
* A future to the current value that will be completed after any currently
* queued updates.
*/
- def future(): Future[T] = (updater !!! Get).asInstanceOf[Future[T]]
+ def future(): Future[T] = (updater ? Get).asInstanceOf[Future[T]]
/**
* Gets this agent's value after all currently queued updates have completed.
diff --git a/akka-stm/src/test/java/akka/transactor/example/UntypedCoordinatedExample.java b/akka-stm/src/test/java/akka/transactor/example/UntypedCoordinatedExample.java
index 127a911677..f3ac18fb73 100644
--- a/akka-stm/src/test/java/akka/transactor/example/UntypedCoordinatedExample.java
+++ b/akka-stm/src/test/java/akka/transactor/example/UntypedCoordinatedExample.java
@@ -19,8 +19,8 @@ public class UntypedCoordinatedExample {
Thread.sleep(3000);
- Future future1 = counter1.sendRequestReplyFuture("GetCount");
- Future future2 = counter2.sendRequestReplyFuture("GetCount");
+ Future future1 = counter1.ask("GetCount");
+ Future future2 = counter2.ask("GetCount");
future1.await();
if (future1.isCompleted()) {
diff --git a/akka-stm/src/test/java/akka/transactor/example/UntypedTransactorExample.java b/akka-stm/src/test/java/akka/transactor/example/UntypedTransactorExample.java
index d2f83ff25e..34e2e2edec 100644
--- a/akka-stm/src/test/java/akka/transactor/example/UntypedTransactorExample.java
+++ b/akka-stm/src/test/java/akka/transactor/example/UntypedTransactorExample.java
@@ -18,8 +18,8 @@ public class UntypedTransactorExample {
Thread.sleep(3000);
- Future future1 = counter1.sendRequestReplyFuture("GetCount");
- Future future2 = counter2.sendRequestReplyFuture("GetCount");
+ Future future1 = counter1.ask("GetCount");
+ Future future2 = counter2.ask("GetCount");
future1.await();
if (future1.isCompleted()) {
diff --git a/akka-stm/src/test/java/akka/transactor/test/UntypedCoordinatedIncrementTest.java b/akka-stm/src/test/java/akka/transactor/test/UntypedCoordinatedIncrementTest.java
index a9eabe7be1..84773d7d5d 100644
--- a/akka-stm/src/test/java/akka/transactor/test/UntypedCoordinatedIncrementTest.java
+++ b/akka-stm/src/test/java/akka/transactor/test/UntypedCoordinatedIncrementTest.java
@@ -49,7 +49,7 @@ public class UntypedCoordinatedIncrementTest {
incrementLatch.await(timeout, TimeUnit.SECONDS);
} catch (InterruptedException exception) {}
for (ActorRef counter : counters) {
- Future future = counter.sendRequestReplyFuture("GetCount");
+ Future future = counter.ask("GetCount");
future.await();
if (future.isCompleted()) {
Option resultOption = future.result();
@@ -72,7 +72,7 @@ public class UntypedCoordinatedIncrementTest {
incrementLatch.await(timeout, TimeUnit.SECONDS);
} catch (InterruptedException exception) {}
for (ActorRef counter : counters) {
- Future future = counter.sendRequestReplyFuture("GetCount");
+ Future future = counter.ask("GetCount");
future.await();
if (future.isCompleted()) {
Option resultOption = future.result();
diff --git a/akka-stm/src/test/java/akka/transactor/test/UntypedTransactorTest.java b/akka-stm/src/test/java/akka/transactor/test/UntypedTransactorTest.java
index 9610aa2ebe..97446d2cda 100644
--- a/akka-stm/src/test/java/akka/transactor/test/UntypedTransactorTest.java
+++ b/akka-stm/src/test/java/akka/transactor/test/UntypedTransactorTest.java
@@ -48,7 +48,7 @@ public class UntypedTransactorTest {
incrementLatch.await(timeout, TimeUnit.SECONDS);
} catch (InterruptedException exception) {}
for (ActorRef counter : counters) {
- Future future = counter.sendRequestReplyFuture("GetCount");
+ Future future = counter.ask("GetCount");
future.await();
if (future.isCompleted()) {
Option resultOption = future.result();
@@ -71,7 +71,7 @@ public class UntypedTransactorTest {
incrementLatch.await(timeout, TimeUnit.SECONDS);
} catch (InterruptedException exception) {}
for (ActorRef counter : counters) {
- Future future = counter.sendRequestReplyFuture("GetCount");
+ Future future = counter.ask("GetCount");
future.await();
if (future.isCompleted()) {
Option resultOption = future.result();
diff --git a/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala b/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
index 5615c97322..8e589c6ff8 100644
--- a/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
+++ b/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
@@ -64,7 +64,7 @@ class CoordinatedIncrementSpec extends WordSpec with MustMatchers {
counters(0) ! coordinated(Increment(counters.tail))
coordinated.await
for (counter ← counters) {
- (counter !! GetCount).get must be === 1
+ (counter ? GetCount).as[Int].get must be === 1
}
counters foreach (_.stop())
failer.stop()
@@ -76,7 +76,7 @@ class CoordinatedIncrementSpec extends WordSpec with MustMatchers {
counters(0) ! Coordinated(Increment(counters.tail :+ failer))
coordinated.await
for (counter ← counters) {
- (counter !! GetCount).get must be === 0
+ (counter ? GetCount).as[Int].get must be === 0
}
counters foreach (_.stop())
failer.stop()
diff --git a/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala b/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
index b275c1a071..f7b0277656 100644
--- a/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
+++ b/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
@@ -109,9 +109,9 @@ class FickleFriendsSpec extends WordSpec with MustMatchers {
val latch = new CountDownLatch(1)
coordinator ! FriendlyIncrement(counters, latch)
latch.await // this could take a while
- (coordinator !! GetCount).get must be === 1
+ (coordinator ? GetCount).as[Int].get must be === 1
for (counter ← counters) {
- (counter !! GetCount).get must be === 1
+ (counter ? GetCount).as[Int].get must be === 1
}
counters foreach (_.stop())
coordinator.stop()
diff --git a/akka-stm/src/test/scala/transactor/TransactorSpec.scala b/akka-stm/src/test/scala/transactor/TransactorSpec.scala
index 33ca14402f..8cccdf430c 100644
--- a/akka-stm/src/test/scala/transactor/TransactorSpec.scala
+++ b/akka-stm/src/test/scala/transactor/TransactorSpec.scala
@@ -92,7 +92,7 @@ class TransactorSpec extends WordSpec with MustMatchers {
counters(0) ! Increment(counters.tail, incrementLatch)
incrementLatch.await(timeout.length, timeout.unit)
for (counter ← counters) {
- (counter !! GetCount).get must be === 1
+ (counter ? GetCount).as[Int].get must be === 1
}
counters foreach (_.stop())
failer.stop()
@@ -104,7 +104,7 @@ class TransactorSpec extends WordSpec with MustMatchers {
counters(0) ! Increment(counters.tail :+ failer, failLatch)
failLatch.await(timeout.length, timeout.unit)
for (counter ← counters) {
- (counter !! GetCount).get must be === 0
+ (counter ? GetCount).as[Int].get must be === 0
}
counters foreach (_.stop())
failer.stop()
diff --git a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
index cd8a778c93..19058b4951 100644
--- a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
@@ -135,6 +135,8 @@ class CallingThreadDispatcher(val warnings: Boolean = true) extends MessageDispa
override def mailboxSize(actor: ActorRef) = getMailbox(actor).queue.size
+ def mailboxIsEmpty(actorRef: ActorRef): Boolean = getMailbox(actorRef).queue.isEmpty
+
private[akka] override def dispatch(handle: MessageInvocation) {
val mbox = getMailbox(handle.receiver)
val queue = mbox.queue
@@ -214,6 +216,7 @@ class CallingThreadDispatcher(val warnings: Boolean = true) extends MessageDispa
class NestingQueue {
private var q = new LinkedList[MessageInvocation]()
def size = q.size
+ def isEmpty = q.isEmpty
def push(handle: MessageInvocation) { q.offer(handle) }
def peek = q.peek
def pop = q.poll
diff --git a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala
index 4e9d7b527d..a940d5ce01 100644
--- a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala
@@ -15,11 +15,11 @@ import com.eaio.uuid.UUID
* overrides the dispatcher to CallingThreadDispatcher and sets the receiveTimeout to None. Otherwise,
* it acts just like a normal ActorRef. You may retrieve a reference to the underlying actor to test internal logic.
*
- *
* @author Roland Kuhn
* @since 1.1
*/
-class TestActorRef[T <: Actor](factory: () ⇒ T, address: String) extends LocalActorRef(factory, address) {
+class TestActorRef[T <: Actor](factory: () ⇒ T, address: String)
+ extends LocalActorRef(factory, address, DeploymentConfig.Transient) {
dispatcher = CallingThreadDispatcher.global
receiveTimeout = None
diff --git a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
index 27e8a5fbd7..3ef904fe88 100644
--- a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
@@ -114,7 +114,7 @@ class TestActorRefSpec extends WordSpec with MustMatchers with BeforeAndAfterEac
def receive = { case _ ⇒ self reply nested }
}).start()
a must not be (null)
- val nested = (a !! "any").get.asInstanceOf[ActorRef]
+ val nested = (a ? "any").as[ActorRef].get
nested must not be (null)
a must not be theSameInstanceAs(nested)
}
@@ -125,7 +125,7 @@ class TestActorRefSpec extends WordSpec with MustMatchers with BeforeAndAfterEac
def receive = { case _ ⇒ self reply nested }
}).start()
a must not be (null)
- val nested = (a !! "any").get.asInstanceOf[ActorRef]
+ val nested = (a ? "any").as[ActorRef].get
nested must not be (null)
a must not be theSameInstanceAs(nested)
}
@@ -160,7 +160,7 @@ class TestActorRefSpec extends WordSpec with MustMatchers with BeforeAndAfterEac
"stop when sent a poison pill" in {
val a = TestActorRef[WorkerActor].start()
intercept[ActorKilledException] {
- a !! PoisonPill
+ (a ? PoisonPill).get
}
a must not be ('running)
a must be('shutdown)
diff --git a/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java b/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
index 12c16d0142..673aeddf42 100644
--- a/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
+++ b/akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
@@ -184,7 +184,7 @@ public class Pi {
// send calculate message
long timeout = 60000;
- Future replyFuture = master.sendRequestReplyFuture(new Calculate(), timeout, null);
+ Future replyFuture = master.ask(new Calculate(), timeout, null);
Option result = replyFuture.await().resultOrException();
if (result.isDefined()) {
double pi = (Double) result.get();
diff --git a/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala b/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
index ff4b8d9c4a..7fcabf0990 100644
--- a/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
+++ b/akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
@@ -104,7 +104,7 @@ object Pi extends App {
val start = now
//send calculate message
- master.!!.
+ master.?(Calculate)(timeout = Actor.Timeout(60000)).
await.resultOrException match {//wait for the result, with a 60 seconds timeout
case Some(pi) =>
EventHandler.info(this, "\n\tPi estimate: \t\t%s\n\tCalculation time: \t%s millis".format(pi, (now - start)))
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 0ea4b6465e..9b43aa97b1 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -10,7 +10,7 @@
akka {
version = "2.0-SNAPSHOT" # Akka version, checked against the runtime version of Akka.
- enabled-modules = [] # Comma separated list of the enabled modules. Options: ["remote", "camel", "http"]
+ enabled-modules = [] # Comma separated list of the enabled modules. Options: ["cluster", "camel", "http"]
time-unit = "seconds" # Time unit for all timeout properties throughout the config
@@ -27,63 +27,76 @@ akka {
boot = []
actor {
- timeout = 5 # Default timeout for Future based invocations
- # - Actor: !! && !!!
- # - UntypedActor: sendRequestReply && sendRequestReplyFuture
- # - TypedActor: methods with non-void return type
- serialize-messages = off # Does a deep clone of (non-primitive) messages to ensure immutability
- throughput = 5 # Default throughput for all Dispatcher, set to 1 for complete fairness
- throughput-deadline-time = -1 # Default throughput deadline for all Dispatcher, set to 0 or negative for no deadline
- dispatcher-shutdown-timeout = 1 # Using the akka.time-unit, how long dispatchers by default will wait for new actors until they shut down
+ timeout = 5 # Default timeout for Future based invocations
+ # - Actor: !! && ?
+ # - UntypedActor: sendRequestReply && ask
+ # - TypedActor: methods with non-void return type
+ serialize-messages = off # Does a deep clone of (non-primitive) messages to ensure immutability
+ throughput = 5 # Default throughput for all Dispatcher, set to 1 for complete fairness
+ throughput-deadline-time = -1 # Default throughput deadline for all Dispatcher, set to 0 or negative for no deadline
+ dispatcher-shutdown-timeout = 1 # Using the akka.time-unit, how long dispatchers by default will wait for new actors until they shut down
deployment {
- # -------------------------------
- # -- all configuration options --
- # -------------------------------
+ service-ping { # stateless actor with replication factor 3 and round-robin load-balancer
- service-ping { # stateless actor with replication factor 3 and round-robin load-balancer
- router = "least-cpu" # routing (load-balance) scheme to use
- # available: "direct", "round-robin", "random", "least-cpu", "least-ram", "least-messages"
- # or: fully qualified class name of the router class
- # default is "direct";
- format = "akka.serialization.Format$Default$"
- clustered { # makes the actor available in the cluster registry
- # default (if omitted) is local non-clustered actor
- home = "node:node1" # defines the hostname, IP-address or node name of the "home" node for clustered actor
- # available: "host:", "ip:" and "node:"
- # default is "host:localhost"
- replicas = 3 # number of actor replicas in the cluster
- # available: positivoe integer (0-N) or the string "auto" for auto-scaling
- # if "auto" is used then 'home' has no meaning
- # default is '0', meaning no replicas;
- stateless = on # is the actor stateless or stateful
- # if turned 'on': actor is defined as stateless and can be load-balanced accordingly
- # if turned 'off' (or omitted): actor is defined as stateful which means replicatable through transaction log
- # default is 'off'
+ format = "akka.serialization.Format$Default$" # serializer for messages and actor instance
+
+ router = "least-cpu" # routing (load-balance) scheme to use
+ # available: "direct", "round-robin", "random",
+ # "least-cpu", "least-ram", "least-messages"
+ # or: fully qualified class name of the router class
+ # default is "direct";
+
+ clustered { # makes the actor available in the cluster registry
+ # default (if omitted) is local non-clustered actor
+
+ home = "node:node1" # hostname, IP-address or node name of the "home" node for clustered actor
+ # available: "host:", "ip:" and "node:"
+ # default is "host:localhost"
+
+ replicas = 3 # number of actor replicas in the cluster
+ # available: positivoe integer (0-N) or the string "auto" for auto-scaling
+ # if "auto" is used then 'home' has no meaning
+ # default is '0', meaning no replicas;
+
+ replication { # use replication or not?
+
+ # FIXME should we have this config option here? If so, implement it all through.
+ serialize-mailbox = on # should the actor mailbox be part of the serialized snapshot?
+
+ storage = "transaction-log" # storage model for replication
+ # available: "transaction-log" and "data-grid"
+ # default is "transaction-log"
+
+ strategy = "write-through" # guaranteees for replication
+ # available: "write-through" and "write-behind"
+ # default is "write-through"
+
+ }
}
}
}
default-dispatcher {
- type = "GlobalDispatcher" # Must be one of the following, all "Global*" are non-configurable
- # - Dispatcher
- # - BalancingDispatcher
- # - GlobalDispatcher
- keep-alive-time = 60 # Keep alive time for threads
- core-pool-size-factor = 1.0 # No of core threads ... ceil(available processors * factor)
- max-pool-size-factor = 4.0 # Max no of threads ... ceil(available processors * factor)
- executor-bounds = -1 # Makes the Executor bounded, -1 is unbounded
- allow-core-timeout = on # Allow core threads to time out
- rejection-policy = "caller-runs" # abort, caller-runs, discard-oldest, discard
- throughput = 5 # Throughput for Dispatcher, set to 1 for complete fairness
- throughput-deadline-time = -1 # Throughput deadline for Dispatcher, set to 0 or negative for no deadline
- mailbox-capacity = -1 # If negative (or zero) then an unbounded mailbox is used (default)
- # If positive then a bounded mailbox is used and the capacity is set using the property
- # NOTE: setting a mailbox to 'blocking' can be a bit dangerous, could lead to deadlock, use with care
- # The following are only used for Dispatcher and only if mailbox-capacity > 0
- mailbox-push-timeout-time = 10 # Specifies the timeout to add a new message to a mailbox that is full - negative number means infinite timeout
- # (in unit defined by the time-unit property)
+ type = "GlobalDispatcher" # Must be one of the following, all "Global*" are non-configurable
+ # - Dispatcher
+ # - BalancingDispatcher
+ # - GlobalDispatcher
+ keep-alive-time = 60 # Keep alive time for threads
+ core-pool-size-factor = 1.0 # No of core threads ... ceil(available processors * factor)
+ max-pool-size-factor = 4.0 # Max no of threads ... ceil(available processors * factor)
+ executor-bounds = -1 # Makes the Executor bounded, -1 is unbounded
+ allow-core-timeout = on # Allow core threads to time out
+ rejection-policy = "caller-runs" # abort, caller-runs, discard-oldest, discard
+ throughput = 5 # Throughput for Dispatcher, set to 1 for complete fairness
+ throughput-deadline-time = -1 # Throughput deadline for Dispatcher, set to 0 or negative for no deadline
+ mailbox-capacity = -1 # If negative (or zero) then an unbounded mailbox is used (default)
+ # If positive then a bounded mailbox is used and the capacity is set using the property
+ # NOTE: setting a mailbox to 'blocking' can be a bit dangerous, could lead to deadlock, use with care
+ # The following are only used for Dispatcher and only if mailbox-capacity > 0
+ mailbox-push-timeout-time = 10 # Specifies the timeout to add a new message to a mailbox that is full - negative number means infinite timeout
+ # (in unit defined by the time-unit property)
}
mailbox {
@@ -128,39 +141,36 @@ akka {
cluster {
name = "test-cluster"
- zookeeper-server-addresses = "localhost:2181"
+ zookeeper-server-addresses = "localhost:2181" # comma-separated list of ':' elements
remote-server-port = 2552
max-time-to-wait-until-connected = 30
session-timeout = 60
connection-timeout = 60
use-compression = off
- remote-daemon-ack-timeout = 30 # Timeout for ACK of cluster operations, lik checking actor out etc.
- exclude-ref-node-in-replica-set = on # Should a replica be instantiated on the same node as the
- # cluster reference to the actor
- # Default: on
-
- replication {
- digest-type = "MAC" # Options: CRC32 (cheap & unsafe), MAC (expensive & secure using password)
- password = "secret" # FIXME: store open in file?
- ensemble-size = 3
- quorum-size = 2
- }
- }
-
- remote {
-
- # secure-cookie = "050E0A0D0D06010A00000900040D060F0C09060B" # generate your own with '$AKKA_HOME/scripts/generate_config_with_secure_cookie.sh' or using 'Crypt.generateSecureCookie'
- secure-cookie = ""
-
- compression-scheme = "zlib" # Options: "zlib" (lzf to come), leave out for no compression
- zlib-compression-level = 6 # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6
+ remote-daemon-ack-timeout = 30 # Timeout for ACK of cluster operations, lik checking actor out etc.
+ exclude-ref-node-in-replica-set = on # Should a replica be instantiated on the same node as the
+ # cluster reference to the actor
+ # Default: on
+ compression-scheme = "zlib" # Options: "zlib" (lzf to come), leave out for no compression
+ zlib-compression-level = 6 # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6
+ # FIXME rename to transport
layer = "akka.remote.netty.NettyRemoteSupport"
+ secure-cookie = "" # generate your own with '$AKKA_HOME/scripts/generate_config_with_secure_cookie.sh'
+ # or using 'Crypt.generateSecureCookie'
+
+ replication {
+ digest-type = "MAC" # Options: CRC32 (cheap & unsafe), MAC (expensive & secure using password)
+ password = "secret" # FIXME: store open in file?
+ ensemble-size = 3
+ quorum-size = 2
+ snapshot-frequency = 1000 # The number of messages that should be logged between every actor snapshot
+ timeout = 30 # Timeout for asyncronous (write-behind) operations
+ }
+
server {
- # FIXME remove hostname/port
- hostname = "localhost" # The hostname or IP that clients should connect to
- port = 2552 # The port clients should connect to. Default is 2552 (AKKA)
+ port = 2552 # The default remote server port clients should connect to. Default is 2552 (AKKA)
message-frame-size = 1048576 # Increase this if you want to be able to send messages with large payloads
connection-timeout = 1
require-cookie = off # Should the remote server require that it peers share the same secure-cookie (defined in the 'remote' section)?
@@ -182,7 +192,7 @@ akka {
read-timeout = 10
message-frame-size = 1048576
reap-futures-delay = 5
- reconnection-time-window = 600 # Maximum time window that a client should try to reconnect for
+ reconnection-time-window = 600 # Maximum time window that a client should try to reconnect for
}
}
@@ -204,15 +214,14 @@ akka {
hostname = "localhost"
port = 9998
- # If you are using akka.http.AkkaMistServlet
- mist-dispatcher {
- #type = "GlobalDispatcher" # Uncomment if you want to use a different dispatcher than the default one for Comet
+ mist-dispatcher { # If you are using akka.http.AkkaMistServlet
+ #type = "GlobalDispatcher" # Uncomment if you want to use a different dispatcher than the default one for Comet
}
- connection-close = true # toggles the addition of the "Connection" response header with a "close" value
- root-actor-id = "_httproot" # the id of the actor to use as the root endpoint
- root-actor-builtin = true # toggles the use of the built-in root endpoint base class
- timeout = 1000 # the default timeout for all async requests (in ms)
- expired-header-name = "Async-Timeout" # the name of the response header to use when an async request expires
- expired-header-value = "expired" # the value of the response header to use when an async request expires
+ connection-close = true # toggles the addition of the "Connection" response header with a "close" value
+ root-actor-id = "_httproot" # the id of the actor to use as the root endpoint
+ root-actor-builtin = true # toggles the use of the built-in root endpoint base class
+ timeout = 1000 # the default timeout for all async requests (in ms)
+ expired-header-name = "Async-Timeout" # the name of the response header to use when an async request expires
+ expired-header-value = "expired" # the value of the response header to use when an async request expires
}
}
diff --git a/config/microkernel-server.xml b/config/microkernel-server.xml
new file mode 100644
index 0000000000..be7382405d
--- /dev/null
+++ b/config/microkernel-server.xml
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 300000
+ 2
+ false
+ 8443
+ 20000
+ 5000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+ /
+
+ akka.http.AkkaMistServlet
+ /*
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ true
+ true
+ true
+ 1000
+
+
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 4721123c0c..efdc0123d5 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -73,6 +73,7 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
lazy val jmsModuleConfig = ModuleConfiguration("javax.jms", JBossRepo)
lazy val jsr311ModuleConfig = ModuleConfiguration("javax.ws.rs", "jsr311-api", sbt.DefaultMavenRepository)
lazy val zookeeperModuleConfig = ModuleConfiguration("org.apache.hadoop.zookeeper", AkkaRepo)
+ lazy val protobufModuleConfig = ModuleConfiguration("com.google.protobuf", AkkaRepo)
lazy val zkclientModuleConfig = ModuleConfiguration("zkclient", AkkaRepo)
lazy val camelModuleConfig = ModuleConfiguration("org.apache.camel", "camel-core", AkkaRepo)
@@ -126,7 +127,7 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
lazy val multiverse = "org.multiverse" % "multiverse-alpha" % MULTIVERSE_VERSION % "compile" //ApacheV2
lazy val netty = "org.jboss.netty" % "netty" % "3.2.4.Final" % "compile" //ApacheV2
lazy val osgi_core = "org.osgi" % "org.osgi.core" % "4.2.0" //ApacheV2
- lazy val protobuf = "com.google.protobuf" % "protobuf-java" % "2.3.0" % "compile" //New BSD
+ lazy val protobuf = "com.google.protobuf" % "protobuf-java" % "2.4.1" % "compile" //New BSD
lazy val redis = "net.debasishg" % "redisclient_2.9.0" % "2.3.1" //ApacheV2
lazy val sjson = "net.debasishg" %% "sjson" % "0.11" % "compile" //ApacheV2
lazy val sjson_test = "net.debasishg" %% "sjson" % "0.11" % "test" //ApacheV2
@@ -135,7 +136,7 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
lazy val spring_context = "org.springframework" % "spring-context" % SPRING_VERSION % "compile" //ApacheV2
lazy val stax_api = "javax.xml.stream" % "stax-api" % "1.0-2" % "compile" //ApacheV2
- lazy val logback = "ch.qos.logback" % "logback-classic" % "0.9.28" % "runtime" //MIT
+ lazy val logback = "ch.qos.logback" % "logback-classic" % "0.9.28" % "runtime" //MIT
lazy val log4j = "log4j" % "log4j" % "1.2.15" //ApacheV2
lazy val zookeeper = "org.apache.hadoop.zookeeper" % "zookeeper" % ZOOKEEPER_VERSION //ApacheV2
lazy val zookeeper_lock = "org.apache.hadoop.zookeeper" % "zookeeper-recipes-lock" % ZOOKEEPER_VERSION //ApacheV2
@@ -143,14 +144,14 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
// Test
lazy val multiverse_test = "org.multiverse" % "multiverse-alpha" % MULTIVERSE_VERSION % "test" //ApacheV2
- lazy val commons_coll = "commons-collections" % "commons-collections" % "3.2.1" % "test" //ApacheV2
- lazy val testJetty = "org.eclipse.jetty" % "jetty-server" % JETTY_VERSION % "test" //Eclipse license
- lazy val testJettyWebApp = "org.eclipse.jetty" % "jetty-webapp" % JETTY_VERSION % "test" //Eclipse license
- lazy val junit = "junit" % "junit" % "4.5" % "test" //Common Public License 1.0
- lazy val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" //MIT
- lazy val scalatest = "org.scalatest" %% "scalatest" % SCALATEST_VERSION % "test" //ApacheV2
- lazy val testLogback = "ch.qos.logback" % "logback-classic" % LOGBACK_VERSION % "test" // EPL 1.0 / LGPL 2.1
- lazy val camel_spring = "org.apache.camel" % "camel-spring" % CAMEL_VERSION % "test" //ApacheV2
+ lazy val commons_coll = "commons-collections" % "commons-collections" % "3.2.1" % "test" //ApacheV2
+ lazy val testJetty = "org.eclipse.jetty" % "jetty-server" % JETTY_VERSION % "test" //Eclipse license
+ lazy val testJettyWebApp = "org.eclipse.jetty" % "jetty-webapp" % JETTY_VERSION % "test" //Eclipse license
+ lazy val junit = "junit" % "junit" % "4.5" % "test" //Common Public License 1.0
+ lazy val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" //MIT
+ lazy val scalatest = "org.scalatest" %% "scalatest" % SCALATEST_VERSION % "test" //ApacheV2
+ lazy val testLogback = "ch.qos.logback" % "logback-classic" % LOGBACK_VERSION % "test" // EPL 1.0 / LGPL 2.1
+ lazy val camel_spring = "org.apache.camel" % "camel-spring" % CAMEL_VERSION % "test" //ApacheV2
}
@@ -168,10 +169,10 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
lazy val akka_cluster = project("akka-cluster", "akka-cluster", new AkkaClusterProject(_), akka_remote)
lazy val akka_durable_mailboxes = project("akka-durable-mailboxes", "akka-durable-mailboxes", new AkkaDurableMailboxesParentProject(_), akka_remote)
- lazy val akka_camel = project("akka-camel", "akka-camel", new AkkaCamelProject(_), akka_actor, akka_slf4j)
- lazy val akka_camel_typed = project("akka-camel-typed", "akka-camel-typed", new AkkaCamelTypedProject(_), akka_actor, akka_slf4j, akka_camel)
+ //lazy val akka_camel = project("akka-camel", "akka-camel", new AkkaCamelProject(_), akka_actor, akka_slf4j)
+ //lazy val akka_camel_typed = project("akka-camel-typed", "akka-camel-typed", new AkkaCamelTypedProject(_), akka_actor, akka_slf4j, akka_camel)
//lazy val akka_spring = project("akka-spring", "akka-spring", new AkkaSpringProject(_), akka_remote, akka_actor, akka_camel)
- lazy val akka_kernel = project("akka-kernel", "akka-kernel", new AkkaKernelProject(_), akka_stm, akka_remote, akka_http, akka_slf4j, akka_camel)
+ //lazy val akka_kernel = project("akka-kernel", "akka-kernel", new AkkaKernelProject(_), akka_stm, akka_remote, akka_http, akka_slf4j, akka_camel)
lazy val akka_sbt_plugin = project("akka-sbt-plugin", "akka-sbt-plugin", new AkkaSbtPluginProject(_))
lazy val akka_tutorials = project("akka-tutorials", "akka-tutorials", new AkkaTutorialsParentProject(_), akka_actor)
@@ -616,16 +617,16 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
lazy val akka_sample_ants = project("akka-sample-ants", "akka-sample-ants",
new AkkaSampleAntsProject(_), akka_stm)
-// lazy val akka_sample_chat = project("akka-sample-chat", "akka-sample-chat",
-// new AkkaSampleChatProject(_), akka_remote)
+ // lazy val akka_sample_chat = project("akka-sample-chat", "akka-sample-chat",
+ // new AkkaSampleChatProject(_), akka_remote)
lazy val akka_sample_fsm = project("akka-sample-fsm", "akka-sample-fsm",
new AkkaSampleFSMProject(_), akka_actor)
- lazy val akka_sample_hello = project("akka-sample-hello", "akka-sample-hello",
- new AkkaSampleHelloProject(_), akka_kernel)
+ // lazy val akka_sample_hello = project("akka-sample-hello", "akka-sample-hello",
+ // new AkkaSampleHelloProject(_), akka_kernel)
lazy val akka_sample_osgi = project("akka-sample-osgi", "akka-sample-osgi",
new AkkaSampleOsgiProject(_), akka_actor)
-// lazy val akka_sample_remote = project("akka-sample-remote", "akka-sample-remote",
-// new AkkaSampleRemoteProject(_), akka_remote)
+ // lazy val akka_sample_remote = project("akka-sample-remote", "akka-sample-remote",
+ // new AkkaSampleRemoteProject(_), akka_remote)
lazy val publishRelease = {
val releaseConfiguration = new DefaultPublishConfiguration(localReleaseRepository, "release", false)
@@ -787,8 +788,8 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
lazy val akkaCoreDist = project("core", "akka-dist-core", new AkkaCoreDistProject(_),
akkaActorsDist, akka_remote, akka_http, akka_slf4j, akka_testkit, akka_actor_tests)
- lazy val akkaMicrokernelDist = project("microkernel", "akka-dist-microkernel", new AkkaMicrokernelDistProject(_),
- akkaCoreDist, akka_kernel, akka_samples)
+// lazy val akkaMicrokernelDist = project("microkernel", "akka-dist-microkernel", new AkkaMicrokernelDistProject(_),
+// akkaCoreDist, akka_kernel, akka_samples)
def doNothing = task { None }
override def publishLocalAction = doNothing
@@ -830,44 +831,44 @@ class AkkaParentProject(info: ProjectInfo) extends ParentProject(info) with Exec
override def distScriptSources = akkaParent.info.projectPath / "scripts" / "microkernel" * "*"
- override def distClasspath = akka_kernel.runClasspath
+// override def distClasspath = akka_kernel.runClasspath
- override def projectDependencies = akka_kernel.topologicalSort
+// override def projectDependencies = akka_kernel.topologicalSort
- override def distAction = super.distAction dependsOn (distSamples)
+// override def distAction = super.distAction dependsOn (distSamples)
- val distSamplesPath = distDocPath / "samples"
+// val distSamplesPath = distDocPath / "samples"
- lazy val distSamples = task {
- val demo = akka_samples.akka_sample_hello.jarPath
- val samples = Set(//akka_samples.akka_sample_camel
- akka_samples.akka_sample_hello)
- //akka_samples.akka_sample_security)
+ // lazy val distSamples = task {
+ // val demo = akka_samples.akka_sample_hello.jarPath
+ // val samples = Set(//akka_samples.akka_sample_camel
+ // akka_samples.akka_sample_hello)
+ // //akka_samples.akka_sample_security)
- def copySamples[P <: DefaultProject](samples: Set[P]) = {
- samples.map { sample =>
- val sampleOutputPath = distSamplesPath / sample.name
- val binPath = sampleOutputPath / "bin"
- val configPath = sampleOutputPath / "config"
- val deployPath = sampleOutputPath / "deploy"
- val libPath = sampleOutputPath / "lib"
- val srcPath = sampleOutputPath / "src"
- val confs = sample.info.projectPath / "config" ** "*.*"
- val scripts = akkaParent.info.projectPath / "scripts" / "samples" * "*"
- val libs = sample.managedClasspath(Configurations.Runtime)
- val deployed = sample.jarPath
- val sources = sample.packageSourcePaths
- copyFiles(confs, configPath) orElse
- copyScripts(scripts, binPath) orElse
- copyFiles(libs, libPath) orElse
- copyFiles(deployed, deployPath) orElse
- copyPaths(sources, srcPath)
- }.foldLeft(None: Option[String])(_ orElse _)
- }
+ // def copySamples[P <: DefaultProject](samples: Set[P]) = {
+ // samples.map { sample =>
+ // val sampleOutputPath = distSamplesPath / sample.name
+ // val binPath = sampleOutputPath / "bin"
+ // val configPath = sampleOutputPath / "config"
+ // val deployPath = sampleOutputPath / "deploy"
+ // val libPath = sampleOutputPath / "lib"
+ // val srcPath = sampleOutputPath / "src"
+ // val confs = sample.info.projectPath / "config" ** "*.*"
+ // val scripts = akkaParent.info.projectPath / "scripts" / "samples" * "*"
+ // val libs = sample.managedClasspath(Configurations.Runtime)
+ // val deployed = sample.jarPath
+ // val sources = sample.packageSourcePaths
+ // copyFiles(confs, configPath) orElse
+ // copyScripts(scripts, binPath) orElse
+ // copyFiles(libs, libPath) orElse
+ // copyFiles(deployed, deployPath) orElse
+ // copyPaths(sources, srcPath)
+ // }.foldLeft(None: Option[String])(_ orElse _)
+ // }
- copyFiles(demo, distDeployPath) orElse
- copySamples(samples)
- } dependsOn (distBase)
+ // copyFiles(demo, distDeployPath) orElse
+ // copySamples(samples)
+ // } dependsOn (distBase)
}
}
}
diff --git a/scripts/microkernel/akka.bat b/scripts/microkernel/akka.bat
index 4d2f912096..59d1a91a48 100644
--- a/scripts/microkernel/akka.bat
+++ b/scripts/microkernel/akka.bat
@@ -1,6 +1,6 @@
@echo off
set AKKA_HOME=%~dp0..
set JAVA_OPTS=-Xms1024M -Xmx1024M -Xss1M -XX:MaxPermSize=256M -XX:+UseParallelGC
-set AKKA_CLASSPATH=%AKKA_HOME%\lib\scala-library.jar;%AKKA_HOME%\lib\akka\*;%AKKA_HOME%\config
+set AKKA_CLASSPATH=%AKKA_HOME%\lib\scala-library.jar;%AKKA_HOME%\config;%AKKA_HOME%\lib\akka\*
java %JAVA_OPTS% -cp "%AKKA_CLASSPATH%" -Dakka.home="%AKKA_HOME%" akka.kernel.Main