diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
index c1e2843..9c3ca0f 100644
--- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -713,7 +713,7 @@
          */
         private PortDescription buildPortDescription(PortDescPropertyType ptype, OFPortOptical port,
                 OpenFlowOpticalSwitch opsw) {
-            checkArgument(port.getDesc().size() >= 1);
+            checkArgument(!port.getDesc().isEmpty());
 
             // Minimally functional fixture. This needs to be fixed as we add better support.
             PortNumber portNo = PortNumber.portNumber(port.getPortNo().getPortNumber());
@@ -790,7 +790,7 @@
             // Use the alias name if it's available
             String name = port.getName();
             List<OFCalientPortDescProp> props = port.getProperties();
-            if (props != null && props.size() > 0) {
+            if (props != null && !props.isEmpty()) {
                 OFCalientPortDescPropOptical propOptical = (OFCalientPortDescPropOptical) props.get(0);
                 if (propOptical != null) {
                     name = propOptical.getInAlias();