diff --git a/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OplinkRoadm.java b/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OplinkRoadm.java
index 99f2be3..273469b 100644
--- a/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OplinkRoadm.java
+++ b/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OplinkRoadm.java
@@ -277,7 +277,7 @@
     private OplinkPortAdjacency getNeighbor(OFExpPortAdjacency ad) {
         for (OFExpPortAdjacencyId adid : ad.getProperties()) {
             List<OFExpExtAdId> otns = adid.getAdId();
-            if (otns != null && otns.size() > 0) {
+            if (otns != null && !otns.isEmpty()) {
                 OFExpPortAdidOtn otn = (OFExpPortAdidOtn) otns.get(0);
                 // ITU-T G.7714 ETH MAC Format (in second 16 bytes of the following)
                 // |---------------------------------------------------------------------------|