Refactor API third step (fields).

src/main/java/com/speedment/core/entity/BaseEntity.java → src/main/java/com/speedment/api/Entity.java

@@ -14,21 +14,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.core.entity;
+package com.speedment.api;
 
-import com.speedment.core.exception.SpeedmentException;
-import com.speedment.core.encoder.JsonEncoder;
-import com.speedment.core.manager.metaresult.MetaResult;
+import com.speedment.api.db.MetaResult;
+import com.speedment.api.annotation.Api;
+import com.speedment.api.exception.SpeedmentException;
+import com.speedment.core.field.encoder.JsonEncoder;
 import java.util.function.Consumer;
 
 /**
  * This interface contains the common methods that are the same for all
  * entities. Do not assume that an entity must implement this interface.
  *
- * @author pemi
- * @param <ENTITY> type
+ * @author          pemi, Emil Forslund
+ * @param <ENTITY>  type
  */
-public interface BaseEntity<ENTITY> {
+@Api(version = "2.1")
+public interface Entity<ENTITY> {
 
     /**
      * Creates and returns a new copy of this entity.

src/main/java/com/speedment/api/HasSpeedment.java

@@ -1,9 +1,28 @@
+/**
+ *
+ * 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.api;
 
+import com.speedment.api.annotation.Api;
+
 /**
  *
  * @author pemi
  */
+@Api(version = "2.1")
 public interface HasSpeedment {
     Speedment getSpeedment();
 }

src/main/java/com/speedment/api/Manager.java

@@ -16,12 +16,12 @@
  */
 package com.speedment.api;
 
+import com.speedment.api.db.MetaResult;
 import com.speedment.api.annotation.Api;
 import com.speedment.api.config.Column;
 import com.speedment.api.config.Table;
-import com.speedment.core.exception.SpeedmentException;
-import com.speedment.core.lifecycle.Lifecyclable;
-import com.speedment.core.manager.metaresult.MetaResult;
+import com.speedment.api.exception.SpeedmentException;
+import com.speedment.core.runtime.Lifecyclable;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 

src/main/java/com/speedment/api/Speedment.java

@@ -18,7 +18,7 @@
 
 import com.speedment.core.platform.component.Component;
 import com.speedment.api.annotation.Api;
-import com.speedment.core.exception.SpeedmentException;
+import com.speedment.api.exception.SpeedmentException;
 
 /**
  * The {@code Platform} class acts as a generic holder of different system

src/main/java/com/speedment/api/config/Column.java

@@ -21,7 +21,7 @@
 import com.speedment.api.annotation.External;
 import com.speedment.api.config.aspects.Child;
 import com.speedment.api.config.aspects.Enableable;
-import com.speedment.core.config.impl.ColumnImpl;
+import com.speedment.core.config.ColumnImpl;
 import com.speedment.api.config.aspects.ColumnCompressionTypeable;
 import com.speedment.api.config.aspects.FieldStorageTypeable;
 import java.util.Optional;

src/main/java/com/speedment/api/config/Dbms.java

@@ -18,13 +18,12 @@
 
 import com.speedment.api.Speedment;
 import com.speedment.api.annotation.Api;
-import com.speedment.core.config.impl.utils.ConfigUtil;
 import com.speedment.api.annotation.External;
 import com.speedment.api.config.aspects.Parent;
 import com.speedment.api.config.aspects.Child;
 import com.speedment.api.config.aspects.Enableable;
 import com.speedment.api.config.aspects.DbmsTypeable;
-import com.speedment.core.config.impl.DbmsImpl;
+import com.speedment.core.config.DbmsImpl;
 import groovy.lang.Closure;
 import java.util.Optional;
 import java.util.function.Function;
@@ -57,7 +56,7 @@ static void setSupplier(Function<Speedment, Dbms> provider) {
     /**
      * Creates a new instance implementing this interface by using the class
      * supplied by the default factory. To change implementation, please use the
-     * {@link #setSupplier(java.util.function.Supplier) setSupplier} method.
+     * {@link #setSupplier(java.util.function.Function) setSupplier} method.
      *
      * @param speedment  the {@link Speedment} instance
      * @return           the new instance

src/main/java/com/speedment/api/config/ForeignKey.java

@@ -17,11 +17,10 @@
 package com.speedment.api.config;
 
 import com.speedment.api.annotation.Api;
-import com.speedment.core.config.impl.utils.ConfigUtil;
 import com.speedment.api.config.aspects.Parent;
 import com.speedment.api.config.aspects.Child;
 import com.speedment.api.config.aspects.Enableable;
-import com.speedment.core.config.impl.ForeignKeyImpl;
+import com.speedment.core.config.ForeignKeyImpl;
 import groovy.lang.Closure;
 import java.util.function.Supplier;
 

src/main/java/com/speedment/api/config/ForeignKeyColumn.java

@@ -22,8 +22,8 @@
 import com.speedment.api.config.aspects.Child;
 import com.speedment.api.config.aspects.Columnable;
 import com.speedment.api.config.aspects.Enableable;
-import com.speedment.core.config.impl.ForeignKeyColumnImpl;
-import com.speedment.core.exception.SpeedmentException;
+import com.speedment.core.config.ForeignKeyColumnImpl;
+import com.speedment.api.exception.SpeedmentException;
 import java.util.function.Supplier;
 
 /**

src/main/java/com/speedment/api/config/Index.java

@@ -17,12 +17,11 @@
 package com.speedment.api.config;
 
 import com.speedment.api.annotation.Api;
-import com.speedment.core.config.impl.utils.ConfigUtil;
 import com.speedment.api.annotation.External;
 import com.speedment.api.config.aspects.Parent;
 import com.speedment.api.config.aspects.Child;
 import com.speedment.api.config.aspects.Enableable;
-import com.speedment.core.config.impl.IndexImpl;
+import com.speedment.core.config.IndexImpl;
 import groovy.lang.Closure;
 import java.util.function.Supplier;
 

src/main/java/com/speedment/api/config/IndexColumn.java

@@ -21,8 +21,8 @@
 import com.speedment.api.config.aspects.Child;
 import com.speedment.api.config.aspects.Columnable;
 import com.speedment.api.config.aspects.Enableable;
-import com.speedment.core.config.impl.IndexColumnImpl;
 import com.speedment.api.config.aspects.OrderTypeable;
+import com.speedment.core.config.IndexColumnImpl;
 import java.util.function.Supplier;
 
 /**

src/main/java/com/speedment/api/config/Node.java

@@ -21,6 +21,7 @@
 import com.speedment.api.config.aspects.Nameable;
 import com.speedment.api.config.aspects.Parent;
 import com.speedment.api.annotation.Api;
+import com.speedment.api.config.aspects.Ordinable;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Stream;

src/main/java/com/speedment/api/config/PrimaryKeyColumn.java

@@ -21,7 +21,7 @@
 import com.speedment.api.config.aspects.Child;
 import com.speedment.api.config.aspects.Columnable;
 import com.speedment.api.config.aspects.Enableable;
-import com.speedment.core.config.impl.PrimaryKeyColumnImpl;
+import com.speedment.core.config.PrimaryKeyColumnImpl;
 import java.util.function.Supplier;
 
 /**

src/main/java/com/speedment/api/config/Project.java

@@ -19,12 +19,11 @@
 import com.speedment.api.HasSpeedment;
 import com.speedment.api.Speedment;
 import com.speedment.api.annotation.Api;
-import com.speedment.core.config.impl.utils.ConfigUtil;
 import com.speedment.api.annotation.External;
 import com.speedment.api.config.aspects.Parent;
 import com.speedment.api.config.aspects.Child;
 import com.speedment.api.config.aspects.Enableable;
-import com.speedment.core.config.impl.ProjectImpl;
+import com.speedment.core.config.ProjectImpl;
 import groovy.lang.Closure;
 import java.nio.file.Path;
 import java.util.Optional;
@@ -58,7 +57,7 @@ static void setSupplier(Function<Speedment, Project> provider) {
     /**
      * Creates a new instance implementing this interface by using the class
      * supplied by the default factory. To change implementation, please use the
-     * {@link #setSupplier(java.util.function.Supplier) setSupplier} method.
+     * {@link #setSupplier(java.util.function.Function) setSupplier} method.
      *
      * @return the new instance
      */

src/main/java/com/speedment/api/config/Schema.java

@@ -17,12 +17,11 @@
 package com.speedment.api.config;
 
 import com.speedment.api.annotation.Api;
-import com.speedment.core.config.impl.utils.ConfigUtil;
 import com.speedment.api.annotation.External;
 import com.speedment.api.config.aspects.Parent;
 import com.speedment.api.config.aspects.Child;
 import com.speedment.api.config.aspects.Enableable;
-import com.speedment.core.config.impl.SchemaImpl;
+import com.speedment.core.config.SchemaImpl;
 import com.speedment.api.config.aspects.ColumnCompressionTypeable;
 import com.speedment.api.config.aspects.FieldStorageTypeable;
 import com.speedment.api.config.aspects.StorageEngineTypeable;

src/main/java/com/speedment/api/config/Table.java

@@ -17,15 +17,14 @@
 package com.speedment.api.config;
 
 import com.speedment.api.annotation.Api;
-import com.speedment.core.config.impl.utils.ConfigUtil;
 import com.speedment.api.annotation.External;
 import com.speedment.api.config.aspects.Parent;
 import com.speedment.api.config.aspects.Child;
 import com.speedment.api.config.aspects.Enableable;
-import com.speedment.core.config.impl.TableImpl;
 import com.speedment.api.config.aspects.ColumnCompressionTypeable;
 import com.speedment.api.config.aspects.FieldStorageTypeable;
 import com.speedment.api.config.aspects.StorageEngineTypeable;
+import com.speedment.core.config.TableImpl;
 import groovy.lang.Closure;
 import java.util.Optional;
 import java.util.function.Supplier;
@@ -145,10 +144,7 @@ default Class<Schema> getParentInterfaceMainClass() {
      * @param c Closure
      * @return the new Column
      */
-    // DO NOT REMOVE, CALLED VIA REFLECTION
-    default Column column(Closure<?> c) {
-        return ConfigUtil.groovyDelegatorHelper(c, this::addNewColumn);
-    }
+    Column column(Closure<?> c);
 
     /**
      * Creates and returns a new Index.
@@ -158,10 +154,7 @@ default Column column(Closure<?> c) {
      * @param c Closure
      * @return the new Index
      */
-    // DO NOT REMOVE, CALLED VIA REFLECTION
-    default Index index(Closure<?> c) {
-        return ConfigUtil.groovyDelegatorHelper(c, this::addNewIndex);
-    }
+    Index index(Closure<?> c);
 
     /**
      * Creates and returns a new ForeignKey.
@@ -171,10 +164,7 @@ default Index index(Closure<?> c) {
      * @param c Closure
      * @return the new ForeignKey
      */
-    // DO NOT REMOVE, CALLED VIA REFLECTION
-    default ForeignKey foreignKey(Closure<?> c) {
-        return ConfigUtil.groovyDelegatorHelper(c, this::addNewForeignKey);
-    }
+    ForeignKey foreignKey(Closure<?> c);
 
     /**
      * Creates and returns a new PrimaryKeyColumn.

src/main/java/com/speedment/api/config/aspects/Parent.java

@@ -18,7 +18,7 @@
 
 import com.speedment.api.config.Node;
 import com.speedment.api.annotation.Api;
-import com.speedment.core.config.impl.ChildHolder;
+import com.speedment.core.config.ChildHolder;
 import java.util.Optional;
 import java.util.stream.Stream;
 

src/main/java/com/speedment/api/config/parameters/DbmsType.java

@@ -19,7 +19,7 @@
 import com.speedment.api.Speedment;
 import com.speedment.api.annotation.Api;
 import com.speedment.api.config.Dbms;
-import com.speedment.core.db.DbmsHandler;
+import com.speedment.api.db.DbmsHandler;
 import java.util.Optional;
 import java.util.Set;
 

src/main/java/com/speedment/core/db/AsynchronousQueryResult.java → src/main/java/com/speedment/api/db/AsynchronousQueryResult.java

@@ -14,8 +14,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.core.db;
+package com.speedment.api.db;
 
+import com.speedment.api.annotation.Api;
 import java.sql.ResultSet;
 import java.util.List;
 import java.util.function.Function;
@@ -26,6 +27,7 @@
  * @author pemi
  * @param <T> The type that the ResultSet shall be mapped to
  */
+@Api(version = "2.1")
 public interface AsynchronousQueryResult<T> extends AutoCloseable {
 
     Stream<T> stream();

src/main/java/com/speedment/core/db/DbmsHandler.java → src/main/java/com/speedment/api/db/DbmsHandler.java

@@ -14,11 +14,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.core.db;
+package com.speedment.api.db;
 
+import com.speedment.api.annotation.Api;
 import com.speedment.api.config.Dbms;
 import com.speedment.api.config.Schema;
-import com.speedment.core.db.impl.SqlFunction;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collections;
@@ -34,6 +34,7 @@
  * @author pemi
  * @since 2.0
  */
+@Api(version = "2.1")
 public interface DbmsHandler {
 
     /**

src/main/java/com/speedment/core/manager/metaresult/MetaResult.java → src/main/java/com/speedment/api/db/MetaResult.java

@@ -14,19 +14,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.core.manager.metaresult;
+package com.speedment.api.db;
 
+import com.speedment.api.annotation.Api;
 import java.util.Optional;
 
 /**
  *
  * @author pemi
  * @param <ENTITY> the entity type
  */
+@Api(version = "2.1")
 public interface MetaResult<ENTITY> {
 
-    default Optional<SqlMetaResult<ENTITY>> getSqlMetaResult() {
+    default Optional<? extends SqlMetaResult<ENTITY, ?>> getSqlMetaResult() {
         return Optional.empty();
     }
 
-}
+}

src/main/java/com/speedment/core/db/impl/SqlFunction.java → src/main/java/com/speedment/api/db/SqlFunction.java

@@ -14,9 +14,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.core.db.impl;
+package com.speedment.api.db;
 
-import com.speedment.core.exception.SpeedmentException;
+import com.speedment.api.annotation.Api;
+import com.speedment.api.exception.SpeedmentException;
 import java.sql.SQLException;
 import java.util.Objects;
 import java.util.function.Function;
@@ -27,6 +28,7 @@
  * @param <T> Input type
  * @param <R> Result type
  */
+@Api(version = "2.1")
 @FunctionalInterface
 public interface SqlFunction<T, R> {
 
@@ -59,5 +61,4 @@ default <V> SqlFunction<T, V> andThen(SqlFunction<? super R, ? extends V> after)
     static <T> SqlFunction<T, T> identity() {
         return (T t) -> t;
     }
-
-}
+}