X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-common-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fcommon%2Fimpl%2Frouting%2FRoutingUtils.java;h=0672ba2b6da5162abb2d6b3039308323c3245759;hp=bfa4f36c18ca1d23f852a3da9c554942aa0b3e0e;hb=be87d8279ec45f347381bc25c56f992785e61079;hpb=6fd408a04fe4a3611843e2246ece6d7c34b76903 diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/RoutingUtils.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/RoutingUtils.java index bfa4f36c18..0672ba2b6d 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/RoutingUtils.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/RoutingUtils.java @@ -16,33 +16,33 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; public class RoutingUtils { - + public static RouteChange removalChange(C context,P path) { final ImmutableMap> announcements = ImmutableMap.>of(); final ImmutableMap> removals = ImmutableMap.>of(context, ImmutableSet.of(path)); return new RouteChangeImpl(announcements, removals); } - + public static RouteChange announcementChange(C context,P path) { final ImmutableMap> announcements = ImmutableMap.>of(context, ImmutableSet.of(path)); final ImmutableMap> removals = ImmutableMap.>of(); return new RouteChangeImpl(announcements, removals); } - - + + public static RouteChange change(Map> announcements, Map> removals) { final ImmutableMap> immutableAnnouncements = ImmutableMap.>copyOf(announcements); final ImmutableMap> immutableRemovals = ImmutableMap.>copyOf(removals); return new RouteChangeImpl(immutableAnnouncements, immutableRemovals); } - - + + private static class RouteChangeImpl implements RouteChange { private final Map> removal; private final Map> announcement; - public RouteChangeImpl(ImmutableMap> removal, ImmutableMap> announcement) { + public RouteChangeImpl(ImmutableMap> announcement, ImmutableMap> removal) { super(); this.removal = removal; this.announcement = announcement; @@ -52,7 +52,7 @@ public class RoutingUtils { public Map> getAnnouncements() { return announcement; } - + @Override public Map> getRemovals() { return removal; @@ -78,22 +78,25 @@ public class RoutingUtils { if (getClass() != obj.getClass()) { return false; } - RouteChangeImpl other = (RouteChangeImpl) obj; + RouteChangeImpl other = (RouteChangeImpl) obj; if (announcement == null) { - if (other.announcement != null) + if (other.announcement != null) { return false; - } else if (!announcement.equals(other.announcement)) + } + } else if (!announcement.equals(other.announcement)) { return false; + } if (removal == null) { if (other.removal != null) { return false; } - } else if (!removal.equals(other.removal)) + } else if (!removal.equals(other.removal)) { return false; + } return true; } } - + }