commit 4ad9df0be006b1717c8750d82f3181b6f2bd9d65
author HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> Fri May 20 14:29:15 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon May 23 20:32:47 2016 +0000
tree 4a9cb0b4a8aedc20f82dc9837e2de30c6d77dd17
parent 8eb6ba155b8f7cedc624bc0d7f52ff1f4007e50c

Cosmetic fixes for DefaultClusterMetadataProvider

Change-Id: I3d4d49fb38ec258f5a9a7c6007a40255d6465801

core/net/src/main/java/org/onosproject/cluster/impl/DefaultClusterMetadataProvider.java

diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/DefaultClusterMetadataProvider.java b/core/net/src/main/java/org/onosproject/cluster/impl/DefaultClusterMetadataProvider.java
index 030fa89..73aba4a 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/DefaultClusterMetadataProvider.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/DefaultClusterMetadataProvider.java
@@ -46,7 +46,6 @@
 import org.slf4j.Logger;
 
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
 
 /**
  * Provider of default {@link ClusterMetadata cluster metadata}.
@@ -65,7 +64,7 @@
     private static final String DEFAULT_ONOS_INTERFACE = "eth0";
     private static final int DEFAULT_ONOS_PORT = 9876;
     private static final ProviderId PROVIDER_ID = new ProviderId("default", "none");
-    private AtomicReference<Versioned<ClusterMetadata>> cachedMetadata = new AtomicReference<>();
+    private final AtomicReference<Versioned<ClusterMetadata>> cachedMetadata = new AtomicReference<>();
 
     @Activate
     public void activate() {
@@ -73,9 +72,9 @@
         ControllerNode localNode =
                 new DefaultControllerNode(new NodeId(localIp), IpAddress.valueOf(localIp), DEFAULT_ONOS_PORT);
         // p0 partition
-        Partition basePartition = new DefaultPartition(PartitionId.from(0), Sets.newHashSet(localNode.id()));
+        Partition basePartition = new DefaultPartition(PartitionId.from(0), ImmutableSet.of(localNode.id()));
         // p1 partition
-        Partition extendedPartition = new DefaultPartition(PartitionId.from(1), Sets.newHashSet(localNode.id()));
+        Partition extendedPartition = new DefaultPartition(PartitionId.from(1), ImmutableSet.of(localNode.id()));
         ClusterMetadata metadata = new ClusterMetadata(PROVIDER_ID,
                                         "default",
                                         ImmutableSet.of(localNode),