Using latest atomix release candidate + Updates to CopycatTransport
Change-Id: I960af428ff733ee7467024811e3b3470e951ecb7
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionDetails.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionDetails.java
index 38b811e..3fb243d 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionDetails.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionDetails.java
@@ -19,14 +19,14 @@
import java.util.Collection;
import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import org.onosproject.cluster.PartitionId;
import org.onosproject.store.service.PartitionInfo;
import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
/**
* Operational details for a {@code StoragePartition}.
@@ -98,9 +98,11 @@
* @return partition info
*/
public PartitionInfo toPartitionInfo() {
+ Function<Member, String> memberToString =
+ m -> m == null ? "none" : String.format("%s:%d", m.address().host(), m.address().port());
return new PartitionInfo(partitionId.toString(),
leaderTerm,
- Lists.transform(ImmutableList.copyOf(activeMembers), m -> m.address().toString()),
- leader == null ? "none" : leader.address().toString());
+ activeMembers.stream().map(memberToString).collect(Collectors.toList()),
+ memberToString.apply(leader));
}
}