runtime-field: Remove unnescessary type parameter from FieldComparator

speedment · May 31, 2017 · 084e7ba · 084e7ba
1 parent 5a4ab71
commit 084e7ba
Show file tree

Hide file tree

Showing 27 changed files with 88 additions and 78 deletions.
diff --git a/...untime-field/src/main/java/com/speedment/runtime/field/comparator/CombinedComparator.java b/...untime-field/src/main/java/com/speedment/runtime/field/comparator/CombinedComparator.java
@@ -30,7 +30,7 @@ public interface CombinedComparator<ENTITY> extends Comparator<ENTITY>  {
      *
      * @return  list of comparators
      */
-    Stream<FieldComparator<? super ENTITY, ?>> stream();
+    Stream<FieldComparator<? super ENTITY>> stream();
 
     /**
      * The number of comparators in the {@link #stream()}.

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
@@ -16,7 +16,8 @@
  */
 package com.speedment.runtime.field.comparator;
 
-import com.speedment.runtime.field.trait.HasComparableOperators;
+import com.speedment.runtime.field.Field;
+
 import java.util.Comparator;
 
 /**
@@ -28,20 +29,19 @@
  * {@link #getNullOrder() null strategy} and the {@link #isReversed() order}.
  * 
  * @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>> 
+public interface FieldComparator<ENTITY>
 extends Comparator<ENTITY> {
 
     /**
      * Returns the field that created this comparator.
      * 
      * @return  the field
      */
-    HasComparableOperators<ENTITY, V> getField();
+    Field<ENTITY> getField();
 
     /**
      * Returns the strategy used when {@code null} values are encountered. If
@@ -72,5 +72,5 @@ public interface FieldComparator<ENTITY, V extends Comparable<? super V>>
      * @return  a new reverse comparator
      */
     @Override
-    FieldComparator<ENTITY, V> reversed();
+    FieldComparator<ENTITY> reversed();
 }
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
@@ -100,17 +100,17 @@ public boolean isUnique() {
     ////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public FieldComparator<ENTITY, V> comparator() {
+    public FieldComparator<ENTITY> comparator() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.LAST);
     }
 
     @Override
-    public FieldComparator<ENTITY, V> comparatorNullFieldsFirst() {
+    public FieldComparator<ENTITY> comparatorNullFieldsFirst() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.FIRST);
     }
 
     @Override
-    public FieldComparator<ENTITY, V> comparatorNullFieldsLast() {
+    public FieldComparator<ENTITY> comparatorNullFieldsLast() {
         return comparator();
     }
 

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
@@ -33,12 +33,14 @@
 import com.speedment.runtime.field.predicate.Inclusion;
 import com.speedment.runtime.field.trait.HasComparableOperators;
 import com.speedment.runtime.typemapper.TypeMapper;
-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
@@ -125,17 +127,17 @@ public boolean isUnique() {
     /*****************************************************************/
 
     @Override
-    public FieldComparator<ENTITY, V> comparator() {
+    public FieldComparator<ENTITY> comparator() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.LAST);
     }
 
     @Override
-    public FieldComparator<ENTITY, V> comparatorNullFieldsFirst() {
+    public FieldComparator<ENTITY> comparatorNullFieldsFirst() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.FIRST);
     }
 
     @Override
-    public FieldComparator<ENTITY, V> comparatorNullFieldsLast() {
+    public FieldComparator<ENTITY> comparatorNullFieldsLast() {
         return comparator();
     }
 

diff --git a/...arent/runtime-field/src/main/java/com/speedment/runtime/field/internal/EnumFieldImpl.java b/...arent/runtime-field/src/main/java/com/speedment/runtime/field/internal/EnumFieldImpl.java
@@ -118,17 +118,17 @@ public boolean isUnique() {
     ////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public FieldComparator<ENTITY, E> comparator() {
+    public FieldComparator<ENTITY> comparator() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.LAST);
     }
 
     @Override
-    public FieldComparator<ENTITY, E> comparatorNullFieldsFirst() {
+    public FieldComparator<ENTITY> comparatorNullFieldsFirst() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.FIRST);
     }
 
     @Override
-    public FieldComparator<ENTITY, E> comparatorNullFieldsLast() {
+    public FieldComparator<ENTITY> comparatorNullFieldsLast() {
         return comparator();
     }
 

diff --git a/...ime-field/src/main/java/com/speedment/runtime/field/internal/EnumForeignKeyFieldImpl.java b/...ime-field/src/main/java/com/speedment/runtime/field/internal/EnumForeignKeyFieldImpl.java
@@ -152,17 +152,17 @@ public FindFrom<ENTITY, FK> finder(TableIdentifier<FK> identifier,
     ////////////////////////////////////////////////////////////////////////////
 
     @Override
-    public FieldComparator<ENTITY, E> comparator() {
+    public FieldComparator<ENTITY> comparator() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.LAST);
     }
 
     @Override
-    public FieldComparator<ENTITY, E> comparatorNullFieldsFirst() {
+    public FieldComparator<ENTITY> comparatorNullFieldsFirst() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.FIRST);
     }
 
     @Override
-    public FieldComparator<ENTITY, E> comparatorNullFieldsLast() {
+    public FieldComparator<ENTITY> comparatorNullFieldsLast() {
         return comparator();
     }
 

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
@@ -28,10 +28,12 @@
 import com.speedment.runtime.field.predicate.FieldPredicate;
 import com.speedment.runtime.field.predicate.Inclusion;
 import com.speedment.runtime.typemapper.TypeMapper;
-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
@@ -96,17 +98,17 @@ public boolean isUnique() {
     /*****************************************************************/
 
     @Override
-    public FieldComparator<ENTITY, String> comparator() {
+    public FieldComparator<ENTITY> comparator() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.LAST);
     }
 
     @Override
-    public FieldComparator<ENTITY, String> comparatorNullFieldsFirst() {
+    public FieldComparator<ENTITY> comparatorNullFieldsFirst() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.FIRST);
     }
 
     @Override
-    public FieldComparator<ENTITY, String> comparatorNullFieldsLast() {
+    public FieldComparator<ENTITY> comparatorNullFieldsLast() {
         return comparator();
     }
 

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
@@ -34,12 +34,14 @@
 import com.speedment.runtime.field.predicate.FieldPredicate;
 import com.speedment.runtime.field.predicate.Inclusion;
 import com.speedment.runtime.typemapper.TypeMapper;
-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
@@ -122,17 +124,17 @@ public boolean isUnique() {
     /*                              Comparators                               */
     /**************************************************************************/
     @Override
-    public FieldComparator<ENTITY, String> comparator() {
+    public FieldComparator<ENTITY> comparator() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.LAST);
     }
 
     @Override
-    public FieldComparator<ENTITY, String> comparatorNullFieldsFirst() {
+    public FieldComparator<ENTITY> comparatorNullFieldsFirst() {
         return new ReferenceFieldComparatorImpl<>(this, NullOrder.FIRST);
     }
 
     @Override
-    public FieldComparator<ENTITY, String> comparatorNullFieldsLast() {
+    public FieldComparator<ENTITY> comparatorNullFieldsLast() {
         return comparator();
     }
 

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
@@ -30,7 +30,7 @@
  * @since  3.0.0
  */
 @GeneratedCode(value = "Speedment")
-public interface ByteFieldComparator<ENTITY, D> extends FieldComparator<ENTITY, Byte> {
+public interface ByteFieldComparator<ENTITY, D> extends FieldComparator<ENTITY> {
 
     /**
      * Gets the field that is being compared.

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
@@ -62,7 +62,7 @@ public boolean isReversed() {
     }
 
     @Override
-    public FieldComparator<ENTITY, Byte> reversed() {
+    public FieldComparator<ENTITY> reversed() {
         return new ByteFieldComparatorImpl<>(field, !reversed);
     }
 
@@ -86,8 +86,8 @@ public boolean equals(Object obj) {
         if (!(obj instanceof FieldComparator)) return false;
 
         @SuppressWarnings("unchecked")
-        final FieldComparator<ENTITY, Byte> casted =
-            (FieldComparator<ENTITY, Byte>) obj;
+        final FieldComparator<ENTITY> casted =
+            (FieldComparator<ENTITY>) obj;
 
         return reversed == casted.isReversed()
             && Objects.equals(

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
@@ -30,7 +30,7 @@
  * @since  3.0.0
  */
 @GeneratedCode(value = "Speedment")
-public interface CharFieldComparator<ENTITY, D> extends FieldComparator<ENTITY, Character> {
+public interface CharFieldComparator<ENTITY, D> extends FieldComparator<ENTITY> {
 
     /**
      * Gets the field that is being compared.

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
@@ -62,7 +62,7 @@ public boolean isReversed() {
     }
 
     @Override
-    public FieldComparator<ENTITY, Character> reversed() {
+    public FieldComparator<ENTITY> reversed() {
         return new CharFieldComparatorImpl<>(field, !reversed);
     }
 
@@ -86,8 +86,8 @@ public boolean equals(Object obj) {
         if (!(obj instanceof FieldComparator)) return false;
 
         @SuppressWarnings("unchecked")
-        final FieldComparator<ENTITY, Character> casted =
-            (FieldComparator<ENTITY, Character>) obj;
+        final FieldComparator<ENTITY> casted =
+            (FieldComparator<ENTITY>) obj;
 
         return reversed == casted.isReversed()
             && Objects.equals(

diff --git a/...src/main/java/com/speedment/runtime/field/internal/comparator/CombinedComparatorImpl.java b/...src/main/java/com/speedment/runtime/field/internal/comparator/CombinedComparatorImpl.java
@@ -28,25 +28,25 @@
 public final class CombinedComparatorImpl<ENTITY>
 implements CombinedComparator<ENTITY> {
 
-    private final List<FieldComparator<? super ENTITY, ?>> comparators;
+    private final List<FieldComparator<? super ENTITY>> comparators;
     private final boolean reversed;
 
     public CombinedComparatorImpl(
-            final List<FieldComparator<? super ENTITY, ?>> comparators) {
+            final List<FieldComparator<? super ENTITY>> comparators) {
 
         this(comparators, false);
     }
 
     private CombinedComparatorImpl(
-            final List<FieldComparator<? super ENTITY, ?>> comparators,
+            final List<FieldComparator<? super ENTITY>> comparators,
             final boolean reversed) {
 
         this.comparators = requireNonNull(comparators);
         this.reversed    = reversed;
     }
 
     @Override
-    public Stream<FieldComparator<? super ENTITY, ?>> stream() {
+    public Stream<FieldComparator<? super ENTITY>> stream() {
         return comparators.stream();
     }
 
@@ -57,7 +57,7 @@ public int size() {
 
     @Override
     public int compare(ENTITY o1, ENTITY o2) {
-        for (final FieldComparator<? super ENTITY, ?> comp : comparators) {
+        for (final FieldComparator<? super ENTITY> comp : comparators) {
             final int c = comp.compare(o1, o2);
             if (c != 0) return isReversed() ? -c : c;
         }
@@ -211,10 +211,10 @@ public <U> Comparator<ENTITY> thenComparing(
     then(Comparator<? super ENTITY> other) {
         if (other instanceof FieldComparator) {
             @SuppressWarnings("unchecked")
-            final FieldComparator<? super ENTITY, V> fc =
-                (FieldComparator<? super ENTITY, V>) other;
+            final FieldComparator<? super ENTITY> fc =
+                (FieldComparator<? super ENTITY>) other;
 
-            final List<FieldComparator<? super ENTITY, ?>> copy =
+            final List<FieldComparator<? super ENTITY>> copy =
                 new ArrayList<>(comparators);
             copy.add(reversed ? fc.reversed() : fc);
 

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
@@ -30,7 +30,7 @@
  * @since  3.0.0
  */
 @GeneratedCode(value = "Speedment")
-public interface DoubleFieldComparator<ENTITY, D> extends FieldComparator<ENTITY, Double> {
+public interface DoubleFieldComparator<ENTITY, D> extends FieldComparator<ENTITY> {
 
     /**
      * Gets the field that is being compared.

diff --git a/.../main/java/com/speedment/runtime/field/internal/comparator/DoubleFieldComparatorImpl.java b/.../main/java/com/speedment/runtime/field/internal/comparator/DoubleFieldComparatorImpl.java
@@ -62,7 +62,7 @@ public boolean isReversed() {
     }
 
     @Override
-    public FieldComparator<ENTITY, Double> reversed() {
+    public FieldComparator<ENTITY> reversed() {
         return new DoubleFieldComparatorImpl<>(field, !reversed);
     }
 
@@ -86,8 +86,8 @@ public boolean equals(Object obj) {
         if (!(obj instanceof FieldComparator)) return false;
 
         @SuppressWarnings("unchecked")
-        final FieldComparator<ENTITY, Double> casted =
-            (FieldComparator<ENTITY, Double>) obj;
+        final FieldComparator<ENTITY> casted =
+            (FieldComparator<ENTITY>) obj;
 
         return reversed == casted.isReversed()
             && Objects.equals(

diff --git a/...d/src/main/java/com/speedment/runtime/field/internal/comparator/FloatFieldComparator.java b/...d/src/main/java/com/speedment/runtime/field/internal/comparator/FloatFieldComparator.java
@@ -30,7 +30,7 @@
  * @since  3.0.0
  */
 @GeneratedCode(value = "Speedment")
-public interface FloatFieldComparator<ENTITY, D> extends FieldComparator<ENTITY, Float> {
+public interface FloatFieldComparator<ENTITY, D> extends FieldComparator<ENTITY> {
 
     /**
      * Gets the field that is being compared.

diff --git a/...c/main/java/com/speedment/runtime/field/internal/comparator/FloatFieldComparatorImpl.java b/...c/main/java/com/speedment/runtime/field/internal/comparator/FloatFieldComparatorImpl.java
@@ -62,7 +62,7 @@ public boolean isReversed() {
     }
 
     @Override
-    public FieldComparator<ENTITY, Float> reversed() {
+    public FieldComparator<ENTITY> reversed() {
         return new FloatFieldComparatorImpl<>(field, !reversed);
     }
 
@@ -86,8 +86,8 @@ public boolean equals(Object obj) {
         if (!(obj instanceof FieldComparator)) return false;
 
         @SuppressWarnings("unchecked")
-        final FieldComparator<ENTITY, Float> casted =
-            (FieldComparator<ENTITY, Float>) obj;
+        final FieldComparator<ENTITY> casted =
+            (FieldComparator<ENTITY>) obj;
 
         return reversed == casted.isReversed()
             && Objects.equals(

diff --git a/...eld/src/main/java/com/speedment/runtime/field/internal/comparator/IntFieldComparator.java b/...eld/src/main/java/com/speedment/runtime/field/internal/comparator/IntFieldComparator.java
@@ -30,7 +30,7 @@
  * @since  3.0.0
  */
 @GeneratedCode(value = "Speedment")
-public interface IntFieldComparator<ENTITY, D> extends FieldComparator<ENTITY, Integer> {
+public interface IntFieldComparator<ENTITY, D> extends FieldComparator<ENTITY> {
 
     /**
      * Gets the field that is being compared.