First version of AbstractManager is ready

src/main/java/com/speedment/orm/code/model/java/entity/EntityManagerTranslator.java

@@ -16,6 +16,7 @@
  */
 package com.speedment.orm.code.model.java.entity;
 
+import static com.speedment.codegen.Formatting.*;
 import com.speedment.codegen.base.CodeGenerator;
 import com.speedment.codegen.lang.models.Field;
 import com.speedment.codegen.lang.models.File;
@@ -25,7 +26,9 @@
 import com.speedment.codegen.lang.models.Type;
 import static com.speedment.codegen.lang.models.constants.DefaultAnnotationUsage.OVERRIDE;
 import static com.speedment.codegen.lang.models.constants.DefaultAnnotationUsage.SUPPRESS_WARNINGS_UNCHECKED;
+import static com.speedment.codegen.lang.models.constants.DefaultType.OBJECT;
 import static com.speedment.codegen.lang.models.constants.DefaultType.STRING;
+import com.speedment.orm.config.model.Column;
 import com.speedment.orm.config.model.Table;
 import com.speedment.orm.core.manager.Manager;
 import com.speedment.orm.platform.Platform;
@@ -49,7 +52,7 @@ protected Interface make(File file) {
             .public_()
             .add(Type.of(Manager.class).add(GENERIC_OF_PK).add(GENERIC_OF_ENTITY).add(GENERIC_OF_BUILDER))
 
-            .add(primaryKeyFor(file))
+            .add(generatePrimaryKeyFor(file))
 
             .add(Method.of("getTableName", STRING).default_().add(OVERRIDE)
                 .add("return \"" + table().getRelativeName(project()) + "\";"))
@@ -63,6 +66,8 @@ protected Interface make(File file) {
             .add(Method.of("getBuilderClass", Type.of(Class.class).add(GENERIC_OF_BUILDER)).default_().add(OVERRIDE)
                 .add("return " + BUILDER.getName() + ".class;"))
 
+            .add(generateGet(file))
+
             .call(i -> file.add(Import.of(Type.of(Platform.class))))
             .call(i -> file.add(Import.of(Type.of(ManagerComponent.class))))
             .add(Method.of("get", MANAGER.getType()).static_().add(SUPPRESS_WARNINGS_UNCHECKED)
@@ -72,7 +77,7 @@ protected Interface make(File file) {
             ;
     }
 
-    protected Method primaryKeyFor(File file) {
+    protected Method generatePrimaryKeyFor(File file) {
         final Method method = Method.of("primaryKeyFor", typeOfPK()).default_().add(OVERRIDE)
             .add(Field.of("entity", ENTITY.getType()));
 
@@ -88,6 +93,17 @@ protected Method primaryKeyFor(File file) {
 
         return method;
     }
+
+    protected Method generateGet(File file) {
+        file.add(Import.of(Type.of(IllegalArgumentException.class)));
+        return Method.of("get", OBJECT).default_().add(OVERRIDE)
+            .add(Field.of("entity", ENTITY.getType()))
+            .add(Field.of("column", Type.of(Column.class)))
+            .add("switch (column.getName()) " + block(
+                columns().map(c -> "case \"" + variableName(c) + "\" : return entity.get" + typeName(c) + "();").collect(Collectors.joining(nl())) 
+                    + nl() + "default : throw new IllegalArgumentException(\"Unknown column '\" + column.getName() + \"'.\");"
+            ));
+    }
 
     @Override
     protected String getJavadocRepresentText() {

src/main/java/com/speedment/orm/core/manager/AbstractManager.java

@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -17,4 +18,35 @@ public abstract class AbstractManager<PK, ENTITY, BUILDER extends Buildable<ENTI
     public AbstractManager() {
         indexes = new ConcurrentHashMap<>();
     }
+
+    @Override
+    public void insert(ENTITY entity) {
+        indexes.entrySet().stream().forEach(e -> {
+            e.getValue().put(makeKey(e.getKey(), entity), entity);
+        });
+    }
+
+    @Override
+    public void update(ENTITY entity) {
+        //TODO Make atomic.
+        delete(entity);
+        insert(entity);
+    }
+
+    @Override
+    public void delete(ENTITY entity) {
+        indexes.entrySet().stream().forEach(e -> {
+            e.getValue().remove(makeKey(e.getKey(), entity));
+        });
+    }
+
+    private Object makeKey(List<Column> columns, ENTITY entity) {
+        if (columns.size() == 1) {
+            return get(entity, columns.get(0));
+        } else {
+            return columns.stream()
+                .map(c -> get(entity, c))
+                .collect(Collectors.toList());
+        }
+    }
 }

src/main/java/com/speedment/orm/core/manager/IndexHolder.java

@@ -6,7 +6,7 @@
  *
  * @author Emil Forslund
  */
-public interface IndexHolder<KEY, ENTITY> {
+public interface IndexHolder<KEY, PK, ENTITY> {
 
     Stream<ENTITY> stream();
 

src/main/java/com/speedment/orm/core/manager/KeyIndexHolder.java

@@ -1,5 +1,6 @@
 package com.speedment.orm.core.manager;
 
+import com.speedment.orm.core.Buildable;
 import static com.speedment.util.stream.StreamUtil.streamOfNullable;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -9,27 +10,30 @@
  *
  * @author Emil Forslund
  */
-public class KeyIndexHolder<KEY, ENTITY> implements IndexHolder<KEY, ENTITY> {
+public class KeyIndexHolder<KEY, PK, ENTITY> implements IndexHolder<KEY, PK, ENTITY> {
 
-    private final Map<KEY, ENTITY> entities;
+    private final Manager<PK, ENTITY, Buildable<ENTITY>> manager;
+    private final Map<KEY, Map<PK, ENTITY>> entities;
 
-    public KeyIndexHolder() {
-        entities = new ConcurrentHashMap<>();
+    public KeyIndexHolder(Manager<PK, ENTITY, Buildable<ENTITY>> manager) {
+        this.manager  = manager;
+        this.entities = new ConcurrentHashMap<>();
     }
 
     @Override
     public Stream<ENTITY> stream() {
-        return entities.values().stream();
+        return entities.values().stream().flatMap(e -> e.values().stream());
     }
 
     @Override
     public Stream<ENTITY> stream(KEY key) {
-        return streamOfNullable(entities.get(key));
+        return streamOfNullable(entities.get(key)).flatMap(e -> e.values().stream());
     }
 
     @Override
     public void put(KEY key, ENTITY entity) {
-        entities.put(key, entity);
+        entities.computeIfAbsent(key, k -> new ConcurrentHashMap<>())
+            .put(manager.primaryKeyFor(entity), entity);
     }
 
     @Override

src/main/java/com/speedment/orm/core/manager/Manager.java

@@ -22,6 +22,7 @@
 package com.speedment.orm.core.manager;
 
 import com.speedment.orm.annotations.Api;
+import com.speedment.orm.config.model.Column;
 import com.speedment.orm.config.model.Table;
 import com.speedment.orm.core.Buildable;
 import java.util.stream.Stream;
@@ -33,19 +34,15 @@
 @Api(version = 0)
 public interface Manager<PK, ENTITY, BUILDER extends Buildable<ENTITY>> {
 
+    // Inspection
     PK primaryKeyFor(ENTITY entity);
 
-    String getTableName();
+    Object get(ENTITY entity, Column column);
 
     // Metadata
     Table getTable();
-
-    // Entity Mapping
-//    PK primaryKey(ENTITY entity);
-//
-//    BEAN bean(ENTITY entity);
-//
-//    BUILDER builder(ENTITY entity);
+
+    String getTableName(); // TODO Remove.
 
     <M extends Manager<PK, ENTITY, BUILDER>> Class<M> getManagerClass();
 
@@ -56,29 +53,22 @@ public interface Manager<PK, ENTITY, BUILDER extends Buildable<ENTITY>> {
     <B extends BUILDER> B builder();
 
     <B extends BUILDER> B toBuilder(ENTITY model);
-//    
-//    <P extends Persistable<ENTITY>> P persister(Class<P> persistableClass);
-//    
-//    <P extends Persistable<ENTITY>> P persisterOf(Class<P> persistableClass, ENTITY model);
-
-//    ENTITY entity(ENTITY prototype);
-//
-//    ENTITY newEntity();
 
     // Retrieval
     Stream<ENTITY> stream();
 
     default long size() {
         return stream().count();
     }
+
+    // Add and remove
+    void insert(ENTITY entity);
+
+    void update(ENTITY entity);
+
+    void delete(ENTITY primaryKey);
 
     // Persistence
-//    T insert(T entity);
-//
-//    T update(T entity);
-//
-//    void delete(Object pk);
-//
 //    void load();
 
     ENTITY persist(ENTITY entity);

src/main/java/com/speedment/orm/core/manager/UniqueKeyIndexHolder.java

@@ -9,7 +9,7 @@
  *
  * @author Emil Forslund
  */
-public class UniqueKeyIndexHolder<KEY, ENTITY> implements IndexHolder<KEY, ENTITY> {
+public class UniqueKeyIndexHolder<KEY, PK, ENTITY> implements IndexHolder<KEY, PK, ENTITY> {
 
     private final Map<KEY, ENTITY> entities;