Revert "Changed responsibility for creating CrudHandler to Manager"

This reverts commit 5bcdda1.

src/main/java/com/speedment/component/CrudHandlerComponent.java

@@ -0,0 +1,173 @@
+/**
+ *
+ * Copyright (c) 2006-2015, Speedment, Inc. All Rights Reserved.
+ *
+ * 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 com.speedment.component;
+
+import com.speedment.annotation.Api;
+import com.speedment.db.crud.Create;
+import com.speedment.db.crud.Delete;
+import com.speedment.db.crud.Read;
+import com.speedment.db.crud.Result;
+import com.speedment.db.crud.Update;
+import com.speedment.exception.SpeedmentException;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+/**
+ * This component is used to execute CRUD operations generated by Speedment.
+ * For each type of CRUD operation, there is a specific executor that will
+ * consume all events of that type. By setting the executor, you can control
+ * how Speedment stores and reads data.
+ * <p>
+ * The executor should be set by the persistance manager (like the database
+ * manager) before any operations are executed.
+ * 
+ * @author Emil Forslund
+ * @since 2.2
+ */
+@Api(version = "2.2")
+public interface CrudHandlerComponent extends Component {
+
+    /**
+     * Functional interface for something that can execute a {@link Create}
+     * operation and map the results into T using the specified mapper.
+     */
+    @FunctionalInterface
+    interface CreateMethod {
+        <T> T apply(Create create, Function<Result, T> mapper) throws SpeedmentException;
+    }
+
+    /**
+     * Functional interface for something that can execute an {@link Update}
+     * operation and map the results into T using the specified mapper.
+     */
+    @FunctionalInterface
+    interface UpdateMethod {
+        <T> T apply(Update update, Function<Result, T> mapper) throws SpeedmentException;
+    }
+
+    /**
+     * Functional interface for something that can execute a {@link Read}
+     * operation and map the results into T using the specified mapper.
+     */
+    @FunctionalInterface
+    interface ReadMethod {
+        <T> Stream<T> apply(Read read, Function<Result, T> mapper) throws SpeedmentException;
+    }
+
+    /**
+     * Functional interface for something that can execute a {@link Delete}
+     * operation.
+     */
+    @FunctionalInterface
+    interface DeleteMethod {
+        void apply(Delete delete) throws SpeedmentException;
+    }
+
+    /**
+     * Sets the method to use when 
+     * {@link #create(com.speedment.db.crud.Create, java.util.function.Function)} 
+     * is called.
+     * 
+     * @param creator  to use
+     * @return         a reference to this
+     */
+    CrudHandlerComponent setCreator(CreateMethod creator);
+
+    /**
+     * Sets the method to use when 
+     * {@link #update(com.speedment.db.crud.Update, java.util.function.Function)} 
+     * is called.
+     * 
+     * @param updater  to use
+     * @return         a reference to this
+     */
+    CrudHandlerComponent setUpdater(UpdateMethod updater);
+
+    /**
+     * Sets the method to use when 
+     * {@link #delete(com.speedment.db.crud.Delete)} 
+     * is called.
+     * 
+     * @param deleter  to use
+     * @return         a reference to this
+     */
+    CrudHandlerComponent setDeleter(DeleteMethod deleter);
+
+    /**
+     * Sets the method to use when 
+     * {@link #read(com.speedment.db.crud.Read, java.util.function.Function)} 
+     * is called.
+     * 
+     * @param reader  to use
+     * @return        a reference to this
+     */
+    CrudHandlerComponent setReader(ReadMethod reader);
+
+    /**
+     * Executes the specified {@link Create} operation in the database, mapping
+     * the result using the specified mapper.
+     * 
+     * @param <T>                  the expected return type
+     * @param operation            the operation to perform
+     * @param mapper               for the result
+     * @return                     the mapped result
+     * @throws SpeedmentException  if the operation failed
+     */
+    <T> T create(final Create operation, final Function<Result, T> mapper) throws SpeedmentException;
+
+    /**
+     * Executes the specified {@link Update} operation in the database, mapping
+     * the result using the specified mapper.
+     * 
+     * @param <T>                  the expected return type
+     * @param operation            the operation to perform
+     * @param mapper               for the result
+     * @return                     the mapped result
+     * @throws SpeedmentException  if the operation failed
+     */
+    <T> T update(final Update operation, final Function<Result, T> mapper) throws SpeedmentException;
+
+    /**
+     * Executes the specified {@link Delete} operation in the database, mapping
+     * the result using the specified mapper.
+     * 
+     * @param <T>                  the expected return type
+     * @param operation            the operation to perform
+     * @throws SpeedmentException  if the operation failed
+     */
+    <T> void delete(final Delete operation) throws SpeedmentException;
+
+    /**
+     * Executes the specified {@link Read} operation in the database, mapping
+     * the result using the specified mapper.
+     * 
+     * @param <T>                  the expected return type
+     * @param operation            the operation to perform
+     * @param mapper               for the result
+     * @return                     the mapped result
+     * @throws SpeedmentException  if the operation failed
+     */
+    <T> Stream<T> read(final Read operation, final Function<Result, T> mapper) throws SpeedmentException;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    default Class<CrudHandlerComponent> getComponentClass() {
+        return CrudHandlerComponent.class;
+    }
+}

src/main/java/com/speedment/db/CrudHandler.java

@@ -17,15 +17,6 @@
 package com.speedment.db;
 
 import com.speedment.annotation.Api;
-import com.speedment.config.Dbms;
-import com.speedment.db.crud.Create;
-import com.speedment.db.crud.Delete;
-import com.speedment.db.crud.Read;
-import com.speedment.db.crud.Result;
-import com.speedment.db.crud.Update;
-import com.speedment.exception.SpeedmentException;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  *
@@ -34,52 +25,5 @@
  */
 @Api(version = "2.2")
 public interface CrudHandler {
-
-    Dbms getDbms();
-
-    /**
-     * Executes the specified {@link Create} operation in the database, mapping
-     * the result using the specified mapper.
-     * 
-     * @param <T>                  the expected return type
-     * @param operation            the operation to perform
-     * @param mapper               for the result
-     * @return                     the mapped result
-     * @throws SpeedmentException  if the operation failed
-     */
-    <T> T create(final Create operation, final Function<Result, T> mapper) throws SpeedmentException;
-
-    /**
-     * Executes the specified {@link Update} operation in the database, mapping
-     * the result using the specified mapper.
-     * 
-     * @param <T>                  the expected return type
-     * @param operation            the operation to perform
-     * @param mapper               for the result
-     * @return                     the mapped result
-     * @throws SpeedmentException  if the operation failed
-     */
-    <T> T update(final Update operation, final Function<Result, T> mapper) throws SpeedmentException;
-
-    /**
-     * Executes the specified {@link Delete} operation in the database, mapping
-     * the result using the specified mapper.
-     * 
-     * @param <T>                  the expected return type
-     * @param operation            the operation to perform
-     * @throws SpeedmentException  if the operation failed
-     */
-    <T> void delete(final Delete operation) throws SpeedmentException;
-
-    /**
-     * Executes the specified {@link Read} operation in the database, mapping
-     * the result using the specified mapper.
-     * 
-     * @param <T>                  the expected return type
-     * @param operation            the operation to perform
-     * @param mapper               for the result
-     * @return                     the mapped result
-     * @throws SpeedmentException  if the operation failed
-     */
-    <T> Stream<T> read(final Read operation, final Function<Result, T> mapper) throws SpeedmentException;
+    void setAsPrimary();
 }

src/main/java/com/speedment/internal/core/db/MySqlCrudHandler.java

@@ -41,6 +41,7 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import static java.util.Objects.requireNonNull;
 import java.util.Spliterators;
 import java.util.stream.StreamSupport;
 
@@ -52,23 +53,25 @@
 public final class MySqlCrudHandler extends AbstractCrudHandler {
 
     private static final Logger LOGGER = LoggerManager.getLogger(MySqlCrudHandler.class);
+    private final Dbms dbms;
 
     public MySqlCrudHandler(Speedment speedment, Dbms dbms) {
-        super(speedment, dbms);
+        super(speedment);
+        this.dbms = requireNonNull(dbms);
     }
 
     @Override
-    public <T> T create(Create create, Function<Result, T> mapper) throws SpeedmentException {
+    protected <T> T create(Create create, Function<Result, T> mapper) throws SpeedmentException {
         return executeUpdate(create, mapper);
     }
 
     @Override
-    public <T> T update(Update update, Function<Result, T> mapper) throws SpeedmentException {
+    protected <T> T update(Update update, Function<Result, T> mapper) throws SpeedmentException {
         return executeUpdate(update, mapper);
     }
 
     @Override
-    public void delete(Delete delete) throws SpeedmentException {
+    protected void delete(Delete delete) throws SpeedmentException {
         final PreparedStatement statement = SqlWriter.prepare(getConnection(), delete);
 
         try {
@@ -81,7 +84,7 @@ public void delete(Delete delete) throws SpeedmentException {
     }
 
     @Override
-    public <T> Stream<T> read(Read read, Function<Result, T> mapper) throws SpeedmentException {
+    protected <T> Stream<T> read(Read read, Function<Result, T> mapper) throws SpeedmentException {
         final PreparedStatement statement = SqlWriter.prepare(getConnection(), read);
         try (final ResultSet set = statement.executeQuery()) {
             return StreamSupport.stream(
@@ -139,15 +142,15 @@ private Connection getConnection() {
         final Connection conn;
 
         final String url      = getUrl();
-        final String user     = getDbms().getUsername().orElse(null);
-        final String password = getDbms().getPassword().orElse(null);
+        final String user     = dbms.getUsername().orElse(null);
+        final String password = dbms.getPassword().orElse(null);
 
         try {
             conn = speedment().get(ConnectionPoolComponent.class)
                 .getConnection(url, user, password);
 
         } catch (SQLException sqle) {
-            final String msg = "Unable to get connection for " + getDbms() + " using url \"" + url + "\", user = " + user + ".";
+            final String msg = "Unable to get connection for " + dbms + " using url \"" + url + "\", user = " + user + ".";
             LOGGER.error(sqle, msg);
             throw new SpeedmentException(msg, sqle);
         }
@@ -156,15 +159,15 @@ private Connection getConnection() {
     }
 
     private String getUrl() {
-        final DbmsType dbmsType    = getDbms().getType();
+        final DbmsType dbmsType    = dbms.getType();
         final StringBuilder result = new StringBuilder();
 
         result.append("jdbc:");
         result.append(dbmsType.getJdbcConnectorName());
         result.append("://");
 
-        getDbms().getIpAddress().ifPresent(ip -> result.append(ip));
-        getDbms().getPort().ifPresent(port -> result.append(":").append(port));
+        dbms.getIpAddress().ifPresent(ip -> result.append(ip));
+        dbms.getPort().ifPresent(port -> result.append(":").append(port));
 
         result.append("/");
 

src/main/java/com/speedment/internal/core/manager/AbstractCrudManager.java

@@ -17,11 +17,10 @@
 package com.speedment.internal.core.manager;
 
 import com.speedment.Speedment;
+import com.speedment.component.CrudHandlerComponent;
 import com.speedment.config.Column;
-import com.speedment.config.Dbms;
 import com.speedment.config.PrimaryKeyColumn;
 import com.speedment.config.Table;
-import com.speedment.db.CrudHandler;
 import com.speedment.db.MetaResult;
 import com.speedment.db.crud.Result;
 import com.speedment.db.crud.Selector;
@@ -47,7 +46,7 @@
  */
 public abstract class AbstractCrudManager<ENTITY> extends AbstractManager<ENTITY> {
 
-    private final CrudHandler handler;
+    private final CrudHandlerComponent handler;
     private final Column primaryKeyColumn;
 
     /**
@@ -58,12 +57,7 @@ public abstract class AbstractCrudManager<ENTITY> extends AbstractManager<ENTITY
      */
     protected AbstractCrudManager(Speedment speedment) {
         super(speedment);
-
-        final Dbms dbms = getTable().ancestor(Dbms.class).orElseThrow(
-            () -> new SpeedmentException("Can not instantiate an entity manager without a Dbms.")
-        );
-
-        this.handler          = dbms.getType().makeCrudHandler(speedment, dbms);
+        this.handler          = speedment.get(CrudHandlerComponent.class);
         this.primaryKeyColumn = findColumnOfPrimaryKey(getTable());
     }