/*
 * Copyright 2014 Open Networking Laboratory
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.onosproject.core.impl;

import org.onosproject.core.IdBlock;
import org.onosproject.core.IdGenerator;
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
 * backend.
 */
public class BlockAllocatorBasedIdGenerator implements IdGenerator {
    protected final IdBlockAllocator allocator;
    protected Supplier<IdBlock> idBlock;

    /**
     * Constructs an ID generator which use {@link IdBlockAllocator} as backend.
     *
     * @param allocator the ID block allocator to use
     */
    protected BlockAllocatorBasedIdGenerator(IdBlockAllocator allocator) {
        this.allocator = allocator;
        this.idBlock = Suppliers.memoize(allocator::allocateUniqueIdBlock);
    }

    @Override
    public long getNewId() {
        try {
            return idBlock.get().getNextId();
        } catch (UnavailableIdException e) {
            synchronized (allocator) {
                idBlock = Suppliers.memoize(allocator::allocateUniqueIdBlock);
                return idBlock.get().getNextId();
            }
        }
    }
}

@@ -774,90 +774,8 @@
 n;%0A%0A
-import com.google.common.base.Supplier;%0Aimport com.google.common.base.Suppliers;%0A%0A
 /**%0A
@@ -1016,25 +1016,15 @@
 ted 
-Supplier%3C
 IdBlock
-%3E
  idB
@@ -1322,34 +1322,16 @@
 Block = 
-Suppliers.memoize(
 allocato
@@ -1323,34 +1323,33 @@
 lock = allocator
-::
+.
 allocateUniqueId
@@ -1349,24 +1349,25 @@
 niqueIdBlock
+(
 );%0A    %7D%0A%0A  
@@ -1440,38 +1440,32 @@
  return idBlock.
-get().
 getNextId();%0A   
@@ -1575,26 +1575,8 @@
 k = 
-Suppliers.memoize(
 allo
@@ -1584,10 +1584,9 @@
 ator
-::
+.
 allo
@@ -1602,16 +1602,17 @@
 eIdBlock
+(
 );%0A     
@@ -1641,14 +1641,8 @@
 ock.
-get().
 getN

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