Rename group messages() API to messaging()

atomix · Apr 10, 2016 · 329ef7b · 329ef7b
1 parent 9c084b4
commit 329ef7b
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 28 deletions.
diff --git a/...les/distributed-group/src/main/java/io/atomix/examples/group/DistributedGroupExample.java b/...les/distributed-group/src/main/java/io/atomix/examples/group/DistributedGroupExample.java
@@ -66,7 +66,7 @@ public static void main(String[] args) throws Exception {
     System.out.println("Joining membership group");
     group.join().thenAccept(member -> {
       System.out.println("Joined group with member ID: " + member.id());
-      MessageConsumer<String> consumer = member.messages().consumer("tasks");
+      MessageConsumer<String> consumer = member.messaging().consumer("tasks");
       consumer.onMessage(task -> {
         System.out.println("Received message");
         try {
@@ -80,7 +80,7 @@ public static void main(String[] args) throws Exception {
     group.onJoin(member -> {
       System.out.println(member.id() + " joined the group!");
 
-      member.messages().producer("tasks").send("hello").thenRun(() -> {
+      member.messaging().producer("tasks").send("hello").thenRun(() -> {
         System.out.println("Task complete!");
       });
     });

diff --git a/groups/src/main/java/io/atomix/group/DistributedGroup.java b/groups/src/main/java/io/atomix/group/DistributedGroup.java
@@ -60,7 +60,7 @@
  *   }
  * </pre>
  * <h2>Configuration</h2>
- * {@code DistributedGroup} instances can be configured to control {@link GroupMember#messages() communication}
+ * {@code DistributedGroup} instances can be configured to control {@link GroupMember#messaging() communication}
  * between members of the group. To configure groups, a {@link DistributedGroup.Options} instance must be provided
  * when constructing the initial group instance.
  * <p>
@@ -407,7 +407,7 @@ public Options withAddress(Address address) {
    *
    * @return The group message client.
    */
-  MessageClient messages();
+  MessageClient messaging();
 
   /**
    * Gets a group member by ID.

diff --git a/groups/src/main/java/io/atomix/group/GroupMember.java b/groups/src/main/java/io/atomix/group/GroupMember.java
@@ -36,10 +36,10 @@ public interface GroupMember {
   String id();
 
   /**
-   * Returns the member message service.
+   * Returns the member message client.
    *
-   * @return The member message service.
+   * @return The member message client.
    */
-  MessageClient messages();
+  MessageClient messaging();
 
 }
diff --git a/groups/src/main/java/io/atomix/group/LocalMember.java b/groups/src/main/java/io/atomix/group/LocalMember.java
@@ -41,8 +41,13 @@
  */
 public interface LocalMember extends GroupMember {
 
+  /**
+   * Returns the local member message service.
+   *
+   * @return The local member message service.
+   */
   @Override
-  MessageService messages();
+  MessageService messaging();
 
   /**
    * Leaves the membership group.

diff --git a/groups/src/main/java/io/atomix/group/internal/AbstractGroupMember.java b/groups/src/main/java/io/atomix/group/internal/AbstractGroupMember.java
@@ -39,6 +39,6 @@ public String id() {
   }
 
   @Override
-  public abstract AbstractMessageClient messages();
+  public abstract AbstractMessageClient messaging();
 
 }
diff --git a/groups/src/main/java/io/atomix/group/internal/LocalGroupMember.java b/groups/src/main/java/io/atomix/group/internal/LocalGroupMember.java
@@ -36,7 +36,7 @@ public LocalGroupMember(GroupMemberInfo info, MembershipGroup group, MessageProd
   }
 
   @Override
-  public MemberMessageService messages() {
+  public MemberMessageService messaging() {
     return messages;
   }
 

diff --git a/groups/src/main/java/io/atomix/group/internal/MembershipGroup.java b/groups/src/main/java/io/atomix/group/internal/MembershipGroup.java
@@ -86,7 +86,7 @@ public Election election() {
   }
 
   @Override
-  public MessageClient messages() {
+  public MessageClient messaging() {
     return messages;
   }
 

diff --git a/groups/src/main/java/io/atomix/group/internal/RemoteGroupMember.java b/groups/src/main/java/io/atomix/group/internal/RemoteGroupMember.java
@@ -33,7 +33,7 @@ public RemoteGroupMember(GroupMemberInfo info, MembershipGroup group, MessagePro
   }
 
   @Override
-  public MemberMessageClient messages() {
+  public MemberMessageClient messaging() {
     return messages;
   }
 

diff --git a/groups/src/test/java/io/atomix/group/DistributedGroupTest.java b/groups/src/test/java/io/atomix/group/DistributedGroupTest.java
@@ -227,12 +227,12 @@ public void testDirectMessage() throws Throwable {
 
     await(5000, 2);
 
-    member.messages().consumer("test").onMessage(message -> {
+    member.messaging().consumer("test").onMessage(message -> {
       threadAssertEquals(message.message(), "Hello world!");
       message.ack();
       resume();
     });
-    group1.member(member.id()).messages().producer("test").send("Hello world!").thenRun(this::resume);
+    group1.member(member.id()).messaging().producer("test").send("Hello world!").thenRun(this::resume);
     await(10000, 2);
   }
 
@@ -258,12 +258,12 @@ public void testDirectMessageFail() throws Throwable {
 
     await(5000, 2);
 
-    member.messages().consumer("test").onMessage(message -> {
+    member.messaging().consumer("test").onMessage(message -> {
       threadAssertEquals(message.message(), "Hello world!");
       message.fail();
       resume();
     });
-    group1.member(member.id()).messages().producer("test").send("Hello world!").whenComplete((result, error) -> {
+    group1.member(member.id()).messaging().producer("test").send("Hello world!").whenComplete((result, error) -> {
       threadAssertTrue(error instanceof MessageFailedException);
       resume();
     });
@@ -292,18 +292,18 @@ public void testDirectMessageRedeliverToPersistentMember() throws Throwable {
 
     await(5000, 2);
 
-    member.messages().consumer("test").onMessage(message -> {
+    member.messaging().consumer("test").onMessage(message -> {
       threadAssertEquals(message.message(), "Hello world!");
       group1.join("test").thenAccept(localMember -> {
-        localMember.messages().consumer("test").onMessage(m -> {
+        localMember.messaging().consumer("test").onMessage(m -> {
           threadAssertEquals(message.message(), "Hello world!");
           m.ack();
           resume();
         });
       });
       resume();
     });
-    group1.member(member.id()).messages().producer("test").send("Hello world!").thenRun(this::resume);
+    group1.member(member.id()).messaging().producer("test").send("Hello world!").thenRun(this::resume);
     await(10000, 3);
   }
 
@@ -329,12 +329,12 @@ public void testDirectMessageFailOnLeave() throws Throwable {
 
     await(5000, 2);
 
-    member.messages().consumer("test").onMessage(message -> {
+    member.messaging().consumer("test").onMessage(message -> {
       member.leave().thenRun(this::resume);
       resume();
     });
 
-    group1.member(member.id()).messages().producer("test").send("Hello world!").whenComplete((result, error) -> {
+    group1.member(member.id()).messaging().producer("test").send("Hello world!").whenComplete((result, error) -> {
       threadAssertTrue(error instanceof MessageFailedException);
       resume();
     });
@@ -365,22 +365,22 @@ public void testGroupMessage() throws Throwable {
     LocalMember member2 = group2.join().get(10, TimeUnit.SECONDS);
     LocalMember member3 = group2.join().get(10, TimeUnit.SECONDS);
 
-    member1.messages().consumer("test").onMessage(message -> {
+    member1.messaging().consumer("test").onMessage(message -> {
       threadAssertEquals(message.message(), "Hello world!");
       message.ack();
       resume();
     });
-    member2.messages().consumer("test").onMessage(message -> {
+    member2.messaging().consumer("test").onMessage(message -> {
       threadAssertEquals(message.message(), "Hello world!");
       message.ack();
       resume();
     });
-    member3.messages().consumer("test").onMessage(message -> {
+    member3.messaging().consumer("test").onMessage(message -> {
       threadAssertEquals(message.message(), "Hello world!");
       message.ack();
       resume();
     });
-    group1.messages().producer("test").send("Hello world!").thenRun(this::resume);
+    group1.messaging().producer("test").send("Hello world!").thenRun(this::resume);
     await(10000, 4);
   }
 
@@ -410,20 +410,20 @@ public void testGroupMessageFailOnLeave() throws Throwable {
 
     await(5000, 2);
 
-    member1.messages().consumer("test").onMessage(message -> {
+    member1.messaging().consumer("test").onMessage(message -> {
       threadAssertEquals(message.message(), "Hello world!");
       member1.leave();
       resume();
     });
-    member2.messages().consumer("test").onMessage(message -> {
+    member2.messaging().consumer("test").onMessage(message -> {
       threadAssertEquals(message.message(), "Hello world!");
       member2.leave();
       resume();
     });
 
     MessageProducer.Options options = new MessageProducer.Options()
       .withDelivery(MessageProducer.Delivery.RANDOM);
-    group1.messages().producer("test", options).send("Hello world!").whenComplete((result, error) -> {
+    group1.messaging().producer("test", options).send("Hello world!").whenComplete((result, error) -> {
       threadAssertNotNull(error);
       resume();
     });