diff --git a/akka-cluster-tools/build.sbt b/akka-cluster-tools/build.sbt new file mode 100644 index 0000000000..ca1f28bb82 --- /dev/null +++ b/akka-cluster-tools/build.sbt @@ -0,0 +1,18 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, MultiNode, Unidoc, OSGi } +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettingsNoVerificationOfDiagrams + +Unidoc.javadocSettings + +OSGi.clusterTools + +MultiNode.multiJvmSettings + +libraryDependencies ++= Dependencies.clusterTools + +//MimaKeys.previousArtifact := akkaPreviousArtifact("akka-cluster-tools").value diff --git a/akka-contrib/src/main/java/akka/contrib/pattern/protobuf/msg/DistributedPubSubMessages.java b/akka-cluster-tools/src/main/java/akka/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java similarity index 77% rename from akka-contrib/src/main/java/akka/contrib/pattern/protobuf/msg/DistributedPubSubMessages.java rename to akka-cluster-tools/src/main/java/akka/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java index 0b0d2bd448..bd3a81cbbf 100644 --- a/akka-contrib/src/main/java/akka/contrib/pattern/protobuf/msg/DistributedPubSubMessages.java +++ b/akka-cluster-tools/src/main/java/akka/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: DistributedPubSubMessages.proto -package akka.contrib.pattern.protobuf.msg; +package akka.cluster.pubsub.protobuf.msg; public final class DistributedPubSubMessages { private DistributedPubSubMessages() {} @@ -15,12 +15,12 @@ public final class DistributedPubSubMessages { /** * repeated .Status.Version versions = 1; */ - java.util.List + java.util.List getVersionsList(); /** * repeated .Status.Version versions = 1; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index); /** * repeated .Status.Version versions = 1; */ @@ -28,12 +28,12 @@ public final class DistributedPubSubMessages { /** * repeated .Status.Version versions = 1; */ - java.util.List + java.util.List getVersionsOrBuilderList(); /** * repeated .Status.Version versions = 1; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder( + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder( int index); } /** @@ -89,10 +89,10 @@ public final class DistributedPubSubMessages { } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - versions_ = new java.util.ArrayList(); + versions_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - versions_.add(input.readMessage(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.PARSER, extensionRegistry)); + versions_.add(input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.PARSER, extensionRegistry)); break; } } @@ -112,14 +112,14 @@ public final class DistributedPubSubMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Status_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -148,11 +148,11 @@ public final class DistributedPubSubMessages { /** * required .Address address = 1; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address getAddress(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getAddress(); /** * required .Address address = 1; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder(); // required int64 timestamp = 2; /** @@ -216,11 +216,11 @@ public final class DistributedPubSubMessages { break; } case 10: { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder subBuilder = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = address_.toBuilder(); } - address_ = input.readMessage(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.PARSER, extensionRegistry); + address_ = input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(address_); address_ = subBuilder.buildPartial(); @@ -247,14 +247,14 @@ public final class DistributedPubSubMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -275,7 +275,7 @@ public final class DistributedPubSubMessages { private int bitField0_; // required .Address address = 1; public static final int ADDRESS_FIELD_NUMBER = 1; - private akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address address_; + private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address address_; /** * required .Address address = 1; */ @@ -285,13 +285,13 @@ public final class DistributedPubSubMessages { /** * required .Address address = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address getAddress() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getAddress() { return address_; } /** * required .Address address = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder() { return address_; } @@ -312,7 +312,7 @@ public final class DistributedPubSubMessages { } private void initFields() { - address_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); + address_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); timestamp_ = 0L; } private byte memoizedIsInitialized = -1; @@ -374,53 +374,53 @@ public final class DistributedPubSubMessages { return super.writeReplace(); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(byte[] data) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version parseDelimitedFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version parseDelimitedFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -429,7 +429,7 @@ public final class DistributedPubSubMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version prototype) { + public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -445,20 +445,20 @@ public final class DistributedPubSubMessages { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder { + implements akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder.class); } - // Construct using akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.newBuilder() + // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -480,7 +480,7 @@ public final class DistributedPubSubMessages { public Builder clear() { super.clear(); if (addressBuilder_ == null) { - address_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); + address_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); } else { addressBuilder_.clear(); } @@ -496,23 +496,23 @@ public final class DistributedPubSubMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_Version_descriptor; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version getDefaultInstanceForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getDefaultInstanceForType() { + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance(); } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version build() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version result = buildPartial(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version build() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version buildPartial() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version result = new akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version(this); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version buildPartial() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -533,16 +533,16 @@ public final class DistributedPubSubMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version) { - return mergeFrom((akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version)other); + if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version) { + return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version other) { - if (other == akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance()) return this; + public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version other) { + if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance()) return this; if (other.hasAddress()) { mergeAddress(other.getAddress()); } @@ -573,11 +573,11 @@ public final class DistributedPubSubMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version parsedMessage = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version) e.getUnfinishedMessage(); + parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -589,9 +589,9 @@ public final class DistributedPubSubMessages { private int bitField0_; // required .Address address = 1; - private akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address address_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); + private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address address_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> addressBuilder_; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> addressBuilder_; /** * required .Address address = 1; */ @@ -601,7 +601,7 @@ public final class DistributedPubSubMessages { /** * required .Address address = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address getAddress() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getAddress() { if (addressBuilder_ == null) { return address_; } else { @@ -611,7 +611,7 @@ public final class DistributedPubSubMessages { /** * required .Address address = 1; */ - public Builder setAddress(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address value) { + public Builder setAddress(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) { if (addressBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -628,7 +628,7 @@ public final class DistributedPubSubMessages { * required .Address address = 1; */ public Builder setAddress( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder builderForValue) { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder builderForValue) { if (addressBuilder_ == null) { address_ = builderForValue.build(); onChanged(); @@ -641,12 +641,12 @@ public final class DistributedPubSubMessages { /** * required .Address address = 1; */ - public Builder mergeAddress(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address value) { + public Builder mergeAddress(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) { if (addressBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - address_ != akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) { + address_ != akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) { address_ = - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder(address_).mergeFrom(value).buildPartial(); } else { address_ = value; } @@ -662,7 +662,7 @@ public final class DistributedPubSubMessages { */ public Builder clearAddress() { if (addressBuilder_ == null) { - address_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); + address_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); onChanged(); } else { addressBuilder_.clear(); @@ -673,7 +673,7 @@ public final class DistributedPubSubMessages { /** * required .Address address = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder getAddressBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder getAddressBuilder() { bitField0_ |= 0x00000001; onChanged(); return getAddressFieldBuilder().getBuilder(); @@ -681,7 +681,7 @@ public final class DistributedPubSubMessages { /** * required .Address address = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getAddressOrBuilder() { if (addressBuilder_ != null) { return addressBuilder_.getMessageOrBuilder(); } else { @@ -692,11 +692,11 @@ public final class DistributedPubSubMessages { * required .Address address = 1; */ private com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> getAddressFieldBuilder() { if (addressBuilder_ == null) { addressBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder>( + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder>( address_, getParentForChildren(), isClean()); @@ -751,17 +751,17 @@ public final class DistributedPubSubMessages { // repeated .Status.Version versions = 1; public static final int VERSIONS_FIELD_NUMBER = 1; - private java.util.List versions_; + private java.util.List versions_; /** * repeated .Status.Version versions = 1; */ - public java.util.List getVersionsList() { + public java.util.List getVersionsList() { return versions_; } /** * repeated .Status.Version versions = 1; */ - public java.util.List + public java.util.List getVersionsOrBuilderList() { return versions_; } @@ -774,13 +774,13 @@ public final class DistributedPubSubMessages { /** * repeated .Status.Version versions = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index) { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index) { return versions_.get(index); } /** * repeated .Status.Version versions = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder( int index) { return versions_.get(index); } @@ -834,53 +834,53 @@ public final class DistributedPubSubMessages { return super.writeReplace(); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status parseFrom(byte[] data) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status parseFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status parseDelimitedFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status parseDelimitedFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -889,7 +889,7 @@ public final class DistributedPubSubMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status prototype) { + public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -905,20 +905,20 @@ public final class DistributedPubSubMessages { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.StatusOrBuilder { + implements akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.StatusOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Status_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Builder.class); } - // Construct using akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.newBuilder() + // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -954,23 +954,23 @@ public final class DistributedPubSubMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Status_descriptor; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status getDefaultInstanceForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.getDefaultInstance(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status getDefaultInstanceForType() { + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.getDefaultInstance(); } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status build() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status result = buildPartial(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status build() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status buildPartial() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status result = new akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status(this); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status buildPartial() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status(this); int from_bitField0_ = bitField0_; if (versionsBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -986,16 +986,16 @@ public final class DistributedPubSubMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status) { - return mergeFrom((akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status)other); + if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status) { + return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status other) { - if (other == akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.getDefaultInstance()) return this; + public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status other) { + if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.getDefaultInstance()) return this; if (versionsBuilder_ == null) { if (!other.versions_.isEmpty()) { if (versions_.isEmpty()) { @@ -1040,11 +1040,11 @@ public final class DistributedPubSubMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status parsedMessage = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status) e.getUnfinishedMessage(); + parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1056,22 +1056,22 @@ public final class DistributedPubSubMessages { private int bitField0_; // repeated .Status.Version versions = 1; - private java.util.List versions_ = + private java.util.List versions_ = java.util.Collections.emptyList(); private void ensureVersionsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - versions_ = new java.util.ArrayList(versions_); + versions_ = new java.util.ArrayList(versions_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder> versionsBuilder_; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder> versionsBuilder_; /** * repeated .Status.Version versions = 1; */ - public java.util.List getVersionsList() { + public java.util.List getVersionsList() { if (versionsBuilder_ == null) { return java.util.Collections.unmodifiableList(versions_); } else { @@ -1091,7 +1091,7 @@ public final class DistributedPubSubMessages { /** * repeated .Status.Version versions = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index) { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version getVersions(int index) { if (versionsBuilder_ == null) { return versions_.get(index); } else { @@ -1102,7 +1102,7 @@ public final class DistributedPubSubMessages { * repeated .Status.Version versions = 1; */ public Builder setVersions( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version value) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version value) { if (versionsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1119,7 +1119,7 @@ public final class DistributedPubSubMessages { * repeated .Status.Version versions = 1; */ public Builder setVersions( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) { if (versionsBuilder_ == null) { ensureVersionsIsMutable(); versions_.set(index, builderForValue.build()); @@ -1132,7 +1132,7 @@ public final class DistributedPubSubMessages { /** * repeated .Status.Version versions = 1; */ - public Builder addVersions(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version value) { + public Builder addVersions(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version value) { if (versionsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1149,7 +1149,7 @@ public final class DistributedPubSubMessages { * repeated .Status.Version versions = 1; */ public Builder addVersions( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version value) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version value) { if (versionsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1166,7 +1166,7 @@ public final class DistributedPubSubMessages { * repeated .Status.Version versions = 1; */ public Builder addVersions( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) { if (versionsBuilder_ == null) { ensureVersionsIsMutable(); versions_.add(builderForValue.build()); @@ -1180,7 +1180,7 @@ public final class DistributedPubSubMessages { * repeated .Status.Version versions = 1; */ public Builder addVersions( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder builderForValue) { if (versionsBuilder_ == null) { ensureVersionsIsMutable(); versions_.add(index, builderForValue.build()); @@ -1194,7 +1194,7 @@ public final class DistributedPubSubMessages { * repeated .Status.Version versions = 1; */ public Builder addAllVersions( - java.lang.Iterable values) { + java.lang.Iterable values) { if (versionsBuilder_ == null) { ensureVersionsIsMutable(); super.addAll(values, versions_); @@ -1233,14 +1233,14 @@ public final class DistributedPubSubMessages { /** * repeated .Status.Version versions = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder getVersionsBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder getVersionsBuilder( int index) { return getVersionsFieldBuilder().getBuilder(index); } /** * repeated .Status.Version versions = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder getVersionsOrBuilder( int index) { if (versionsBuilder_ == null) { return versions_.get(index); } else { @@ -1250,7 +1250,7 @@ public final class DistributedPubSubMessages { /** * repeated .Status.Version versions = 1; */ - public java.util.List + public java.util.List getVersionsOrBuilderList() { if (versionsBuilder_ != null) { return versionsBuilder_.getMessageOrBuilderList(); @@ -1261,31 +1261,31 @@ public final class DistributedPubSubMessages { /** * repeated .Status.Version versions = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder addVersionsBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder addVersionsBuilder() { return getVersionsFieldBuilder().addBuilder( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance()); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance()); } /** * repeated .Status.Version versions = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder addVersionsBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder addVersionsBuilder( int index) { return getVersionsFieldBuilder().addBuilder( - index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance()); + index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.getDefaultInstance()); } /** * repeated .Status.Version versions = 1; */ - public java.util.List + public java.util.List getVersionsBuilderList() { return getVersionsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder> + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder> getVersionsFieldBuilder() { if (versionsBuilder_ == null) { versionsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder>( + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.Version.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Status.VersionOrBuilder>( versions_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -1313,12 +1313,12 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Bucket buckets = 1; */ - java.util.List + java.util.List getBucketsList(); /** * repeated .Delta.Bucket buckets = 1; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index); /** * repeated .Delta.Bucket buckets = 1; */ @@ -1326,12 +1326,12 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Bucket buckets = 1; */ - java.util.List + java.util.List getBucketsOrBuilderList(); /** * repeated .Delta.Bucket buckets = 1; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder( + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder( int index); } /** @@ -1387,10 +1387,10 @@ public final class DistributedPubSubMessages { } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - buckets_ = new java.util.ArrayList(); + buckets_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - buckets_.add(input.readMessage(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.PARSER, extensionRegistry)); + buckets_.add(input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.PARSER, extensionRegistry)); break; } } @@ -1410,14 +1410,14 @@ public final class DistributedPubSubMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1558,14 +1558,14 @@ public final class DistributedPubSubMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1753,53 +1753,53 @@ public final class DistributedPubSubMessages { return super.writeReplace(); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(byte[] data) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseDelimitedFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseDelimitedFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1808,7 +1808,7 @@ public final class DistributedPubSubMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry prototype) { + public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1824,20 +1824,20 @@ public final class DistributedPubSubMessages { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder { + implements akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder.class); } - // Construct using akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.newBuilder() + // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1872,23 +1872,23 @@ public final class DistributedPubSubMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Entry_descriptor; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry getDefaultInstanceForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getDefaultInstanceForType() { + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance(); } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry build() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry result = buildPartial(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry build() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry buildPartial() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry result = new akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry(this); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry buildPartial() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1909,16 +1909,16 @@ public final class DistributedPubSubMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry) { - return mergeFrom((akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry)other); + if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry) { + return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry other) { - if (other == akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance()) return this; + public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry other) { + if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance()) return this; if (other.hasKey()) { bitField0_ |= 0x00000001; key_ = other.key_; @@ -1952,11 +1952,11 @@ public final class DistributedPubSubMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry parsedMessage = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry) e.getUnfinishedMessage(); + parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2170,11 +2170,11 @@ public final class DistributedPubSubMessages { /** * required .Address owner = 1; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address getOwner(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getOwner(); /** * required .Address owner = 1; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder(); // required int64 version = 2; /** @@ -2190,12 +2190,12 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Entry content = 3; */ - java.util.List + java.util.List getContentList(); /** * repeated .Delta.Entry content = 3; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index); /** * repeated .Delta.Entry content = 3; */ @@ -2203,12 +2203,12 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Entry content = 3; */ - java.util.List + java.util.List getContentOrBuilderList(); /** * repeated .Delta.Entry content = 3; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder( + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder( int index); } /** @@ -2263,11 +2263,11 @@ public final class DistributedPubSubMessages { break; } case 10: { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder subBuilder = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = owner_.toBuilder(); } - owner_ = input.readMessage(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.PARSER, extensionRegistry); + owner_ = input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(owner_); owner_ = subBuilder.buildPartial(); @@ -2282,10 +2282,10 @@ public final class DistributedPubSubMessages { } case 26: { if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - content_ = new java.util.ArrayList(); + content_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } - content_.add(input.readMessage(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.PARSER, extensionRegistry)); + content_.add(input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.PARSER, extensionRegistry)); break; } } @@ -2305,14 +2305,14 @@ public final class DistributedPubSubMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2333,7 +2333,7 @@ public final class DistributedPubSubMessages { private int bitField0_; // required .Address owner = 1; public static final int OWNER_FIELD_NUMBER = 1; - private akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address owner_; + private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address owner_; /** * required .Address owner = 1; */ @@ -2343,13 +2343,13 @@ public final class DistributedPubSubMessages { /** * required .Address owner = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address getOwner() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getOwner() { return owner_; } /** * required .Address owner = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder() { return owner_; } @@ -2371,17 +2371,17 @@ public final class DistributedPubSubMessages { // repeated .Delta.Entry content = 3; public static final int CONTENT_FIELD_NUMBER = 3; - private java.util.List content_; + private java.util.List content_; /** * repeated .Delta.Entry content = 3; */ - public java.util.List getContentList() { + public java.util.List getContentList() { return content_; } /** * repeated .Delta.Entry content = 3; */ - public java.util.List + public java.util.List getContentOrBuilderList() { return content_; } @@ -2394,19 +2394,19 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Entry content = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index) { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index) { return content_.get(index); } /** * repeated .Delta.Entry content = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder( int index) { return content_.get(index); } private void initFields() { - owner_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); + owner_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); version_ = 0L; content_ = java.util.Collections.emptyList(); } @@ -2482,53 +2482,53 @@ public final class DistributedPubSubMessages { return super.writeReplace(); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(byte[] data) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseDelimitedFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseDelimitedFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2537,7 +2537,7 @@ public final class DistributedPubSubMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket prototype) { + public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2553,20 +2553,20 @@ public final class DistributedPubSubMessages { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder { + implements akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder.class); } - // Construct using akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.newBuilder() + // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2589,7 +2589,7 @@ public final class DistributedPubSubMessages { public Builder clear() { super.clear(); if (ownerBuilder_ == null) { - owner_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); + owner_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); } else { ownerBuilder_.clear(); } @@ -2611,23 +2611,23 @@ public final class DistributedPubSubMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_Bucket_descriptor; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getDefaultInstanceForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getDefaultInstanceForType() { + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance(); } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket build() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket result = buildPartial(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket build() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket buildPartial() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket result = new akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket(this); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket buildPartial() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2657,16 +2657,16 @@ public final class DistributedPubSubMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket) { - return mergeFrom((akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket)other); + if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket) { + return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket other) { - if (other == akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance()) return this; + public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket other) { + if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance()) return this; if (other.hasOwner()) { mergeOwner(other.getOwner()); } @@ -2729,11 +2729,11 @@ public final class DistributedPubSubMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parsedMessage = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket) e.getUnfinishedMessage(); + parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2745,9 +2745,9 @@ public final class DistributedPubSubMessages { private int bitField0_; // required .Address owner = 1; - private akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address owner_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); + private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address owner_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> ownerBuilder_; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> ownerBuilder_; /** * required .Address owner = 1; */ @@ -2757,7 +2757,7 @@ public final class DistributedPubSubMessages { /** * required .Address owner = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address getOwner() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getOwner() { if (ownerBuilder_ == null) { return owner_; } else { @@ -2767,7 +2767,7 @@ public final class DistributedPubSubMessages { /** * required .Address owner = 1; */ - public Builder setOwner(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address value) { + public Builder setOwner(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) { if (ownerBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2784,7 +2784,7 @@ public final class DistributedPubSubMessages { * required .Address owner = 1; */ public Builder setOwner( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder builderForValue) { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder builderForValue) { if (ownerBuilder_ == null) { owner_ = builderForValue.build(); onChanged(); @@ -2797,12 +2797,12 @@ public final class DistributedPubSubMessages { /** * required .Address owner = 1; */ - public Builder mergeOwner(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address value) { + public Builder mergeOwner(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address value) { if (ownerBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - owner_ != akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) { + owner_ != akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) { owner_ = - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.newBuilder(owner_).mergeFrom(value).buildPartial(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder(owner_).mergeFrom(value).buildPartial(); } else { owner_ = value; } @@ -2818,7 +2818,7 @@ public final class DistributedPubSubMessages { */ public Builder clearOwner() { if (ownerBuilder_ == null) { - owner_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); + owner_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); onChanged(); } else { ownerBuilder_.clear(); @@ -2829,7 +2829,7 @@ public final class DistributedPubSubMessages { /** * required .Address owner = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder getOwnerBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder getOwnerBuilder() { bitField0_ |= 0x00000001; onChanged(); return getOwnerFieldBuilder().getBuilder(); @@ -2837,7 +2837,7 @@ public final class DistributedPubSubMessages { /** * required .Address owner = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder getOwnerOrBuilder() { if (ownerBuilder_ != null) { return ownerBuilder_.getMessageOrBuilder(); } else { @@ -2848,11 +2848,11 @@ public final class DistributedPubSubMessages { * required .Address owner = 1; */ private com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder> getOwnerFieldBuilder() { if (ownerBuilder_ == null) { ownerBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder>( + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder>( owner_, getParentForChildren(), isClean()); @@ -2895,22 +2895,22 @@ public final class DistributedPubSubMessages { } // repeated .Delta.Entry content = 3; - private java.util.List content_ = + private java.util.List content_ = java.util.Collections.emptyList(); private void ensureContentIsMutable() { if (!((bitField0_ & 0x00000004) == 0x00000004)) { - content_ = new java.util.ArrayList(content_); + content_ = new java.util.ArrayList(content_); bitField0_ |= 0x00000004; } } private com.google.protobuf.RepeatedFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder> contentBuilder_; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder> contentBuilder_; /** * repeated .Delta.Entry content = 3; */ - public java.util.List getContentList() { + public java.util.List getContentList() { if (contentBuilder_ == null) { return java.util.Collections.unmodifiableList(content_); } else { @@ -2930,7 +2930,7 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Entry content = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index) { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry getContent(int index) { if (contentBuilder_ == null) { return content_.get(index); } else { @@ -2941,7 +2941,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Entry content = 3; */ public Builder setContent( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) { if (contentBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2958,7 +2958,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Entry content = 3; */ public Builder setContent( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) { if (contentBuilder_ == null) { ensureContentIsMutable(); content_.set(index, builderForValue.build()); @@ -2971,7 +2971,7 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Entry content = 3; */ - public Builder addContent(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) { + public Builder addContent(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) { if (contentBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2988,7 +2988,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Entry content = 3; */ public Builder addContent( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry value) { if (contentBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3005,7 +3005,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Entry content = 3; */ public Builder addContent( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) { if (contentBuilder_ == null) { ensureContentIsMutable(); content_.add(builderForValue.build()); @@ -3019,7 +3019,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Entry content = 3; */ public Builder addContent( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder builderForValue) { if (contentBuilder_ == null) { ensureContentIsMutable(); content_.add(index, builderForValue.build()); @@ -3033,7 +3033,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Entry content = 3; */ public Builder addAllContent( - java.lang.Iterable values) { + java.lang.Iterable values) { if (contentBuilder_ == null) { ensureContentIsMutable(); super.addAll(values, content_); @@ -3072,14 +3072,14 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Entry content = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder getContentBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder getContentBuilder( int index) { return getContentFieldBuilder().getBuilder(index); } /** * repeated .Delta.Entry content = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder getContentOrBuilder( int index) { if (contentBuilder_ == null) { return content_.get(index); } else { @@ -3089,7 +3089,7 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Entry content = 3; */ - public java.util.List + public java.util.List getContentOrBuilderList() { if (contentBuilder_ != null) { return contentBuilder_.getMessageOrBuilderList(); @@ -3100,31 +3100,31 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Entry content = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder addContentBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder addContentBuilder() { return getContentFieldBuilder().addBuilder( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance()); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance()); } /** * repeated .Delta.Entry content = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder addContentBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder addContentBuilder( int index) { return getContentFieldBuilder().addBuilder( - index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance()); + index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.getDefaultInstance()); } /** * repeated .Delta.Entry content = 3; */ - public java.util.List + public java.util.List getContentBuilderList() { return getContentFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder> + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder> getContentFieldBuilder() { if (contentBuilder_ == null) { contentBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder>( + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Entry.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.EntryOrBuilder>( content_, ((bitField0_ & 0x00000004) == 0x00000004), getParentForChildren(), @@ -3147,17 +3147,17 @@ public final class DistributedPubSubMessages { // repeated .Delta.Bucket buckets = 1; public static final int BUCKETS_FIELD_NUMBER = 1; - private java.util.List buckets_; + private java.util.List buckets_; /** * repeated .Delta.Bucket buckets = 1; */ - public java.util.List getBucketsList() { + public java.util.List getBucketsList() { return buckets_; } /** * repeated .Delta.Bucket buckets = 1; */ - public java.util.List + public java.util.List getBucketsOrBuilderList() { return buckets_; } @@ -3170,13 +3170,13 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Bucket buckets = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index) { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index) { return buckets_.get(index); } /** * repeated .Delta.Bucket buckets = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder( int index) { return buckets_.get(index); } @@ -3230,53 +3230,53 @@ public final class DistributedPubSubMessages { return super.writeReplace(); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(byte[] data) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta parseDelimitedFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta parseDelimitedFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3285,7 +3285,7 @@ public final class DistributedPubSubMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta prototype) { + public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3301,20 +3301,20 @@ public final class DistributedPubSubMessages { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.DeltaOrBuilder { + implements akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.DeltaOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Builder.class); } - // Construct using akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.newBuilder() + // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3350,23 +3350,23 @@ public final class DistributedPubSubMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Delta_descriptor; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta getDefaultInstanceForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.getDefaultInstance(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta getDefaultInstanceForType() { + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.getDefaultInstance(); } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta build() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta result = buildPartial(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta build() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta buildPartial() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta result = new akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta(this); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta buildPartial() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta(this); int from_bitField0_ = bitField0_; if (bucketsBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -3382,16 +3382,16 @@ public final class DistributedPubSubMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta) { - return mergeFrom((akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta)other); + if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta) { + return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta other) { - if (other == akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.getDefaultInstance()) return this; + public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta other) { + if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.getDefaultInstance()) return this; if (bucketsBuilder_ == null) { if (!other.buckets_.isEmpty()) { if (buckets_.isEmpty()) { @@ -3436,11 +3436,11 @@ public final class DistributedPubSubMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta parsedMessage = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta) e.getUnfinishedMessage(); + parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3452,22 +3452,22 @@ public final class DistributedPubSubMessages { private int bitField0_; // repeated .Delta.Bucket buckets = 1; - private java.util.List buckets_ = + private java.util.List buckets_ = java.util.Collections.emptyList(); private void ensureBucketsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - buckets_ = new java.util.ArrayList(buckets_); + buckets_ = new java.util.ArrayList(buckets_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder> bucketsBuilder_; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder> bucketsBuilder_; /** * repeated .Delta.Bucket buckets = 1; */ - public java.util.List getBucketsList() { + public java.util.List getBucketsList() { if (bucketsBuilder_ == null) { return java.util.Collections.unmodifiableList(buckets_); } else { @@ -3487,7 +3487,7 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Bucket buckets = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index) { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket getBuckets(int index) { if (bucketsBuilder_ == null) { return buckets_.get(index); } else { @@ -3498,7 +3498,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Bucket buckets = 1; */ public Builder setBuckets( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) { if (bucketsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3515,7 +3515,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Bucket buckets = 1; */ public Builder setBuckets( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) { if (bucketsBuilder_ == null) { ensureBucketsIsMutable(); buckets_.set(index, builderForValue.build()); @@ -3528,7 +3528,7 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Bucket buckets = 1; */ - public Builder addBuckets(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) { + public Builder addBuckets(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) { if (bucketsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3545,7 +3545,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Bucket buckets = 1; */ public Builder addBuckets( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket value) { if (bucketsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3562,7 +3562,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Bucket buckets = 1; */ public Builder addBuckets( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) { if (bucketsBuilder_ == null) { ensureBucketsIsMutable(); buckets_.add(builderForValue.build()); @@ -3576,7 +3576,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Bucket buckets = 1; */ public Builder addBuckets( - int index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) { + int index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder builderForValue) { if (bucketsBuilder_ == null) { ensureBucketsIsMutable(); buckets_.add(index, builderForValue.build()); @@ -3590,7 +3590,7 @@ public final class DistributedPubSubMessages { * repeated .Delta.Bucket buckets = 1; */ public Builder addAllBuckets( - java.lang.Iterable values) { + java.lang.Iterable values) { if (bucketsBuilder_ == null) { ensureBucketsIsMutable(); super.addAll(values, buckets_); @@ -3629,14 +3629,14 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Bucket buckets = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder getBucketsBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder getBucketsBuilder( int index) { return getBucketsFieldBuilder().getBuilder(index); } /** * repeated .Delta.Bucket buckets = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder getBucketsOrBuilder( int index) { if (bucketsBuilder_ == null) { return buckets_.get(index); } else { @@ -3646,7 +3646,7 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Bucket buckets = 1; */ - public java.util.List + public java.util.List getBucketsOrBuilderList() { if (bucketsBuilder_ != null) { return bucketsBuilder_.getMessageOrBuilderList(); @@ -3657,31 +3657,31 @@ public final class DistributedPubSubMessages { /** * repeated .Delta.Bucket buckets = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder addBucketsBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder addBucketsBuilder() { return getBucketsFieldBuilder().addBuilder( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance()); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance()); } /** * repeated .Delta.Bucket buckets = 1; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder addBucketsBuilder( + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder addBucketsBuilder( int index) { return getBucketsFieldBuilder().addBuilder( - index, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance()); + index, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.getDefaultInstance()); } /** * repeated .Delta.Bucket buckets = 1; */ - public java.util.List + public java.util.List getBucketsBuilderList() { return getBucketsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder> + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder> getBucketsFieldBuilder() { if (bucketsBuilder_ == null) { bucketsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder>( + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.Bucket.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Delta.BucketOrBuilder>( buckets_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -3850,14 +3850,14 @@ public final class DistributedPubSubMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Address_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder.class); } public static com.google.protobuf.Parser
PARSER = @@ -4100,53 +4100,53 @@ public final class DistributedPubSubMessages { return super.writeReplace(); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address parseFrom(byte[] data) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address parseFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address parseDelimitedFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address parseDelimitedFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4155,7 +4155,7 @@ public final class DistributedPubSubMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address prototype) { + public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -4176,20 +4176,20 @@ public final class DistributedPubSubMessages { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder { + implements akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.AddressOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Address_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.Builder.class); } - // Construct using akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.newBuilder() + // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -4226,23 +4226,23 @@ public final class DistributedPubSubMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Address_descriptor; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address getDefaultInstanceForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address getDefaultInstanceForType() { + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance(); } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address build() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address result = buildPartial(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address build() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address buildPartial() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address result = new akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address(this); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address buildPartial() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -4267,16 +4267,16 @@ public final class DistributedPubSubMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address) { - return mergeFrom((akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address)other); + if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address) { + return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address other) { - if (other == akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) return this; + public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address other) { + if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address.getDefaultInstance()) return this; if (other.hasSystem()) { bitField0_ |= 0x00000001; system_ = other.system_; @@ -4319,11 +4319,11 @@ public final class DistributedPubSubMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address parsedMessage = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Address) e.getUnfinishedMessage(); + parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Address) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -4636,11 +4636,11 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload getPayload(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload(); /** * required .Payload payload = 3; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder(); } /** * Protobuf type {@code Send} @@ -4709,11 +4709,11 @@ public final class DistributedPubSubMessages { break; } case 26: { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = payload_.toBuilder(); } - payload_ = input.readMessage(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry); + payload_ = input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(payload_); payload_ = subBuilder.buildPartial(); @@ -4735,14 +4735,14 @@ public final class DistributedPubSubMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Send_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -4822,7 +4822,7 @@ public final class DistributedPubSubMessages { // required .Payload payload = 3; public static final int PAYLOAD_FIELD_NUMBER = 3; - private akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload payload_; + private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_; /** * required .Payload payload = 3; */ @@ -4832,20 +4832,20 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { return payload_; } /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { return payload_; } private void initFields() { path_ = ""; localAffinity_ = false; - payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -4917,53 +4917,53 @@ public final class DistributedPubSubMessages { return super.writeReplace(); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send parseFrom(byte[] data) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send parseFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send parseDelimitedFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send parseDelimitedFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4972,7 +4972,7 @@ public final class DistributedPubSubMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send prototype) { + public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -4993,20 +4993,20 @@ public final class DistributedPubSubMessages { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendOrBuilder { + implements akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Send_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.Builder.class); } - // Construct using akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send.newBuilder() + // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -5032,7 +5032,7 @@ public final class DistributedPubSubMessages { localAffinity_ = false; bitField0_ = (bitField0_ & ~0x00000002); if (payloadBuilder_ == null) { - payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); } else { payloadBuilder_.clear(); } @@ -5046,23 +5046,23 @@ public final class DistributedPubSubMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Send_descriptor; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send getDefaultInstanceForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send.getDefaultInstance(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send getDefaultInstanceForType() { + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.getDefaultInstance(); } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send build() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send result = buildPartial(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send build() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send buildPartial() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send result = new akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send(this); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send buildPartial() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -5087,16 +5087,16 @@ public final class DistributedPubSubMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send) { - return mergeFrom((akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send)other); + if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send) { + return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send other) { - if (other == akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send.getDefaultInstance()) return this; + public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send other) { + if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send.getDefaultInstance()) return this; if (other.hasPath()) { bitField0_ |= 0x00000001; path_ = other.path_; @@ -5136,11 +5136,11 @@ public final class DistributedPubSubMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send parsedMessage = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Send) e.getUnfinishedMessage(); + parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Send) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -5259,9 +5259,9 @@ public final class DistributedPubSubMessages { } // required .Payload payload = 3; - private akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_; /** * required .Payload payload = 3; */ @@ -5271,7 +5271,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { if (payloadBuilder_ == null) { return payload_; } else { @@ -5281,7 +5281,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public Builder setPayload(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload value) { + public Builder setPayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) { if (payloadBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5298,7 +5298,7 @@ public final class DistributedPubSubMessages { * required .Payload payload = 3; */ public Builder setPayload( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) { if (payloadBuilder_ == null) { payload_ = builderForValue.build(); onChanged(); @@ -5311,12 +5311,12 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public Builder mergePayload(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload value) { + public Builder mergePayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) { if (payloadBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - payload_ != akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) { + payload_ != akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) { payload_ = - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial(); } else { payload_ = value; } @@ -5332,7 +5332,7 @@ public final class DistributedPubSubMessages { */ public Builder clearPayload() { if (payloadBuilder_ == null) { - payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); onChanged(); } else { payloadBuilder_.clear(); @@ -5343,7 +5343,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() { bitField0_ |= 0x00000004; onChanged(); return getPayloadFieldBuilder().getBuilder(); @@ -5351,7 +5351,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { if (payloadBuilder_ != null) { return payloadBuilder_.getMessageOrBuilder(); } else { @@ -5362,11 +5362,11 @@ public final class DistributedPubSubMessages { * required .Payload payload = 3; */ private com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> getPayloadFieldBuilder() { if (payloadBuilder_ == null) { payloadBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>( + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>( payload_, getParentForChildren(), isClean()); @@ -5422,11 +5422,11 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload getPayload(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload(); /** * required .Payload payload = 3; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder(); } /** * Protobuf type {@code SendToAll} @@ -5495,11 +5495,11 @@ public final class DistributedPubSubMessages { break; } case 26: { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = payload_.toBuilder(); } - payload_ = input.readMessage(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry); + payload_ = input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(payload_); payload_ = subBuilder.buildPartial(); @@ -5521,14 +5521,14 @@ public final class DistributedPubSubMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -5608,7 +5608,7 @@ public final class DistributedPubSubMessages { // required .Payload payload = 3; public static final int PAYLOAD_FIELD_NUMBER = 3; - private akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload payload_; + private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_; /** * required .Payload payload = 3; */ @@ -5618,20 +5618,20 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { return payload_; } /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { return payload_; } private void initFields() { path_ = ""; allButSelf_ = false; - payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -5703,53 +5703,53 @@ public final class DistributedPubSubMessages { return super.writeReplace(); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(byte[] data) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll parseDelimitedFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll parseDelimitedFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5758,7 +5758,7 @@ public final class DistributedPubSubMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll prototype) { + public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -5779,20 +5779,20 @@ public final class DistributedPubSubMessages { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAllOrBuilder { + implements akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAllOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.Builder.class); } - // Construct using akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll.newBuilder() + // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -5818,7 +5818,7 @@ public final class DistributedPubSubMessages { allButSelf_ = false; bitField0_ = (bitField0_ & ~0x00000002); if (payloadBuilder_ == null) { - payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); } else { payloadBuilder_.clear(); } @@ -5832,23 +5832,23 @@ public final class DistributedPubSubMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_SendToAll_descriptor; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll getDefaultInstanceForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll.getDefaultInstance(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll getDefaultInstanceForType() { + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.getDefaultInstance(); } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll build() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll result = buildPartial(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll build() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll buildPartial() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll result = new akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll(this); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll buildPartial() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -5873,16 +5873,16 @@ public final class DistributedPubSubMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll) { - return mergeFrom((akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll)other); + if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll) { + return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll other) { - if (other == akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll.getDefaultInstance()) return this; + public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll other) { + if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll.getDefaultInstance()) return this; if (other.hasPath()) { bitField0_ |= 0x00000001; path_ = other.path_; @@ -5922,11 +5922,11 @@ public final class DistributedPubSubMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll parsedMessage = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.SendToAll) e.getUnfinishedMessage(); + parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.SendToAll) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -6045,9 +6045,9 @@ public final class DistributedPubSubMessages { } // required .Payload payload = 3; - private akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_; /** * required .Payload payload = 3; */ @@ -6057,7 +6057,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { if (payloadBuilder_ == null) { return payload_; } else { @@ -6067,7 +6067,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public Builder setPayload(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload value) { + public Builder setPayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) { if (payloadBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6084,7 +6084,7 @@ public final class DistributedPubSubMessages { * required .Payload payload = 3; */ public Builder setPayload( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) { if (payloadBuilder_ == null) { payload_ = builderForValue.build(); onChanged(); @@ -6097,12 +6097,12 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public Builder mergePayload(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload value) { + public Builder mergePayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) { if (payloadBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - payload_ != akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) { + payload_ != akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) { payload_ = - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial(); } else { payload_ = value; } @@ -6118,7 +6118,7 @@ public final class DistributedPubSubMessages { */ public Builder clearPayload() { if (payloadBuilder_ == null) { - payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); onChanged(); } else { payloadBuilder_.clear(); @@ -6129,7 +6129,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() { bitField0_ |= 0x00000004; onChanged(); return getPayloadFieldBuilder().getBuilder(); @@ -6137,7 +6137,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { if (payloadBuilder_ != null) { return payloadBuilder_.getMessageOrBuilder(); } else { @@ -6148,11 +6148,11 @@ public final class DistributedPubSubMessages { * required .Payload payload = 3; */ private com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> getPayloadFieldBuilder() { if (payloadBuilder_ == null) { payloadBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>( + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>( payload_, getParentForChildren(), isClean()); @@ -6198,11 +6198,11 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload getPayload(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload(); /** * required .Payload payload = 3; */ - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder(); } /** * Protobuf type {@code Publish} @@ -6266,11 +6266,11 @@ public final class DistributedPubSubMessages { break; } case 26: { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = payload_.toBuilder(); } - payload_ = input.readMessage(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry); + payload_ = input.readMessage(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(payload_); payload_ = subBuilder.buildPartial(); @@ -6292,14 +6292,14 @@ public final class DistributedPubSubMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -6363,7 +6363,7 @@ public final class DistributedPubSubMessages { // required .Payload payload = 3; public static final int PAYLOAD_FIELD_NUMBER = 3; - private akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload payload_; + private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_; /** * required .Payload payload = 3; */ @@ -6373,19 +6373,19 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { return payload_; } /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { return payload_; } private void initFields() { topic_ = ""; - payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -6446,53 +6446,53 @@ public final class DistributedPubSubMessages { return super.writeReplace(); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(byte[] data) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish parseDelimitedFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish parseDelimitedFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -6501,7 +6501,7 @@ public final class DistributedPubSubMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish prototype) { + public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -6522,20 +6522,20 @@ public final class DistributedPubSubMessages { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PublishOrBuilder { + implements akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PublishOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.Builder.class); } - // Construct using akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish.newBuilder() + // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -6559,7 +6559,7 @@ public final class DistributedPubSubMessages { topic_ = ""; bitField0_ = (bitField0_ & ~0x00000001); if (payloadBuilder_ == null) { - payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); } else { payloadBuilder_.clear(); } @@ -6573,23 +6573,23 @@ public final class DistributedPubSubMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Publish_descriptor; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish getDefaultInstanceForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish.getDefaultInstance(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish getDefaultInstanceForType() { + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.getDefaultInstance(); } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish build() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish result = buildPartial(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish build() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish buildPartial() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish result = new akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish(this); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish buildPartial() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -6610,16 +6610,16 @@ public final class DistributedPubSubMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish) { - return mergeFrom((akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish)other); + if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish) { + return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish other) { - if (other == akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish.getDefaultInstance()) return this; + public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish other) { + if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish.getDefaultInstance()) return this; if (other.hasTopic()) { bitField0_ |= 0x00000001; topic_ = other.topic_; @@ -6652,11 +6652,11 @@ public final class DistributedPubSubMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish parsedMessage = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Publish) e.getUnfinishedMessage(); + parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Publish) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -6742,9 +6742,9 @@ public final class DistributedPubSubMessages { } // required .Payload payload = 3; - private akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + private akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> payloadBuilder_; /** * required .Payload payload = 3; */ @@ -6754,7 +6754,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getPayload() { if (payloadBuilder_ == null) { return payload_; } else { @@ -6764,7 +6764,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public Builder setPayload(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload value) { + public Builder setPayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) { if (payloadBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6781,7 +6781,7 @@ public final class DistributedPubSubMessages { * required .Payload payload = 3; */ public Builder setPayload( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder builderForValue) { if (payloadBuilder_ == null) { payload_ = builderForValue.build(); onChanged(); @@ -6794,12 +6794,12 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public Builder mergePayload(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload value) { + public Builder mergePayload(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload value) { if (payloadBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - payload_ != akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) { + payload_ != akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) { payload_ = - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial(); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder(payload_).mergeFrom(value).buildPartial(); } else { payload_ = value; } @@ -6815,7 +6815,7 @@ public final class DistributedPubSubMessages { */ public Builder clearPayload() { if (payloadBuilder_ == null) { - payload_ = akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + payload_ = akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); onChanged(); } else { payloadBuilder_.clear(); @@ -6826,7 +6826,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder getPayloadBuilder() { bitField0_ |= 0x00000002; onChanged(); return getPayloadFieldBuilder().getBuilder(); @@ -6834,7 +6834,7 @@ public final class DistributedPubSubMessages { /** * required .Payload payload = 3; */ - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder getPayloadOrBuilder() { if (payloadBuilder_ != null) { return payloadBuilder_.getMessageOrBuilder(); } else { @@ -6845,11 +6845,11 @@ public final class DistributedPubSubMessages { * required .Payload payload = 3; */ private com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder> getPayloadFieldBuilder() { if (payloadBuilder_ == null) { payloadBuilder_ = new com.google.protobuf.SingleFieldBuilder< - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>( + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder>( payload_, getParentForChildren(), isClean()); @@ -6982,14 +6982,14 @@ public final class DistributedPubSubMessages { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -7123,53 +7123,53 @@ public final class DistributedPubSubMessages { return super.writeReplace(); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(byte[] data) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload parseDelimitedFrom(java.io.InputStream input) + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload parseDelimitedFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( + public static akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -7178,7 +7178,7 @@ public final class DistributedPubSubMessages { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload prototype) { + public static Builder newBuilder(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -7194,20 +7194,20 @@ public final class DistributedPubSubMessages { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder { + implements akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.PayloadOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_fieldAccessorTable + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_fieldAccessorTable .ensureFieldAccessorsInitialized( - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.class, akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.Builder.class); + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.class, akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.Builder.class); } - // Construct using akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder() + // Construct using akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -7242,23 +7242,23 @@ public final class DistributedPubSubMessages { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor; + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.internal_static_Payload_descriptor; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload getDefaultInstanceForType() { - return akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload getDefaultInstanceForType() { + return akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance(); } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload build() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload result = buildPartial(); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload build() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload buildPartial() { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload result = new akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload(this); + public akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload buildPartial() { + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload result = new akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -7279,16 +7279,16 @@ public final class DistributedPubSubMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload) { - return mergeFrom((akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload)other); + if (other instanceof akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload) { + return mergeFrom((akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload other) { - if (other == akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) return this; + public Builder mergeFrom(akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload other) { + if (other == akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload.getDefaultInstance()) return this; if (other.hasEnclosedMessage()) { setEnclosedMessage(other.getEnclosedMessage()); } @@ -7318,11 +7318,11 @@ public final class DistributedPubSubMessages { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload parsedMessage = null; + akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (akka.contrib.pattern.protobuf.msg.DistributedPubSubMessages.Payload) e.getUnfinishedMessage(); + parsedMessage = (akka.cluster.pubsub.protobuf.msg.DistributedPubSubMessages.Payload) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -7524,8 +7524,8 @@ public final class DistributedPubSubMessages { "\003 \002(\0132\010.Payload\"3\n\007Publish\022\r\n\005topic\030\001 \002(" + "\t\022\031\n\007payload\030\003 \002(\0132\010.Payload\"Q\n\007Payload\022" + "\027\n\017enclosedMessage\030\001 \002(\014\022\024\n\014serializerId" + - "\030\002 \002(\005\022\027\n\017messageManifest\030\004 \001(\014B%\n!akka." + - "contrib.pattern.protobuf.msgH\001" + "\030\002 \002(\005\022\027\n\017messageManifest\030\004 \001(\014B$\n akka." + + "cluster.pubsub.protobuf.msgH\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/akka-contrib/src/main/protobuf/DistributedPubSubMessages.proto b/akka-cluster-tools/src/main/protobuf/DistributedPubSubMessages.proto similarity index 95% rename from akka-contrib/src/main/protobuf/DistributedPubSubMessages.proto rename to akka-cluster-tools/src/main/protobuf/DistributedPubSubMessages.proto index fcc3bdebd4..8323ccfcdc 100644 --- a/akka-contrib/src/main/protobuf/DistributedPubSubMessages.proto +++ b/akka-cluster-tools/src/main/protobuf/DistributedPubSubMessages.proto @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -option java_package = "akka.contrib.pattern.protobuf.msg"; +option java_package = "akka.cluster.pubsub.protobuf.msg"; option optimize_for = SPEED; message Status { diff --git a/akka-cluster-tools/src/main/resources/reference.conf b/akka-cluster-tools/src/main/resources/reference.conf new file mode 100644 index 0000000000..7c87468224 --- /dev/null +++ b/akka-cluster-tools/src/main/resources/reference.conf @@ -0,0 +1,77 @@ +############################################ +# Akka Cluster Tools Reference Config File # +############################################ + +# This is the reference config file that contains all the default settings. +# Make your edits/overrides in your application.conf. + +# //#pub-sub-ext-config +# Settings for the DistributedPubSubExtension +akka.cluster.pub-sub { + # Actor name of the mediator actor, /user/distributedPubSubMediator + name = distributedPubSubMediator + + # Start the mediator on members tagged with this role. + # All members are used if undefined or empty. + role = "" + + # The routing logic to use for 'Send' + # Possible values: random, round-robin, broadcast + routing-logic = random + + # How often the DistributedPubSubMediator should send out gossip information + gossip-interval = 1s + + # Removed entries are pruned after this duration + removed-time-to-live = 120s + + # Maximum number of elements to transfer in one message when synchronizing the registries. + # Next chunk will be transferred in next round of gossip. + max-delta-elements = 3000 + +} +# //#pub-sub-ext-config + +# Protobuf serializer for cluster DistributedPubSubMeditor messages +akka.actor { + serializers { + akka-pubsub = "akka.cluster.pubsub.protobuf.DistributedPubSubMessageSerializer" + } + serialization-bindings { + "akka.cluster.pubsub.DistributedPubSubMessage" = akka-pubsub + } + serialization-identifiers { + "akka.cluster.pubsub.protobuf.DistributedPubSubMessageSerializer" = 9 + } +} + + +# //#receptionist-ext-config +# Settings for the ClusterReceptionistExtension +akka.cluster.client.receptionist { + # Actor name of the ClusterReceptionist actor, /user/receptionist + name = receptionist + + # Start the receptionist on members tagged with this role. + # All members are used if undefined or empty. + role = "" + + # The receptionist will send this number of contact points to the client + number-of-contacts = 3 + + # The actor that tunnel response messages to the client will be stopped + # after this time of inactivity. + response-tunnel-receive-timeout = 30s +} +# //#receptionist-ext-config + +# //#cluster-client-mailbox-config +akka.cluster.client { + mailbox { + mailbox-type = "akka.dispatch.UnboundedDequeBasedMailbox" + stash-capacity = 1000 + } +} +# //#cluster-client-mailbox-config + + diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterClient.scala b/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala similarity index 98% rename from akka-contrib/src/main/scala/akka/contrib/pattern/ClusterClient.scala rename to akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala index ab1a76ea59..38070f6e00 100644 --- a/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterClient.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern +package akka.cluster.client import java.net.URLEncoder import scala.collection.immutable @@ -29,6 +29,7 @@ import akka.routing.ConsistentHash import akka.routing.MurmurHash import akka.actor.Stash import akka.actor.Cancellable +import akka.cluster.pubsub._ object ClusterClient { @@ -40,7 +41,7 @@ object ClusterClient { establishingGetContactsInterval: FiniteDuration = 3.second, refreshContactsInterval: FiniteDuration = 1.minute): Props = Props(classOf[ClusterClient], initialContacts, establishingGetContactsInterval, refreshContactsInterval). - withMailbox("akka.contrib.cluster.client.mailbox") + withMailbox("akka.cluster.client.mailbox") /** * Java API: Factory method for `ClusterClient` [[akka.actor.Props]]. @@ -77,7 +78,7 @@ object ClusterClient { /** * INTERNAL API */ - private[pattern] object Internal { + private[akka] object Internal { case object RefreshContactsTick } } @@ -194,7 +195,7 @@ class ClusterClient( /** * Extension that starts [[ClusterReceptionist]] and accompanying [[DistributedPubSubMediator]] - * with settings defined in config section `akka.contrib.cluster.receptionist`. + * with settings defined in config section `akka.cluster.client.receptionist`. * The [[DistributedPubSubMediator]] is started by the [[DistributedPubSubExtension]]. */ object ClusterReceptionistExtension extends ExtensionId[ClusterReceptionistExtension] with ExtensionIdProvider { @@ -208,7 +209,7 @@ object ClusterReceptionistExtension extends ExtensionId[ClusterReceptionistExten class ClusterReceptionistExtension(system: ExtendedActorSystem) extends Extension { - private val config = system.settings.config.getConfig("akka.contrib.cluster.receptionist") + private val config = system.settings.config.getConfig("akka.cluster.client.receptionist") private val role: Option[String] = config.getString("role") match { case "" ⇒ None case r ⇒ Some(r) @@ -309,7 +310,7 @@ object ClusterReceptionist { /** * INTERNAL API */ - private[pattern] object Internal { + private[akka] object Internal { @SerialVersionUID(1L) case object GetContacts @SerialVersionUID(1L) diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/DistributedPubSubMediator.scala b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala similarity index 99% rename from akka-contrib/src/main/scala/akka/contrib/pattern/DistributedPubSubMediator.scala rename to akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala index 63f7fe04b8..1f4354ce67 100644 --- a/akka-contrib/src/main/scala/akka/contrib/pattern/DistributedPubSubMediator.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern +package akka.cluster.pubsub import scala.collection.immutable import scala.collection.immutable.Set @@ -137,7 +137,7 @@ object DistributedPubSubMediator { /** * INTERNAL API */ - private[pattern] object Internal { + private[akka] object Internal { case object Prune @SerialVersionUID(1L) @@ -650,7 +650,7 @@ class DistributedPubSubMediator( /** * Extension that starts a [[DistributedPubSubMediator]] actor - * with settings defined in config section `akka.contrib.cluster.pub-sub`. + * with settings defined in config section `akka.cluster.pub-sub`. */ object DistributedPubSubExtension extends ExtensionId[DistributedPubSubExtension] with ExtensionIdProvider { override def get(system: ActorSystem): DistributedPubSubExtension = super.get(system) @@ -663,7 +663,7 @@ object DistributedPubSubExtension extends ExtensionId[DistributedPubSubExtension class DistributedPubSubExtension(system: ExtendedActorSystem) extends Extension { - private val config = system.settings.config.getConfig("akka.contrib.cluster.pub-sub") + private val config = system.settings.config.getConfig("akka.cluster.pub-sub") private val role: Option[String] = config.getString("role") match { case "" ⇒ None case r ⇒ Some(r) diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/protobuf/DistributedPubSubMessageSerializer.scala b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala similarity index 96% rename from akka-contrib/src/main/scala/akka/contrib/pattern/protobuf/DistributedPubSubMessageSerializer.scala rename to akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala index f07bfeede8..770f572742 100644 --- a/akka-contrib/src/main/scala/akka/contrib/pattern/protobuf/DistributedPubSubMessageSerializer.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern.protobuf +package akka.cluster.pubsub.protobuf import akka.serialization.BaseSerializer import akka.cluster._ @@ -17,12 +17,12 @@ import java.util.zip.GZIPOutputStream import java.util.zip.GZIPInputStream import com.google.protobuf.MessageLite import scala.annotation.tailrec -import akka.contrib.pattern.protobuf.msg.{ DistributedPubSubMessages ⇒ dm } +import akka.cluster.pubsub.protobuf.msg.{ DistributedPubSubMessages ⇒ dm } import scala.collection.JavaConverters._ import scala.concurrent.duration.Deadline -import akka.contrib.pattern.DistributedPubSubMessage -import akka.contrib.pattern.DistributedPubSubMediator._ -import akka.contrib.pattern.DistributedPubSubMediator.Internal._ +import akka.cluster.pubsub.DistributedPubSubMessage +import akka.cluster.pubsub.DistributedPubSubMediator._ +import akka.cluster.pubsub.DistributedPubSubMediator.Internal._ import akka.serialization.Serialization import akka.actor.ActorRef import akka.serialization.SerializationExtension diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonManager.scala b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala similarity index 99% rename from akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonManager.scala rename to akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala index 1030ce0e65..439031a249 100644 --- a/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonManager.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern +package akka.cluster.singleton import scala.concurrent.duration._ import scala.collection.immutable @@ -317,7 +317,7 @@ class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(mess * reached. If the retry limit is reached it takes the decision to be * the new oldest if previous oldest is unknown (typically removed), * otherwise it initiates a new round by throwing - * [[akka.contrib.pattern.ClusterSingletonManagerIsStuck]] and expecting + * [[akka.cluster.singleton.ClusterSingletonManagerIsStuck]] and expecting * restart with fresh state. For a cluster with many members you might * need to increase this retry limit because it takes longer time to * propagate changes across all nodes. @@ -328,7 +328,7 @@ class ClusterSingletonManagerIsStuck(message: String) extends AkkaException(mess * oldest immediately, without knowing who was previous oldest. This is retried * with the `retryInterval` until this retry limit has been reached. If the retry * limit is reached it initiates a new round by throwing - * [[akka.contrib.pattern.ClusterSingletonManagerIsStuck]] and expecting + * [[akka.cluster.singleton.ClusterSingletonManagerIsStuck]] and expecting * restart with fresh state. This will also cause the singleton actor to be * stopped. `maxTakeOverRetries` must be less than `maxHandOverRetries` to * ensure that new oldest doesn't start singleton actor before previous is diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonProxy.scala b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala similarity index 98% rename from akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonProxy.scala rename to akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala index b5706df7bd..f6f37d424b 100644 --- a/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSingletonProxy.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern +package akka.cluster.singleton import akka.actor._ import akka.cluster.{ MemberStatus, Cluster, Member } @@ -58,7 +58,7 @@ object ClusterSingletonProxy { } /** - * The `ClusterSingletonProxy` works together with the [[akka.contrib.pattern.ClusterSingletonManager]] to provide a + * The `ClusterSingletonProxy` works together with the [[akka.cluster.singleton.ClusterSingletonManager]] to provide a * distributed proxy to the singleton actor. * * The proxy can be started on every node where the singleton needs to be reached and used as if it were the singleton diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterClientSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala similarity index 99% rename from akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterClientSpec.scala rename to akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala index 180affc04b..6f8de09165 100644 --- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterClientSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern +package akka.cluster.client import language.postfixOps import scala.concurrent.duration._ @@ -17,6 +17,7 @@ import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ import akka.actor.Address +import akka.cluster.pubsub._ object ClusterClientSpec extends MultiNodeConfig { val client = role("client") diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/DistributedPubSubMediatorSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala similarity index 98% rename from akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/DistributedPubSubMediatorSpec.scala rename to akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala index b99b5206a1..deea3f8225 100644 --- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/DistributedPubSubMediatorSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern +package akka.cluster.pubsub import language.postfixOps import scala.concurrent.duration._ @@ -18,8 +18,8 @@ import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ import akka.actor.ActorLogging -import akka.contrib.pattern.DistributedPubSubMediator.Internal.Status -import akka.contrib.pattern.DistributedPubSubMediator.Internal.Delta +import akka.cluster.pubsub.DistributedPubSubMediator.Internal.Status +import akka.cluster.pubsub.DistributedPubSubMediator.Internal.Delta object DistributedPubSubMediatorSpec extends MultiNodeConfig { val first = role("first") @@ -31,7 +31,7 @@ object DistributedPubSubMediatorSpec extends MultiNodeConfig { akka.actor.provider = "akka.cluster.ClusterActorRefProvider" akka.remote.log-remote-lifecycle-events = off akka.cluster.auto-down-unreachable-after = 0s - akka.contrib.cluster.pub-sub.max-delta-elements = 500 + akka.cluster.pub-sub.max-delta-elements = 500 """)) object TestChatUser { diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerChaosSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala similarity index 99% rename from akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerChaosSpec.scala rename to akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala index f5f5d542ee..5da1515bac 100644 --- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerChaosSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern +package akka.cluster.singleton import language.postfixOps import scala.collection.immutable diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerLeaveSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala similarity index 99% rename from akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerLeaveSpec.scala rename to akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala index 0b04acb5d6..dfad366be4 100644 --- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerLeaveSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern +package akka.cluster.singleton import language.postfixOps import scala.collection.immutable diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala similarity index 99% rename from akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala rename to akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala index 344aedb3c8..66b7a29270 100644 --- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern +package akka.cluster.singleton import language.postfixOps import scala.collection.immutable diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerStartupSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala similarity index 99% rename from akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerStartupSpec.scala rename to akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala index 55804d0cb2..114cbaac79 100644 --- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerStartupSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern +package akka.cluster.singleton import language.postfixOps import scala.collection.immutable diff --git a/akka-contrib/src/test/java/akka/contrib/pattern/DistributedPubSubMediatorTest.java b/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java similarity index 98% rename from akka-contrib/src/test/java/akka/contrib/pattern/DistributedPubSubMediatorTest.java rename to akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java index 623df55a42..dc3ce68327 100644 --- a/akka-contrib/src/test/java/akka/contrib/pattern/DistributedPubSubMediatorTest.java +++ b/akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern; +package akka.cluster.pubsub; import akka.testkit.AkkaJUnitActorSystemResource; import org.junit.ClassRule; diff --git a/akka-contrib/src/test/java/akka/contrib/pattern/ClusterSingletonManagerTest.java b/akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java similarity index 99% rename from akka-contrib/src/test/java/akka/contrib/pattern/ClusterSingletonManagerTest.java rename to akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java index 6c4c742622..654ce00ee5 100644 --- a/akka-contrib/src/test/java/akka/contrib/pattern/ClusterSingletonManagerTest.java +++ b/akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern; +package akka.cluster.singleton; import java.util.ArrayList; import java.util.Comparator; diff --git a/akka-cluster-tools/src/test/resources/reference.conf b/akka-cluster-tools/src/test/resources/reference.conf new file mode 100644 index 0000000000..ab48718a51 --- /dev/null +++ b/akka-cluster-tools/src/test/resources/reference.conf @@ -0,0 +1,6 @@ +akka { + actor { + serialize-creators = on + serialize-messages = on + } +} \ No newline at end of file diff --git a/akka-contrib/src/test/scala/akka/contrib/pattern/DistributedPubSubMediatorRouterSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala similarity index 97% rename from akka-contrib/src/test/scala/akka/contrib/pattern/DistributedPubSubMediatorRouterSpec.scala rename to akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala index dcce407657..b23222cefb 100644 --- a/akka-contrib/src/test/scala/akka/contrib/pattern/DistributedPubSubMediatorRouterSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala @@ -1,4 +1,4 @@ -package akka.contrib.pattern +package akka.cluster.pubsub import akka.testkit._ import akka.routing.{ ConsistentHashingRoutingLogic, RouterEnvelope } @@ -16,7 +16,7 @@ object DistributedPubSubMediatorRouterSpec { akka.loglevel = INFO akka.actor.provider = "akka.cluster.ClusterActorRefProvider" akka.remote.log-remote-lifecycle-events = off - akka.contrib.cluster.pub-sub.routing-logic = $routingLogic + akka.cluster.pub-sub.routing-logic = $routingLogic """ } diff --git a/akka-contrib/src/test/scala/akka/contrib/pattern/protobuf/DistributedPubSubMessageSerializerSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala similarity index 91% rename from akka-contrib/src/test/scala/akka/contrib/pattern/protobuf/DistributedPubSubMessageSerializerSpec.scala rename to akka-cluster-tools/src/test/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala index 9f317b97a7..43830d7ab4 100644 --- a/akka-contrib/src/test/scala/akka/contrib/pattern/protobuf/DistributedPubSubMessageSerializerSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala @@ -1,12 +1,12 @@ /** * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern.protobuf +package akka.cluster.pubsub.protobuf import akka.actor.{ ExtendedActorSystem, Address } import akka.testkit.AkkaSpec -import akka.contrib.pattern.DistributedPubSubMediator._ -import akka.contrib.pattern.DistributedPubSubMediator.Internal._ +import akka.cluster.pubsub.DistributedPubSubMediator._ +import akka.cluster.pubsub.DistributedPubSubMediator.Internal._ import akka.actor.Props import scala.collection.immutable.TreeMap diff --git a/akka-contrib/src/test/scala/akka/contrib/pattern/ClusterSingletonProxySpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala similarity index 98% rename from akka-contrib/src/test/scala/akka/contrib/pattern/ClusterSingletonProxySpec.scala rename to akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala index 325079ad71..bbbd3cea10 100644 --- a/akka-contrib/src/test/scala/akka/contrib/pattern/ClusterSingletonProxySpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2009-2015 Typesafe Inc. */ -package akka.contrib.pattern +package akka.cluster.singleton import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpecLike } import akka.testkit.{ TestProbe, TestKit } diff --git a/akka-contrib/docs/index.rst b/akka-contrib/docs/index.rst index 59a906118a..e60c577a8b 100644 --- a/akka-contrib/docs/index.rst +++ b/akka-contrib/docs/index.rst @@ -34,10 +34,7 @@ The Current List of Modules throttle jul peek-mailbox - cluster-singleton cluster-sharding - distributed-pub-sub - cluster-client aggregator receive-pipeline diff --git a/akka-contrib/src/main/resources/reference.conf b/akka-contrib/src/main/resources/reference.conf index d8c942b19f..a32843c2a4 100644 --- a/akka-contrib/src/main/resources/reference.conf +++ b/akka-contrib/src/main/resources/reference.conf @@ -5,74 +5,6 @@ # This is the reference config file that contains all the default settings. # Make your edits/overrides in your application.conf. -# //#pub-sub-ext-config -# Settings for the DistributedPubSubExtension -akka.contrib.cluster.pub-sub { - # Actor name of the mediator actor, /user/distributedPubSubMediator - name = distributedPubSubMediator - - # Start the mediator on members tagged with this role. - # All members are used if undefined or empty. - role = "" - - # The routing logic to use for 'Send' - # Possible values: random, round-robin, broadcast - routing-logic = random - - # How often the DistributedPubSubMediator should send out gossip information - gossip-interval = 1s - - # Removed entries are pruned after this duration - removed-time-to-live = 120s - - # Maximum number of elements to transfer in one message when synchronizing the registries. - # Next chunk will be transferred in next round of gossip. - max-delta-elements = 3000 - -} -# //#pub-sub-ext-config - -# Protobuf serializer for cluster DistributedPubSubMeditor messages -akka.actor { - serializers { - akka-pubsub = "akka.contrib.pattern.protobuf.DistributedPubSubMessageSerializer" - } - serialization-bindings { - "akka.contrib.pattern.DistributedPubSubMessage" = akka-pubsub - } - serialization-identifiers { - "akka.contrib.pattern.protobuf.DistributedPubSubMessageSerializer" = 9 - } -} - - -# //#receptionist-ext-config -# Settings for the ClusterReceptionistExtension -akka.contrib.cluster.receptionist { - # Actor name of the ClusterReceptionist actor, /user/receptionist - name = receptionist - - # Start the receptionist on members tagged with this role. - # All members are used if undefined or empty. - role = "" - - # The receptionist will send this number of contact points to the client - number-of-contacts = 3 - - # The actor that tunnel response messages to the client will be stopped - # after this time of inactivity. - response-tunnel-receive-timeout = 30s -} -# //#receptionist-ext-config - -# //#cluster-client-mailbox-config -akka.contrib.cluster.client { - mailbox { - mailbox-type = "akka.dispatch.UnboundedDequeBasedMailbox" - stash-capacity = 1000 - } -} -# //#cluster-client-mailbox-config # //#sharding-ext-config diff --git a/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSharding.scala b/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSharding.scala index d4fe73c869..99c3d928d9 100644 --- a/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSharding.scala +++ b/akka-contrib/src/main/scala/akka/contrib/pattern/ClusterSharding.scala @@ -38,6 +38,7 @@ import akka.cluster.MemberStatus import akka.pattern.ask import akka.persistence._ import akka.cluster.ClusterEvent.ClusterDomainEvent +import akka.cluster.singleton.ClusterSingletonManager /** * This extension provides sharding functionality of actors in a cluster. diff --git a/akka-docs/rst/java/index-network.rst b/akka-docs/rst/java/index-network.rst index 1e313da6f9..e95f23bb60 100644 --- a/akka-docs/rst/java/index-network.rst +++ b/akka-docs/rst/java/index-network.rst @@ -6,6 +6,9 @@ Networking ../common/cluster cluster-usage + ../scala/cluster-singleton + ../scala/distributed-pub-sub + ../scala/cluster-client cluster-metrics remoting serialization diff --git a/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst b/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst index c77a690d9e..2bfbcadbeb 100644 --- a/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst +++ b/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst @@ -201,4 +201,14 @@ user defined main class and packaging with `sbt-native-packager `_. Please see :ref:`deployment-scenarios` for more information. +Cluster tools moved to separate module +====================================== +The Cluster Singleton, Distributed Pub-Sub, and Cluster Client previously located in the ``akka-contrib`` +jar is now moved to a separate module named ``akka-cluster-tools``. You need to replace this dependency +if you use any of these tools. + +The classes changed package name from ``akka.contrib.pattern`` to ``akka.cluster.singleton``, ``akka.cluster.pubsub`` +and ``akka.cluster.client``. + +The configuration properties changed name to ``akka.cluster.pub-sub`` and ``akka.cluster.client``. diff --git a/akka-contrib/docs/cluster-client.rst b/akka-docs/rst/scala/cluster-client.rst similarity index 79% rename from akka-contrib/docs/cluster-client.rst rename to akka-docs/rst/scala/cluster-client.rst index 21c190e581..a625a85c2e 100644 --- a/akka-contrib/docs/cluster-client.rst +++ b/akka-docs/rst/scala/cluster-client.rst @@ -15,6 +15,8 @@ i.e. not necessarily the initial contact points. Also, note it's necessary to ch ``akka.remote.RemoteActorRefProvider`` or ``akka.cluster.ClusterActorRefProvider`` when using the cluster client. + + The receptionist is supposed to be started on all nodes, or all nodes with specified role, in the cluster. The receptionist can be started with the ``ClusterReceptionistExtension`` or as an ordinary actor. @@ -57,7 +59,7 @@ handled in by the supervision strategy of the parent actor. The size of the buff can be configured by the following ``stash-capacity`` setting of the mailbox that is used by the ``ClusterClient`` actor. -.. includecode:: @contribSrc@/src/main/resources/reference.conf#cluster-client-mailbox-config +.. includecode:: ../../../akka-cluster-tools/src/main/resources/reference.conf#cluster-client-mailbox-config An Example ---------- @@ -65,21 +67,21 @@ An Example On the cluster nodes first start the receptionist. Note, it is recommended to load the extension when the actor system is started by defining it in the ``akka.extensions`` configuration property:: - akka.extensions = ["akka.contrib.pattern.ClusterReceptionistExtension"] + akka.extensions = ["akka.cluster.client.ClusterReceptionistExtension"] Next, register the actors that should be available for the client. -.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterClientSpec.scala#server +.. includecode:: ../../../akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala#server On the client you create the ``ClusterClient`` actor and use it as a gateway for sending messages to the actors identified by their path (without address information) somewhere in the cluster. -.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterClientSpec.scala#client +.. includecode:: ../../../akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala#client The ``initialContacts`` parameter is a ``Set[ActorSelection]``, which can be created like this: -.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterClientSpec.scala#initialContacts +.. includecode:: ../../../akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala#initialContacts You will probably define the address information of the initial contact points in configuration or system property. @@ -90,14 +92,14 @@ and `Distributed workers with Akka and Java! + com.typesafe.akka + akka-cluster-tools_@binVersion@ + @version@ + diff --git a/akka-contrib/docs/cluster-singleton.rst b/akka-docs/rst/scala/cluster-singleton.rst similarity index 84% rename from akka-contrib/docs/cluster-singleton.rst rename to akka-docs/rst/scala/cluster-singleton.rst index 4238d0e643..01b244ce97 100644 --- a/akka-contrib/docs/cluster-singleton.rst +++ b/akka-docs/rst/scala/cluster-singleton.rst @@ -19,7 +19,7 @@ such as single-point of bottleneck. Single-point of failure is also a relevant c but for some cases this feature takes care of that by making sure that another singleton instance will eventually be started. -The cluster singleton pattern is implemented by ``akka.contrib.pattern.ClusterSingletonManager``. +The cluster singleton pattern is implemented by ``akka.cluster.singleton.ClusterSingletonManager``. It manages one singleton actor instance among all cluster nodes or a group of nodes tagged with a specific role. ``ClusterSingletonManager`` is an actor that is supposed to be started on all nodes, or all nodes with specified role, in the cluster. The actual singleton actor is @@ -38,7 +38,7 @@ take over and a new singleton actor is created. For these failure scenarios ther not be a graceful hand-over, but more than one active singletons is prevented by all reasonable means. Some corner cases are eventually resolved by configurable timeouts. -You can access the singleton actor by using the provided ``akka.contrib.pattern.ClusterSingletonProxy``, +You can access the singleton actor by using the provided ``akka.cluster.singleton.ClusterSingletonProxy``, which will route all messages to the current instance of the singleton. The proxy will keep track of the oldest node in the cluster and resolve the singleton's ``ActorRef`` by explicitly sending the singleton's ``actorSelection`` the ``akka.actor.Identify`` message and waiting for it to reply. @@ -83,18 +83,18 @@ supply the ``Props`` of the singleton actor, in this case the JMS queue consumer In Scala: -.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala#create-singleton-manager +.. includecode:: ../../../akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala#create-singleton-manager Here we limit the singleton to nodes tagged with the ``"worker"`` role, but all nodes, independent of role, can be used by specifying ``None`` as ``role`` parameter. -The corresponding Java API for the ``singeltonProps`` function is ``akka.contrib.pattern.ClusterSingletonPropsFactory``. +The corresponding Java API for the ``singeltonProps`` function is ``akka.cluster.singleton.ClusterSingletonPropsFactory``. The Java API takes a plain String for the role parameter and ``null`` means that all nodes, independent of role, are used. In Java: -.. includecode:: @contribSrc@/src/test/java/akka/contrib/pattern/ClusterSingletonManagerTest.java#create-singleton-manager +.. includecode:: ../../../akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java#create-singleton-manager .. note:: @@ -108,7 +108,7 @@ perfectly fine ``terminationMessage`` if you only need to stop the actor. Here is how the singleton actor handles the ``terminationMessage`` in this example. -.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala#consumer-end +.. includecode:: ../../../akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala#consumer-end Note that you can send back current state to the ``ClusterSingletonManager`` before terminating. This message will be sent over to the ``ClusterSingletonManager`` at the new oldest node and it @@ -119,14 +119,29 @@ configured proxy. In Scala: -.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/ClusterSingletonManagerSpec.scala#create-singleton-proxy +.. includecode:: ../../../akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala#create-singleton-proxy In Java: -.. includecode:: @contribSrc@/src/test/java/akka/contrib/pattern/ClusterSingletonManagerTest.java#create-singleton-proxy +.. includecode:: ../../../akka-cluster-tools/src/test/java/akka/cluster/singleton/ClusterSingletonManagerTest.java#create-singleton-proxy A more comprehensive sample is available in the `Typesafe Activator `_ tutorial named `Distributed workers with Akka and Scala! `_ and `Distributed workers with Akka and Java! `_. +Dependencies +------------ +To use the Cluster Singleton you must add the following dependency in your project. + +sbt:: + + "com.typesafe.akka" %% "akka-cluster-tools" % "@version@" @crossString@ + +maven:: + + + com.typesafe.akka + akka-cluster-tools_@binVersion@ + @version@ + diff --git a/akka-contrib/docs/distributed-pub-sub.rst b/akka-docs/rst/scala/distributed-pub-sub.rst similarity index 77% rename from akka-contrib/docs/distributed-pub-sub.rst rename to akka-docs/rst/scala/distributed-pub-sub.rst index 34c0adbfb3..64d74c91eb 100644 --- a/akka-contrib/docs/distributed-pub-sub.rst +++ b/akka-docs/rst/scala/distributed-pub-sub.rst @@ -8,7 +8,7 @@ How do I send a message to an actor without knowing which node it is running on? How do I send messages to all actors in the cluster that have registered interest in a named topic? -This pattern provides a mediator actor, ``akka.contrib.pattern.DistributedPubSubMediator``, +This pattern provides a mediator actor, ``akka.cluster.pubsub.DistributedPubSubMediator``, that manages a registry of actor references and replicates the entries to peer actors among all cluster nodes or a group of nodes tagged with a specific role. @@ -84,40 +84,40 @@ A Small Example in Java A subscriber actor: -.. includecode:: @contribSrc@/src/test/java/akka/contrib/pattern/DistributedPubSubMediatorTest.java#subscriber +.. includecode:: ../../../akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java#subscriber Subscriber actors can be started on several nodes in the cluster, and all will receive messages published to the "content" topic. -.. includecode:: @contribSrc@/src/test/java/akka/contrib/pattern/DistributedPubSubMediatorTest.java#start-subscribers +.. includecode:: ../../../akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java#start-subscribers A simple actor that publishes to this "content" topic: -.. includecode:: @contribSrc@/src/test/java/akka/contrib/pattern/DistributedPubSubMediatorTest.java#publisher +.. includecode:: ../../../akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java#publisher It can publish messages to the topic from anywhere in the cluster: -.. includecode:: @contribSrc@/src/test/java/akka/contrib/pattern/DistributedPubSubMediatorTest.java#publish-message +.. includecode:: ../../../akka-cluster-tools/src/test/java/akka/cluster/pubsub/DistributedPubSubMediatorTest.java#publish-message A Small Example in Scala ------------------------ A subscriber actor: -.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/DistributedPubSubMediatorSpec.scala#subscriber +.. includecode:: ../../../akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala#subscriber Subscriber actors can be started on several nodes in the cluster, and all will receive messages published to the "content" topic. -.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/DistributedPubSubMediatorSpec.scala#start-subscribers +.. includecode:: ../../../akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala#start-subscribers A simple actor that publishes to this "content" topic: -.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/DistributedPubSubMediatorSpec.scala#publisher +.. includecode:: ../../../akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala#publisher It can publish messages to the topic from anywhere in the cluster: -.. includecode:: @contribSrc@/src/multi-jvm/scala/akka/contrib/pattern/DistributedPubSubMediatorSpec.scala#publish-message +.. includecode:: ../../../akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala#publish-message A more comprehensive sample is available in the `Typesafe Activator `_ tutorial named `Akka Clustered PubSub with Scala! `_. @@ -125,7 +125,7 @@ tutorial named `Akka Clustered PubSub with Scala! + com.typesafe.akka + akka-cluster-tools_@binVersion@ + @version@ + diff --git a/akka-docs/rst/scala/index-network.rst b/akka-docs/rst/scala/index-network.rst index 1e313da6f9..72feb1c431 100644 --- a/akka-docs/rst/scala/index-network.rst +++ b/akka-docs/rst/scala/index-network.rst @@ -6,6 +6,9 @@ Networking ../common/cluster cluster-usage + cluster-singleton + distributed-pub-sub + cluster-client cluster-metrics remoting serialization diff --git a/akka-samples/akka-sample-cluster-java/build.sbt b/akka-samples/akka-sample-cluster-java/build.sbt index b7533f3d9d..620dda5585 100644 --- a/akka-samples/akka-sample-cluster-java/build.sbt +++ b/akka-samples/akka-sample-cluster-java/build.sbt @@ -18,7 +18,7 @@ val project = Project( "com.typesafe.akka" %% "akka-remote" % akkaVersion, "com.typesafe.akka" %% "akka-cluster" % akkaVersion, "com.typesafe.akka" %% "akka-cluster-metrics" % akkaVersion, - "com.typesafe.akka" %% "akka-contrib" % akkaVersion, + "com.typesafe.akka" %% "akka-cluster-tools" % akkaVersion, "com.typesafe.akka" %% "akka-multi-node-testkit" % akkaVersion, "org.scalatest" %% "scalatest" % "2.2.1" % "test", "io.kamon" % "sigar-loader" % "1.6.5-rev001"), diff --git a/akka-samples/akka-sample-cluster-java/src/main/java/sample/cluster/stats/StatsSampleOneMasterMain.java b/akka-samples/akka-sample-cluster-java/src/main/java/sample/cluster/stats/StatsSampleOneMasterMain.java index 5119d7fd4b..8ae86a89d0 100644 --- a/akka-samples/akka-sample-cluster-java/src/main/java/sample/cluster/stats/StatsSampleOneMasterMain.java +++ b/akka-samples/akka-sample-cluster-java/src/main/java/sample/cluster/stats/StatsSampleOneMasterMain.java @@ -6,8 +6,8 @@ import com.typesafe.config.ConfigFactory; import akka.actor.ActorSystem; import akka.actor.PoisonPill; import akka.actor.Props; -import akka.contrib.pattern.ClusterSingletonManager; -import akka.contrib.pattern.ClusterSingletonProxy; +import akka.cluster.singleton.ClusterSingletonManager; +import akka.cluster.singleton.ClusterSingletonProxy; public class StatsSampleOneMasterMain { diff --git a/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala b/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala index 8a86a8f720..9e8e0e5cf1 100644 --- a/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala +++ b/akka-samples/akka-sample-cluster-java/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala @@ -14,8 +14,8 @@ import akka.cluster.Member import akka.cluster.MemberStatus import akka.cluster.ClusterEvent.CurrentClusterState import akka.cluster.ClusterEvent.MemberUp -import akka.contrib.pattern.ClusterSingletonManager -import akka.contrib.pattern.ClusterSingletonProxy +import akka.cluster.singleton.ClusterSingletonManager +import akka.cluster.singleton.ClusterSingletonProxy import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit.ImplicitSender diff --git a/akka-samples/akka-sample-cluster-scala/build.sbt b/akka-samples/akka-sample-cluster-scala/build.sbt index f388649b45..4a33f0e2c2 100644 --- a/akka-samples/akka-sample-cluster-scala/build.sbt +++ b/akka-samples/akka-sample-cluster-scala/build.sbt @@ -17,7 +17,7 @@ val project = Project( "com.typesafe.akka" %% "akka-remote" % akkaVersion, "com.typesafe.akka" %% "akka-cluster" % akkaVersion, "com.typesafe.akka" %% "akka-cluster-metrics" % akkaVersion, - "com.typesafe.akka" %% "akka-contrib" % akkaVersion, + "com.typesafe.akka" %% "akka-cluster-tools" % akkaVersion, "com.typesafe.akka" %% "akka-multi-node-testkit" % akkaVersion, "org.scalatest" %% "scalatest" % "2.2.1" % "test", "io.kamon" % "sigar-loader" % "1.6.5-rev001"), diff --git a/akka-samples/akka-sample-cluster-scala/src/main/scala/sample/cluster/stats/StatsSampleOneMaster.scala b/akka-samples/akka-sample-cluster-scala/src/main/scala/sample/cluster/stats/StatsSampleOneMaster.scala index 91367604c3..49809e3eca 100644 --- a/akka-samples/akka-sample-cluster-scala/src/main/scala/sample/cluster/stats/StatsSampleOneMaster.scala +++ b/akka-samples/akka-sample-cluster-scala/src/main/scala/sample/cluster/stats/StatsSampleOneMaster.scala @@ -4,8 +4,8 @@ import com.typesafe.config.ConfigFactory import akka.actor.ActorSystem import akka.actor.PoisonPill import akka.actor.Props -import akka.contrib.pattern.ClusterSingletonManager -import akka.contrib.pattern.ClusterSingletonProxy +import akka.cluster.singleton.ClusterSingletonManager +import akka.cluster.singleton.ClusterSingletonProxy object StatsSampleOneMaster { def main(args: Array[String]): Unit = { diff --git a/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala b/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala index b0ebcf9fe8..cb599ac59f 100644 --- a/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala +++ b/akka-samples/akka-sample-cluster-scala/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala @@ -9,8 +9,8 @@ import org.scalatest.Matchers import akka.actor.PoisonPill import akka.actor.Props import akka.actor.RootActorPath -import akka.contrib.pattern.ClusterSingletonManager -import akka.contrib.pattern.ClusterSingletonProxy +import akka.cluster.singleton.ClusterSingletonManager +import akka.cluster.singleton.ClusterSingletonProxy import akka.cluster.Cluster import akka.cluster.Member import akka.cluster.MemberStatus diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index f49547cc24..49b19ae84b 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -55,7 +55,7 @@ object AkkaBuild extends Build { archivesPathFinder.get.map(file => (file -> ("akka/" + file.getName))) } ), - aggregate = Seq(actor, testkit, actorTests, remote, remoteTests, camel, cluster, clusterMetrics, slf4j, agent, + aggregate = Seq(actor, testkit, actorTests, remote, remoteTests, camel, cluster, clusterMetrics, clusterTools, slf4j, agent, persistence, persistenceTck, kernel, osgi, docs, contrib, samples, multiNodeTestkit, typed) ) @@ -64,7 +64,7 @@ object AkkaBuild extends Build { base = file("akka-scala-nightly"), // remove dependencies that we have to build ourselves (Scala STM) // samples don't work with dbuild right now - aggregate = Seq(actor, testkit, actorTests, remote, remoteTests, camel, cluster, slf4j, + aggregate = Seq(actor, testkit, actorTests, remote, remoteTests, camel, cluster, clusterMetrics, clusterTools, slf4j, persistence, persistenceTck, kernel, osgi, contrib, multiNodeTestkit, typed) ).disablePlugins(ValidatePullRequest) @@ -127,6 +127,12 @@ object AkkaBuild extends Build { dependencies = Seq(cluster % "compile->compile;test->test;multi-jvm->multi-jvm", slf4j % "test->compile") ) configs (MultiJvm) + lazy val clusterTools = Project( + id = "akka-cluster-tools", + base = file("akka-cluster-tools"), + dependencies = Seq(cluster % "compile->compile;test->test;multi-jvm->multi-jvm") + ) configs (MultiJvm) + lazy val slf4j = Project( id = "akka-slf4j", base = file("akka-slf4j"), @@ -181,7 +187,7 @@ object AkkaBuild extends Build { lazy val contrib = Project( id = "akka-contrib", base = file("akka-contrib"), - dependencies = Seq(remote, remoteTests % "test->test", cluster, persistence % "compile;test->provided") + dependencies = Seq(remote, remoteTests % "test->test", cluster, clusterTools, persistence % "compile;test->provided") ) configs (MultiJvm) lazy val samples = Project( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 96df136dfe..e42d277c0e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -87,6 +87,8 @@ object Dependencies { val remoteTests = deps(Test.junit, Test.scalatest, Test.scalaXml) val cluster = Seq(Test.junit, Test.scalatest) + + val clusterTools = Seq(Test.junit, Test.scalatest) val clusterMetrics = Seq(Provided.sigarLoader, Test.slf4jJul, Test.slf4jLog4j, Test.logback, Test.mockito) diff --git a/project/OSGi.scala b/project/OSGi.scala index 0c5be9db38..2ba3b8ca6b 100644 --- a/project/OSGi.scala +++ b/project/OSGi.scala @@ -27,6 +27,9 @@ object OSGi { val camel = exports(Seq("akka.camel.*")) val cluster = exports(Seq("akka.cluster.*"), imports = Seq(protobufImport())) + + val clusterTools = exports(Seq("akka.cluster.singleton.*", "akka.cluster.client.*", "akka.cluster.pubsub.*"), + imports = Seq(protobufImport())) val clusterMetrics = exports(Seq("akka.cluster.metrics.*"), imports = Seq(protobufImport(),kamonImport(),sigarImport()))