diff --git a/core/api/src/main/java/org/onosproject/ui/UiExtension.java b/core/api/src/main/java/org/onosproject/ui/UiExtension.java
index bc0dfc9..17201cb 100644
--- a/core/api/src/main/java/org/onosproject/ui/UiExtension.java
+++ b/core/api/src/main/java/org/onosproject/ui/UiExtension.java
@@ -165,7 +165,7 @@
          */
         public Builder(ClassLoader cl, List<UiView> views) {
             checkNotNull(cl, "Must provide a class loader");
-            checkArgument(views.size() > 0, "Must provide at least one view");
+            checkArgument(!views.isEmpty(), "Must provide at least one view");
             classLoader = cl;
             viewList = views;
         }
diff --git a/core/api/src/main/java/org/onosproject/ui/topo/NodeSelection.java b/core/api/src/main/java/org/onosproject/ui/topo/NodeSelection.java
index ce5680e..f906546 100644
--- a/core/api/src/main/java/org/onosproject/ui/topo/NodeSelection.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/NodeSelection.java
@@ -97,7 +97,7 @@
         Set<String> unmatched = findLinks(ids);
         unmatched = findDevices(unmatched);
         unmatched = findHosts(unmatched);
-        if (unmatched.size() > 0) {
+        if (!unmatched.isEmpty()) {
             log.debug("Skipping unmatched IDs {}", unmatched);
         }