Improvment of dynamically changed await

fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/AbstractFluentListConditions.java

@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.function.Predicate;
 
-import org.fluentlenium.core.domain.FluentList;
 import org.fluentlenium.core.domain.FluentWebElement;
 
 /**
@@ -64,7 +63,7 @@ public List<? extends FluentWebElement> getActualElements() {
     }
 
     @Override
-    public DynamicIntegerConditions size() {
+    public AbstractIntegerConditions size() {
         return new DynamicIntegerConditionsImpl(() -> elements, negation);
     }
 

fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/DynamicIntegerConditions.java → fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/AbstractIntegerConditions.java

@@ -1,18 +1,12 @@
 package org.fluentlenium.core.conditions;
 
-import java.util.List;
-
 import org.fluentlenium.core.conditions.message.Message;
 import org.fluentlenium.core.conditions.message.NotMessage;
-import org.fluentlenium.core.domain.FluentWebElement;
 
-/**
- * Conditions API for Integer.
- */
-public interface DynamicIntegerConditions extends Conditions<List<? extends FluentWebElement>> {
+public interface AbstractIntegerConditions<T, C extends AbstractIntegerConditions> extends Conditions<T> {
     @Override
     @Negation
-    DynamicIntegerConditions not();
+    C not();
 
     /**
      * Check that this is equal to given value
@@ -63,5 +57,4 @@ public interface DynamicIntegerConditions extends Conditions<List<? extends Flue
     @Message("is greater than or equal to {0}")
     @NotMessage("is not greater than or equal to {0}")
     boolean greaterThanOrEqualTo(int value);
-
 }

fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/DynamicIntegerConditionsImpl.java

@@ -10,24 +10,14 @@
  * Conditions for integer
  */
 public class DynamicIntegerConditionsImpl extends AbstractObjectConditions<List<? extends FluentWebElement>>
-        implements DynamicIntegerConditions {
-    /**
-     * Creates a new conditions object on integer.
-     *
-     * @param supplier underlying integer
-     */
-    public DynamicIntegerConditionsImpl(Supplier<List<? extends FluentWebElement>> supplier) {
-        super(supplier.get());
-    }
-
+        implements ListIntegerConditions {
     /**
      * Creates a new conditions object on integer.
      *
      * @param supplier  underlying list
      * @param negation negation value
      */
-    public DynamicIntegerConditionsImpl(Supplier<List<? extends FluentWebElement>> supplier, boolean
-            negation) {
+    public DynamicIntegerConditionsImpl(Supplier<List<? extends FluentWebElement>> supplier, boolean negation) {
         super(supplier.get(), negation);
     }
 

fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/FluentListConditions.java

@@ -55,5 +55,5 @@ public interface FluentListConditions extends FluentConditions {
      * @return an object to configure advanced conditions on size
      */
     @MessageContext("size")
-    DynamicIntegerConditions size();
+    AbstractIntegerConditions size();
 }

fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/IntegerConditions.java

@@ -1,67 +1,8 @@
 package org.fluentlenium.core.conditions;
 
-import org.fluentlenium.core.conditions.message.Message;
-import org.fluentlenium.core.conditions.message.NotMessage;
-
 /**
  * Conditions API for Integer.
  */
-
-
-//todo consider removal of this class and replacing by DynamicIntegerConditions
-public interface IntegerConditions extends Conditions<Integer> {
-    @Override
-    @Negation
-    IntegerConditions not();
-
-    /**
-     * Check that this is equal to given value
-     *
-     * @param value the value to compare with
-     * @return true if is equals, false otherwise
-     */
-    @Message("is equal to {0}")
-    @NotMessage("is not equal to {0}")
-    boolean equalTo(int value);
-
-    /**
-     * Check that this is less than given value
-     *
-     * @param value the value to compare with
-     * @return true if less than, false otherwise
-     */
-    @Message("is less than {0}")
-    @NotMessage("is not less than {0}")
-    boolean lessThan(int value);
-
-    /**
-     * Check that this is less than or equal given value
-     *
-     * @param value the value to compare with
-     * @return true if less than or equal, false otherwise
-     */
-    @Message("is less than or equal to {0}")
-    @NotMessage("is not less than or equal to {0}")
-    boolean lessThanOrEqualTo(int value);
-
-    /**
-     * Check that this is greater than given value
-     *
-     * @param value the value to compare with
-     * @return true if greater than, false otherwise
-     */
-    @Message("is greater than {0}")
-    @NotMessage("is not greater than {0}")
-    boolean greaterThan(int value);
-
-    /**
-     * Check that this is greater than or equal given value
-     *
-     * @param value the value to compare with
-     * @return true if greater than or equal, false otherwise
-     */
-    @Message("is greater than or equal to {0}")
-    @NotMessage("is not greater than or equal to {0}")
-    boolean greaterThanOrEqualTo(int value);
+public interface IntegerConditions extends AbstractIntegerConditions<Integer, IntegerConditions> {
 
 }

fluentlenium-core/src/main/java/org/fluentlenium/core/conditions/ListIntegerConditions.java

@@ -0,0 +1,13 @@
+package org.fluentlenium.core.conditions;
+
+import java.util.List;
+
+import org.fluentlenium.core.domain.FluentWebElement;
+
+/**
+ * Conditions API for FluentLists.
+ */
+public interface ListIntegerConditions extends AbstractIntegerConditions<List<? extends FluentWebElement>,
+        ListIntegerConditions> {
+
+}