db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1836434 - in /db/jdo/trunk: api/src/main/java/javax/jdo/query/ tck/src/main/resources/conf/
Date Sun, 22 Jul 2018 12:30:43 GMT
Author: mbo
Date: Sun Jul 22 12:30:43 2018
New Revision: 1836434

URL: http://svn.apache.org/viewvc?rev=1836434&view=rev
Log:
JDO-652: sort out some of the generics specifications of (some of) the JDOQLTyped expressions
+ StringExpression.add(String)

Modified:
    db/jdo/trunk/api/src/main/java/javax/jdo/query/ComparableExpression.java
    db/jdo/trunk/api/src/main/java/javax/jdo/query/NumericExpression.java
    db/jdo/trunk/api/src/main/java/javax/jdo/query/StringExpression.java
    db/jdo/trunk/tck/src/main/resources/conf/jdo-signatures.txt

Modified: db/jdo/trunk/api/src/main/java/javax/jdo/query/ComparableExpression.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/main/java/javax/jdo/query/ComparableExpression.java?rev=1836434&r1=1836433&r2=1836434&view=diff
==============================================================================
--- db/jdo/trunk/api/src/main/java/javax/jdo/query/ComparableExpression.java (original)
+++ db/jdo/trunk/api/src/main/java/javax/jdo/query/ComparableExpression.java Sun Jul 22 12:30:43
2018
@@ -28,7 +28,7 @@ public interface ComparableExpression<T>
      * @param expr Other expression
      * @return Whether this is less than the other
      */
-    BooleanExpression lt(ComparableExpression expr);
+    BooleanExpression lt(ComparableExpression<T> expr);
 
     /**
      * Method returning whether this expression is less than the literal.
@@ -42,7 +42,7 @@ public interface ComparableExpression<T>
      * @param expr Other expression
      * @return Whether this is less than or equal the other
      */
-    BooleanExpression lteq(ComparableExpression expr);
+    BooleanExpression lteq(ComparableExpression<T> expr);
 
     /**
      * Method returning whether this expression is less than or equal the literal.
@@ -56,7 +56,7 @@ public interface ComparableExpression<T>
      * @param expr Other expression
      * @return Whether this is greater than the other
      */
-    BooleanExpression gt(ComparableExpression expr);
+    BooleanExpression gt(ComparableExpression<T> expr);
 
     /**
      * Method returning whether this expression is greater than the literal.
@@ -70,7 +70,7 @@ public interface ComparableExpression<T>
      * @param expr Other expression
      * @return Whether this is greater than or equal to the other
      */
-    BooleanExpression gteq(ComparableExpression expr);
+    BooleanExpression gteq(ComparableExpression<T> expr);
 
     /**
      * Method returning whether this expression is greater than or equal the literal.
@@ -83,23 +83,24 @@ public interface ComparableExpression<T>
      * Method to return a numeric expression representing the aggregated minimum of this
expression.
      * @return Numeric expression for the minimum
      */
-    NumericExpression min();
+    NumericExpression<T> min();
 
     /**
      * Method to return a numeric expression representing the aggregated maximum of this
expression.
      * @return Numeric expression for the maximum
      */
-    NumericExpression max();
+    NumericExpression<T> max();
 
     /**
      * Method to return an order expression for this expression in ascending order.
      * @return The order expression
      */
-    OrderExpression asc();
+    OrderExpression<T> asc();
 
     /**
      * Method to return an order expression for this expression in descending order.
      * @return The order expression
      */
-    OrderExpression desc();
-}
\ No newline at end of file
+    OrderExpression<T> desc();
+}
+

Modified: db/jdo/trunk/api/src/main/java/javax/jdo/query/NumericExpression.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/main/java/javax/jdo/query/NumericExpression.java?rev=1836434&r1=1836433&r2=1836434&view=diff
==============================================================================
--- db/jdo/trunk/api/src/main/java/javax/jdo/query/NumericExpression.java (original)
+++ db/jdo/trunk/api/src/main/java/javax/jdo/query/NumericExpression.java Sun Jul 22 12:30:43
2018
@@ -109,7 +109,7 @@ public interface NumericExpression<T> ex
      * Method to return a numeric expression representing the aggregated average of this
expression.
      * @return Numeric expression for the average
      */
-    NumericExpression avg();
+    NumericExpression<Double> avg();
 
     /**
      * Method to return a numeric expression representing the aggregated sum of this expression.
@@ -209,4 +209,4 @@ public interface NumericExpression<T> ex
      * @return Bitwise XOR expression
      */
     NumericExpression bXor(NumericExpression bitExpr);
-}
\ No newline at end of file
+}

Modified: db/jdo/trunk/api/src/main/java/javax/jdo/query/StringExpression.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/main/java/javax/jdo/query/StringExpression.java?rev=1836434&r1=1836433&r2=1836434&view=diff
==============================================================================
--- db/jdo/trunk/api/src/main/java/javax/jdo/query/StringExpression.java (original)
+++ db/jdo/trunk/api/src/main/java/javax/jdo/query/StringExpression.java Sun Jul 22 12:30:43
2018
@@ -29,6 +29,13 @@ public interface StringExpression extend
     StringExpression add(Expression expr);
 
     /**
+     * Method to return an expression for this expression added to the passed string (String
concatenation).
+     * @param str The other string
+     * @return The summation
+     */
+    StringExpression add(String str);
+
+    /**
      * Method to return an expression for the character at a position of this string expression.
      * @param pos The position
      * @return Expression for the character

Modified: db/jdo/trunk/tck/src/main/resources/conf/jdo-signatures.txt
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/main/resources/conf/jdo-signatures.txt?rev=1836434&r1=1836433&r2=1836434&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/main/resources/conf/jdo-signatures.txt (original)
+++ db/jdo/trunk/tck/src/main/resources/conf/jdo-signatures.txt Sun Jul 22 12:30:43 2018
@@ -1919,6 +1919,7 @@ public interface javax.jdo.query.Persist
 public interface javax.jdo.query.StringExpression extends javax.jdo.query.ComparableExpression
 {
     javax.jdo.query.StringExpression add(javax.jdo.query.Expression expr);
+    javax.jdo.query.StringExpression add(java.lang.String);
     javax.jdo.query.CharacterExpression charAt(int pos);
     javax.jdo.query.CharacterExpression charAt(javax.jdo.query.NumericExpression pos);
     javax.jdo.query.BooleanExpression endsWith(javax.jdo.query.StringExpression expr);



Mime
View raw message