runtime-field: Add FieldComparator with additional metadata

speedment · Nov 10, 2016 · e11ce18 · e11ce18
1 parent 8816f42
commit e11ce18
Show file tree

Hide file tree

Showing 22 changed files with 121 additions and 103 deletions.
diff --git a/...t/runtime-field/src/main/java/com/speedment/runtime/field/comparator/FieldComparator.java b/...t/runtime-field/src/main/java/com/speedment/runtime/field/comparator/FieldComparator.java
@@ -0,0 +1,26 @@
+package com.speedment.runtime.field.comparator;
+
+import com.speedment.runtime.field.trait.HasComparableOperators;
+import java.util.Comparator;
+
+/**
+ * A specialized {@link Comparator} that contains meta data information about 
+ * the field that is being compared.
+ * 
+ * @param <ENTITY>  the entity type
+ * @param <V>       the value type
+ * 
+ * @author Emil Forslund
+ * @since  3.0.2
+ */
+public interface FieldComparator<ENTITY, V extends Comparable<? super V>> 
+extends Comparator<ENTITY> {
+
+    /**
+     * Returns the field that created this comparator.
+     * 
+     * @return  the field
+     */
+    HasComparableOperators<ENTITY, V> getField();
+
+}
diff --git a/...runtime-field/src/main/java/com/speedment/runtime/field/internal/ComparableFieldImpl.java b/...runtime-field/src/main/java/com/speedment/runtime/field/internal/ComparableFieldImpl.java
@@ -18,6 +18,7 @@
 
 import com.speedment.runtime.config.identifier.ColumnIdentifier;
 import com.speedment.runtime.field.ComparableField;
+import com.speedment.runtime.field.comparator.FieldComparator;
 import com.speedment.runtime.field.internal.comparator.NullOrder;
 import com.speedment.runtime.field.internal.comparator.ReferenceFieldComparatorImpl;
 import com.speedment.runtime.field.internal.predicate.reference.*;
@@ -26,13 +27,10 @@
 import com.speedment.runtime.field.predicate.FieldPredicate;
 import com.speedment.runtime.field.predicate.Inclusion;
 import com.speedment.runtime.typemapper.TypeMapper;
-
-import java.util.Comparator;
+import static java.util.Objects.requireNonNull;
 import java.util.Set;
 import java.util.function.Predicate;
 
-import static java.util.Objects.requireNonNull;
-
 /**
  * @param <ENTITY> the entity type
  * @param <D>      the database type
@@ -100,17 +98,17 @@ public boolean isUnique() {
     /*****************************************************************/
 
     @Override
-    public Comparator<ENTITY> comparator() {
+    public FieldComparator<ENTITY, V> comparator() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.NONE);
     }
 
     @Override
-    public Comparator<ENTITY> comparatorNullFieldsFirst() {
+    public FieldComparator<ENTITY, V> comparatorNullFieldsFirst() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.FIRST);
     }
 
     @Override
-    public Comparator<ENTITY> comparatorNullFieldsLast() {
+    public FieldComparator<ENTITY, V> comparatorNullFieldsLast() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.LAST);
     }
 

diff --git a/...eld/src/main/java/com/speedment/runtime/field/internal/ComparableForeignKeyFieldImpl.java b/...eld/src/main/java/com/speedment/runtime/field/internal/ComparableForeignKeyFieldImpl.java
@@ -19,6 +19,7 @@
 import com.speedment.runtime.config.identifier.ColumnIdentifier;
 import com.speedment.runtime.config.identifier.TableIdentifier;
 import com.speedment.runtime.field.ComparableForeignKeyField;
+import com.speedment.runtime.field.comparator.FieldComparator;
 import com.speedment.runtime.field.internal.comparator.NullOrder;
 import com.speedment.runtime.field.internal.comparator.ReferenceFieldComparatorImpl;
 import com.speedment.runtime.field.internal.method.BackwardFinderImpl;
@@ -32,15 +33,12 @@
 import com.speedment.runtime.field.predicate.Inclusion;
 import com.speedment.runtime.field.trait.HasComparableOperators;
 import com.speedment.runtime.typemapper.TypeMapper;
-
-import java.util.Comparator;
+import static java.util.Objects.requireNonNull;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import static java.util.Objects.requireNonNull;
-
 /**
  * @param <ENTITY>     the entity type
  * @param <D>          the database type
@@ -127,17 +125,17 @@ public boolean isUnique() {
     /*****************************************************************/
 
     @Override
-    public Comparator<ENTITY> comparator() {
+    public FieldComparator<ENTITY, V> comparator() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.NONE);
     }
 
     @Override
-    public Comparator<ENTITY> comparatorNullFieldsFirst() {
+    public FieldComparator<ENTITY, V> comparatorNullFieldsFirst() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.FIRST);
     }
 
     @Override
-    public Comparator<ENTITY> comparatorNullFieldsLast() {
+    public FieldComparator<ENTITY, V> comparatorNullFieldsLast() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.LAST);
     }
 

diff --git a/...ent/runtime-field/src/main/java/com/speedment/runtime/field/internal/StringFieldImpl.java b/...ent/runtime-field/src/main/java/com/speedment/runtime/field/internal/StringFieldImpl.java
@@ -18,6 +18,7 @@
 
 import com.speedment.runtime.config.identifier.ColumnIdentifier;
 import com.speedment.runtime.field.StringField;
+import com.speedment.runtime.field.comparator.FieldComparator;
 import com.speedment.runtime.field.internal.comparator.NullOrder;
 import com.speedment.runtime.field.internal.comparator.ReferenceFieldComparatorImpl;
 import com.speedment.runtime.field.internal.predicate.reference.*;
@@ -27,13 +28,10 @@
 import com.speedment.runtime.field.predicate.FieldPredicate;
 import com.speedment.runtime.field.predicate.Inclusion;
 import com.speedment.runtime.typemapper.TypeMapper;
-
-import java.util.Comparator;
+import static java.util.Objects.requireNonNull;
 import java.util.Set;
 import java.util.function.Predicate;
 
-import static java.util.Objects.requireNonNull;
-
 /**
  * @param <ENTITY> the entity type
  * @param <D>      the database type
@@ -98,17 +96,17 @@ public boolean isUnique() {
     /*****************************************************************/
 
     @Override
-    public Comparator<ENTITY> comparator() {
+    public FieldComparator<ENTITY, String> comparator() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.NONE);
     }
 
     @Override
-    public Comparator<ENTITY> comparatorNullFieldsFirst() {
+    public FieldComparator<ENTITY, String> comparatorNullFieldsFirst() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.FIRST);
     }
 
     @Override
-    public Comparator<ENTITY> comparatorNullFieldsLast() {
+    public FieldComparator<ENTITY, String> comparatorNullFieldsLast() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.LAST);
     }
 

diff --git a/...e-field/src/main/java/com/speedment/runtime/field/internal/StringForeignKeyFieldImpl.java b/...e-field/src/main/java/com/speedment/runtime/field/internal/StringForeignKeyFieldImpl.java
@@ -20,6 +20,7 @@
 import com.speedment.runtime.config.identifier.TableIdentifier;
 import com.speedment.runtime.field.StringField;
 import com.speedment.runtime.field.StringForeignKeyField;
+import com.speedment.runtime.field.comparator.FieldComparator;
 import com.speedment.runtime.field.internal.comparator.NullOrder;
 import com.speedment.runtime.field.internal.comparator.ReferenceFieldComparatorImpl;
 import com.speedment.runtime.field.internal.method.BackwardFinderImpl;
@@ -33,15 +34,12 @@
 import com.speedment.runtime.field.predicate.FieldPredicate;
 import com.speedment.runtime.field.predicate.Inclusion;
 import com.speedment.runtime.typemapper.TypeMapper;
-
-import java.util.Comparator;
+import static java.util.Objects.requireNonNull;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import static java.util.Objects.requireNonNull;
-
 /**
  * @param <ENTITY>     the entity type
  * @param <D>          the database type
@@ -124,17 +122,17 @@ public boolean isUnique() {
     /*                              Comparators                               */
     /**************************************************************************/
     @Override
-    public Comparator<ENTITY> comparator() {
+    public FieldComparator<ENTITY, String> comparator() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.NONE);
     }
 
     @Override
-    public Comparator<ENTITY> comparatorNullFieldsFirst() {
+    public FieldComparator<ENTITY, String> comparatorNullFieldsFirst() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.FIRST);
     }
 
     @Override
-    public Comparator<ENTITY> comparatorNullFieldsLast() {
+    public FieldComparator<ENTITY, String> comparatorNullFieldsLast() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.LAST);
     }
 

diff --git a/...ld/src/main/java/com/speedment/runtime/field/internal/comparator/ByteFieldComparator.java b/...ld/src/main/java/com/speedment/runtime/field/internal/comparator/ByteFieldComparator.java
@@ -16,8 +16,8 @@
  */
 package com.speedment.runtime.field.internal.comparator;
 
-import com.speedment.runtime.field.trait.HasByteValue;
-import java.util.Comparator;
+import com.speedment.runtime.field.ByteField;
+import com.speedment.runtime.field.comparator.FieldComparator;
 import javax.annotation.Generated;
 
 /**
@@ -30,14 +30,14 @@
  * @since  3.0.0
  */
 @Generated(value = "Speedment")
-public interface ByteFieldComparator<ENTITY, D> extends Comparator<ENTITY> {
+public interface ByteFieldComparator<ENTITY, D> extends FieldComparator<ENTITY, Byte> {
 
     /**
      * Gets the field that is being compared.
      * 
      * @return the compared field
      */
-    HasByteValue<ENTITY, D> getField();
+    ByteField<ENTITY, D> getField();
 
     /**
      * Returns if this {@code Comparator} is reversed.

diff --git a/...rc/main/java/com/speedment/runtime/field/internal/comparator/ByteFieldComparatorImpl.java b/...rc/main/java/com/speedment/runtime/field/internal/comparator/ByteFieldComparatorImpl.java
@@ -16,7 +16,7 @@
  */
 package com.speedment.runtime.field.internal.comparator;
 
-import com.speedment.runtime.field.trait.HasByteValue;
+import com.speedment.runtime.field.ByteField;
 import java.util.Comparator;
 import javax.annotation.Generated;
 import static com.speedment.common.invariant.NullUtil.requireNonNulls;
@@ -32,16 +32,16 @@
 @Generated(value = "Speedment")
 public final class ByteFieldComparatorImpl<ENTITY, D> implements ByteFieldComparator<ENTITY, D> {
 
-    private final HasByteValue<ENTITY, D> field;
+    private final ByteField<ENTITY, D> field;
     private boolean reversed;
 
-    public ByteFieldComparatorImpl(HasByteValue<ENTITY, D> field) {
+    public ByteFieldComparatorImpl(ByteField<ENTITY, D> field) {
         this.field    = requireNonNull(field);
         this.reversed = false;
     }
 
     @Override
-    public HasByteValue<ENTITY, D> getField() {
+    public ByteField<ENTITY, D> getField() {
         return field;
     }
 

diff --git a/...ld/src/main/java/com/speedment/runtime/field/internal/comparator/CharFieldComparator.java b/...ld/src/main/java/com/speedment/runtime/field/internal/comparator/CharFieldComparator.java
@@ -16,8 +16,8 @@
  */
 package com.speedment.runtime.field.internal.comparator;
 
-import com.speedment.runtime.field.trait.HasCharValue;
-import java.util.Comparator;
+import com.speedment.runtime.field.CharField;
+import com.speedment.runtime.field.comparator.FieldComparator;
 import javax.annotation.Generated;
 
 /**
@@ -30,14 +30,14 @@
  * @since  3.0.0
  */
 @Generated(value = "Speedment")
-public interface CharFieldComparator<ENTITY, D> extends Comparator<ENTITY> {
+public interface CharFieldComparator<ENTITY, D> extends FieldComparator<ENTITY, Character> {
 
     /**
      * Gets the field that is being compared.
      * 
      * @return the compared field
      */
-    HasCharValue<ENTITY, D> getField();
+    CharField<ENTITY, D> getField();
 
     /**
      * Returns if this {@code Comparator} is reversed.

diff --git a/...rc/main/java/com/speedment/runtime/field/internal/comparator/CharFieldComparatorImpl.java b/...rc/main/java/com/speedment/runtime/field/internal/comparator/CharFieldComparatorImpl.java
@@ -16,7 +16,7 @@
  */
 package com.speedment.runtime.field.internal.comparator;
 
-import com.speedment.runtime.field.trait.HasCharValue;
+import com.speedment.runtime.field.CharField;
 import java.util.Comparator;
 import javax.annotation.Generated;
 import static com.speedment.common.invariant.NullUtil.requireNonNulls;
@@ -32,16 +32,16 @@
 @Generated(value = "Speedment")
 public final class CharFieldComparatorImpl<ENTITY, D> implements CharFieldComparator<ENTITY, D> {
 
-    private final HasCharValue<ENTITY, D> field;
+    private final CharField<ENTITY, D> field;
     private boolean reversed;
 
-    public CharFieldComparatorImpl(HasCharValue<ENTITY, D> field) {
+    public CharFieldComparatorImpl(CharField<ENTITY, D> field) {
         this.field    = requireNonNull(field);
         this.reversed = false;
     }
 
     @Override
-    public HasCharValue<ENTITY, D> getField() {
+    public CharField<ENTITY, D> getField() {
         return field;
     }
 

diff --git a/.../src/main/java/com/speedment/runtime/field/internal/comparator/DoubleFieldComparator.java b/.../src/main/java/com/speedment/runtime/field/internal/comparator/DoubleFieldComparator.java
@@ -16,8 +16,8 @@
  */
 package com.speedment.runtime.field.internal.comparator;
 
-import com.speedment.runtime.field.trait.HasDoubleValue;
-import java.util.Comparator;
+import com.speedment.runtime.field.DoubleField;
+import com.speedment.runtime.field.comparator.FieldComparator;
 import javax.annotation.Generated;
 
 /**
@@ -30,14 +30,14 @@
  * @since  3.0.0
  */
 @Generated(value = "Speedment")
-public interface DoubleFieldComparator<ENTITY, D> extends Comparator<ENTITY> {
+public interface DoubleFieldComparator<ENTITY, D> extends FieldComparator<ENTITY, Double> {
 
     /**
      * Gets the field that is being compared.
      * 
      * @return the compared field
      */
-    HasDoubleValue<ENTITY, D> getField();
+    DoubleField<ENTITY, D> getField();
 
     /**
      * Returns if this {@code Comparator} is reversed.

diff --git a/.../main/java/com/speedment/runtime/field/internal/comparator/DoubleFieldComparatorImpl.java b/.../main/java/com/speedment/runtime/field/internal/comparator/DoubleFieldComparatorImpl.java
@@ -16,7 +16,7 @@
  */
 package com.speedment.runtime.field.internal.comparator;
 
-import com.speedment.runtime.field.trait.HasDoubleValue;
+import com.speedment.runtime.field.DoubleField;
 import java.util.Comparator;
 import javax.annotation.Generated;
 import static com.speedment.common.invariant.NullUtil.requireNonNulls;
@@ -32,16 +32,16 @@
 @Generated(value = "Speedment")
 public final class DoubleFieldComparatorImpl<ENTITY, D> implements DoubleFieldComparator<ENTITY, D> {
 
-    private final HasDoubleValue<ENTITY, D> field;
+    private final DoubleField<ENTITY, D> field;
     private boolean reversed;
 
-    public DoubleFieldComparatorImpl(HasDoubleValue<ENTITY, D> field) {
+    public DoubleFieldComparatorImpl(DoubleField<ENTITY, D> field) {
         this.field    = requireNonNull(field);
         this.reversed = false;
     }
 
     @Override
-    public HasDoubleValue<ENTITY, D> getField() {
+    public DoubleField<ENTITY, D> getField() {
         return field;
     }