diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
index 1dad271..b30604a 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
@@ -136,16 +136,16 @@
     }
 
     private Set<ResourceAllocation> getResourceCapacity(ResourceType type, Link link) {
-        if (type == ResourceType.BANDWIDTH) {
-            return ImmutableSet.of(getBandwidthResourceCapacity(link));
+        switch (type) {
+            case BANDWIDTH:
+                return ImmutableSet.of(getBandwidthResourceCapacity(link));
+            case LAMBDA:
+                return getLambdaResourceCapacity(link);
+            case MPLS_LABEL:
+                return getMplsResourceCapacity();
+            default:
+                return ImmutableSet.of();
         }
-        if (type == ResourceType.LAMBDA) {
-            return getLambdaResourceCapacity(link);
-        }
-        if (type == ResourceType.MPLS_LABEL) {
-            return getMplsResourceCapacity();
-        }
-        return ImmutableSet.of();
     }
 
     private Set<ResourceAllocation> getLambdaResourceCapacity(Link link) {
