From 81391595dca425ae58e2294898f09f11d9a32dbc Mon Sep 17 00:00:00 2001
From: Ashlee Young <ashlee@onosfw.com>
Date: Tue, 22 Sep 2015 12:49:09 -0700
Subject: bringing src to commit tag 65d551b50e782b0c1ea76c1a9ed1c5a801a5a7e4

Change-Id: Ib2da78962eaef856f418636c31b0f5c84286244f
---
 framework/src/onos/apps/test/demo/pom.xml                        | 2 +-
 .../test/demo/src/main/java/org/onosproject/demo/DemoAPI.java    | 2 +-
 .../demo/src/main/java/org/onosproject/demo/DemoInstaller.java   | 9 ++-------
 3 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'framework/src/onos/apps/test/demo')

diff --git a/framework/src/onos/apps/test/demo/pom.xml b/framework/src/onos/apps/test/demo/pom.xml
index 27dd6675..4b08430d 100644
--- a/framework/src/onos/apps/test/demo/pom.xml
+++ b/framework/src/onos/apps/test/demo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoAPI.java b/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoAPI.java
index 4197bb60..00956763 100644
--- a/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoAPI.java
+++ b/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoAPI.java
@@ -24,7 +24,7 @@ import java.util.Optional;
  */
 public interface DemoAPI {
 
-    enum InstallType { MESH, RANDOM };
+    enum InstallType { MESH, RANDOM }
 
     /**
      * Tests flow subsystem based on the parameters supplied.
diff --git a/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java b/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
index 27d1ca96..a408e695 100644
--- a/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
+++ b/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
@@ -393,13 +393,8 @@ public class DemoInstaller implements DemoAPI {
         }
 
         private Predicate<? super Host> hasLocalMaster() {
-            return new Predicate<Host>() {
-                @Override
-                public boolean apply(Host host) {
-                    return mastershipService.getLocalRole(
-                            host.location().deviceId()).equals(MastershipRole.MASTER);
-                }
-            };
+            return host -> mastershipService.getLocalRole(
+                    host.location().deviceId()).equals(MastershipRole.MASTER);
         }
 
 
-- 
cgit 1.2.3-korg