/*
 * Copyright 2015 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.net.intent.impl;

import com.google.common.collect.Maps;
import org.onlab.util.AbstractAccumulator;
import org.onosproject.net.intent.IntentBatchDelegate;
import org.onosproject.net.intent.IntentData;

import java.util.List;
import java.util.Map;
import java.util.Timer;

/**
 * An accumulator for building batches of intent operations. Only one batch should
 * be in process per instance at a time.
 */
public class IntentAccumulator extends AbstractAccumulator<IntentData> {

    private static final int DEFAULT_MAX_EVENTS = 1000;
    private static final int DEFAULT_MAX_IDLE_MS = 10;
    private static final int DEFAULT_MAX_BATCH_MS = 50;

    // FIXME: Replace with a system-wide timer instance;
    // TODO: Convert to use HashedWheelTimer or produce a variant of that; then decide which we want to adopt
    private static final Timer TIMER = new Timer("intent-op-batching");

    private final IntentBatchDelegate delegate;

    /**
     * Creates an intent operation accumulator.
     */
    protected IntentAccumulator(IntentBatchDelegate delegate) {
        super(TIMER, DEFAULT_MAX_EVENTS, DEFAULT_MAX_BATCH_MS, DEFAULT_MAX_IDLE_MS);
        this.delegate = delegate;
    }

    @Override
    public void processEvents(List<IntentData> ops) {
        Map<String, IntentData> opMap = reduce(ops);
        delegate.execute(opMap.values());
        // FIXME kick off the work
        //for (IntentData data : opMap.values()) {}
    }

    private Map<String, IntentData> reduce(List<IntentData> ops) {
        Map<String, IntentData> map = Maps.newHashMap();
        for (IntentData op : ops) {
            map.put(op.key(), op);
        }
        //TODO check the version... or maybe store will handle this.
        return map;
    }
}

@@ -829,16 +829,45 @@
 tData;%0A%0A
+import java.util.Collection;%0A
 import j
@@ -1917,61 +1917,8 @@
 ) %7B%0A
-        Map%3CString, IntentData%3E opMap = reduce(ops);%0A
     
@@ -1938,29 +1938,26 @@
 execute(
-opMap.values(
+reduce(ops
 ));%0A    
@@ -2058,28 +2058,27 @@
 private 
-Map%3CString, 
+Collection%3C
 IntentDa
@@ -2337,16 +2337,25 @@
 turn map
+.values()
 ;%0A    %7D%0A

Change the return type of IntentAccumulator.reduce()