From bd6afb89521ed94fdffde31d3e6030ec2d295359 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Mon, 3 Jul 2017 10:44:24 +0200
Subject: [PATCH] Revert "Less abbreviations, more reliable test"

This reverts commit 61e289b276f410654c1b063c33648e0d7ea88e50.
---
 akka-cluster/src/main/resources/reference.conf   |  4 ++--
 .../src/main/scala/akka/cluster/ClusterJmx.scala |  2 +-
 .../src/main/scala/akka/cluster/Member.scala     |  2 +-
 .../multi-jvm/scala/akka/cluster/MBeanSpec.scala | 16 ++++++++--------
 akka-docs/src/main/paradox/scala/cluster-team.md |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/akka-cluster/src/main/resources/reference.conf b/akka-cluster/src/main/resources/reference.conf
index f5b49f6c81..8e69ea6d20 100644
--- a/akka-cluster/src/main/resources/reference.conf
+++ b/akka-cluster/src/main/resources/reference.conf
@@ -65,8 +65,8 @@ akka {
     # move 'WeaklyUp' members to 'Up' status once convergence has been reached.
     allow-weakly-up-members = on
 
-    # Teams are used to make islands of the cluster that are colocated. This can be used
-    # to make the cluster aware that it is running across multiple availability zones or regions.
+    # Teams are used to make islands of the cluster that are colocated. It can be used
+    # to make the cluster "dc-aware", run the cluster in multiple availability zones or regions.
     # The team is added to the list of roles of the node with the prefix "team-".
     team = "default"
 
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
index 26056f8963..bd828e4e80 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
@@ -154,7 +154,7 @@ private[akka] class ClusterJmx(cluster: Cluster, log: LoggingAdapter) {
         val members = clusterView.members.toSeq.sorted(Member.ordering).map { m ⇒
           s"""{
               |      "address": "${m.address}",
-              |      "roles": [${if (m.roles.isEmpty) "" else m.roles.toList.sorted.map("\"" + _ + "\"").mkString("\n        ", ",\n        ", "\n      ")}],
+              |      "roles": [${if (m.roles.isEmpty) "" else m.roles.map("\"" + _ + "\"").mkString("\n        ", ",\n        ", "\n      ")}],
               |      "status": "${m.status}"
               |    }""".stripMargin
         } mkString (",\n    ")
diff --git a/akka-cluster/src/main/scala/akka/cluster/Member.scala b/akka-cluster/src/main/scala/akka/cluster/Member.scala
index c0195d5e39..145d14f9ef 100644
--- a/akka-cluster/src/main/scala/akka/cluster/Member.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/Member.scala
@@ -22,7 +22,7 @@ class Member private[cluster] (
   val status:                    MemberStatus,
   val roles:                     Set[String]) extends Serializable {
 
-  lazy val team: String = roles.find(_.startsWith("team-"))
+  lazy val team = roles.find(_.startsWith("team-"))
     .getOrElse(throw new IllegalStateException("Team undefined, should not be possible"))
 
   def address: Address = uniqueAddress.address
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala
index cb43fe4d52..37ed3d24ae 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala
@@ -120,32 +120,32 @@ abstract class MBeanSpec
              |    {
              |      "address": "${sortedNodes(0)}",
              |      "roles": [
-             |        "team-default",
-             |        "testNode"
+             |        "testNode",
+             |        "team-default"
              |      ],
              |      "status": "Up"
              |    },
              |    {
              |      "address": "${sortedNodes(1)}",
              |      "roles": [
-             |        "team-default",
-             |        "testNode"
+             |        "testNode",
+             |        "team-default"
              |      ],
              |      "status": "Up"
              |    },
              |    {
              |      "address": "${sortedNodes(2)}",
              |      "roles": [
-             |        "team-default",
-             |        "testNode"
+             |        "testNode",
+             |        "team-default"
              |      ],
              |      "status": "Up"
              |    },
              |    {
              |      "address": "${sortedNodes(3)}",
              |      "roles": [
-             |        "team-default",
-             |        "testNode"
+             |        "testNode",
+             |        "team-default"
              |      ],
              |      "status": "Up"
              |    }
diff --git a/akka-docs/src/main/paradox/scala/cluster-team.md b/akka-docs/src/main/paradox/scala/cluster-team.md
index a4019d360f..436d5a9ad8 100644
--- a/akka-docs/src/main/paradox/scala/cluster-team.md
+++ b/akka-docs/src/main/paradox/scala/cluster-team.md
@@ -6,8 +6,8 @@ Cluster teams are a work-in-progress feature, and behavior is still expected to
 
 @@@
 
-Teams are used to make islands of the cluster that are colocated. This can be used
-to make the cluster aware that it is running across multiple availability zones or regions.
+Teams are used to define islands of the cluster that are colocated.
+They can be used to make the cluster "dc-aware", run the cluster in multiple availability zones or regions.
 
 Cluster nodes can be assigned to a team by setting the `akka.cluster.team` setting.
 When no team is specified, a node will belong to the 'default' team.