commit 6d01d3df9190aa9c5092f2d4bdb4ed6fa8d3f3a8
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri May 08 14:08:36 2015 -0700
committer Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri May 08 16:10:55 2015 -0700
tree 42f38c1f15cf96b31e6e4103002277ca1492edfe
parent f81725bb43dbaf859acb803f86c713d25a65f3f9

Inline static factory methods in BandwidthResource

Change-Id: I8ac7fbaea5c81c9558f88f6ac88bcf581466d073

core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java

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 62d9d02..6b22b75 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
@@ -16,6 +16,7 @@
 import org.apache.felix.scr.annotations.Service;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Deactivate;
+import org.onlab.util.Bandwidth;
 import org.slf4j.Logger;
 import org.onlab.util.KryoNamespace;
 import org.onlab.util.PositionalParameterStringFormatter;
@@ -67,8 +68,8 @@
 
     private final Logger log = getLogger(getClass());
 
-    private static final BandwidthResource DEFAULT_BANDWIDTH = BandwidthResource.mbps(1_000);
-    private static final BandwidthResource EMPTY_BW = BandwidthResource.bps(0);
+    private static final BandwidthResource DEFAULT_BANDWIDTH = new BandwidthResource(Bandwidth.mbps(1_000));
+    private static final BandwidthResource EMPTY_BW = new BandwidthResource(Bandwidth.bps(0));
 
     // Smallest non-reserved MPLS label
     private static final int MIN_UNRESERVED_LABEL = 0x10;
@@ -154,7 +155,7 @@
         String strBw = link.annotations().value(BANDWIDTH);
         if (strBw != null) {
             try {
-                bandwidth = BandwidthResource.mbps(Double.parseDouble(strBw));
+                bandwidth = new BandwidthResource(Bandwidth.mbps(Double.parseDouble(strBw)));
             } catch (NumberFormatException e) {
                 // do nothings
                 bandwidth = null;
@@ -237,7 +238,8 @@
                         }
                     }
 
-                    free.put(type, Sets.newHashSet(new BandwidthResourceAllocation(BandwidthResource.bps(freeBw))));
+                    free.put(type, Sets.newHashSet(
+                            new BandwidthResourceAllocation(new BandwidthResource(Bandwidth.bps(freeBw)))));
                     break;
                 case LAMBDA:
                     Set<? extends ResourceAllocation> lmd = caps.get(type);