Changed numbering of operand to words

speedment · Oct 14, 2015 · 3ddd45b · 3ddd45b
1 parent 173f57d
commit 3ddd45b
Show file tree

Hide file tree

Showing 18 changed files with 8,299 additions and 75 deletions.
diff --git a/src/main/java/com/speedment/internal/core/field/predicate/PredicateUtil.java b/src/main/java/com/speedment/internal/core/field/predicate/PredicateUtil.java
@@ -18,63 +18,63 @@
 
 import com.speedment.field.Inclusion;
 import com.speedment.field.predicate.SpeedmentPredicate;
-import com.speedment.internal.core.field.predicate.iface.type.HasInclusionOperand2;
-import com.speedment.internal.core.field.predicate.iface.type.HasOperand0;
-import com.speedment.internal.core.field.predicate.iface.type.HasOperand1;
-import com.speedment.internal.core.field.predicate.iface.type.HasOperand2;
-import com.speedment.internal.core.field.predicate.iface.type.HasSetOperand0;
 import com.speedment.internal.util.Cast;
 import java.util.Set;
+import com.speedment.internal.core.field.predicate.iface.type.HasFirstOperand;
+import com.speedment.internal.core.field.predicate.iface.type.HasFirstSetOperand;
+import com.speedment.internal.core.field.predicate.iface.type.HasSecondOperand;
+import com.speedment.internal.core.field.predicate.iface.type.HasThirdOperand;
+import com.speedment.internal.core.field.predicate.iface.type.HasThirdInclusionOperand;
 
 /**
  *
  * @author pemi
  */
 public class PredicateUtil {
 
-    public static Object get0Raw(SpeedmentPredicate<?, ?> p) {
+    public static Object getFirstOperandAsRaw(SpeedmentPredicate<?, ?> p) {
-        return Cast.castOrFail(p, HasOperand0.class).getOperand0();
+        return Cast.castOrFail(p, HasFirstOperand.class).getFirstOperand();
     }
 
-    public static <ENTITY, V> V get0(SpeedmentPredicate<ENTITY, V> p) {
+    public static <ENTITY, V> V getFirstOperand(SpeedmentPredicate<ENTITY, V> p) {
         @SuppressWarnings("unchecked")
-        final V result = (V) Cast.castOrFail(p, HasOperand0.class).getOperand0();
+        final V result = (V) Cast.castOrFail(p, HasFirstOperand.class).getFirstOperand();
         return result;
     }
 
-    public static Set<?> GetSet0Raw(SpeedmentPredicate<?, ?> p) {
+    public static Set<?> getFirstOperandAsRawSet(SpeedmentPredicate<?, ?> p) {
-        return Cast.castOrFail(p, HasSetOperand0.class).getOperand0();
+        return Cast.castOrFail(p, HasFirstSetOperand.class).getFirstOperand();
     }
 
-    public static <ENTITY, V> Set<?> GetSet0(SpeedmentPredicate<ENTITY, V> p) {
+    public static <ENTITY, V> Set<?> getFirstOperandAsSet(SpeedmentPredicate<ENTITY, V> p) {
         @SuppressWarnings("unchecked")
-        final Set<V> result = (Set<V>) Cast.castOrFail(p, HasOperand0.class).getOperand0();
+        final Set<V> result = (Set<V>) Cast.castOrFail(p, HasFirstOperand.class).getFirstOperand();
         return result;
     }
 
-    public static <ENTITY, V> V get1(SpeedmentPredicate<ENTITY, V> p) {
+    public static <ENTITY, V> V getSecondOperand(SpeedmentPredicate<ENTITY, V> p) {
         @SuppressWarnings("unchecked")
-        final V result = (V) Cast.castOrFail(p, HasOperand1.class).getOperand1();
+        final V result = (V) Cast.castOrFail(p, HasSecondOperand.class).getSecondOperand();
         return result;
     }
 
-    public static Object get1Raw(SpeedmentPredicate<?, ?> p) {
+    public static Object getSecondOperandAsRaw(SpeedmentPredicate<?, ?> p) {
-        return Cast.castOrFail(p, HasOperand1.class).getOperand1();
+        return Cast.castOrFail(p, HasSecondOperand.class).getSecondOperand();
     }
 
-    public static <ENTITY, V> V get2(SpeedmentPredicate<ENTITY, V> p) {
+    public static <ENTITY, V> V getThirdOperand(SpeedmentPredicate<ENTITY, V> p) {
         @SuppressWarnings("unchecked")
-        final V result = (V) Cast.castOrFail(p, HasOperand2.class).getOperand2();
+        final V result = (V) Cast.castOrFail(p, HasThirdOperand.class).getThirdOperand();
         return result;
     }
 
-    public static Object get2Raw(SpeedmentPredicate<?, ?> p) {
+    public static Object getThirdOperandAsRaw(SpeedmentPredicate<?, ?> p) {
-        return Cast.castOrFail(p, HasOperand2.class).getOperand2();
+        return Cast.castOrFail(p, HasThirdOperand.class).getThirdOperand();
     }
 
-    public static Inclusion getInclusion2(SpeedmentPredicate<?, ?> p) {
+    public static Inclusion getThirdOperandAsInclusion(SpeedmentPredicate<?, ?> p) {
         //QuaternaryInclusionOperation
-        return Cast.castOrFail(p, HasInclusionOperand2.class).getOperand2();
+        return Cast.castOrFail(p, HasThirdInclusionOperand.class).getThirdOperand();
     }
 
     private PredicateUtil() {

diff --git a/src/main/java/com/speedment/internal/core/field/predicate/iface/type/BinaryOperation.java b/src/main/java/com/speedment/internal/core/field/predicate/iface/type/BinaryOperation.java
@@ -21,6 +21,6 @@
  * @author pemi
  * @param <T0> type
  */
-public interface BinaryOperation<T0> extends HasOperand0<T0> {
+public interface BinaryOperation<T0> extends HasFirstOperand<T0> {
 
 }
diff --git a/src/main/java/com/speedment/internal/core/field/predicate/iface/type/BinarySetOperation.java b/src/main/java/com/speedment/internal/core/field/predicate/iface/type/BinarySetOperation.java
@@ -21,6 +21,6 @@
  * @author pemi
  * @param <T0> Set type
  */
-public interface BinarySetOperation<T0> extends HasSetOperand0<T0> {
+public interface BinarySetOperation<T0> extends HasFirstSetOperand<T0> {
 
 }
diff --git a/...eld/predicate/iface/type/HasOperand0.java → ...predicate/iface/type/HasFirstOperand.java b/...eld/predicate/iface/type/HasOperand0.java → ...predicate/iface/type/HasFirstOperand.java
@@ -20,7 +20,7 @@
  *
  * @author pemi
  */
-public interface HasOperand0<T> {
+public interface HasFirstOperand<T> {
 
-    T getOperand0();
+    T getFirstOperand();
 }
diff --git a/.../predicate/iface/type/HasSetOperand0.java → ...dicate/iface/type/HasFirstSetOperand.java b/.../predicate/iface/type/HasSetOperand0.java → ...dicate/iface/type/HasFirstSetOperand.java
@@ -21,10 +21,11 @@
 /**
  *
  * @author pemi
+ * @param <T>  the first operand type
  */
-public interface HasSetOperand0<T> extends HasOperand0<Set<T>> {
+public interface HasFirstSetOperand<T> extends HasFirstOperand<Set<T>> {
 
     @Override
-    Set<T> getOperand0();
+    Set<T> getFirstOperand();
 
-}
+}
diff --git a/...eld/predicate/iface/type/HasOperand2.java → ...redicate/iface/type/HasSecondOperand.java b/...eld/predicate/iface/type/HasOperand2.java → ...redicate/iface/type/HasSecondOperand.java
@@ -20,8 +20,9 @@
 /**
  *
  * @author pemi
+ * @param <T>  the second operand type
  */
-public interface HasOperand2<T> {
+public interface HasSecondOperand<T> {
 
-    T getOperand2();
+    T getSecondOperand();
 }
diff --git a/...cate/iface/type/HasInclusionOperand2.java → .../iface/type/HasThirdInclusionOperand.java b/...cate/iface/type/HasInclusionOperand2.java → .../iface/type/HasThirdInclusionOperand.java
@@ -22,9 +22,9 @@
  *
  * @author pemi
  */
-public interface HasInclusionOperand2 extends HasOperand2<Inclusion> {
+public interface HasThirdInclusionOperand extends HasThirdOperand<Inclusion> {
 
     @Override
-    public Inclusion getOperand2();
+    public Inclusion getThirdOperand();
 
-}
+}
diff --git a/...eld/predicate/iface/type/HasOperand1.java → ...predicate/iface/type/HasThirdOperand.java b/...eld/predicate/iface/type/HasOperand1.java → ...predicate/iface/type/HasThirdOperand.java
@@ -20,8 +20,9 @@
 /**
  *
  * @author pemi
+ * @param <T>  the third operand type
  */
-public interface HasOperand1<T> {
+public interface HasThirdOperand<T> {
 
-    T getOperand1();
+    T getThirdOperand();
 }
diff --git a/.../com/speedment/internal/core/field/predicate/iface/type/QuaternaryInclusionOperation.java b/.../com/speedment/internal/core/field/predicate/iface/type/QuaternaryInclusionOperation.java
@@ -24,9 +24,9 @@
  * @param <T0> first type
  * @param <T1> second type
  */
-public interface QuaternaryInclusionOperation<T0, T1> extends QuaternaryOperation<T0, T1, Inclusion>, HasInclusionOperand2 {
+public interface QuaternaryInclusionOperation<T0, T1> extends QuaternaryOperation<T0, T1, Inclusion>, HasThirdInclusionOperand {
 
     @Override
-    public Inclusion getOperand2();
+    public Inclusion getThirdOperand();
 
 }
diff --git a/...main/java/com/speedment/internal/core/field/predicate/iface/type/QuaternaryOperation.java b/...main/java/com/speedment/internal/core/field/predicate/iface/type/QuaternaryOperation.java
@@ -23,6 +23,6 @@
  * @param <T1> type 1
  * @param <T2> type 2
  */
-public interface QuaternaryOperation<T0, T1, T2> extends HasOperand0<T0>, HasOperand1<T1>, HasOperand2<T2> {
+public interface QuaternaryOperation<T0, T1, T2> extends HasFirstOperand<T0>, HasSecondOperand<T1>, HasThirdOperand<T2> {
 
 }
diff --git a/src/main/java/com/speedment/internal/core/field/predicate/iface/type/TernaryOperation.java b/src/main/java/com/speedment/internal/core/field/predicate/iface/type/TernaryOperation.java
@@ -20,6 +20,6 @@
  *
  * @author pemi
  */
-public interface TernaryOperation<T0, T1> extends HasOperand0<T0>, HasOperand1<T1> {
+public interface TernaryOperation<T0, T1> extends HasFirstOperand<T0>, HasSecondOperand<T1> {
 
 }
diff --git a/src/main/java/com/speedment/internal/core/field/predicate/impl/SpeedmentPredicateImpl.java b/src/main/java/com/speedment/internal/core/field/predicate/impl/SpeedmentPredicateImpl.java
@@ -22,10 +22,10 @@
 import com.speedment.field.trait.FieldTrait;
 import com.speedment.field.trait.ReferenceFieldTrait;
 import com.speedment.internal.core.field.predicate.AbstractBasePredicate;
-import com.speedment.internal.core.field.predicate.iface.type.HasOperand0;
-import com.speedment.internal.core.field.predicate.iface.type.HasOperand1;
-import com.speedment.internal.core.field.predicate.iface.type.HasOperand2;
 import com.speedment.internal.util.Cast;
+import com.speedment.internal.core.field.predicate.iface.type.HasFirstOperand;
+import com.speedment.internal.core.field.predicate.iface.type.HasSecondOperand;
+import com.speedment.internal.core.field.predicate.iface.type.HasThirdOperand;
 
 /**
  *
@@ -83,9 +83,9 @@ public String toString() {
             .append("field: ").append(field)
             .append(", type: '").append(predicateType).append("'");
 
-        Cast.cast(this, HasOperand0.class).map(HasOperand0<?>::getOperand0).ifPresent(o -> sb.append(", operand0: '").append(o).append("'"));
+        Cast.cast(this, HasFirstOperand.class).map(HasFirstOperand<?>::getFirstOperand).ifPresent(o -> sb.append(", operand0: '").append(o).append("'"));
-        Cast.cast(this, HasOperand1.class).map(HasOperand1<?>::getOperand1).ifPresent(o -> sb.append(", operand1: '").append(o).append("'"));
+        Cast.cast(this, HasSecondOperand.class).map(HasSecondOperand<?>::getSecondOperand).ifPresent(o -> sb.append(", operand1: '").append(o).append("'"));
-        Cast.cast(this, HasOperand2.class).map(HasOperand2<?>::getOperand2).ifPresent(o -> sb.append(", operand2: '").append(o).append("'"));
+        Cast.cast(this, HasThirdOperand.class).map(HasThirdOperand<?>::getThirdOperand).ifPresent(o -> sb.append(", operand2: '").append(o).append("'"));
 
         sb.append(", negated: ").append(isNegated())
             .append("}");

diff --git a/.../com/speedment/internal/core/field/predicate/impl/comparable/BaseComparablePredicate.java b/.../com/speedment/internal/core/field/predicate/impl/comparable/BaseComparablePredicate.java
@@ -49,7 +49,7 @@ public BaseComparablePredicate(
     }
 
     @Override
-    public V getOperand0() {
+    public V getFirstOperand() {
         return operand0;
     }
 

diff --git a/...in/java/com/speedment/internal/core/field/predicate/impl/comparable/BetweenPredicate.java b/...in/java/com/speedment/internal/core/field/predicate/impl/comparable/BetweenPredicate.java
@@ -48,17 +48,17 @@ public BetweenPredicate(FieldTrait field, ReferenceFieldTrait<ENTITY, V> referen
     }
 
     @Override
-    public V getOperand0() {
+    public V getFirstOperand() {
         return operand0;
     }
 
     @Override
-    public V getOperand1() {
+    public V getSecondOperand() {
         return operand1;
     }
 
     @Override
-    public Inclusion getOperand2() {
+    public Inclusion getThirdOperand() {
         return operand2;
     }
 

diff --git a/src/main/java/com/speedment/internal/core/field/predicate/impl/comparable/InPredicate.java b/src/main/java/com/speedment/internal/core/field/predicate/impl/comparable/InPredicate.java
@@ -44,7 +44,7 @@ public InPredicate(FieldTrait field, ReferenceFieldTrait<ENTITY, V> referenceFie
     }
 
     @Override
-    public Set<V> getOperand0() {
+    public Set<V> getFirstOperand() {
         return operand0;
     }
 

diff --git a/...ain/java/com/speedment/internal/core/field/predicate/impl/string/BaseStringPredicate.java b/...ain/java/com/speedment/internal/core/field/predicate/impl/string/BaseStringPredicate.java
@@ -47,7 +47,7 @@ public BaseStringPredicate(PredicateType predicateType,
     }
 
     @Override
-    public String getOperand0() {
+    public String getFirstOperand() {
         return operand0;
     }
 

diff --git a/src/main/java/com/speedment/internal/core/manager/sql/AbstractSpeedmentPredicateView.java b/src/main/java/com/speedment/internal/core/manager/sql/AbstractSpeedmentPredicateView.java
@@ -18,15 +18,46 @@
 
 import com.speedment.field.Inclusion;
 import com.speedment.field.predicate.SpeedmentPredicate;
-import com.speedment.internal.core.field.predicate.iface.type.HasInclusionOperand2;
-import com.speedment.internal.core.field.predicate.iface.type.HasOperand0;
-import com.speedment.internal.core.field.predicate.iface.type.HasOperand1;
-import com.speedment.internal.core.field.predicate.iface.type.HasOperand2;
-import com.speedment.internal.core.field.predicate.iface.type.HasSetOperand0;
 import com.speedment.internal.util.Cast;
 import java.util.Collection;
 import static java.util.Objects.requireNonNull;
 import java.util.Set;
+import com.speedment.internal.core.field.predicate.iface.type.HasFirstOperand;
+import static java.util.Objects.requireNonNull;
+import com.speedment.internal.core.field.predicate.iface.type.HasFirstSetOperand;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import com.speedment.internal.core.field.predicate.iface.type.HasSecondOperand;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import com.speedment.internal.core.field.predicate.iface.type.HasThirdOperand;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import com.speedment.internal.core.field.predicate.iface.type.HasThirdInclusionOperand;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  *