diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/AllTest.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/AllTest.java index 77739f6ff1..6e0ebecc33 100644 --- a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/AllTest.java +++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/AllTest.java @@ -17,4 +17,4 @@ public class AllTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } -} \ No newline at end of file +} diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/Foo.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/Foo.java index cae712c5aa..5849eb902d 100644 --- a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/Foo.java +++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/Foo.java @@ -26,7 +26,7 @@ public class Foo extends se.scalablesolutions.akka.serialization.Serializable.Ja if (true) throw new RuntimeException("Expected exception; to test fault-tolerance"); return "test"; } - + public int $tag() throws java.rmi.RemoteException { return 0; diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java index d6b9c3482f..3908e3cd59 100644 --- a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java +++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemFailer.java @@ -1,6 +1,6 @@ package se.scalablesolutions.akka.api; -public class InMemFailer implements java.io.Serializable { +public class InMemFailer implements java.io.Serializable { public int fail() { throw new RuntimeException("Expected exception; to test fault-tolerance"); } diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java index 221259f6e8..fdd1fd5b93 100644 --- a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java +++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java @@ -12,8 +12,8 @@ public class InMemStateful { private TransactionalVector vectorState; private Ref refState; private boolean isInitialized = false; - - @inittransactionalstate + + @inittransactionalstate public void init() { if (!isInitialized) { mapState = new TransactionalMap(); @@ -22,7 +22,7 @@ public class InMemStateful { isInitialized = true; } } - + public String getMapState(String key) { return (String)mapState.get(key).get(); } diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java index 08c89883b0..9cd92bd075 100644 --- a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java +++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java @@ -11,7 +11,7 @@ public class InMemStatefulNested { private Ref refState; private boolean isInitialized = false; - @inittransactionalstate + @inittransactionalstate public void init() { if (!isInitialized) { mapState = new TransactionalMap(); @@ -83,4 +83,4 @@ public class InMemStatefulNested { this.success("clash", "clash"); } */ -} \ No newline at end of file +} diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/MiscActiveObjectTest.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/MiscActiveObjectTest.java index aaa97d3587..6ab6d2ff03 100644 --- a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/MiscActiveObjectTest.java +++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/MiscActiveObjectTest.java @@ -11,13 +11,13 @@ import junit.framework.TestCase; /** *

Small misc tests that do not fit anywhere else and does not require a separate testcase

- * + * * @author johanrask * */ public class MiscTypedActorTest extends TestCase { - + /** * Verifies that both preRestart and postRestart methods are invoked when * an actor is restarted @@ -31,5 +31,5 @@ public class MiscTypedActorTest extends TestCase { Assert.assertTrue(pojo.pre); Assert.assertTrue(pojo.post); } - + } diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java index 3ae8b647ab..89f7e92162 100644 --- a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java +++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java @@ -131,4 +131,4 @@ public class RemoteInMemoryStateTest extends TestCase { // is // // == init state // } -} \ No newline at end of file +} diff --git a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/SimpleJavaPojo.java b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/SimpleJavaPojo.java index 3921fde81f..f2f05842e9 100644 --- a/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/SimpleJavaPojo.java +++ b/akka-active-object-test/src/test/java/se/scalablesolutions/akka/api/SimpleJavaPojo.java @@ -4,26 +4,26 @@ import se.scalablesolutions.akka.actor.annotation.prerestart; import se.scalablesolutions.akka.actor.annotation.postrestart; public class SimpleJavaPojo { - + public boolean pre = false; public boolean post = false; - + private String name; - + public void setName(String name) { this.name = name; } - + public String getName() { return name; } - + @prerestart public void pre() { System.out.println("** pre()"); pre = true; } - + @postrestart public void post() { System.out.println("** post()"); diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ExampleSession.scala b/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ExampleSession.scala index f3a8197abf..f45553520d 100644 --- a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ExampleSession.scala +++ b/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/ExampleSession.scala @@ -256,7 +256,7 @@ object ExampleSession { def protobufRequestHandler(request: AddressProtocol): AddressProtocol = { AddressProtocol.newBuilder.setHostname(request.getHostname.reverse).setPort(request.getPort).build } - + RPC.newProtobufRpcServer(connection, exchangeName, protobufRequestHandler) val protobufRpcClient = RPC.newProtobufRpcClient[AddressProtocol, AddressProtocol](connection, exchangeName) diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/rpc/RPC.scala b/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/rpc/RPC.scala index b51cbe407f..5c50fd4670 100644 --- a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/rpc/RPC.scala +++ b/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/rpc/RPC.scala @@ -113,7 +113,7 @@ object RPC { queueName: Option[String] = None, durable: Boolean = false, autoDelete: Boolean = true): RpcServerHandle = { - + val serializer = new RpcServerSerializer[String, String]( new FromBinary[String] { def fromBinary(bytes: Array[Byte]): String = { diff --git a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPConsumerManualRejectTest.scala b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPConsumerManualRejectTest.scala index d00d09b480..cdbfe4028c 100644 --- a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPConsumerManualRejectTest.scala +++ b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPConsumerManualRejectTest.scala @@ -50,4 +50,4 @@ class AMQPConsumerManualRejectTest extends JUnitSuite with MustMatchers { connection.stop } } -} \ No newline at end of file +} diff --git a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPProtobufProducerConsumerTest.scala b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPProtobufProducerConsumerTest.scala index 5d03dae5c2..fdc147210a 100644 --- a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPProtobufProducerConsumerTest.scala +++ b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPProtobufProducerConsumerTest.scala @@ -40,4 +40,4 @@ class AMQPProtobufProducerConsumerTest extends JUnitSuite with MustMatchers { def requestHandler(request: AddressProtocol): AddressProtocol = { AddressProtocol.newBuilder.setHostname(request.getHostname.reverse).setPort(request.getPort).build } -} \ No newline at end of file +} diff --git a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcClientServerTest.scala b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcClientServerTest.scala index 7de8044314..1bb487f51c 100644 --- a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcClientServerTest.scala +++ b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcClientServerTest.scala @@ -18,7 +18,7 @@ class AMQPRpcClientServerTest extends JUnitSuite with MustMatchers { @Test def consumerMessage = if (AMQPTest.enabled) AMQPTest.withCleanEndState { - + val connection = AMQP.newConnection() val countDown = new CountDownLatch(3) diff --git a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcProtobufTest.scala b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcProtobufTest.scala index 6b796374a6..c86dd9bf81 100644 --- a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcProtobufTest.scala +++ b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcProtobufTest.scala @@ -46,4 +46,4 @@ class AMQPRpcProtobufTest extends JUnitSuite with MustMatchers { def requestHandler(request: AddressProtocol): AddressProtocol = { AddressProtocol.newBuilder.setHostname(request.getHostname.reverse).setPort(request.getPort).build } -} \ No newline at end of file +} diff --git a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcStringTest.scala b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcStringTest.scala index 0a55fda954..999100d0da 100644 --- a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcStringTest.scala +++ b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPRpcStringTest.scala @@ -44,4 +44,4 @@ class AMQPRpcStringTest extends JUnitSuite with MustMatchers { def requestHandler(request: String): String= { request.reverse } -} \ No newline at end of file +} diff --git a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPStringProducerConsumerTest.scala b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPStringProducerConsumerTest.scala index bbb77c51a7..f490b605ae 100644 --- a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPStringProducerConsumerTest.scala +++ b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPStringProducerConsumerTest.scala @@ -23,9 +23,9 @@ class AMQPStringProducerConsumerTest extends JUnitSuite with MustMatchers { RPC.newStringRpcServer(connection, "stringexchange", requestHandler) val request = "somemessage" - + def responseHandler(response: String) = { - + assert(response == request.reverse) responseLatch.open } @@ -41,4 +41,4 @@ class AMQPStringProducerConsumerTest extends JUnitSuite with MustMatchers { println("###### Reverse") request.reverse } -} \ No newline at end of file +} diff --git a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPTest.scala b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPTest.scala index 2930ce4e68..0c993d6815 100644 --- a/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPTest.scala +++ b/akka-amqp/src/test/scala/se/scalablesolutions/akka/amqp/test/AMQPTest.scala @@ -6,7 +6,7 @@ package se.scalablesolutions.akka.amqp.test import se.scalablesolutions.akka.amqp.AMQP object AMQPTest { - + def enabled = false def withCleanEndState(action: => Unit) { diff --git a/akka-camel/src/main/scala/CamelService.scala b/akka-camel/src/main/scala/CamelService.scala index d47daf8d9a..5fd8c9a66c 100644 --- a/akka-camel/src/main/scala/CamelService.scala +++ b/akka-camel/src/main/scala/CamelService.scala @@ -89,7 +89,7 @@ trait CamelService extends Bootable with Logging { onLoad this } - + /** * Stops the CamelService. * diff --git a/akka-camel/src/main/scala/Consumer.scala b/akka-camel/src/main/scala/Consumer.scala index 3b54c5df77..ea07757a9c 100644 --- a/akka-camel/src/main/scala/Consumer.scala +++ b/akka-camel/src/main/scala/Consumer.scala @@ -66,7 +66,7 @@ trait UntypedConsumer extends Consumer { self: UntypedActor => abstract class UntypedConsumerActor extends UntypedActor with UntypedConsumer /** - * Subclass this abstract class to create an MDB-style transacted untyped consumer + * Subclass this abstract class to create an MDB-style transacted untyped consumer * actor. This class is meant to be used from Java. */ abstract class UntypedConsumerTransactor extends UntypedTransactor with UntypedConsumer diff --git a/akka-camel/src/main/scala/Producer.scala b/akka-camel/src/main/scala/Producer.scala index 6f5c914a65..8764b91b4c 100644 --- a/akka-camel/src/main/scala/Producer.scala +++ b/akka-camel/src/main/scala/Producer.scala @@ -170,7 +170,7 @@ trait Producer extends ProducerSupport { this: Actor => /** * Java-friendly {@link ProducerSupport} inherited by {@link UntypedProducerActor} implementations. - * + * * @author Martin Krasser */ trait UntypedProducer extends ProducerSupport { this: UntypedActor => diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActor.java b/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActor.java index d4d7f152bf..e335e08b84 100644 --- a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActor.java +++ b/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActor.java @@ -6,4 +6,4 @@ package se.scalablesolutions.akka.camel; public interface SampleTypedActor { public String foo(String s); -} \ No newline at end of file +} diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActorImpl.java b/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActorImpl.java index dc91fc3f7f..aeb0878af7 100644 --- a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActorImpl.java +++ b/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedActorImpl.java @@ -10,5 +10,5 @@ public class SampleTypedActorImpl extends TypedActor implements SampleTypedActor public String foo(String s) { return String.format("foo: %s", s); } - -} \ No newline at end of file + +} diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedSingleConsumer.java b/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedSingleConsumer.java index 5d31a35ae2..1ef6614020 100644 --- a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedSingleConsumer.java +++ b/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleTypedSingleConsumer.java @@ -9,5 +9,5 @@ public interface SampleTypedSingleConsumer { @consume("direct:foo") public void foo(String b); - + } diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumer.java b/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumer.java index 303b4302f3..01b0edd251 100644 --- a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumer.java +++ b/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumer.java @@ -17,5 +17,5 @@ public class SampleUntypedConsumer extends UntypedConsumerActor { String header = msg.headerAs("test", String.class); getContext().replySafe(String.format("%s %s", body, header)); } - + } diff --git a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumerBlocking.java b/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumerBlocking.java index c653d421bc..a8ce6f1484 100644 --- a/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumerBlocking.java +++ b/akka-camel/src/test/java/se/scalablesolutions/akka/camel/SampleUntypedConsumerBlocking.java @@ -19,5 +19,5 @@ public class SampleUntypedConsumerBlocking extends UntypedConsumerActor { String header = msg.headerAs("test", String.class); getContext().replySafe(String.format("%s %s", body, header)); } - + } diff --git a/akka-camel/src/test/scala/CamelServiceManagerSpec.scala b/akka-camel/src/test/scala/CamelServiceManagerSpec.scala index 9de84f1c27..222c1a17c6 100644 --- a/akka-camel/src/test/scala/CamelServiceManagerSpec.scala +++ b/akka-camel/src/test/scala/CamelServiceManagerSpec.scala @@ -60,4 +60,4 @@ class CamelServiceManagerSpec extends WordSpec with BeforeAndAfterAll with MustM } } } -} \ No newline at end of file +} diff --git a/akka-camel/src/test/scala/ConsumerSpec.scala b/akka-camel/src/test/scala/ConsumerSpec.scala index 14f5e1cf40..678ed70057 100644 --- a/akka-camel/src/test/scala/ConsumerSpec.scala +++ b/akka-camel/src/test/scala/ConsumerSpec.scala @@ -193,7 +193,7 @@ object ConsumerSpec { @consume("direct:publish-test-4") def bar(s: String) = "bar: %s" format s } - + class TestBlocker(uri: String) extends Actor with Consumer { self.timeout = 1000 def endpointUri = uri @@ -202,4 +202,4 @@ object ConsumerSpec { case msg: Message => { /* do not reply */ } } } -} \ No newline at end of file +} diff --git a/akka-core/src/main/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java b/akka-core/src/main/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java index 8babc16770..0ab1a0aa10 100644 --- a/akka-core/src/main/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java +++ b/akka-core/src/main/java/se/scalablesolutions/akka/remote/protocol/RemoteProtocol.java @@ -14,10 +14,10 @@ public final class RemoteProtocol { JAVA_ACTOR(1, 2), TYPED_ACTOR(2, 3), ; - - + + public final int getNumber() { return value; } - + public static ActorType valueOf(int value) { switch (value) { case 1: return SCALA_ACTOR; @@ -26,7 +26,7 @@ public final class RemoteProtocol { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -38,7 +38,7 @@ public final class RemoteProtocol { return ActorType.valueOf(number) ; } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -51,9 +51,9 @@ public final class RemoteProtocol { getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(0); } - + private static final ActorType[] VALUES = { - SCALA_ACTOR, JAVA_ACTOR, TYPED_ACTOR, + SCALA_ACTOR, JAVA_ACTOR, TYPED_ACTOR, }; public static ActorType valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { @@ -69,14 +69,14 @@ public final class RemoteProtocol { this.index = index; this.value = value; } - + static { se.scalablesolutions.akka.remote.protocol.RemoteProtocol.getDescriptor(); } - + // @@protoc_insertion_point(enum_scope:ActorType) } - + public enum SerializationSchemeType implements com.google.protobuf.ProtocolMessageEnum { JAVA(0, 1), @@ -85,10 +85,10 @@ public final class RemoteProtocol { JAVA_JSON(3, 4), PROTOBUF(4, 5), ; - - + + public final int getNumber() { return value; } - + public static SerializationSchemeType valueOf(int value) { switch (value) { case 1: return JAVA; @@ -99,7 +99,7 @@ public final class RemoteProtocol { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -111,7 +111,7 @@ public final class RemoteProtocol { return SerializationSchemeType.valueOf(number) ; } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -124,9 +124,9 @@ public final class RemoteProtocol { getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(1); } - + private static final SerializationSchemeType[] VALUES = { - JAVA, SBINARY, SCALA_JSON, JAVA_JSON, PROTOBUF, + JAVA, SBINARY, SCALA_JSON, JAVA_JSON, PROTOBUF, }; public static SerializationSchemeType valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { @@ -142,23 +142,23 @@ public final class RemoteProtocol { this.index = index; this.value = value; } - + static { se.scalablesolutions.akka.remote.protocol.RemoteProtocol.getDescriptor(); } - + // @@protoc_insertion_point(enum_scope:SerializationSchemeType) } - + public enum LifeCycleType implements com.google.protobuf.ProtocolMessageEnum { PERMANENT(0, 1), TEMPORARY(1, 2), ; - - + + public final int getNumber() { return value; } - + public static LifeCycleType valueOf(int value) { switch (value) { case 1: return PERMANENT; @@ -166,7 +166,7 @@ public final class RemoteProtocol { default: return null; } } - + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; @@ -178,7 +178,7 @@ public final class RemoteProtocol { return LifeCycleType.valueOf(number) ; } }; - + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { return getDescriptor().getValues().get(index); @@ -191,9 +191,9 @@ public final class RemoteProtocol { getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.getDescriptor().getEnumTypes().get(2); } - + private static final LifeCycleType[] VALUES = { - PERMANENT, TEMPORARY, + PERMANENT, TEMPORARY, }; public static LifeCycleType valueOf( com.google.protobuf.Descriptors.EnumValueDescriptor desc) { @@ -209,14 +209,14 @@ public final class RemoteProtocol { this.index = index; this.value = value; } - + static { se.scalablesolutions.akka.remote.protocol.RemoteProtocol.getDescriptor(); } - + // @@protoc_insertion_point(enum_scope:LifeCycleType) } - + public static final class RemoteActorRefProtocol extends com.google.protobuf.GeneratedMessage { // Use RemoteActorRefProtocol.newBuilder() to construct. @@ -224,54 +224,54 @@ public final class RemoteProtocol { initFields(); } private RemoteActorRefProtocol(boolean noInit) {} - + private static final RemoteActorRefProtocol defaultInstance; public static RemoteActorRefProtocol getDefaultInstance() { return defaultInstance; } - + public RemoteActorRefProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_RemoteActorRefProtocol_fieldAccessorTable; } - + // required string uuid = 1; public static final int UUID_FIELD_NUMBER = 1; private boolean hasUuid; private java.lang.String uuid_ = ""; public boolean hasUuid() { return hasUuid; } public java.lang.String getUuid() { return uuid_; } - + // required string actorClassname = 2; public static final int ACTORCLASSNAME_FIELD_NUMBER = 2; private boolean hasActorClassname; private java.lang.String actorClassname_ = ""; public boolean hasActorClassname() { return hasActorClassname; } public java.lang.String getActorClassname() { return actorClassname_; } - + // required .AddressProtocol homeAddress = 3; public static final int HOMEADDRESS_FIELD_NUMBER = 3; private boolean hasHomeAddress; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol homeAddress_; public boolean hasHomeAddress() { return hasHomeAddress; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol getHomeAddress() { return homeAddress_; } - + // optional uint64 timeout = 4; public static final int TIMEOUT_FIELD_NUMBER = 4; private boolean hasTimeout; private long timeout_ = 0L; public boolean hasTimeout() { return hasTimeout; } public long getTimeout() { return timeout_; } - + private void initFields() { homeAddress_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol.getDefaultInstance(); } @@ -282,7 +282,7 @@ public final class RemoteProtocol { if (!getHomeAddress().isInitialized()) return false; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -300,12 +300,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasUuid()) { size += com.google.protobuf.CodedOutputStream @@ -327,7 +327,7 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -394,31 +394,31 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol result; - + // Construct using se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol(); return builder; } - + protected se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -427,20 +427,20 @@ public final class RemoteProtocol { result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDescriptor(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getDefaultInstanceForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -450,7 +450,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -459,7 +459,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol buildPartial() { if (result == null) { throw new IllegalStateException( @@ -469,7 +469,7 @@ public final class RemoteProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol) { return mergeFrom((se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol)other); @@ -478,7 +478,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol other) { if (other == se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance()) return this; if (other.hasUuid()) { @@ -496,7 +496,7 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -542,8 +542,8 @@ public final class RemoteProtocol { } } } - - + + // required string uuid = 1; public boolean hasUuid() { return result.hasUuid(); @@ -564,7 +564,7 @@ public final class RemoteProtocol { result.uuid_ = getDefaultInstance().getUuid(); return this; } - + // required string actorClassname = 2; public boolean hasActorClassname() { return result.hasActorClassname(); @@ -585,7 +585,7 @@ public final class RemoteProtocol { result.actorClassname_ = getDefaultInstance().getActorClassname(); return this; } - + // required .AddressProtocol homeAddress = 3; public boolean hasHomeAddress() { return result.hasHomeAddress(); @@ -622,7 +622,7 @@ public final class RemoteProtocol { result.homeAddress_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol.getDefaultInstance(); return this; } - + // optional uint64 timeout = 4; public boolean hasTimeout() { return result.hasTimeout(); @@ -640,19 +640,19 @@ public final class RemoteProtocol { result.timeout_ = 0L; return this; } - + // @@protoc_insertion_point(builder_scope:RemoteActorRefProtocol) } - + static { defaultInstance = new RemoteActorRefProtocol(true); se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:RemoteActorRefProtocol) } - + public static final class SerializedActorRefProtocol extends com.google.protobuf.GeneratedMessage { // Use SerializedActorRefProtocol.newBuilder() to construct. @@ -660,110 +660,110 @@ public final class RemoteProtocol { initFields(); } private SerializedActorRefProtocol(boolean noInit) {} - + private static final SerializedActorRefProtocol defaultInstance; public static SerializedActorRefProtocol getDefaultInstance() { return defaultInstance; } - + public SerializedActorRefProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_SerializedActorRefProtocol_fieldAccessorTable; } - + // required string uuid = 1; public static final int UUID_FIELD_NUMBER = 1; private boolean hasUuid; private java.lang.String uuid_ = ""; public boolean hasUuid() { return hasUuid; } public java.lang.String getUuid() { return uuid_; } - + // required string id = 2; public static final int ID_FIELD_NUMBER = 2; private boolean hasId; private java.lang.String id_ = ""; public boolean hasId() { return hasId; } public java.lang.String getId() { return id_; } - + // 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_; } - + // required .AddressProtocol originalAddress = 4; public static final int ORIGINALADDRESS_FIELD_NUMBER = 4; private boolean hasOriginalAddress; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol originalAddress_; public boolean hasOriginalAddress() { return hasOriginalAddress; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol getOriginalAddress() { return originalAddress_; } - + // optional bytes actorInstance = 5; public static final int ACTORINSTANCE_FIELD_NUMBER = 5; 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_; } - + // optional string serializerClassname = 6; public static final int SERIALIZERCLASSNAME_FIELD_NUMBER = 6; private boolean hasSerializerClassname; private java.lang.String serializerClassname_ = ""; public boolean hasSerializerClassname() { return hasSerializerClassname; } public java.lang.String getSerializerClassname() { return serializerClassname_; } - + // optional bool isTransactor = 7; public static final int ISTRANSACTOR_FIELD_NUMBER = 7; private boolean hasIsTransactor; private boolean isTransactor_ = false; public boolean hasIsTransactor() { return hasIsTransactor; } public boolean getIsTransactor() { return isTransactor_; } - + // optional uint64 timeout = 8; public static final int TIMEOUT_FIELD_NUMBER = 8; private boolean hasTimeout; private long timeout_ = 0L; public boolean hasTimeout() { return hasTimeout; } public long getTimeout() { return timeout_; } - + // optional uint64 receiveTimeout = 9; public static final int RECEIVETIMEOUT_FIELD_NUMBER = 9; private boolean hasReceiveTimeout; private long receiveTimeout_ = 0L; public boolean hasReceiveTimeout() { return hasReceiveTimeout; } public long getReceiveTimeout() { return receiveTimeout_; } - + // optional .LifeCycleProtocol lifeCycle = 10; public static final int LIFECYCLE_FIELD_NUMBER = 10; private boolean hasLifeCycle; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol lifeCycle_; public boolean hasLifeCycle() { return hasLifeCycle; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol getLifeCycle() { return lifeCycle_; } - + // optional .RemoteActorRefProtocol supervisor = 11; public static final int SUPERVISOR_FIELD_NUMBER = 11; private boolean hasSupervisor; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol supervisor_; public boolean hasSupervisor() { return hasSupervisor; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSupervisor() { return supervisor_; } - + // optional bytes hotswapStack = 12; public static final int HOTSWAPSTACK_FIELD_NUMBER = 12; 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_; } - + // repeated .RemoteRequestProtocol messages = 13; public static final int MESSAGES_FIELD_NUMBER = 13; private java.util.List messages_ = @@ -775,7 +775,7 @@ public final class RemoteProtocol { public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol getMessages(int index) { return messages_.get(index); } - + private void initFields() { originalAddress_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol.getDefaultInstance(); lifeCycle_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance(); @@ -798,7 +798,7 @@ public final class RemoteProtocol { } return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -843,12 +843,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasUuid()) { size += com.google.protobuf.CodedOutputStream @@ -906,7 +906,7 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -973,31 +973,31 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol result; - + // Construct using se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol(); return builder; } - + protected se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -1006,20 +1006,20 @@ public final class RemoteProtocol { result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDescriptor(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol getDefaultInstanceForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -1029,7 +1029,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -1038,7 +1038,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol buildPartial() { if (result == null) { throw new IllegalStateException( @@ -1052,7 +1052,7 @@ public final class RemoteProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol) { return mergeFrom((se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol)other); @@ -1061,7 +1061,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol other) { if (other == se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializedActorRefProtocol.getDefaultInstance()) return this; if (other.hasUuid()) { @@ -1109,7 +1109,7 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1203,8 +1203,8 @@ public final class RemoteProtocol { } } } - - + + // required string uuid = 1; public boolean hasUuid() { return result.hasUuid(); @@ -1225,7 +1225,7 @@ public final class RemoteProtocol { result.uuid_ = getDefaultInstance().getUuid(); return this; } - + // required string id = 2; public boolean hasId() { return result.hasId(); @@ -1246,7 +1246,7 @@ public final class RemoteProtocol { result.id_ = getDefaultInstance().getId(); return this; } - + // required string actorClassname = 3; public boolean hasActorClassname() { return result.hasActorClassname(); @@ -1267,7 +1267,7 @@ public final class RemoteProtocol { result.actorClassname_ = getDefaultInstance().getActorClassname(); return this; } - + // required .AddressProtocol originalAddress = 4; public boolean hasOriginalAddress() { return result.hasOriginalAddress(); @@ -1304,7 +1304,7 @@ public final class RemoteProtocol { result.originalAddress_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol.getDefaultInstance(); return this; } - + // optional bytes actorInstance = 5; public boolean hasActorInstance() { return result.hasActorInstance(); @@ -1325,7 +1325,7 @@ public final class RemoteProtocol { result.actorInstance_ = getDefaultInstance().getActorInstance(); return this; } - + // optional string serializerClassname = 6; public boolean hasSerializerClassname() { return result.hasSerializerClassname(); @@ -1346,7 +1346,7 @@ public final class RemoteProtocol { result.serializerClassname_ = getDefaultInstance().getSerializerClassname(); return this; } - + // optional bool isTransactor = 7; public boolean hasIsTransactor() { return result.hasIsTransactor(); @@ -1364,7 +1364,7 @@ public final class RemoteProtocol { result.isTransactor_ = false; return this; } - + // optional uint64 timeout = 8; public boolean hasTimeout() { return result.hasTimeout(); @@ -1382,7 +1382,7 @@ public final class RemoteProtocol { result.timeout_ = 0L; return this; } - + // optional uint64 receiveTimeout = 9; public boolean hasReceiveTimeout() { return result.hasReceiveTimeout(); @@ -1400,7 +1400,7 @@ public final class RemoteProtocol { result.receiveTimeout_ = 0L; return this; } - + // optional .LifeCycleProtocol lifeCycle = 10; public boolean hasLifeCycle() { return result.hasLifeCycle(); @@ -1437,7 +1437,7 @@ public final class RemoteProtocol { result.lifeCycle_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance(); return this; } - + // optional .RemoteActorRefProtocol supervisor = 11; public boolean hasSupervisor() { return result.hasSupervisor(); @@ -1474,7 +1474,7 @@ public final class RemoteProtocol { result.supervisor_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); return this; } - + // optional bytes hotswapStack = 12; public boolean hasHotswapStack() { return result.hasHotswapStack(); @@ -1495,7 +1495,7 @@ public final class RemoteProtocol { result.hotswapStack_ = getDefaultInstance().getHotswapStack(); return this; } - + // repeated .RemoteRequestProtocol messages = 13; public java.util.List getMessagesList() { return java.util.Collections.unmodifiableList(result.messages_); @@ -1546,19 +1546,19 @@ public final class RemoteProtocol { result.messages_ = java.util.Collections.emptyList(); return this; } - + // @@protoc_insertion_point(builder_scope:SerializedActorRefProtocol) } - + static { defaultInstance = new SerializedActorRefProtocol(true); se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:SerializedActorRefProtocol) } - + public static final class MessageProtocol extends com.google.protobuf.GeneratedMessage { // Use MessageProtocol.newBuilder() to construct. @@ -1566,47 +1566,47 @@ public final class RemoteProtocol { initFields(); } private MessageProtocol(boolean noInit) {} - + private static final MessageProtocol defaultInstance; public static MessageProtocol getDefaultInstance() { return defaultInstance; } - + public MessageProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_MessageProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_MessageProtocol_fieldAccessorTable; } - + // required .SerializationSchemeType serializationScheme = 1; public static final int SERIALIZATIONSCHEME_FIELD_NUMBER = 1; private boolean hasSerializationScheme; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializationSchemeType serializationScheme_; public boolean hasSerializationScheme() { return hasSerializationScheme; } public se.scalablesolutions.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_; } - + // 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 void initFields() { serializationScheme_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializationSchemeType.JAVA; } @@ -1615,7 +1615,7 @@ public final class RemoteProtocol { if (!hasMessage) return false; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -1630,12 +1630,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasSerializationScheme()) { size += com.google.protobuf.CodedOutputStream @@ -1653,7 +1653,7 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -1720,31 +1720,31 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol result; - + // Construct using se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol(); return builder; } - + protected se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -1753,20 +1753,20 @@ public final class RemoteProtocol { result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol.getDescriptor(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol getDefaultInstanceForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -1776,7 +1776,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -1785,7 +1785,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol buildPartial() { if (result == null) { throw new IllegalStateException( @@ -1795,7 +1795,7 @@ public final class RemoteProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol) { return mergeFrom((se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol)other); @@ -1804,7 +1804,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol other) { if (other == se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance()) return this; if (other.hasSerializationScheme()) { @@ -1819,7 +1819,7 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1862,8 +1862,8 @@ public final class RemoteProtocol { } } } - - + + // required .SerializationSchemeType serializationScheme = 1; public boolean hasSerializationScheme() { return result.hasSerializationScheme(); @@ -1884,7 +1884,7 @@ public final class RemoteProtocol { result.serializationScheme_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.SerializationSchemeType.JAVA; return this; } - + // required bytes message = 2; public boolean hasMessage() { return result.hasMessage(); @@ -1905,7 +1905,7 @@ public final class RemoteProtocol { result.message_ = getDefaultInstance().getMessage(); return this; } - + // optional bytes messageManifest = 3; public boolean hasMessageManifest() { return result.hasMessageManifest(); @@ -1926,19 +1926,19 @@ public final class RemoteProtocol { result.messageManifest_ = getDefaultInstance().getMessageManifest(); return this; } - + // @@protoc_insertion_point(builder_scope:MessageProtocol) } - + static { defaultInstance = new MessageProtocol(true); se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:MessageProtocol) } - + public static final class ActorInfoProtocol extends com.google.protobuf.GeneratedMessage { // Use ActorInfoProtocol.newBuilder() to construct. @@ -1946,61 +1946,61 @@ public final class RemoteProtocol { initFields(); } private ActorInfoProtocol(boolean noInit) {} - + private static final ActorInfoProtocol defaultInstance; public static ActorInfoProtocol getDefaultInstance() { return defaultInstance; } - + public ActorInfoProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_ActorInfoProtocol_fieldAccessorTable; } - + // required string uuid = 1; public static final int UUID_FIELD_NUMBER = 1; private boolean hasUuid; private java.lang.String uuid_ = ""; public boolean hasUuid() { return hasUuid; } public java.lang.String getUuid() { return uuid_; } - + // required string target = 2; public static final int TARGET_FIELD_NUMBER = 2; private boolean hasTarget; private java.lang.String target_ = ""; public boolean hasTarget() { return hasTarget; } public java.lang.String getTarget() { return target_; } - + // required 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_; } - + // required .ActorType actorType = 4; public static final int ACTORTYPE_FIELD_NUMBER = 4; private boolean hasActorType; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorType actorType_; public boolean hasActorType() { return hasActorType; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorType getActorType() { return actorType_; } - + // optional .TypedActorInfoProtocol typedActorInfo = 5; public static final int TYPEDACTORINFO_FIELD_NUMBER = 5; private boolean hasTypedActorInfo; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol typedActorInfo_; public boolean hasTypedActorInfo() { return hasTypedActorInfo; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol getTypedActorInfo() { return typedActorInfo_; } - + private void initFields() { actorType_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorType.SCALA_ACTOR; typedActorInfo_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol.getDefaultInstance(); @@ -2015,7 +2015,7 @@ public final class RemoteProtocol { } return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -2036,12 +2036,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasUuid()) { size += com.google.protobuf.CodedOutputStream @@ -2067,7 +2067,7 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -2134,31 +2134,31 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol result; - + // Construct using se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol(); return builder; } - + protected se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -2167,20 +2167,20 @@ public final class RemoteProtocol { result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDescriptor(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol getDefaultInstanceForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -2190,7 +2190,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -2199,7 +2199,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol buildPartial() { if (result == null) { throw new IllegalStateException( @@ -2209,7 +2209,7 @@ public final class RemoteProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol) { return mergeFrom((se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol)other); @@ -2218,7 +2218,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol other) { if (other == se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance()) return this; if (other.hasUuid()) { @@ -2239,7 +2239,7 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2295,8 +2295,8 @@ public final class RemoteProtocol { } } } - - + + // required string uuid = 1; public boolean hasUuid() { return result.hasUuid(); @@ -2317,7 +2317,7 @@ public final class RemoteProtocol { result.uuid_ = getDefaultInstance().getUuid(); return this; } - + // required string target = 2; public boolean hasTarget() { return result.hasTarget(); @@ -2338,7 +2338,7 @@ public final class RemoteProtocol { result.target_ = getDefaultInstance().getTarget(); return this; } - + // required uint64 timeout = 3; public boolean hasTimeout() { return result.hasTimeout(); @@ -2356,7 +2356,7 @@ public final class RemoteProtocol { result.timeout_ = 0L; return this; } - + // required .ActorType actorType = 4; public boolean hasActorType() { return result.hasActorType(); @@ -2377,7 +2377,7 @@ public final class RemoteProtocol { result.actorType_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorType.SCALA_ACTOR; return this; } - + // optional .TypedActorInfoProtocol typedActorInfo = 5; public boolean hasTypedActorInfo() { return result.hasTypedActorInfo(); @@ -2414,19 +2414,19 @@ public final class RemoteProtocol { result.typedActorInfo_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol.getDefaultInstance(); return this; } - + // @@protoc_insertion_point(builder_scope:ActorInfoProtocol) } - + static { defaultInstance = new ActorInfoProtocol(true); se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:ActorInfoProtocol) } - + public static final class TypedActorInfoProtocol extends com.google.protobuf.GeneratedMessage { // Use TypedActorInfoProtocol.newBuilder() to construct. @@ -2434,40 +2434,40 @@ public final class RemoteProtocol { initFields(); } private TypedActorInfoProtocol(boolean noInit) {} - + private static final TypedActorInfoProtocol defaultInstance; public static TypedActorInfoProtocol getDefaultInstance() { return defaultInstance; } - + public TypedActorInfoProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_TypedActorInfoProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_TypedActorInfoProtocol_fieldAccessorTable; } - + // required string interface = 1; public static final int INTERFACE_FIELD_NUMBER = 1; private boolean hasInterface; private java.lang.String interface_ = ""; public boolean hasInterface() { return hasInterface; } public java.lang.String getInterface() { return interface_; } - + // required string method = 2; public static final int METHOD_FIELD_NUMBER = 2; private boolean hasMethod; private java.lang.String method_ = ""; public boolean hasMethod() { return hasMethod; } public java.lang.String getMethod() { return method_; } - + private void initFields() { } public final boolean isInitialized() { @@ -2475,7 +2475,7 @@ public final class RemoteProtocol { if (!hasMethod) return false; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -2487,12 +2487,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasInterface()) { size += com.google.protobuf.CodedOutputStream @@ -2506,7 +2506,7 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -2573,31 +2573,31 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol result; - + // Construct using se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol(); return builder; } - + protected se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -2606,20 +2606,20 @@ public final class RemoteProtocol { result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol.getDescriptor(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol getDefaultInstanceForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -2629,7 +2629,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -2638,7 +2638,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol buildPartial() { if (result == null) { throw new IllegalStateException( @@ -2648,7 +2648,7 @@ public final class RemoteProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol) { return mergeFrom((se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol)other); @@ -2657,7 +2657,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol other) { if (other == se.scalablesolutions.akka.remote.protocol.RemoteProtocol.TypedActorInfoProtocol.getDefaultInstance()) return this; if (other.hasInterface()) { @@ -2669,7 +2669,7 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2702,8 +2702,8 @@ public final class RemoteProtocol { } } } - - + + // required string interface = 1; public boolean hasInterface() { return result.hasInterface(); @@ -2724,7 +2724,7 @@ public final class RemoteProtocol { result.interface_ = getDefaultInstance().getInterface(); return this; } - + // required string method = 2; public boolean hasMethod() { return result.hasMethod(); @@ -2745,19 +2745,19 @@ public final class RemoteProtocol { result.method_ = getDefaultInstance().getMethod(); return this; } - + // @@protoc_insertion_point(builder_scope:TypedActorInfoProtocol) } - + static { defaultInstance = new TypedActorInfoProtocol(true); se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:TypedActorInfoProtocol) } - + public static final class RemoteRequestProtocol extends com.google.protobuf.GeneratedMessage { // Use RemoteRequestProtocol.newBuilder() to construct. @@ -2765,68 +2765,68 @@ public final class RemoteProtocol { initFields(); } private RemoteRequestProtocol(boolean noInit) {} - + private static final RemoteRequestProtocol defaultInstance; public static RemoteRequestProtocol getDefaultInstance() { return defaultInstance; } - + public RemoteRequestProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_RemoteRequestProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_RemoteRequestProtocol_fieldAccessorTable; } - + // required uint64 id = 1; public static final int ID_FIELD_NUMBER = 1; private boolean hasId; private long id_ = 0L; public boolean hasId() { return hasId; } public long getId() { return id_; } - + // required .MessageProtocol message = 2; public static final int MESSAGE_FIELD_NUMBER = 2; private boolean hasMessage; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol message_; public boolean hasMessage() { return hasMessage; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol getMessage() { return message_; } - + // required .ActorInfoProtocol actorInfo = 3; public static final int ACTORINFO_FIELD_NUMBER = 3; private boolean hasActorInfo; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol actorInfo_; public boolean hasActorInfo() { return hasActorInfo; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol getActorInfo() { return actorInfo_; } - + // required bool isOneWay = 4; public static final int ISONEWAY_FIELD_NUMBER = 4; private boolean hasIsOneWay; private boolean isOneWay_ = false; public boolean hasIsOneWay() { return hasIsOneWay; } public boolean getIsOneWay() { return isOneWay_; } - + // optional string supervisorUuid = 5; public static final int SUPERVISORUUID_FIELD_NUMBER = 5; private boolean hasSupervisorUuid; private java.lang.String supervisorUuid_ = ""; public boolean hasSupervisorUuid() { return hasSupervisorUuid; } public java.lang.String getSupervisorUuid() { return supervisorUuid_; } - + // optional .RemoteActorRefProtocol sender = 6; public static final int SENDER_FIELD_NUMBER = 6; private boolean hasSender; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol sender_; public boolean hasSender() { return hasSender; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol getSender() { return sender_; } - + private void initFields() { message_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance(); actorInfo_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance(); @@ -2844,7 +2844,7 @@ public final class RemoteProtocol { } return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -2868,12 +2868,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasId()) { size += com.google.protobuf.CodedOutputStream @@ -2903,7 +2903,7 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -2970,31 +2970,31 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol result; - + // Construct using se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol(); return builder; } - + protected se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -3003,20 +3003,20 @@ public final class RemoteProtocol { result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol.getDescriptor(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol getDefaultInstanceForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -3026,7 +3026,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -3035,7 +3035,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol buildPartial() { if (result == null) { throw new IllegalStateException( @@ -3045,7 +3045,7 @@ public final class RemoteProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol) { return mergeFrom((se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol)other); @@ -3054,7 +3054,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol other) { if (other == se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteRequestProtocol.getDefaultInstance()) return this; if (other.hasId()) { @@ -3078,7 +3078,7 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -3142,8 +3142,8 @@ public final class RemoteProtocol { } } } - - + + // required uint64 id = 1; public boolean hasId() { return result.hasId(); @@ -3161,7 +3161,7 @@ public final class RemoteProtocol { result.id_ = 0L; return this; } - + // required .MessageProtocol message = 2; public boolean hasMessage() { return result.hasMessage(); @@ -3198,7 +3198,7 @@ public final class RemoteProtocol { result.message_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance(); return this; } - + // required .ActorInfoProtocol actorInfo = 3; public boolean hasActorInfo() { return result.hasActorInfo(); @@ -3235,7 +3235,7 @@ public final class RemoteProtocol { result.actorInfo_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorInfoProtocol.getDefaultInstance(); return this; } - + // required bool isOneWay = 4; public boolean hasIsOneWay() { return result.hasIsOneWay(); @@ -3253,7 +3253,7 @@ public final class RemoteProtocol { result.isOneWay_ = false; return this; } - + // optional string supervisorUuid = 5; public boolean hasSupervisorUuid() { return result.hasSupervisorUuid(); @@ -3274,7 +3274,7 @@ public final class RemoteProtocol { result.supervisorUuid_ = getDefaultInstance().getSupervisorUuid(); return this; } - + // optional .RemoteActorRefProtocol sender = 6; public boolean hasSender() { return result.hasSender(); @@ -3311,19 +3311,19 @@ public final class RemoteProtocol { result.sender_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteActorRefProtocol.getDefaultInstance(); return this; } - + // @@protoc_insertion_point(builder_scope:RemoteRequestProtocol) } - + static { defaultInstance = new RemoteRequestProtocol(true); se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:RemoteRequestProtocol) } - + public static final class RemoteReplyProtocol extends com.google.protobuf.GeneratedMessage { // Use RemoteReplyProtocol.newBuilder() to construct. @@ -3331,68 +3331,68 @@ public final class RemoteProtocol { initFields(); } private RemoteReplyProtocol(boolean noInit) {} - + private static final RemoteReplyProtocol defaultInstance; public static RemoteReplyProtocol getDefaultInstance() { return defaultInstance; } - + public RemoteReplyProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_RemoteReplyProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_RemoteReplyProtocol_fieldAccessorTable; } - + // required uint64 id = 1; public static final int ID_FIELD_NUMBER = 1; private boolean hasId; private long id_ = 0L; public boolean hasId() { return hasId; } public long getId() { return id_; } - + // optional .MessageProtocol message = 2; public static final int MESSAGE_FIELD_NUMBER = 2; private boolean hasMessage; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol message_; public boolean hasMessage() { return hasMessage; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol getMessage() { return message_; } - + // optional .ExceptionProtocol exception = 3; public static final int EXCEPTION_FIELD_NUMBER = 3; private boolean hasException; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol exception_; public boolean hasException() { return hasException; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol getException() { return exception_; } - + // optional string supervisorUuid = 4; public static final int SUPERVISORUUID_FIELD_NUMBER = 4; private boolean hasSupervisorUuid; private java.lang.String supervisorUuid_ = ""; public boolean hasSupervisorUuid() { return hasSupervisorUuid; } public java.lang.String getSupervisorUuid() { return supervisorUuid_; } - + // required bool isActor = 5; public static final int ISACTOR_FIELD_NUMBER = 5; private boolean hasIsActor; private boolean isActor_ = false; public boolean hasIsActor() { return hasIsActor; } public boolean getIsActor() { return isActor_; } - + // required bool isSuccessful = 6; public static final int ISSUCCESSFUL_FIELD_NUMBER = 6; private boolean hasIsSuccessful; private boolean isSuccessful_ = false; public boolean hasIsSuccessful() { return hasIsSuccessful; } public boolean getIsSuccessful() { return isSuccessful_; } - + private void initFields() { message_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance(); exception_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance(); @@ -3409,7 +3409,7 @@ public final class RemoteProtocol { } return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -3433,12 +3433,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasId()) { size += com.google.protobuf.CodedOutputStream @@ -3468,7 +3468,7 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3535,31 +3535,31 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol result; - + // Construct using se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol(); return builder; } - + protected se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -3568,20 +3568,20 @@ public final class RemoteProtocol { result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol.getDescriptor(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol getDefaultInstanceForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -3591,7 +3591,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -3600,7 +3600,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol buildPartial() { if (result == null) { throw new IllegalStateException( @@ -3610,7 +3610,7 @@ public final class RemoteProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol) { return mergeFrom((se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol)other); @@ -3619,7 +3619,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol other) { if (other == se.scalablesolutions.akka.remote.protocol.RemoteProtocol.RemoteReplyProtocol.getDefaultInstance()) return this; if (other.hasId()) { @@ -3643,7 +3643,7 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -3702,8 +3702,8 @@ public final class RemoteProtocol { } } } - - + + // required uint64 id = 1; public boolean hasId() { return result.hasId(); @@ -3721,7 +3721,7 @@ public final class RemoteProtocol { result.id_ = 0L; return this; } - + // optional .MessageProtocol message = 2; public boolean hasMessage() { return result.hasMessage(); @@ -3758,7 +3758,7 @@ public final class RemoteProtocol { result.message_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.MessageProtocol.getDefaultInstance(); return this; } - + // optional .ExceptionProtocol exception = 3; public boolean hasException() { return result.hasException(); @@ -3795,7 +3795,7 @@ public final class RemoteProtocol { result.exception_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance(); return this; } - + // optional string supervisorUuid = 4; public boolean hasSupervisorUuid() { return result.hasSupervisorUuid(); @@ -3816,7 +3816,7 @@ public final class RemoteProtocol { result.supervisorUuid_ = getDefaultInstance().getSupervisorUuid(); return this; } - + // required bool isActor = 5; public boolean hasIsActor() { return result.hasIsActor(); @@ -3834,7 +3834,7 @@ public final class RemoteProtocol { result.isActor_ = false; return this; } - + // required bool isSuccessful = 6; public boolean hasIsSuccessful() { return result.hasIsSuccessful(); @@ -3852,19 +3852,19 @@ public final class RemoteProtocol { result.isSuccessful_ = false; return this; } - + // @@protoc_insertion_point(builder_scope:RemoteReplyProtocol) } - + static { defaultInstance = new RemoteReplyProtocol(true); se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:RemoteReplyProtocol) } - + public static final class LifeCycleProtocol extends com.google.protobuf.GeneratedMessage { // Use LifeCycleProtocol.newBuilder() to construct. @@ -3872,61 +3872,61 @@ public final class RemoteProtocol { initFields(); } private LifeCycleProtocol(boolean noInit) {} - + private static final LifeCycleProtocol defaultInstance; public static LifeCycleProtocol getDefaultInstance() { return defaultInstance; } - + public LifeCycleProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_LifeCycleProtocol_fieldAccessorTable; } - + // required .LifeCycleType lifeCycle = 1; public static final int LIFECYCLE_FIELD_NUMBER = 1; private boolean hasLifeCycle; private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleType lifeCycle_; public boolean hasLifeCycle() { return hasLifeCycle; } public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleType getLifeCycle() { return lifeCycle_; } - + // optional string preRestart = 2; public static final int PRERESTART_FIELD_NUMBER = 2; private boolean hasPreRestart; private java.lang.String preRestart_ = ""; public boolean hasPreRestart() { return hasPreRestart; } public java.lang.String getPreRestart() { return preRestart_; } - + // optional string postRestart = 3; public static final int POSTRESTART_FIELD_NUMBER = 3; private boolean hasPostRestart; private java.lang.String postRestart_ = ""; public boolean hasPostRestart() { return hasPostRestart; } public java.lang.String getPostRestart() { return postRestart_; } - + // optional string init = 4; public static final int INIT_FIELD_NUMBER = 4; private boolean hasInit; private java.lang.String init_ = ""; public boolean hasInit() { return hasInit; } public java.lang.String getInit() { return init_; } - + // optional string shutdown = 5; public static final int SHUTDOWN_FIELD_NUMBER = 5; private boolean hasShutdown; private java.lang.String shutdown_ = ""; public boolean hasShutdown() { return hasShutdown; } public java.lang.String getShutdown() { return shutdown_; } - + private void initFields() { lifeCycle_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleType.PERMANENT; } @@ -3934,7 +3934,7 @@ public final class RemoteProtocol { if (!hasLifeCycle) return false; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -3955,12 +3955,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasLifeCycle()) { size += com.google.protobuf.CodedOutputStream @@ -3986,7 +3986,7 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -4053,31 +4053,31 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol result; - + // Construct using se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol(); return builder; } - + protected se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -4086,20 +4086,20 @@ public final class RemoteProtocol { result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDescriptor(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol getDefaultInstanceForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -4109,7 +4109,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -4118,7 +4118,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol buildPartial() { if (result == null) { throw new IllegalStateException( @@ -4128,7 +4128,7 @@ public final class RemoteProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol) { return mergeFrom((se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol)other); @@ -4137,7 +4137,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol other) { if (other == se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleProtocol.getDefaultInstance()) return this; if (other.hasLifeCycle()) { @@ -4158,7 +4158,7 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -4209,8 +4209,8 @@ public final class RemoteProtocol { } } } - - + + // required .LifeCycleType lifeCycle = 1; public boolean hasLifeCycle() { return result.hasLifeCycle(); @@ -4231,7 +4231,7 @@ public final class RemoteProtocol { result.lifeCycle_ = se.scalablesolutions.akka.remote.protocol.RemoteProtocol.LifeCycleType.PERMANENT; return this; } - + // optional string preRestart = 2; public boolean hasPreRestart() { return result.hasPreRestart(); @@ -4252,7 +4252,7 @@ public final class RemoteProtocol { result.preRestart_ = getDefaultInstance().getPreRestart(); return this; } - + // optional string postRestart = 3; public boolean hasPostRestart() { return result.hasPostRestart(); @@ -4273,7 +4273,7 @@ public final class RemoteProtocol { result.postRestart_ = getDefaultInstance().getPostRestart(); return this; } - + // optional string init = 4; public boolean hasInit() { return result.hasInit(); @@ -4294,7 +4294,7 @@ public final class RemoteProtocol { result.init_ = getDefaultInstance().getInit(); return this; } - + // optional string shutdown = 5; public boolean hasShutdown() { return result.hasShutdown(); @@ -4315,19 +4315,19 @@ public final class RemoteProtocol { result.shutdown_ = getDefaultInstance().getShutdown(); return this; } - + // @@protoc_insertion_point(builder_scope:LifeCycleProtocol) } - + static { defaultInstance = new LifeCycleProtocol(true); se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:LifeCycleProtocol) } - + public static final class AddressProtocol extends com.google.protobuf.GeneratedMessage { // Use AddressProtocol.newBuilder() to construct. @@ -4335,40 +4335,40 @@ public final class RemoteProtocol { initFields(); } private AddressProtocol(boolean noInit) {} - + private static final AddressProtocol defaultInstance; public static AddressProtocol getDefaultInstance() { return defaultInstance; } - + public AddressProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_AddressProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_AddressProtocol_fieldAccessorTable; } - + // 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_; } - + // 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 void initFields() { } public final boolean isInitialized() { @@ -4376,7 +4376,7 @@ public final class RemoteProtocol { if (!hasPort) return false; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -4388,12 +4388,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasHostname()) { size += com.google.protobuf.CodedOutputStream @@ -4407,7 +4407,7 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -4474,31 +4474,31 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol result; - + // Construct using se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol(); return builder; } - + protected se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -4507,20 +4507,20 @@ public final class RemoteProtocol { result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol.getDescriptor(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol getDefaultInstanceForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -4530,7 +4530,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -4539,7 +4539,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol buildPartial() { if (result == null) { throw new IllegalStateException( @@ -4549,7 +4549,7 @@ public final class RemoteProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol) { return mergeFrom((se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol)other); @@ -4558,7 +4558,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol other) { if (other == se.scalablesolutions.akka.remote.protocol.RemoteProtocol.AddressProtocol.getDefaultInstance()) return this; if (other.hasHostname()) { @@ -4570,7 +4570,7 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -4603,8 +4603,8 @@ public final class RemoteProtocol { } } } - - + + // required string hostname = 1; public boolean hasHostname() { return result.hasHostname(); @@ -4625,7 +4625,7 @@ public final class RemoteProtocol { result.hostname_ = getDefaultInstance().getHostname(); return this; } - + // required uint32 port = 2; public boolean hasPort() { return result.hasPort(); @@ -4643,19 +4643,19 @@ public final class RemoteProtocol { result.port_ = 0; return this; } - + // @@protoc_insertion_point(builder_scope:AddressProtocol) } - + static { defaultInstance = new AddressProtocol(true); se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:AddressProtocol) } - + public static final class ExceptionProtocol extends com.google.protobuf.GeneratedMessage { // Use ExceptionProtocol.newBuilder() to construct. @@ -4663,40 +4663,40 @@ public final class RemoteProtocol { initFields(); } private ExceptionProtocol(boolean noInit) {} - + private static final ExceptionProtocol defaultInstance; public static ExceptionProtocol getDefaultInstance() { return defaultInstance; } - + public ExceptionProtocol getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_ExceptionProtocol_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internal_static_ExceptionProtocol_fieldAccessorTable; } - + // 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_; } - + // 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 void initFields() { } public final boolean isInitialized() { @@ -4704,7 +4704,7 @@ public final class RemoteProtocol { if (!hasMessage) return false; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -4716,12 +4716,12 @@ public final class RemoteProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasClassname()) { size += com.google.protobuf.CodedOutputStream @@ -4735,7 +4735,7 @@ public final class RemoteProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -4802,31 +4802,31 @@ public final class RemoteProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol result; - + // Construct using se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol(); return builder; } - + protected se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -4835,20 +4835,20 @@ public final class RemoteProtocol { result = new se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDescriptor(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol getDefaultInstanceForType() { return se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -4858,7 +4858,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -4867,7 +4867,7 @@ public final class RemoteProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol buildPartial() { if (result == null) { throw new IllegalStateException( @@ -4877,7 +4877,7 @@ public final class RemoteProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol) { return mergeFrom((se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol)other); @@ -4886,7 +4886,7 @@ public final class RemoteProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol other) { if (other == se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ExceptionProtocol.getDefaultInstance()) return this; if (other.hasClassname()) { @@ -4898,7 +4898,7 @@ public final class RemoteProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -4931,8 +4931,8 @@ public final class RemoteProtocol { } } } - - + + // required string classname = 1; public boolean hasClassname() { return result.hasClassname(); @@ -4953,7 +4953,7 @@ public final class RemoteProtocol { result.classname_ = getDefaultInstance().getClassname(); return this; } - + // required string message = 2; public boolean hasMessage() { return result.hasMessage(); @@ -4974,19 +4974,19 @@ public final class RemoteProtocol { result.message_ = getDefaultInstance().getMessage(); return this; } - + // @@protoc_insertion_point(builder_scope:ExceptionProtocol) } - + static { defaultInstance = new ExceptionProtocol(true); se.scalablesolutions.akka.remote.protocol.RemoteProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:ExceptionProtocol) } - + private static com.google.protobuf.Descriptors.Descriptor internal_static_RemoteActorRefProtocol_descriptor; private static @@ -5037,7 +5037,7 @@ public final class RemoteProtocol { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_ExceptionProtocol_fieldAccessorTable; - + public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; @@ -5183,8 +5183,8 @@ public final class RemoteProtocol { new com.google.protobuf.Descriptors.FileDescriptor[] { }, assigner); } - + public static void internalForceInit() {} - + // @@protoc_insertion_point(outer_class_scope) } diff --git a/akka-core/src/main/scala/actor/Actor.scala b/akka-core/src/main/scala/actor/Actor.scala index 4e22e5db0b..2435598c8c 100644 --- a/akka-core/src/main/scala/actor/Actor.scala +++ b/akka-core/src/main/scala/actor/Actor.scala @@ -342,7 +342,7 @@ trait Actor extends Logging { "\n\t\t'val actor = Actor.actorOf[MyActor]', or" + "\n\t\t'val actor = Actor.actorOf(new MyActor(..))', or" + "\n\t\t'val actor = Actor.actor { case msg => .. } }'") - + val ref = optRef.asInstanceOf[Some[ActorRef]].get ref.id = getClass.getName //FIXME: Is this needed? optRef.asInstanceOf[Some[ActorRef]] @@ -467,7 +467,7 @@ trait Actor extends Logging { // ========================================= // ==== INTERNAL IMPLEMENTATION DETAILS ==== // ========================================= - + private[akka] def apply(msg: Any) = processingBehavior(msg) private lazy val processingBehavior: Receive = { @@ -482,7 +482,7 @@ trait Actor extends Logging { case msg if self.hotswap.isDefined && self.hotswap.get.isDefinedAt(msg) => self.hotswap.get.apply(msg) case msg if self.hotswap.isEmpty && - defaultBehavior.isDefinedAt(msg) => defaultBehavior.apply(msg) + defaultBehavior.isDefinedAt(msg) => defaultBehavior.apply(msg) } actorBehavior } diff --git a/akka-core/src/main/scala/actor/ActorRef.scala b/akka-core/src/main/scala/actor/ActorRef.scala index 6f818b9c50..87999b8580 100644 --- a/akka-core/src/main/scala/actor/ActorRef.scala +++ b/akka-core/src/main/scala/actor/ActorRef.scala @@ -1268,9 +1268,9 @@ class LocalActorRef private[akka]( if (supervisor.isDefined) notifySupervisorWithMessage(Exit(this, reason)) else { - lifeCycle match { + lifeCycle match { case Some(LifeCycle(Temporary)) => shutDownTemporaryActor(this) - case _ => + case _ => } } } @@ -1360,7 +1360,7 @@ private[akka] case class RemoteActorRef private[akka] ( uuuid: String, val className: String, val hostname: String, val port: Int, _timeout: Long, loader: Option[ClassLoader]) // uuid: String, className: String, hostname: String, port: Int, timeOut: Long, isOnRemoteHost: Boolean) extends ActorRef { extends ActorRef with ScalaActorRef { - + _uuid = uuuid timeout = _timeout @@ -1522,7 +1522,7 @@ trait ScalaActorRef extends ActorRefShared { ref: ActorRef => * */ @volatile var faultHandler: Option[FaultHandlingStrategy] = None - + /** * The reference sender Actor of the last received message. diff --git a/akka-core/src/main/scala/actor/Implicits.scala b/akka-core/src/main/scala/actor/Implicits.scala index 16bce4b016..604e5189b9 100644 --- a/akka-core/src/main/scala/actor/Implicits.scala +++ b/akka-core/src/main/scala/actor/Implicits.scala @@ -12,4 +12,4 @@ package object actor { implicit def scala2ActorRef(ref: ScalaActorRef): ActorRef = ref.asInstanceOf[ActorRef] -} \ No newline at end of file +} diff --git a/akka-core/src/main/scala/actor/SerializationProtocol.scala b/akka-core/src/main/scala/actor/SerializationProtocol.scala index 403589aef3..b3f7caf8c2 100644 --- a/akka-core/src/main/scala/actor/SerializationProtocol.scala +++ b/akka-core/src/main/scala/actor/SerializationProtocol.scala @@ -73,7 +73,7 @@ object ActorSerialization { def fromBinary[T <: Actor](bytes: Array[Byte])(implicit format: Format[T]): ActorRef = fromBinaryToLocalActorRef(bytes, format) - def toBinary[T <: Actor](a: ActorRef)(implicit format: Format[T]): Array[Byte] = + def toBinary[T <: Actor](a: ActorRef)(implicit format: Format[T]): Array[Byte] = toSerializedActorRefProtocol(a, format).toByteArray // wrapper for implicits to be used by Java @@ -81,7 +81,7 @@ object ActorSerialization { fromBinary(bytes)(format) // wrapper for implicits to be used by Java - def toBinaryJ[T <: Actor](a: ActorRef, format: Format[T]): Array[Byte] = + def toBinaryJ[T <: Actor](a: ActorRef, format: Format[T]): Array[Byte] = toBinary(a)(format) private def toSerializedActorRefProtocol[T <: Actor](actorRef: ActorRef, format: Format[T]): SerializedActorRefProtocol = { diff --git a/akka-core/src/main/scala/actor/TypedActor.scala b/akka-core/src/main/scala/actor/TypedActor.scala index adb794741c..77473fe4d1 100644 --- a/akka-core/src/main/scala/actor/TypedActor.scala +++ b/akka-core/src/main/scala/actor/TypedActor.scala @@ -32,7 +32,7 @@ import scala.reflect.BeanProperty * Here is an example of usage (in Java): * 
  * class TestActorImpl extends TypedActor implements TestActor {
- * 
+ *
  *   public void hit(int count) {
  *     Pong pong = (Pong) getContext().getSender();
  *     pong.hit(count++);
@@ -41,7 +41,7 @@ import scala.reflect.BeanProperty
  *   public Future square(int x) {
  *     return future(x * x);
  *   }
- * 
+ *
  *   @Override
  *   public void init() {
  *     ... // optional initialization on start
@@ -65,7 +65,7 @@ import scala.reflect.BeanProperty
  * Future future = actor.square(10);
  * future.await();
  * Integer result = future.get();
- * 
+ *
  * // stop the actor
  * TypedActor.stop(actor);
  *
@@ -73,14 +73,14 @@ import scala.reflect.BeanProperty * Here is an example of usage (in Scala): * 
  * class TestActorImpl extends TypedActor with TestActor {
- * 
+ *
  *   def hit(count: Int) = {
  *     val pong = context.sender.asInstanceOf[Pong]
  *     pong.hit(count += 1)
  *   }
  *
  *   def square(x: Int): Future[Integer] = future(x * x)
- * 
+ *
  *   override def init = {
  *     ... // optional initialization on start
  *   }
@@ -102,7 +102,7 @@ import scala.reflect.BeanProperty
  * val future = actor.square(10)
  * future.await
  * val result: Int = future.get
- * 
+ *
  * // stop the actor
  * TypedActor.stop(ping)
  *
@@ -168,7 +168,7 @@ abstract class TypedActor extends Actor { * Integer result = future.get(); * */ - def future[T](value: T): Future[T] = + def future[T](value: T): Future[T] = self.senderFuture .map{f => f.completeWithResult(value); f } .getOrElse(throw new IllegalActorStateException("No sender future in scope")) @@ -234,7 +234,7 @@ abstract class TypedActor extends Actor { /** * Transactional TypedActor. All messages send to this actor as sent in a transaction. If an enclosing transaction - * exists it will be joined, if not then a new transaction will be created. + * exists it will be joined, if not then a new transaction will be created. * * @author Jonas Bonér */ @@ -409,7 +409,7 @@ object TypedActor extends Logging { /* // NOTE: currently not used - but keep it around - private[akka] def newInstance[T <: TypedActor](targetClass: Class[T], + private[akka] def newInstance[T <: TypedActor](targetClass: Class[T], remoteAddress: Option[InetSocketAddress], timeout: Long): T = { val proxy = { val instance = Proxy.newInstance(targetClass, true, false) @@ -526,13 +526,13 @@ object TypedActor extends Logging { typedActor } - private[akka] def isOneWay(joinPoint: JoinPoint): Boolean = + private[akka] def isOneWay(joinPoint: JoinPoint): Boolean = isOneWay(joinPoint.getRtti.asInstanceOf[MethodRtti]) - private[akka] def isOneWay(methodRtti: MethodRtti): Boolean = + private[akka] def isOneWay(methodRtti: MethodRtti): Boolean = methodRtti.getMethod.getReturnType == java.lang.Void.TYPE - private[akka] def returnsFuture_?(methodRtti: MethodRtti): Boolean = + private[akka] def returnsFuture_?(methodRtti: MethodRtti): Boolean = classOf[Future[_]].isAssignableFrom(methodRtti.getMethod.getReturnType) private[akka] def supervise(restartStrategy: RestartStrategy, components: List[Supervise]): Supervisor = diff --git a/akka-core/src/main/scala/actor/UntypedActor.scala b/akka-core/src/main/scala/actor/UntypedActor.scala index e94ea94b3e..cf16b7f064 100644 --- a/akka-core/src/main/scala/actor/UntypedActor.scala +++ b/akka-core/src/main/scala/actor/UntypedActor.scala @@ -155,4 +155,4 @@ object UntypedActor { * */ def actorOf(factory: UntypedActorFactory): ActorRef = Actor.actorOf(factory.create) -} \ No newline at end of file +} diff --git a/akka-core/src/main/scala/config/TypedActorGuiceConfigurator.scala b/akka-core/src/main/scala/config/TypedActorGuiceConfigurator.scala index cced864721..718050655c 100644 --- a/akka-core/src/main/scala/config/TypedActorGuiceConfigurator.scala +++ b/akka-core/src/main/scala/config/TypedActorGuiceConfigurator.scala @@ -120,13 +120,13 @@ private[akka] class TypedActorGuiceConfigurator extends TypedActorConfiguratorBa Some(new InetSocketAddress(component.remoteAddress.get.hostname, component.remoteAddress.get.port)) else None - remoteAddress.foreach { address => + remoteAddress.foreach { address => actorRef.makeRemote(remoteAddress.get) RemoteServer.registerTypedActor(address, implementationClass.getName, proxy) } AspectInitRegistry.register( - proxy, + proxy, AspectInit(interfaceClass, typedActor, actorRef, remoteAddress, timeout)) typedActor.initialize(proxy) actorRef.start diff --git a/akka-core/src/main/scala/dispatch/Dispatchers.scala b/akka-core/src/main/scala/dispatch/Dispatchers.scala index a627e56438..f9ffc219cf 100644 --- a/akka-core/src/main/scala/dispatch/Dispatchers.scala +++ b/akka-core/src/main/scala/dispatch/Dispatchers.scala @@ -46,7 +46,7 @@ import java.util.concurrent.ThreadPoolExecutor.{AbortPolicy, CallerRunsPolicy, D object Dispatchers extends Logging { val THROUGHPUT = config.getInt("akka.actor.throughput", 5) val MAILBOX_CAPACITY = config.getInt("akka.actor.default-dispatcher.mailbox-capacity", 1000) - + lazy val defaultGlobalDispatcher = { config.getConfigMap("akka.actor.default-dispatcher").flatMap(from).getOrElse(globalExecutorBasedEventDrivenDispatcher) } @@ -138,7 +138,7 @@ object Dispatchers extends Logging { * Utility function that tries to load the specified dispatcher config from the akka.conf * or else use the supplied default dispatcher */ - def fromConfig(key: String, default: => MessageDispatcher = defaultGlobalDispatcher): MessageDispatcher = + def fromConfig(key: String, default: => MessageDispatcher = defaultGlobalDispatcher): MessageDispatcher = config.getConfigMap(key).flatMap(from).getOrElse(default) /* @@ -177,20 +177,20 @@ object Dispatchers extends Logging { case "GlobalReactorBasedThreadPoolEventDriven" => globalReactorBasedThreadPoolEventDrivenDispatcher case "GlobalExecutorBasedEventDriven" => globalExecutorBasedEventDrivenDispatcher case "GlobalHawt" => globalHawtDispatcher - + case unknown => throw new IllegalArgumentException("Unknown dispatcher type [%s]" format unknown) } dispatcher foreach { case d: ThreadPoolBuilder => d.configureIfPossible( builder => { - + cfg.getInt("keep-alive-ms").foreach(builder.setKeepAliveTimeInMillis(_)) cfg.getDouble("core-pool-size-factor").foreach(builder.setCorePoolSizeFromFactor(_)) cfg.getDouble("max-pool-size-factor").foreach(builder.setMaxPoolSizeFromFactor(_)) cfg.getInt("executor-bounds").foreach(builder.setExecutorBounds(_)) cfg.getBool("allow-core-timeout").foreach(builder.setAllowCoreThreadTimeout(_)) cfg.getInt("mailbox-capacity").foreach(builder.setMailboxCapacity(_)) - + cfg.getString("rejection-policy").map({ case "abort" => new AbortPolicy() case "caller-runs" => new CallerRunsPolicy() diff --git a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala index c3d3f6fbb6..6316627ff6 100644 --- a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala +++ b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala @@ -63,15 +63,15 @@ import java.util.concurrent.{ConcurrentLinkedQueue, LinkedBlockingQueue} * Larger values (or zero or negative) increase througput, smaller values increase fairness */ class ExecutorBasedEventDrivenDispatcher( - _name: String, - throughput: Int = Dispatchers.THROUGHPUT, + _name: String, + throughput: Int = Dispatchers.THROUGHPUT, capacity: Int = Dispatchers.MAILBOX_CAPACITY) extends MessageDispatcher with ThreadPoolBuilder { def this(_name: String, throughput: Int) = this(_name, throughput, Dispatchers.MAILBOX_CAPACITY) // Needed for Java API usage def this(_name: String) = this(_name, Dispatchers.THROUGHPUT) // Needed for Java API usage mailboxCapacity = capacity - + @volatile private var active: Boolean = false val name = "akka:event-driven:dispatcher:" + _name diff --git a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala index 74aa4fe584..2b98975cb9 100644 --- a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala +++ b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala @@ -91,7 +91,7 @@ class ExecutorBasedEventDrivenWorkStealingDispatcher( } } } while ((lockAcquiredOnce && !getMailbox(receiver).isEmpty)) - + lockAcquiredOnce } diff --git a/akka-core/src/main/scala/dispatch/ThreadBasedDispatcher.scala b/akka-core/src/main/scala/dispatch/ThreadBasedDispatcher.scala index 9005956a52..684a38a97c 100644 --- a/akka-core/src/main/scala/dispatch/ThreadBasedDispatcher.scala +++ b/akka-core/src/main/scala/dispatch/ThreadBasedDispatcher.scala @@ -15,7 +15,7 @@ import se.scalablesolutions.akka.config.Config.config * * @author Jonas Bonér */ -class ThreadBasedDispatcher(private val actor: ActorRef, val mailboxCapacity: Int = Dispatchers.MAILBOX_CAPACITY) extends MessageDispatcher { +class ThreadBasedDispatcher(private val actor: ActorRef, val mailboxCapacity: Int = Dispatchers.MAILBOX_CAPACITY) extends MessageDispatcher { def this(actor: ActorRef) = this(actor, Dispatchers.MAILBOX_CAPACITY)// For Java private val name = actor.getClass.getName + ":" + actor.uuid diff --git a/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala b/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala index a8cc9c3c30..9fe47d5415 100644 --- a/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala +++ b/akka-core/src/main/scala/dispatch/ThreadPoolBuilder.scala @@ -154,7 +154,7 @@ trait ThreadPoolBuilder extends Logging { def setExecutorBounds(bounds: Int): Unit = synchronized { this.boundedExecutorBound = bounds } - + /** * Sets the mailbox capacity, -1 is unbounded */ diff --git a/akka-core/src/main/scala/remote/RemoteClient.scala b/akka-core/src/main/scala/remote/RemoteClient.scala index ac8f8fd0d2..5d5233c2a7 100644 --- a/akka-core/src/main/scala/remote/RemoteClient.scala +++ b/akka-core/src/main/scala/remote/RemoteClient.scala @@ -56,13 +56,13 @@ case class RemoteClientStopped( @BeanProperty val client: RemoteClient) extends RemoteClientLifeCycleEvent /** - * Thrown for example when trying to send a message using a RemoteClient that is either not started or shut down. + * Thrown for example when trying to send a message using a RemoteClient that is either not started or shut down. */ class RemoteClientException private[akka](message: String, @BeanProperty val client: RemoteClient) extends AkkaException(message) /** * The RemoteClient object manages RemoteClient instances and gives you an API to lookup remote actor handles. - * + * * @author Jonas Bonér */ object RemoteClient extends Logging { @@ -172,10 +172,10 @@ object RemoteClient extends Logging { /** * RemoteClient represents a connection to a RemoteServer. Is used to send messages to remote actors on the RemoteServer. - * + * * @author Jonas Bonér */ -class RemoteClient private[akka] (val hostname: String, val port: Int, val loader: Option[ClassLoader] = None) +class RemoteClient private[akka] (val hostname: String, val port: Int, val loader: Option[ClassLoader] = None) extends Logging with ListenerManagement { val name = "RemoteClient@" + hostname + "::" + port @@ -194,7 +194,7 @@ class RemoteClient private[akka] (val hostname: String, val port: Int, val loade private[remote] var connection: ChannelFuture = _ private[remote] val openChannels = new DefaultChannelGroup(classOf[RemoteClient].getName); - private val reconnectionTimeWindow = + private val reconnectionTimeWindow = Duration(config.getInt("akka.remote.client.reconnection-time-window", 600), TIME_UNIT).toMillis @volatile private var reconnectionTimeWindowStart = 0L @@ -267,7 +267,7 @@ class RemoteClient private[akka] (val hostname: String, val port: Int, val loade if (!actorRef.supervisor.isDefined) throw new IllegalActorStateException( "Can't unregister supervisor for " + actorRef + " since it is not under supervision") else supervisors.remove(actorRef.supervisor.get.uuid) - + private[akka] def isWithinReconnectionTimeWindow: Boolean = { if (reconnectionTimeWindowStart == 0L) { reconnectionTimeWindowStart = System.currentTimeMillis @@ -459,4 +459,4 @@ import se.scalablesolutions.akka.actor.{Actor,ActorRef} } } } -} \ No newline at end of file +} diff --git a/akka-core/src/main/scala/remote/RemoteServer.scala b/akka-core/src/main/scala/remote/RemoteServer.scala index 67ec0b282a..95d016094d 100644 --- a/akka-core/src/main/scala/remote/RemoteServer.scala +++ b/akka-core/src/main/scala/remote/RemoteServer.scala @@ -88,11 +88,11 @@ object RemoteServer { ).map(x => ("akka.remote.ssl." + x._1, "javax.net.ssl." + x._2)) // If property is not set, and we have a value from our akka.conf, use that value - for { + for { p <- properties if System.getProperty(p._2) eq null c <- config.getString(p._1) } System.setProperty(p._2, c) - + if (config.getBool("akka.remote.ssl.debug", false)) System.setProperty("javax.net.debug","ssl") true } else */false @@ -101,7 +101,7 @@ object RemoteServer { object Address { def apply(hostname: String, port: Int) = new Address(hostname, port) } - + class Address(val hostname: String, val port: Int) { override def hashCode: Int = { var result = HashCode.SEED diff --git a/akka-core/src/main/scala/util/AkkaException.scala b/akka-core/src/main/scala/util/AkkaException.scala index ca8284ced5..1dc652c2d5 100644 --- a/akka-core/src/main/scala/util/AkkaException.scala +++ b/akka-core/src/main/scala/util/AkkaException.scala @@ -16,16 +16,16 @@ import java.net.{InetAddress, UnknownHostException} *
  • a message including exception name, uuid, original message and the stacktrace
    • *
  • a method 'log' that will log the exception once and only once
    • * - * + * * @author Jonas Bonér */ @serializable abstract class AkkaException(message: String) extends RuntimeException(message) { @volatile private var isLogged = false val exceptionName = getClass.getName - + val uuid = String.format("%s_%s", AkkaException.hostname, UUID.newUuid.toString) - override val toString = + override val toString = String.format("%s\n\t[%s]\n\t%s\n\t%s", exceptionName, uuid, message, stackTrace) val stackTrace = { @@ -42,7 +42,7 @@ import java.net.{InetAddress, UnknownHostException} } object AkkaException extends Logging { - val hostname = try { + val hostname = try { InetAddress.getLocalHost.getHostName } catch { case e: UnknownHostException => "unknown" diff --git a/akka-core/src/main/scala/util/Logging.scala b/akka-core/src/main/scala/util/Logging.scala index 1fed0d017a..aea7c93740 100644 --- a/akka-core/src/main/scala/util/Logging.scala +++ b/akka-core/src/main/scala/util/Logging.scala @@ -150,7 +150,7 @@ object Logger { { import org.slf4j.LoggerFactory import ch.qos.logback.classic.LoggerContext - import ch.qos.logback.core.util.StatusPrinter + import ch.qos.logback.core.util.StatusPrinter // print logback's internal status StatusPrinter.print(LoggerFactory.getILoggerFactory.asInstanceOf[LoggerContext]) diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/Foo.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/Foo.java index 4cc5b977dc..a64f975bce 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/Foo.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/Foo.java @@ -3,12 +3,12 @@ package se.scalablesolutions.akka.actor; public interface Foo { public Foo body(); public Bar getBar(); - + public String foo(String msg); public void bar(String msg); public String longRunning(); public String throwsException(); - + public int $tag() throws java.rmi.RemoteException; } diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/FooImpl.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/FooImpl.java index dc6aba481c..ded09f4e07 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/FooImpl.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/FooImpl.java @@ -33,7 +33,7 @@ public class FooImpl extends TypedActor implements Foo { if (true) throw new RuntimeException("Expected exception; to test fault-tolerance"); return "test"; } - + public int $tag() throws java.rmi.RemoteException { return 0; } diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActor.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActor.java index ee7998f69a..fbd241763f 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActor.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActor.java @@ -9,4 +9,4 @@ public interface NestedTransactionalTypedActor { public void setRefState(String msg); public void success(String key, String msg); public String failure(String key, String msg, TypedActorFailer failer); -} \ No newline at end of file +} diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActorImpl.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActorImpl.java index 5b7eab615e..1b95517c22 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActorImpl.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/NestedTransactionalTypedActorImpl.java @@ -56,4 +56,4 @@ public class NestedTransactionalTypedActorImpl extends TypedTransactor implement failer.fail(); return msg; } -} \ No newline at end of file +} diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/ProtobufProtocol.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/ProtobufProtocol.java index 183d2025d0..683f008729 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/ProtobufProtocol.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/ProtobufProtocol.java @@ -15,47 +15,47 @@ public final class ProtobufProtocol { initFields(); } private ProtobufPOJO(boolean noInit) {} - + private static final ProtobufPOJO defaultInstance; public static ProtobufPOJO getDefaultInstance() { return defaultInstance; } - + public ProtobufPOJO getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_ProtobufPOJO_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_ProtobufPOJO_fieldAccessorTable; } - + // required uint64 id = 1; public static final int ID_FIELD_NUMBER = 1; private boolean hasId; private long id_ = 0L; public boolean hasId() { return hasId; } public long getId() { return id_; } - + // required string name = 2; public static final int NAME_FIELD_NUMBER = 2; private boolean hasName; private java.lang.String name_ = ""; public boolean hasName() { return hasName; } public java.lang.String getName() { return name_; } - + // required bool status = 3; public static final int STATUS_FIELD_NUMBER = 3; private boolean hasStatus; private boolean status_ = false; public boolean hasStatus() { return hasStatus; } public boolean getStatus() { return status_; } - + private void initFields() { } public final boolean isInitialized() { @@ -64,7 +64,7 @@ public final class ProtobufProtocol { if (!hasStatus) return false; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -79,12 +79,12 @@ public final class ProtobufProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasId()) { size += com.google.protobuf.CodedOutputStream @@ -102,7 +102,7 @@ public final class ProtobufProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -169,31 +169,31 @@ public final class ProtobufProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO result; - + // Construct using se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO(); return builder; } - + protected se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -202,20 +202,20 @@ public final class ProtobufProtocol { result = new se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO.getDescriptor(); } - + public se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO getDefaultInstanceForType() { return se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -225,7 +225,7 @@ public final class ProtobufProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -234,7 +234,7 @@ public final class ProtobufProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO buildPartial() { if (result == null) { throw new IllegalStateException( @@ -244,7 +244,7 @@ public final class ProtobufProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO) { return mergeFrom((se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO)other); @@ -253,7 +253,7 @@ public final class ProtobufProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO other) { if (other == se.scalablesolutions.akka.actor.ProtobufProtocol.ProtobufPOJO.getDefaultInstance()) return this; if (other.hasId()) { @@ -268,7 +268,7 @@ public final class ProtobufProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -305,8 +305,8 @@ public final class ProtobufProtocol { } } } - - + + // required uint64 id = 1; public boolean hasId() { return result.hasId(); @@ -324,7 +324,7 @@ public final class ProtobufProtocol { result.id_ = 0L; return this; } - + // required string name = 2; public boolean hasName() { return result.hasName(); @@ -345,7 +345,7 @@ public final class ProtobufProtocol { result.name_ = getDefaultInstance().getName(); return this; } - + // required bool status = 3; public boolean hasStatus() { return result.hasStatus(); @@ -363,19 +363,19 @@ public final class ProtobufProtocol { result.status_ = false; return this; } - + // @@protoc_insertion_point(builder_scope:se.scalablesolutions.akka.actor.ProtobufPOJO) } - + static { defaultInstance = new ProtobufPOJO(true); se.scalablesolutions.akka.actor.ProtobufProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:se.scalablesolutions.akka.actor.ProtobufPOJO) } - + public static final class Counter extends com.google.protobuf.GeneratedMessage { // Use Counter.newBuilder() to construct. @@ -383,40 +383,40 @@ public final class ProtobufProtocol { initFields(); } private Counter(boolean noInit) {} - + private static final Counter defaultInstance; public static Counter getDefaultInstance() { return defaultInstance; } - + public Counter getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_Counter_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_Counter_fieldAccessorTable; } - + // required uint32 count = 1; public static final int COUNT_FIELD_NUMBER = 1; private boolean hasCount; private int count_ = 0; public boolean hasCount() { return hasCount; } public int getCount() { return count_; } - + private void initFields() { } public final boolean isInitialized() { if (!hasCount) return false; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -425,12 +425,12 @@ public final class ProtobufProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasCount()) { size += com.google.protobuf.CodedOutputStream @@ -440,7 +440,7 @@ public final class ProtobufProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.actor.ProtobufProtocol.Counter parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -507,31 +507,31 @@ public final class ProtobufProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.actor.ProtobufProtocol.Counter prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.actor.ProtobufProtocol.Counter result; - + // Construct using se.scalablesolutions.akka.actor.ProtobufProtocol.Counter.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.actor.ProtobufProtocol.Counter(); return builder; } - + protected se.scalablesolutions.akka.actor.ProtobufProtocol.Counter internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -540,20 +540,20 @@ public final class ProtobufProtocol { result = new se.scalablesolutions.akka.actor.ProtobufProtocol.Counter(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.actor.ProtobufProtocol.Counter.getDescriptor(); } - + public se.scalablesolutions.akka.actor.ProtobufProtocol.Counter getDefaultInstanceForType() { return se.scalablesolutions.akka.actor.ProtobufProtocol.Counter.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -563,7 +563,7 @@ public final class ProtobufProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.actor.ProtobufProtocol.Counter buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -572,7 +572,7 @@ public final class ProtobufProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.actor.ProtobufProtocol.Counter buildPartial() { if (result == null) { throw new IllegalStateException( @@ -582,7 +582,7 @@ public final class ProtobufProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.actor.ProtobufProtocol.Counter) { return mergeFrom((se.scalablesolutions.akka.actor.ProtobufProtocol.Counter)other); @@ -591,7 +591,7 @@ public final class ProtobufProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.actor.ProtobufProtocol.Counter other) { if (other == se.scalablesolutions.akka.actor.ProtobufProtocol.Counter.getDefaultInstance()) return this; if (other.hasCount()) { @@ -600,7 +600,7 @@ public final class ProtobufProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -629,8 +629,8 @@ public final class ProtobufProtocol { } } } - - + + // required uint32 count = 1; public boolean hasCount() { return result.hasCount(); @@ -648,19 +648,19 @@ public final class ProtobufProtocol { result.count_ = 0; return this; } - + // @@protoc_insertion_point(builder_scope:se.scalablesolutions.akka.actor.Counter) } - + static { defaultInstance = new Counter(true); se.scalablesolutions.akka.actor.ProtobufProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:se.scalablesolutions.akka.actor.Counter) } - + public static final class DualCounter extends com.google.protobuf.GeneratedMessage { // Use DualCounter.newBuilder() to construct. @@ -668,40 +668,40 @@ public final class ProtobufProtocol { initFields(); } private DualCounter(boolean noInit) {} - + private static final DualCounter defaultInstance; public static DualCounter getDefaultInstance() { return defaultInstance; } - + public DualCounter getDefaultInstanceForType() { return defaultInstance; } - + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_DualCounter_descriptor; } - + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return se.scalablesolutions.akka.actor.ProtobufProtocol.internal_static_se_scalablesolutions_akka_actor_DualCounter_fieldAccessorTable; } - + // required uint32 count1 = 1; public static final int COUNT1_FIELD_NUMBER = 1; private boolean hasCount1; private int count1_ = 0; public boolean hasCount1() { return hasCount1; } public int getCount1() { return count1_; } - + // required uint32 count2 = 2; public static final int COUNT2_FIELD_NUMBER = 2; private boolean hasCount2; private int count2_ = 0; public boolean hasCount2() { return hasCount2; } public int getCount2() { return count2_; } - + private void initFields() { } public final boolean isInitialized() { @@ -709,7 +709,7 @@ public final class ProtobufProtocol { if (!hasCount2) return false; return true; } - + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -721,12 +721,12 @@ public final class ProtobufProtocol { } getUnknownFields().writeTo(output); } - + private int memoizedSerializedSize = -1; public int getSerializedSize() { int size = memoizedSerializedSize; if (size != -1) return size; - + size = 0; if (hasCount1()) { size += com.google.protobuf.CodedOutputStream @@ -740,7 +740,7 @@ public final class ProtobufProtocol { memoizedSerializedSize = size; return size; } - + public static se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { @@ -807,31 +807,31 @@ public final class ProtobufProtocol { return newBuilder().mergeFrom(input, extensionRegistry) .buildParsed(); } - + public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } - + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder { private se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter result; - + // Construct using se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter.newBuilder() private Builder() {} - + private static Builder create() { Builder builder = new Builder(); builder.result = new se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter(); return builder; } - + protected se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter internalGetResult() { return result; } - + public Builder clear() { if (result == null) { throw new IllegalStateException( @@ -840,20 +840,20 @@ public final class ProtobufProtocol { result = new se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter(); return this; } - + public Builder clone() { return create().mergeFrom(result); } - + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter.getDescriptor(); } - + public se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter getDefaultInstanceForType() { return se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter.getDefaultInstance(); } - + public boolean isInitialized() { return result.isInitialized(); } @@ -863,7 +863,7 @@ public final class ProtobufProtocol { } return buildPartial(); } - + private se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter buildParsed() throws com.google.protobuf.InvalidProtocolBufferException { if (!isInitialized()) { @@ -872,7 +872,7 @@ public final class ProtobufProtocol { } return buildPartial(); } - + public se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter buildPartial() { if (result == null) { throw new IllegalStateException( @@ -882,7 +882,7 @@ public final class ProtobufProtocol { result = null; return returnMe; } - + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter) { return mergeFrom((se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter)other); @@ -891,7 +891,7 @@ public final class ProtobufProtocol { return this; } } - + public Builder mergeFrom(se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter other) { if (other == se.scalablesolutions.akka.actor.ProtobufProtocol.DualCounter.getDefaultInstance()) return this; if (other.hasCount1()) { @@ -903,7 +903,7 @@ public final class ProtobufProtocol { this.mergeUnknownFields(other.getUnknownFields()); return this; } - + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -936,8 +936,8 @@ public final class ProtobufProtocol { } } } - - + + // required uint32 count1 = 1; public boolean hasCount1() { return result.hasCount1(); @@ -955,7 +955,7 @@ public final class ProtobufProtocol { result.count1_ = 0; return this; } - + // required uint32 count2 = 2; public boolean hasCount2() { return result.hasCount2(); @@ -973,19 +973,19 @@ public final class ProtobufProtocol { result.count2_ = 0; return this; } - + // @@protoc_insertion_point(builder_scope:se.scalablesolutions.akka.actor.DualCounter) } - + static { defaultInstance = new DualCounter(true); se.scalablesolutions.akka.actor.ProtobufProtocol.internalForceInit(); defaultInstance.initFields(); } - + // @@protoc_insertion_point(class_scope:se.scalablesolutions.akka.actor.DualCounter) } - + private static com.google.protobuf.Descriptors.Descriptor internal_static_se_scalablesolutions_akka_actor_ProtobufPOJO_descriptor; private static @@ -1001,7 +1001,7 @@ public final class ProtobufProtocol { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_se_scalablesolutions_akka_actor_DualCounter_fieldAccessorTable; - + public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; @@ -1053,8 +1053,8 @@ public final class ProtobufProtocol { new com.google.protobuf.Descriptors.FileDescriptor[] { }, assigner); } - + public static void internalForceInit() {} - + // @@protoc_insertion_point(outer_class_scope) } diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java index 03df632582..dd03a45d12 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOne.java @@ -3,4 +3,4 @@ package se.scalablesolutions.akka.actor; public interface RemoteTypedActorOne { public String requestReply(String s) throws Exception; public void oneWay() throws Exception; -} \ No newline at end of file +} diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java index 0744652181..715e5366a4 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorOneImpl.java @@ -26,4 +26,4 @@ public class RemoteTypedActorOneImpl extends TypedActor implements RemoteTypedAc try { RemoteTypedActorLog.messageLog().put(e.getMessage()); } catch(Exception ex) {} latch.countDown(); } -} \ No newline at end of file +} diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java index 58f294c6cd..5fd289b8c2 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwo.java @@ -3,4 +3,4 @@ package se.scalablesolutions.akka.actor; public interface RemoteTypedActorTwo { public String requestReply(String s) throws Exception; public void oneWay() throws Exception; -} \ No newline at end of file +} diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java index 36bb055ef8..a5882fd4e6 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/RemoteTypedActorTwoImpl.java @@ -26,4 +26,4 @@ public class RemoteTypedActorTwoImpl extends TypedActor implements RemoteTypedAc try { RemoteTypedActorLog.messageLog().put(e.getMessage()); } catch(Exception ex) {} latch.countDown(); } -} \ No newline at end of file +} diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojo.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojo.java index ae47276ba6..5d06afdc9c 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojo.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojo.java @@ -5,4 +5,4 @@ import java.util.concurrent.CountDownLatch; public interface SamplePojo { public String greet(String s); public String fail(); -} \ No newline at end of file +} diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojoImpl.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojoImpl.java index d57232b629..12985c72ce 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojoImpl.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/SamplePojoImpl.java @@ -16,7 +16,7 @@ public class SamplePojoImpl extends TypedActor implements SamplePojo { _post = false; _down = false; } - + public String greet(String s) { return "hello " + s; } @@ -36,10 +36,10 @@ public class SamplePojoImpl extends TypedActor implements SamplePojo { _post = true; latch.countDown(); } - + @Override public void shutdown() { _down = true; latch.countDown(); } -} \ No newline at end of file +} diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCallerImpl.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCallerImpl.java index 3fbc994f71..760b69f8b9 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCallerImpl.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/SimpleJavaPojoCallerImpl.java @@ -6,7 +6,7 @@ import se.scalablesolutions.akka.dispatch.Future; public class SimpleJavaPojoCallerImpl extends TypedActor implements SimpleJavaPojoCaller { SimpleJavaPojo pojo; - + public void setPojo(SimpleJavaPojo pojo) { this.pojo = pojo; } diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActorImpl.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActorImpl.java index f992028caf..9b32f5d329 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActorImpl.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/TransactionalTypedActorImpl.java @@ -8,8 +8,8 @@ public class TransactionalTypedActorImpl extends TypedTransactor implements Tran private TransactionalVector vectorState; private Ref refState; private boolean isInitialized = false; - - @Override + + @Override public void initTransactionalState() { if (!isInitialized) { mapState = new TransactionalMap(); @@ -18,7 +18,7 @@ public class TransactionalTypedActorImpl extends TypedTransactor implements Tran isInitialized = true; } } - + public String getMapState(String key) { return (String)mapState.get(key).get(); } diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailer.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailer.java index b4a69e1cd1..e0b1e72c33 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailer.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailer.java @@ -1,5 +1,5 @@ package se.scalablesolutions.akka.actor; -public interface TypedActorFailer extends java.io.Serializable { +public interface TypedActorFailer extends java.io.Serializable { public int fail(); } diff --git a/akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailerImpl.java b/akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailerImpl.java index 0d01fd801c..89a97330df 100644 --- a/akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailerImpl.java +++ b/akka-core/src/test/java/se/scalablesolutions/akka/actor/TypedActorFailerImpl.java @@ -2,7 +2,7 @@ package se.scalablesolutions.akka.actor; import se.scalablesolutions.akka.actor.*; -public class TypedActorFailerImpl extends TypedActor implements TypedActorFailer { +public class TypedActorFailerImpl extends TypedActor implements TypedActorFailer { public int fail() { throw new RuntimeException("expected"); } diff --git a/akka-core/src/test/scala/actor/actor/ActorFireForgetRequestReplySpec.scala b/akka-core/src/test/scala/actor/actor/ActorFireForgetRequestReplySpec.scala index 6d3b4d5124..9d3ce765ec 100644 --- a/akka-core/src/test/scala/actor/actor/ActorFireForgetRequestReplySpec.scala +++ b/akka-core/src/test/scala/actor/actor/ActorFireForgetRequestReplySpec.scala @@ -24,7 +24,7 @@ object ActorFireForgetRequestReplySpec { self.lifeCycle = Some(LifeCycle(Temporary)) def receive = { - case "Die" => + case "Die" => state.finished.await throw new Exception("Expected exception") } diff --git a/akka-core/src/test/scala/remote/RemoteTypedActorSpec.scala b/akka-core/src/test/scala/remote/RemoteTypedActorSpec.scala index c49882f61d..780828c310 100644 --- a/akka-core/src/test/scala/remote/RemoteTypedActorSpec.scala +++ b/akka-core/src/test/scala/remote/RemoteTypedActorSpec.scala @@ -65,7 +65,7 @@ class RemoteTypedActorSpec extends classOf[RemoteTypedActorTwoImpl], new LifeCycle(new Permanent), 10000, - new RemoteAddress("localhost", 9995)) + new RemoteAddress("localhost", 9995)) ).toArray).supervise Thread.sleep(1000) } @@ -93,7 +93,7 @@ class RemoteTypedActorSpec extends oneWayLog.poll(5, TimeUnit.SECONDS) } } - + it("should respond to request-reply message") { clearMessageLogs val ta = conf.getInstance(classOf[RemoteTypedActorOne]) diff --git a/akka-karaf/akka-features/src/main/resources/features.xml b/akka-karaf/akka-features/src/main/resources/features.xml index 7506820024..db48a13785 100644 --- a/akka-karaf/akka-features/src/main/resources/features.xml +++ b/akka-karaf/akka-features/src/main/resources/features.xml @@ -12,7 +12,7 @@ mvn:org.objenesis/objenesis/1.2 mvn:sjson.json/sjson/0.6-SNAPSHOT - + sjson mvn:se.scalablesolutions.akka.akka-wrap/jgroups-wrapper_2.8.0.RC3_osgi/2.9.0.GA diff --git a/akka-samples/akka-sample-camel/src/main/java/sample/camel/BeanImpl.java b/akka-samples/akka-sample-camel/src/main/java/sample/camel/BeanImpl.java index 5fa9e8c599..e1b4520f59 100644 --- a/akka-samples/akka-sample-camel/src/main/java/sample/camel/BeanImpl.java +++ b/akka-samples/akka-sample-camel/src/main/java/sample/camel/BeanImpl.java @@ -9,5 +9,5 @@ public class BeanImpl extends TypedActor implements BeanIntf { public String foo(String s) { return "hello " + s; } - + } diff --git a/akka-samples/akka-sample-camel/src/main/java/sample/camel/RemoteTypedConsumer2Impl.java b/akka-samples/akka-sample-camel/src/main/java/sample/camel/RemoteTypedConsumer2Impl.java index cc85ef963a..68e208d834 100644 --- a/akka-samples/akka-sample-camel/src/main/java/sample/camel/RemoteTypedConsumer2Impl.java +++ b/akka-samples/akka-sample-camel/src/main/java/sample/camel/RemoteTypedConsumer2Impl.java @@ -14,4 +14,4 @@ public class RemoteTypedConsumer2Impl { return String.format("remote2: body=%s header=%s", body, header); } -} \ No newline at end of file +} diff --git a/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer1.java b/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer1.java index e495ee404c..78a8430880 100644 --- a/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer1.java +++ b/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer1.java @@ -11,7 +11,7 @@ import se.scalablesolutions.akka.camel.consume; public interface TypedConsumer1 { @consume("file:data/input/typed-actor") public void foo(String body); - + @consume("jetty:http://0.0.0.0:8877/camel/typed-actor") public String bar(@Body String body, @Header("name") String header); } diff --git a/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer2.java b/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer2.java index 96878a2938..e8fe43c167 100644 --- a/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer2.java +++ b/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer2.java @@ -11,4 +11,4 @@ public interface TypedConsumer2 { @consume("direct:default") public String foo(String body); -} \ No newline at end of file +} diff --git a/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer2Impl.java b/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer2Impl.java index 8a5fe1e4c9..9e61a78804 100644 --- a/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer2Impl.java +++ b/akka-samples/akka-sample-camel/src/main/java/sample/camel/TypedConsumer2Impl.java @@ -10,4 +10,4 @@ public class TypedConsumer2Impl extends TypedActor implements TypedConsumer2 { public String foo(String body) { return String.format("default: %s", body); } -} \ No newline at end of file +} diff --git a/akka-samples/akka-sample-camel/src/main/resources/context-standalone.xml b/akka-samples/akka-sample-camel/src/main/resources/context-standalone.xml index 1defa6b9fb..27443b921a 100644 --- a/akka-samples/akka-sample-camel/src/main/resources/context-standalone.xml +++ b/akka-samples/akka-sample-camel/src/main/resources/context-standalone.xml @@ -11,7 +11,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - + diff --git a/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala b/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala index e4ccd219ed..4d3baf4c49 100644 --- a/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala +++ b/akka-samples/akka-sample-fsm/src/main/scala/DiningHakkersOnFsm.scala @@ -149,4 +149,4 @@ object DiningHakkersOnFsm { hakkers.foreach(_ ! Think) } -} \ No newline at end of file +} diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleService.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleService.java index 67368ceedd..5ed4b65dcf 100644 --- a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleService.java +++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleService.java @@ -6,4 +6,4 @@ package sample.rest.java; public interface PersistentSimpleService { public String count(); -} \ No newline at end of file +} diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleServiceImpl.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleServiceImpl.java index 2b83f4acbb..28a332abfe 100644 --- a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleServiceImpl.java +++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleServiceImpl.java @@ -39,4 +39,4 @@ public class PersistentSimpleServiceImpl extends TypedTransactor implements Pers public void postRestart(Throwable cause) { System.out.println("Reinitialize after restart by supervisor"); } -} \ No newline at end of file +} diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleServiceRest.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleServiceRest.java index dc2d2d5aee..1a1467c250 100644 --- a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleServiceRest.java +++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/PersistentSimpleServiceRest.java @@ -8,7 +8,7 @@ import javax.ws.rs.Path; import javax.ws.rs.GET; import javax.ws.rs.Produces; -/** +/** * Try service out by invoking (multiple times): * 
      * curl http://localhost:9998/persistentjavacount
@@ -24,4 +24,4 @@ public class PersistentSimpleServiceRest {
   public String count() {
     return service.count();
   }
-}
\ No newline at end of file
+}
diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleService.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleService.java
index 8055b3383a..ca8ee5e34d 100644
--- a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleService.java
+++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleService.java
@@ -6,4 +6,4 @@ package sample.rest.java;
 
 public interface SimpleService {
   public String count();
-}
\ No newline at end of file
+}
diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleServiceImpl.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleServiceImpl.java
index 27008de212..9de40a1a04 100644
--- a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleServiceImpl.java
+++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleServiceImpl.java
@@ -14,7 +14,7 @@ public class SimpleServiceImpl extends TypedTransactor implements SimpleService
   private boolean hasStartedTicking = false;
   private TransactionalMap storage;
   private Receiver receiver = TypedActor.newInstance(Receiver.class, ReceiverImpl.class);
-  
+
   public String count() {
     if (storage == null) storage = new TransactionalMap();
     if (!hasStartedTicking) {
@@ -39,4 +39,4 @@ public class SimpleServiceImpl extends TypedTransactor implements SimpleService
   public void postRestart(Throwable cause) {
     System.out.println("Reinitialize after restart by supervisor");
   }
-}
\ No newline at end of file
+}
diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleServiceRest.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleServiceRest.java
index ed048f25dc..eba7c85f2a 100644
--- a/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleServiceRest.java
+++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/rest/java/SimpleServiceRest.java
@@ -8,7 +8,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.GET;
 import javax.ws.rs.Produces;
 
-/**                                
+/**
  * Try service out by invoking (multiple times):
  * 
      * curl http://localhost:9998/javacount
@@ -24,4 +24,4 @@ public class SimpleServiceRest {
   public String count() {
     return service.count();
   }
-}
\ No newline at end of file
+}
diff --git a/akka-samples/akka-sample-security/src/main/webapp/WEB-INF/web.xml b/akka-samples/akka-sample-security/src/main/webapp/WEB-INF/web.xml
index 02a6f7d918..b81f94c9e6 100644
--- a/akka-samples/akka-sample-security/src/main/webapp/WEB-INF/web.xml
+++ b/akka-samples/akka-sample-security/src/main/webapp/WEB-INF/web.xml
@@ -15,5 +15,5 @@
     AkkaServlet
     /*
   
- 
+
 
diff --git a/akka-spring/src/test/java/se/scalablesolutions/akka/spring/Pojo.java b/akka-spring/src/test/java/se/scalablesolutions/akka/spring/Pojo.java
index f588fc777a..24c0fea352 100644
--- a/akka-spring/src/test/java/se/scalablesolutions/akka/spring/Pojo.java
+++ b/akka-spring/src/test/java/se/scalablesolutions/akka/spring/Pojo.java
@@ -15,11 +15,11 @@ public class Pojo extends TypedActor implements PojoInf, ApplicationContextAware
 
     private boolean gotApplicationContext = false;
     private boolean initInvoked = false;
-    
+
     public boolean gotApplicationContext() {
       return gotApplicationContext;
     }
-    
+
     public void setApplicationContext(ApplicationContext context) {
       gotApplicationContext = true;
     }
diff --git a/akka-spring/src/test/java/se/scalablesolutions/akka/spring/SampleBean.java b/akka-spring/src/test/java/se/scalablesolutions/akka/spring/SampleBean.java
index 2828c42bcb..f9d3381436 100644
--- a/akka-spring/src/test/java/se/scalablesolutions/akka/spring/SampleBean.java
+++ b/akka-spring/src/test/java/se/scalablesolutions/akka/spring/SampleBean.java
@@ -10,7 +10,7 @@ public class SampleBean extends TypedActor implements SampleBeanIntf {
         down = false;
     }
 
-    public boolean down() { 
+    public boolean down() {
       return down;
     }
 
diff --git a/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/Bar.java b/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/Bar.java
index 7a0f5c439d..bc86766c90 100644
--- a/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/Bar.java
+++ b/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/Bar.java
@@ -9,7 +9,7 @@ public class Bar extends TypedActor implements IBar {
         public String getBar() {
                 return "bar";
         }
-        
+
         public void throwsIOException() throws IOException {
           throw new IOException("some IO went wrong");
         }
diff --git a/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/IBar.java b/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/IBar.java
index d462d0b09b..99bd7e3cf5 100644
--- a/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/IBar.java
+++ b/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/IBar.java
@@ -1,7 +1,7 @@
 package se.scalablesolutions.akka.spring.foo;
 
 public interface IBar {
-        
+
         String getBar();
 
 }
diff --git a/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/MyPojo.java b/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/MyPojo.java
index 0ead5901cc..fe3e9ba767 100644
--- a/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/MyPojo.java
+++ b/akka-spring/src/test/java/se/scalablesolutions/akka/spring/foo/MyPojo.java
@@ -3,11 +3,11 @@ package se.scalablesolutions.akka.spring.foo;
 import se.scalablesolutions.akka.actor.*;
 
 public class MyPojo extends TypedActor implements IMyPojo{
-        
+
         private String foo;
         private String bar;
-        
-        
+
+
         public MyPojo() {
                 this.foo = "foo";
                 this.bar = "bar";
@@ -22,11 +22,11 @@ public class MyPojo extends TypedActor implements IMyPojo{
         public String getBar() {
                 return bar;
         }
-        
+
         public void preRestart() {
                 System.out.println("pre restart");
         }
-        
+
         public void postRestart() {
                 System.out.println("post restart");
         }
diff --git a/akka-spring/src/test/resources/appContext.xml b/akka-spring/src/test/resources/appContext.xml
index 02ea1c6733..47c8755a5c 100644
--- a/akka-spring/src/test/resources/appContext.xml
+++ b/akka-spring/src/test/resources/appContext.xml
@@ -7,23 +7,23 @@
        http://www.akkasource.org/schema/akka
        http://scalablesolutions.se/akka/akka-0.10.xsd">
 
-    
-    
-    
-    
+
     
         
diff --git a/akka-spring/src/test/resources/appContextCamelServiceCustom.xml b/akka-spring/src/test/resources/appContextCamelServiceCustom.xml
index 84f442ebf6..8096ce3b1a 100644
--- a/akka-spring/src/test/resources/appContextCamelServiceCustom.xml
+++ b/akka-spring/src/test/resources/appContextCamelServiceCustom.xml
@@ -20,8 +20,8 @@ http://camel.apache.org/schema/spring/camel-spring.xsd">
     
   
 
-  
 
diff --git a/akka-spring/src/test/resources/dispatcher-config.xml b/akka-spring/src/test/resources/dispatcher-config.xml
index c02c5b4d14..1427b3ce1a 100644
--- a/akka-spring/src/test/resources/dispatcher-config.xml
+++ b/akka-spring/src/test/resources/dispatcher-config.xml
@@ -68,7 +68,7 @@ http://scalablesolutions.se/akka/akka-0.10.xsd">
 
   
   
-  
+
   
   
 
@@ -114,4 +114,4 @@ http://scalablesolutions.se/akka/akka-0.10.xsd">
 
 
 
-
\ No newline at end of file
+
diff --git a/akka-spring/src/test/resources/failing-appContext.xml b/akka-spring/src/test/resources/failing-appContext.xml
index 66382056bd..d4651e63ef 100644
--- a/akka-spring/src/test/resources/failing-appContext.xml
+++ b/akka-spring/src/test/resources/failing-appContext.xml
@@ -6,16 +6,16 @@
        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.akkasource.org/schema/akka
        classpath:se/scalablesolutions/akka/spring/akka-0.10.xsd">
-       
+
     
-                              
+        
     
 
     
         
     
- 
\ No newline at end of file
+ 
diff --git a/akka-spring/src/test/resources/supervisor-config.xml b/akka-spring/src/test/resources/supervisor-config.xml
index 698581d903..c12e536473 100644
--- a/akka-spring/src/test/resources/supervisor-config.xml
+++ b/akka-spring/src/test/resources/supervisor-config.xml
@@ -117,4 +117,4 @@ http://scalablesolutions.se/akka/akka-0.10.xsd">
   
   -->
 
-
\ No newline at end of file
+
diff --git a/akka-spring/src/test/resources/typed-actor-config.xml b/akka-spring/src/test/resources/typed-actor-config.xml
index dfa40f99ad..78b8a5b816 100644
--- a/akka-spring/src/test/resources/typed-actor-config.xml
+++ b/akka-spring/src/test/resources/typed-actor-config.xml
@@ -80,4 +80,4 @@ http://scalablesolutions.se/akka/akka-0.10.xsd">
     
   
 
-
\ No newline at end of file
+
diff --git a/akka-spring/src/test/resources/untyped-actor-config.xml b/akka-spring/src/test/resources/untyped-actor-config.xml
index aea5e86d44..2bcf7b732f 100644
--- a/akka-spring/src/test/resources/untyped-actor-config.xml
+++ b/akka-spring/src/test/resources/untyped-actor-config.xml
@@ -33,4 +33,4 @@ http://scalablesolutions.se/akka/akka-0.10.xsd">
     
   
 
-
\ No newline at end of file
+
diff --git a/akka-spring/src/test/scala/DispatcherSpringFeatureTest.scala b/akka-spring/src/test/scala/DispatcherSpringFeatureTest.scala
index 9fbc2c800e..7b2c740c73 100644
--- a/akka-spring/src/test/scala/DispatcherSpringFeatureTest.scala
+++ b/akka-spring/src/test/scala/DispatcherSpringFeatureTest.scala
@@ -141,4 +141,4 @@ class DispatcherSpringFeatureTest extends FeatureSpec with ShouldMatchers {
     executor;
   }
 
-}
\ No newline at end of file
+}
diff --git a/akka-spring/src/test/scala/SupervisorSpringFeatureTest.scala b/akka-spring/src/test/scala/SupervisorSpringFeatureTest.scala
index 30c3710b79..1a35451315 100644
--- a/akka-spring/src/test/scala/SupervisorSpringFeatureTest.scala
+++ b/akka-spring/src/test/scala/SupervisorSpringFeatureTest.scala
@@ -26,7 +26,7 @@ import java.util.concurrent._
  */
 @RunWith(classOf[JUnitRunner])
 class SupervisorSpringFeatureTest extends FeatureSpec with ShouldMatchers {
-  
+
   feature("Spring configuration") {
 
     scenario("get a supervisor for typed actors from context") {
@@ -54,4 +54,4 @@ class SupervisorSpringFeatureTest extends FeatureSpec with ShouldMatchers {
       assert(foo != null)
     }
   }
-}
\ No newline at end of file
+}
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 8818b7592d..6a74d24403 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -6,7 +6,7 @@
 # Modify as needed.
 
 akka {
-  version = "0.10" # Akka version, checked against the runtime version of Akka. 
+  version = "0.10" # Akka version, checked against the runtime version of Akka.
 
   time-unit = "seconds" # Default timeout time unit for all timeout properties throughout the config
 
@@ -47,7 +47,7 @@ akka {
       aggregate = off                  # Aggregate on/off for HawtDispatchers
       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, 
+                                       # NOTE: setting a mailbox to 'blocking' can be a bit dangerous,
                                        #       could lead to deadlock, use with care
     }
   }
@@ -56,7 +56,7 @@ akka {
     fair = on             # Should global transactions be fair or non-fair (non fair yield better performance)
     jta-aware = off       # Option 'on' means that if there JTA Transaction Manager available then the STM will
                           #     begin (or join), commit or rollback the JTA transaction. Default is 'off'.
-    timeout = 5           # Default timeout for blocking transactions and transaction set (in unit defined by 
+    timeout = 5           # Default timeout for blocking transactions and transaction set (in unit defined by
                           #     the time-unit property)
   }
 
@@ -95,7 +95,7 @@ akka {
     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
 
-    ssl { 
+    ssl {
       service = off # NOTE: This feature is not deemed production ready and is not possible to turn on yet
 
       # You can either use java command-line options or use the settings below
diff --git a/embedded-repo/org/apache/camel/camel-jetty/maven-metadata.xml b/embedded-repo/org/apache/camel/camel-jetty/maven-metadata.xml
index 0e25837b64..ac53a45ab4 100644
--- a/embedded-repo/org/apache/camel/camel-jetty/maven-metadata.xml
+++ b/embedded-repo/org/apache/camel/camel-jetty/maven-metadata.xml
@@ -8,4 +8,4 @@
     
     20100723102939
   
-
\ No newline at end of file
+