/**
 * @license
 * Copyright 2017 The FOAM Authors. All Rights Reserved.
 * http://www.apache.org/licenses/LICENSE-2.0
 */

package foam.dao;

import foam.core.*;
import foam.mlang.order.Comparator;
import foam.mlang.predicate.Predicate;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;

public class MapDAO
  extends AbstractDAO
{
  protected Map<Object, FObject> data_ = null;

  public MapDAO() {
  }

  public MapDAO(ClassInfo of) {
    setOf(of);
  }

  protected synchronized void data_factory() {
    if ( data_ == null ) {
      data_ = (Map<Object, FObject>) new ConcurrentHashMap();
    }
  }

  protected Map<Object, FObject> getData() {
    if ( data_ == null ) {
      data_factory();
    }
    return data_;
  }

  public void setData(Map<Object, FObject> data) {
    data_ = data;
  }

  public FObject put_(X x, FObject obj) {
    getData().put(getPrimaryKey().get(obj), obj);
    return obj;
  }

  public FObject remove_(X x, FObject obj) {
    getData().remove(getPrimaryKey().get(obj));
    return obj;
  }

  public FObject find_(X x, Object o) {
    return AbstractFObject.maybeClone(
        getOf().isInstance(o)
          ? getData().get(getPrimaryKey().get(o))
          : getData().get(o)
    );
  }

  public Sink select_(X x, Sink sink, long skip, long limit, Comparator order, Predicate predicate) {
    if ( sink == null ) sink = new ListSink();

    Sink         decorated = decorateSink_(sink, skip, limit, order, predicate);
    Subscription sub       = new Subscription();

    for ( FObject obj : getData().values() ) {
      if ( sub.getDetached() ) break;

      if ( predicate == null || predicate.f(obj) ) decorated.put(obj, sub);
    }

    decorated.eof();

    return sink;
  }

  public void pipe_(X x, Sink s) {
    // TODO
  }
}

@@ -904,16 +904,41 @@
 , obj);%0A
+    onPut(obj.fclone());%0A
     retu
@@ -937,32 +937,32 @@
     return obj;%0A
-
   %7D%0A%0A  public FO
@@ -987,32 +987,102 @@
  FObject obj) %7B%0A
+    FObject existing = find_(x, obj);%0A    if ( existing != null ) %7B%0A  
     getData().re
@@ -1109,24 +1109,57 @@
 .get(obj));%0A
+      onRemove(existing);%0A    %7D%0A%0A
     return o

Add events to MapDAO.