Remove if statement checking the same condition at filter()

Change-Id: I3f25b8cabfef48cc4bf693e8606d137b59a8cb7d

Remove if statement checking the same condition at filter()
Change-Id: I3f25b8cabfef48cc4bf693e8606d137b59a8cb7d
Sho SHIMIZU · Gerrit Code Review
Commit d1fd4699333f11849d1cff2a266dca1cd1b14629 d1fd4699 1 parent 00c9cfac
Showing 1 changed file with 2 additions and 4 deletions
apps/vtn/src/main/java/org/onosproject/vtn/impl/VTNManager.java
--- a/apps/vtn/src/main/java/org/onosproject/vtn/impl/VTNManager.java
View file @d1fd469
+++ b/apps/vtn/src/main/java/org/onosproject/vtn/impl/VTNManager.java
View file @d1fd469
@@ -163,9 +163,8 @@ public class VTNManager implements VTNService {
         IpAddress ip = IpAddress.valueOf(ipAddress);
         Sets.newHashSet(devices).stream()
                 .filter(d -> Device.Type.CONTROLLER == d.type())
-                 .filter(d -> !device.id().equals(d.id())).forEach(d -> {
-                     if (!device.id().equals(d.id())
-                             && Device.Type.CONTROLLER == d.type()) {
+                 .filter(d -> !device.id().equals(d.id()))
+                 .forEach(d -> {
                         String ipAddress1 = d.annotations()
                                 .value(CONTROLLER_IP_KEY);
                         IpAddress ip1 = IpAddress.valueOf(ipAddress1);
@@ -173,7 +172,6 @@ public class VTNManager implements VTNService {
                         DriverHandler handler1 = driverService
                                 .createHandler(d.id());
                         applyTunnelConfig(ip1, ip, handler1);
-                     }
                 });
     }