tool-config: Separate tool config HasTypeMapper into trait as well

runtime-parent/runtime-field/src/main/java/com/speedment/runtime/field/trait/HasTypeMapper.java

@@ -16,15 +16,13 @@
  */
 package com.speedment.runtime.field.trait;
 
-
 import com.speedment.runtime.typemapper.TypeMapper;
 
 /**
  *
  * @author Emil Forslund
  * @since  3.0.0
  */
-
 public interface HasTypeMapper {
 
     /**

tool-parent/tool-config/src/main/java/com/speedment/tool/config/ColumnProperty.java

@@ -25,8 +25,6 @@
 import com.speedment.tool.config.trait.*;
 import java.util.List;
 import java.util.Optional;
-import static javafx.beans.binding.Bindings.createObjectBinding;
-import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.StringProperty;
 
@@ -43,6 +41,7 @@ public final class ColumnProperty
         HasNameProperty,
         HasAliasProperty,
         HasNullableProperty,
+        HasTypeMapperProperty,
         HasOrdinalPositionProperty {
 
     public ColumnProperty(Table parent) {
@@ -62,15 +61,6 @@ public BooleanProperty autoIncrementProperty() {
     public boolean isAutoIncrement() {
         return autoIncrementProperty().get();
     }
-
-    public StringProperty typeMapperProperty() {
-        return stringPropertyOf(TYPE_MAPPER, () -> Column.super.getTypeMapper().orElse(null));
-    }
-
-    @Override
-    public Optional<String> getTypeMapper() {
-        return Optional.ofNullable(typeMapperProperty().get());
-    }
 
     public StringProperty enumConstantsProperty() {
         return stringPropertyOf(ENUM_CONSTANTS, () -> Column.super.getEnumConstants().orElse(null));
@@ -80,23 +70,6 @@ public StringProperty enumConstantsProperty() {
     public Optional<String> getEnumConstants() {
         return Optional.ofNullable(enumConstantsProperty().get());
     }
-    @Override
-    public String getDatabaseType() {
-        return databaseTypeProperty().get();
-    }
-
-    public StringProperty databaseTypeProperty() {
-        return stringPropertyOf(DATABASE_TYPE, Column.super::getDatabaseType);
-    }
-
-    public ObjectBinding<Class<?>> databaseTypeObjectProperty() {
-        return createObjectBinding(Column.super::findDatabaseType, databaseTypeProperty());
-    }
-
-    @Override
-    public Class<?> findDatabaseType() {
-        return databaseTypeObjectProperty().get();
-    }
 
     @Override
     public ColumnPropertyMutator mutator() {

tool-parent/tool-config/src/main/java/com/speedment/tool/config/mutator/ColumnPropertyMutator.java

@@ -16,7 +16,6 @@
  */
 package com.speedment.tool.config.mutator;
 
-
 import com.speedment.runtime.config.mutator.ColumnMutator;
 import com.speedment.tool.config.ColumnProperty;
 import com.speedment.tool.config.mutator.trait.HasAliasPropertyMutator;
@@ -29,7 +28,6 @@
  * @author  Emil Forslund
  * @since   2.3.0
  */
-
 public final class ColumnPropertyMutator extends ColumnMutator<ColumnProperty> implements 
         HasEnabledPropertyMutator<ColumnProperty>, 
         HasNamePropertyMutator<ColumnProperty>, 

tool-parent/tool-config/src/main/java/com/speedment/tool/config/mutator/trait/HasOrderTypePropertyMutator.java

@@ -16,7 +16,6 @@
  */
 package com.speedment.tool.config.mutator.trait;
 
-
 import com.speedment.runtime.config.mutator.trait.HasOrderTypeMutator;
 import com.speedment.runtime.config.parameter.OrderType;
 import com.speedment.tool.config.trait.HasOrderTypeProperty;
@@ -28,8 +27,8 @@
  * @author  Emil Forslund
  * @since   2.3.0
  */
-
-public interface HasOrderTypePropertyMutator<DOC extends HasOrderTypeProperty> extends HasOrderTypeMutator<DOC> {
+public interface HasOrderTypePropertyMutator<DOC extends HasOrderTypeProperty> 
+extends HasOrderTypeMutator<DOC> {
 
     @Override
     default void setOrderType(OrderType orderType) {

tool-parent/tool-config/src/main/java/com/speedment/tool/config/trait/HasIconPath.java

@@ -16,14 +16,11 @@
  */
 package com.speedment.tool.config.trait;
 
-
-
 /**
  *
  * @author  Emil Forslund
  * @since   2.3.0
  */
-
 public interface HasIconPath {
     String getIconPath();
 }

tool-parent/tool-config/src/main/java/com/speedment/tool/config/trait/HasNullableProperty.java

@@ -33,7 +33,6 @@
  * @author  Emil Forslund
  * @since   2.3.0
  */
-
 public interface HasNullableProperty extends DocumentProperty, HasNullable {
 
     /**

tool-parent/tool-config/src/main/java/com/speedment/tool/config/trait/HasTypeMapperProperty.java

@@ -0,0 +1,56 @@
+package com.speedment.tool.config.trait;
+
+import com.speedment.runtime.config.trait.HasTypeMapper;
+import static com.speedment.runtime.config.trait.HasTypeMapper.DATABASE_TYPE;
+import static com.speedment.runtime.config.trait.HasTypeMapper.TYPE_MAPPER;
+import com.speedment.tool.config.DocumentProperty;
+import java.util.Optional;
+import static javafx.beans.binding.Bindings.createObjectBinding;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.property.StringProperty;
+
+/**
+ * A trait for documents that have a {@code TypeMapper} specified. This 
+ * corresponds to the {@link HasTypeMapper} trait but for observable documents.
+ * 
+ * @author Emil Forslund
+ * @since  3.0.2
+ */
+public interface HasTypeMapperProperty extends DocumentProperty, HasTypeMapper {
+
+    default StringProperty typeMapperProperty() {
+        return stringPropertyOf(TYPE_MAPPER, 
+            () -> HasTypeMapper.super.getTypeMapper().orElse(null)
+        );
+    }
+
+    @Override
+    default Optional<String> getTypeMapper() {
+        return Optional.ofNullable(typeMapperProperty().get());
+    }
+
+    @Override
+    default String getDatabaseType() {
+        return databaseTypeProperty().get();
+    }
+
+    @Override
+    default Class<?> findDatabaseType() {
+        return databaseTypeObjectProperty().get();
+    }
+
+    default StringProperty databaseTypeProperty() {
+        return stringPropertyOf(
+            DATABASE_TYPE, 
+            HasTypeMapper.super::getDatabaseType
+        );
+    }
+
+    default ObjectBinding<Class<?>> databaseTypeObjectProperty() {
+        return createObjectBinding(
+            HasTypeMapper.super::findDatabaseType, 
+            databaseTypeProperty()
+        );
+    }
+
+}