/*
 * Copyright 2014-2015 Open Networking Laboratory
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.onosproject.cluster;

import java.util.List;
import java.util.Objects;
import java.util.Optional;

import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;

/**
 * An immutable container for role information for a device,
 * within the current cluster. Role attributes include current
 * master and a preference-ordered list of backup nodes.
 */
public class RoleInfo {
    private final Optional<NodeId> master;
    private final List<NodeId> backups;

    public RoleInfo(NodeId master, List<NodeId> backups) {
        this.master = Optional.ofNullable(master);
        this.backups = ImmutableList.copyOf(backups);
    }

    public RoleInfo() {
        this.master = Optional.empty();
        this.backups = ImmutableList.of();
    }

    // This will return a Optional<NodeId> in the future.
    public NodeId master() {
        return master.orElseGet(() -> null);
    }

    public List<NodeId> backups() {
        return backups;
    }

    @Override
    public boolean equals(Object other) {
        if (other == null) {
            return false;
        }
        if (!(other instanceof RoleInfo)) {
            return false;
        }
        RoleInfo that = (RoleInfo) other;
        if (!Objects.equals(this.master, that.master)) {
            return false;
        }
        if (!Objects.equals(this.backups, that.backups)) {
            return false;
        }
        return true;
    }

    @Override
    public int hashCode() {
        return Objects.hash(master, backups);
    }

    @Override
    public String toString() {
        return MoreObjects.toStringHelper(this.getClass())
                .add("master", master.orElseGet(() -> null))
            .add("backups", backups)
            .toString();
    }
}

@@ -1671,21 +1671,21 @@
 if (
-o
 th
-er
+is
  == 
-null
+other
 ) %7B%0A
@@ -1695,36 +1695,35 @@
          return 
-fals
+tru
 e;%0A        %7D%0A   
@@ -1711,32 +1711,33 @@
 true;%0A        %7D%0A
+%0A
         if (!(ot
@@ -1842,24 +1842,25 @@
  other;%0A
+%0A
         
 if (!Obj
@@ -1843,37 +1843,39 @@
 other;%0A%0A        
-if (!
+return 
 Objects.equals(t
@@ -1898,19 +1898,16 @@
 .master)
-) %7B
 %0A       
@@ -1915,45 +1915,15 @@
     
-return false;%0A        %7D%0A        if (!
+    && 
 Obje
@@ -1964,67 +1964,8 @@
 ups)
-) %7B%0A            return false;%0A        %7D%0A        return true
 ;%0A  

Simplify equals() implementation