Fix perf regression by reverting https://gerrit.onosproject.org/#/c/3801/

Change-Id: Ia6930f53f1f7258a711b10ee648bc9024788117e

@@ -19,16 +19,13 @@ import org.onosproject.core.IdBlock;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.core.UnavailableIdException;
 import org.onosproject.core.UnavailableIdException;
 
 
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-
 /**
 /**
  * Base class of {@link IdGenerator} implementations which use {@link IdBlockAllocator} as
  * Base class of {@link IdGenerator} implementations which use {@link IdBlockAllocator} as
  * backend.
  * backend.
  */
  */
 public class BlockAllocatorBasedIdGenerator implements IdGenerator {
 public class BlockAllocatorBasedIdGenerator implements IdGenerator {
     protected final IdBlockAllocator allocator;
     protected final IdBlockAllocator allocator;
-    protected Supplier<IdBlock> idBlock;
+    protected IdBlock idBlock;
 
 
     /**
     /**
      * Constructs an ID generator which use {@link IdBlockAllocator} as backend.
      * Constructs an ID generator which use {@link IdBlockAllocator} as backend.
@@ -37,17 +34,17 @@ public class BlockAllocatorBasedIdGenerator implements IdGenerator {
      */
      */
     protected BlockAllocatorBasedIdGenerator(IdBlockAllocator allocator) {
     protected BlockAllocatorBasedIdGenerator(IdBlockAllocator allocator) {
         this.allocator = allocator;
         this.allocator = allocator;
-        this.idBlock = Suppliers.memoize(allocator::allocateUniqueIdBlock);
+        this.idBlock = allocator.allocateUniqueIdBlock();
     }
     }
 
 
     @Override
     @Override
     public long getNewId() {
     public long getNewId() {
         try {
         try {
-            return idBlock.get().getNextId();
+            return idBlock.getNextId();
         } catch (UnavailableIdException e) {
         } catch (UnavailableIdException e) {
             synchronized (allocator) {
             synchronized (allocator) {
-                idBlock = Suppliers.memoize(allocator::allocateUniqueIdBlock);
-                return idBlock.get().getNextId();
+                idBlock = allocator.allocateUniqueIdBlock();
+                return idBlock.getNextId();
             }
             }
         }
         }
     }
     }