DataNucleus

Revision: 10262
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10262&view=rev
Author:   andy_jefferson
Date:     2010-06-22 17:52:02 +0000 (Tue, 22 Jun 2010)

Log Message:
-----------
[NUCCORE-545] Added result() methd to query so we can specify results, and the result class type. Also expression placeholder

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	2010-06-22 17:52:02 UTC (rev 10262)
@@ -0,0 +1,66 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of an expression that is comparable.
+ */
+public interface ComparableExpression extends Expression
+{
+    /**
+     * Method returning whether this expression equals the other expression.
+     * @param expr Other expression
+     * @return Whether they are equal
+     */
+    ComparableExpression eq(ComparableExpression expr);
+
+    /**
+     * Method returning whether this expression doesn't equal the other expression.
+     * @param expr Other expression
+     * @return Whether they are not equal
+     */
+    ComparableExpression ne(ComparableExpression expr);
+
+    /**
+     * Method returning whether this expression is less than the other expression.
+     * @param expr Other expression
+     * @return Whether this is less than the other
+     */
+    ComparableExpression lt(ComparableExpression expr);
+
+    /**
+     * Method returning whether this expression is less than or equal the other expression.
+     * @param expr Other expression
+     * @return Whether this is less than or equal the other
+     */
+    ComparableExpression lteq(ComparableExpression expr);
+
+    /**
+     * Method returning whether this expression is greater than the other expression.
+     * @param expr Other expression
+     * @return Whether this is greater than the other
+     */
+    ComparableExpression gt(ComparableExpression expr);
+
+    /**
+     * Method returning whether this expression is greater than or equal the other expression.
+     * @param expr Other expression
+     * @return Whether this is greater than or equal to the other
+     */
+    ComparableExpression gteq(ComparableExpression expr);
+}
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-06-22 17:52:02 UTC (rev 10262)
@@ -0,0 +1,30 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of an expression in a query.
+ */
+public interface Expression
+{
+    /**
+     * Method to return this expression as a String form.
+     * @return The string form
+     */
+    String toString();
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-22 14:16:03 UTC (rev 10261)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-22 17:52:02 UTC (rev 10262)
@@ -23,7 +23,7 @@
  * Interface for a type-safe query, using a fluent API.
  * Designed to handle JDO query requirements as a whole.
  */
-public interface Query<Q extends Query<Q>>
+public interface Query<T, Q extends Query<T, Q>>
 {
     /**
      * Method to set the filter of the query.
@@ -72,11 +72,27 @@
      */
     Q unique(boolean unique);
 
+    /**
+     * Method to set the result components of the query.
+     * @return The query
+     */
+    Q result(); // TODO Need expression varargs
+
     // TODO Add imports, variables, parameters
-    List execute(); // TODO Set parameters on execute?
-    List deletePersistentAll(); // TODO Set parameters on execute?
 
     /**
+     * Method to execute the query.
+     * @return The results
+     */
+    List<T> execute(); // TODO Set parameters on execute?
+
+    /**
+     * Method to execute the query deleting the affected instances.
+     * @return The number of objects deleted
+     */
+    long deletePersistentAll(); // TODO Set parameters on execute?
+
+    /**
      * Method to return the equivalent String form of this query (if applicable for the query language).
      * @return The single-string form of this query
      */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10266
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10266&view=rev
Author:   andy_jefferson
Date:     2010-06-23 06:22:40 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
[NUCCORE-545] Placeholder for boolean and string expressions

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java	2010-06-23 06:22:40 UTC (rev 10266)
@@ -0,0 +1,44 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a boolean expression.
+ */
+public interface BooleanExpression extends ComparableExpression
+{
+    /**
+     * Method to return the AND of this expression and the other expression.
+     * @param expr The other expression
+     * @return The resultant (boolean) expression
+     */
+    BooleanExpression and(BooleanExpression expr);
+
+    /**
+     * Method to return the OR of this expression and the other expression.
+     * @param expr The other expression
+     * @return The resultant (boolean) expression
+     */
+    BooleanExpression or(BooleanExpression expr);
+
+    /**
+     * Method to negate this expression.
+     * @return The negated expression
+     */
+    BooleanExpression not();
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-22 18:40:56 UTC (rev 10265)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-23 06:22:40 UTC (rev 10266)
@@ -29,25 +29,25 @@
      * Method to set the filter of the query.
      * @return The query
      */
-    Q filter(); // TODO Needs boolean expression argument
+    Q filter(BooleanExpression expr);
 
     /**
      * Method to set the grouping(s) for the query.
      * @return The query
      */
-    Q groupBy(); // TODO Needs expression varargs
+    Q groupBy(Expression... exprs);
 
     /**
      * Method to set the having clause of the query.
      * @return The query
      */
-    Q having(); // TODO Needs boolean expression argument
+    Q having(Expression expr);
 
     /**
      * Method to set the ordering of the query.
      * @return The query
      */
-    Q orderBy(); // TODO Needs expression varargs
+    Q orderBy(); // TODO Needs order expression varargs
 
     /**
      * Method to set the range of any required results.
@@ -76,7 +76,7 @@
      * Method to set the result components of the query.
      * @return The query
      */
-    Q result(); // TODO Need expression varargs
+    Q result(Expression... exprs);
 
     // TODO Add imports, variables, parameters
 

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-06-23 06:22:40 UTC (rev 10266)
@@ -0,0 +1,30 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a string expression.
+ */
+public interface StringExpression extends ComparableExpression
+{
+    StringExpression charAt(int i); // TODO IntegerExpression
+
+    StringExpression toLowerCase();
+
+    StringExpression toUpperCase();
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10267
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10267&view=rev
Author:   andy_jefferson
Date:     2010-06-23 06:38:31 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
[NUCCORE-545] Placeholder for numeric, collection, map expressions

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-06-23 06:38:31 UTC (rev 10267)
@@ -0,0 +1,43 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a collection expression.
+ */
+public interface CollectionExpression extends ComparableExpression
+{
+    /**
+     * Method returning whether the specified expression is contained in this collection.
+     * @param expr The element expression
+     * @return Whether it is contained here
+     */
+    BooleanExpression contains(Expression expr);
+
+    /**
+     * Method returning whether the collection is empty.
+     * @return Whether it is empty
+     */
+    BooleanExpression isEmpty();
+
+    /**
+     * Method returning an expression for the size of the collection
+     * @return The size
+     */
+    NumericExpression size();
+}
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-06-23 06:38:31 UTC (rev 10267)
@@ -0,0 +1,57 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a map expression
+ */
+public interface MapExpression extends ComparableExpression
+{
+    /**
+     * Method returning whether the specified key expression is contained in this map.
+     * @param expr The key expression
+     * @return Whether it is contained here
+     */
+    BooleanExpression containsKey(Expression expr);
+
+    /**
+     * Method returning whether the specified value expression is contained in this map.
+     * @param expr The value expression
+     * @return Whether it is contained here
+     */
+    BooleanExpression containsValue(Expression expr);
+
+    /**
+     * Method returning whether the specified entry expression is contained in this map.
+     * @param expr The entry expression
+     * @return Whether it is contained here
+     */
+    BooleanExpression containsEntry(Expression expr);
+
+    /**
+     * Method returning whether the map is empty.
+     * @return Whether it is empty
+     */
+    BooleanExpression isEmpty();
+
+    /**
+     * Method returning an expression for the size of the map
+     * @return The size
+     */
+    NumericExpression size();
+}
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-06-23 06:38:31 UTC (rev 10267)
@@ -0,0 +1,26 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a numeric expression.
+ */
+public interface NumericExpression extends ComparableExpression
+{
+
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10269
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10269&view=rev
Author:   andy_jefferson
Date:     2010-06-23 07:19:13 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
[NUCCORE-545] Placeholder for ordering expression

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java	2010-06-23 07:19:13 UTC (rev 10269)
@@ -0,0 +1,34 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Expression representing the ordering using an expression and a direction.
+ */
+public interface OrderExpression
+{
+    public enum OrderDirection
+    {
+        ASC,
+        DESC
+    }
+
+    OrderDirection getDirection();
+
+    Expression getExpression();
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-23 07:06:42 UTC (rev 10268)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-23 07:19:13 UTC (rev 10269)
@@ -27,38 +27,42 @@
 {
     /**
      * Method to set the filter of the query.
+     * @param expr Filter expression
      * @return The query
      */
     Q filter(BooleanExpression expr);
 
     /**
      * Method to set the grouping(s) for the query.
+     * @param exprs Grouping expression(s)
      * @return The query
      */
     Q groupBy(Expression... exprs);
 
     /**
      * Method to set the having clause of the query.
+     * @param expr Having expression
      * @return The query
      */
     Q having(Expression expr);
 
     /**
      * Method to set the ordering of the query.
+     * @param orderExprs Ordering expression(s)
      * @return The query
      */
-    Q orderBy(); // TODO Needs order expression varargs
+    Q orderBy(OrderExpression... orderExprs);
 
     /**
-     * Method to set the range of any required results.
-     * @param lowerIncl The position of the first result (inclusive)
-     * @param upperExcl The position of the last result (exclusive)
+     * Method to set the range of any required results, using.
+     * @param lowerInclExpr The position of the first result (inclusive)
+     * @param upperExclExpr The position of the last result (exclusive)
      * @return The query
      */
-    Q range(long lowerIncl, long upperExcl);
+    Q range(NumericExpression lowerInclExpr, NumericExpression upperExclExpr);
 
     /**
-     * Method to set the range of any required results.
+     * Method to set the range of any required results, using parameters.
      * @param paramLowerIncl The name of a parameter defining the position of the first result (inclusive)
      * @param paramUpperExcl The name of a parameter defining the position of the last result (exclusive)
      * @return The query


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10271
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10271&view=rev
Author:   andy_jefferson
Date:     2010-06-23 07:35:46 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
[NUCCORE-545] Placeholders for parameters and variables

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java	2010-06-23 07:35:46 UTC (rev 10271)
@@ -0,0 +1,26 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a parameter in a query.
+ */
+public interface ParameterExpression extends ComparableExpression
+{
+    String getName();
+}
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java	2010-06-23 07:35:46 UTC (rev 10271)
@@ -0,0 +1,26 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a variable in a query.
+ */
+public interface VariableExpression extends ComparableExpression
+{
+    String getName();
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10273
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10273&view=rev
Author:   andy_jefferson
Date:     2010-06-23 12:49:08 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
[NUCCORE-545] More of StringExpression methods. Handling for implicit/explicit params/vars.

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java	2010-06-23 11:00:34 UTC (rev 10272)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java	2010-06-23 12:49:08 UTC (rev 10273)
@@ -22,5 +22,15 @@
  */
 public interface ParameterExpression extends ComparableExpression
 {
+    /**
+     * Accessor for the name of the parameter.
+     * @return Parameter name
+     */
     String getName();
+
+    /**
+     * Accessor for the type of the parameter (if known).
+     * @return Parameter type
+     */
+    Class getType();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-23 11:00:34 UTC (rev 10272)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-23 12:49:08 UTC (rev 10273)
@@ -82,8 +82,6 @@
      */
     Q result(Expression... exprs);
 
-    // TODO Add imports, variables, parameters
-
     /**
      * Method to set a parameter value for use when executing the query.
      * @param name Name of the parameter

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java	2010-06-23 11:00:34 UTC (rev 10272)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java	2010-06-23 12:49:08 UTC (rev 10273)
@@ -22,9 +22,41 @@
  */
 public interface QueryBuilder
 {
+    /**
+     * Method to create and return a named parameter.
+     * @param name Name of the parameter
+     * @param type Type of the parameter
+     * @return The parameter expression
+     */
     ParameterExpression createParameter(String name, Class type);
 
+    /**
+     * Method to create and return a positional parameter.
+     * @param position Position of the parameter
+     * @param type Type of the parameter
+     * @return Parameter expression
+     */
     ParameterExpression createParameter(int position, Class type);
 
+    /**
+     * Method to create and return a named implicit parameter.
+     * @param name Name of the parameter
+     * @return The parameter expression
+     */
+    ParameterExpression createParameter(String name);
+
+    /**
+     * Method to create and return a named variable.
+     * @param name Name of the variable
+     * @param type Type of the variable
+     * @return Variable expression
+     */
     VariableExpression createVariable(String name, Class type);
+
+    /**
+     * Method to create and return a named implicit variable.
+     * @param name Name of the variable
+     * @return Variable expression
+     */
+    VariableExpression createVariable(String name);
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-06-23 11:00:34 UTC (rev 10272)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-06-23 12:49:08 UTC (rev 10273)
@@ -22,9 +22,78 @@
  */
 public interface StringExpression extends ComparableExpression
 {
-    StringExpression charAt(int i); // TODO IntegerExpression
+    /**
+     * Method to return an expression for the character at a position of this string expression.
+     * @param pos The position
+     * @return Expression for the character
+     */
+    StringExpression charAt(NumericExpression pos);
 
+    /**
+     * Method returning an expression for whether this string expression ends with the passed string expression.
+     * @param expr The expression that it ends with.
+     * @return Whether it ends with the other string
+     */
+    BooleanExpression endsWith(StringExpression expr);
+
+    /**
+     * Method to return an expression for the position of the passed string in this string.
+     * @param expr The other string
+     * @return Expression for the position of the passed string
+     */
+    NumericExpression indexOf(StringExpression expr);
+
+    /**
+     * Method to return an expression for the position of the passed string in this string after a position.
+     * @param expr The other string
+     * @param pos Start point of the search
+     * @return Expression for the position of the passed string
+     */
+    NumericExpression indexOf(StringExpression expr, NumericExpression pos);
+
+    /**
+     * Method returning a expression for the length of this string.
+     * @return Expression for the length
+     */
+    NumericExpression length();
+
+    /**
+     * Method returning an expression for whether this string expression starts with the passed string expression.
+     * @param expr The expression that it starts with.
+     * @return Whether it starts with the other string
+     */
+    BooleanExpression startsWith(StringExpression expr);
+
+    /**
+     * Method to return an expression for the substring of this string expression.
+     * @param pos The position of the start point of the substring
+     * @return Expression for the substring
+     */
+    StringExpression substring(NumericExpression pos);
+
+    /**
+     * Method to return an expression for the substring of this string expression.
+     * @param startPos The position of the start point of the substring (inclusive, origin 0)
+     * @param endPos The position of the end point of the substring (exclusive, origin 0)
+     * @return Expression for the substring
+     */
+    StringExpression substring(NumericExpression startPos, NumericExpression endPos);
+
+    /**
+     * Method to return a StringExpression representing this string expression in lower case.
+     * @return The lower case expression
+     */
     StringExpression toLowerCase();
 
+    /**
+     * Method to return a StringExpression representing this string expression in upper case.
+     * @return The upper case expression
+     */
     StringExpression toUpperCase();
+
+    /**
+     * Method returning a string expression with whitespace trimmed from start and end.
+     * @return String expression with whitespace trimmed
+     */
+    StringExpression trim();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java	2010-06-23 11:00:34 UTC (rev 10272)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java	2010-06-23 12:49:08 UTC (rev 10273)
@@ -22,5 +22,15 @@
  */
 public interface VariableExpression extends ComparableExpression
 {
+    /**
+     * Accessor for the name of the variable.
+     * @return Variable name
+     */
     String getName();
+
+    /**
+     * Accessor for the type of the variable (if known).
+     * @return Variable type (implicit variable will return null)
+     */
+    Class getType();
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10274
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10274&view=rev
Author:   andy_jefferson
Date:     2010-06-23 12:58:27 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
[NUCCORE-545] More placeholders

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-06-23 12:58:27 UTC (rev 10274)
@@ -0,0 +1,61 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a date in a query.
+ * TODO Consider splitting this into time and date and datetime expressions
+ */
+public interface DateExpression extends ComparableExpression
+{
+    /**
+     * Accessor for the year of this date.
+     * @return Expression for the year
+     */
+    NumericExpression getYear();
+
+    /**
+     * Accessor for the month of this date.
+     * @return Expression for the month
+     */
+    NumericExpression getMonth();
+
+    /**
+     * Accessor for the day (of the month) of this date.
+     * @return Expression for the day of the month
+     */
+    NumericExpression getDay();
+
+    /**
+     * Accessor for the hour of this date.
+     * @return Expression for the hour
+     */
+    NumericExpression getHour();
+
+    /**
+     * Accessor for the minute of this date.
+     * @return Expression for the minute
+     */
+    NumericExpression getMinute();
+
+    /**
+     * Accessor for the second of this date.
+     * @return Expression for the second
+     */
+    NumericExpression getSecond();
+}
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java	2010-06-23 12:58:27 UTC (rev 10274)
@@ -0,0 +1,26 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Expression representing a path in a query (e.g alias.field).
+ */
+public interface PathExpression extends Expression
+{
+
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10275
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10275&view=rev
Author:   andy_jefferson
Date:     2010-06-23 16:15:00 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
[NUCCORE-545] Add construction of ordering expressions

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-06-23 12:58:27 UTC (rev 10274)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-06-23 16:15:00 UTC (rev 10275)
@@ -23,6 +23,18 @@
 public interface Expression
 {
     /**
+     * Method to return an order expression for this expression in ascending order.
+     * @return The order expression
+     */
+    OrderExpression asc();
+
+    /**
+     * Method to return an order expression for this expression in descending order.
+     * @return The order expression
+     */
+    OrderExpression desc();
+
+    /**
      * Method to return this expression as a String form.
      * @return The string form
      */

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java	2010-06-23 12:58:27 UTC (rev 10274)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java	2010-06-23 16:15:00 UTC (rev 10275)
@@ -22,5 +22,10 @@
  */
 public interface PathExpression extends Expression
 {
-
+    /**
+     * Expression for the parent path expression (if any).
+     * If this expression represents "a.b" then the parent expression represents "a".
+     * @return Parent path expression
+     */
+    PathExpression getParentExpression();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-23 12:58:27 UTC (rev 10274)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-23 16:15:00 UTC (rev 10275)
@@ -84,13 +84,21 @@
 
     /**
      * Method to set a parameter value for use when executing the query.
-     * @param name Name of the parameter
+     * @param paramExpr Parameter expression
      * @param value The value
      * @return The query
      */
-    Q setParameter(String name, Object value);
+    Q setParameter(ParameterExpression paramExpr, Object value);
 
     /**
+     * Method to set a parameter value for use when executing the query.
+     * @param paramName Parameter name
+     * @param value The value
+     * @return The query
+     */
+    Q setParameter(String paramName, Object value);
+
+    /**
      * Method to execute the query where there are (potentially) multiple rows and we are returning either a
      * result type or the candidate type.
      * @param resultCls Result class


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10276
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10276&view=rev
Author:   andy_jefferson
Date:     2010-06-23 18:14:46 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
javadocs, and List placeholder

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-06-23 16:15:00 UTC (rev 10275)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-06-23 18:14:46 UTC (rev 10276)
@@ -18,7 +18,7 @@
 package org.datanucleus.query.typesafe;
 
 /**
- * Representation of a collection expression.
+ * Representation of a collection in a query.
  */
 public interface CollectionExpression extends ComparableExpression
 {

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java	2010-06-23 18:14:46 UTC (rev 10276)
@@ -0,0 +1,38 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a List in a query.
+ */
+public interface ListExpression extends CollectionExpression
+{
+    /**
+     * Method returning the element at this position in the List.
+     * @param posExpr The position expression
+     * @return The element at this position in the List
+     */
+    Expression get(NumericExpression posExpr);
+
+    /**
+     * Method returning the element at this position in the List.
+     * @param pos The position
+     * @return The element at this position in the List
+     */
+    Expression get(int pos);
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-06-23 16:15:00 UTC (rev 10275)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-06-23 18:14:46 UTC (rev 10276)
@@ -18,7 +18,7 @@
 package org.datanucleus.query.typesafe;
 
 /**
- * Representation of a map expression
+ * Representation of a map in a query.
  */
 public interface MapExpression extends ComparableExpression
 {

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-06-23 16:15:00 UTC (rev 10275)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-06-23 18:14:46 UTC (rev 10276)
@@ -18,7 +18,7 @@
 package org.datanucleus.query.typesafe;
 
 /**
- * Representation of a string expression.
+ * Representation of a string in a query.
  */
 public interface StringExpression extends ComparableExpression
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10277
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10277&view=rev
Author:   andy_jefferson
Date:     2010-06-23 18:40:55 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
[NUCCORE-545] More combinations for method input args

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java	2010-06-23 18:14:46 UTC (rev 10276)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java	2010-06-23 18:40:55 UTC (rev 10277)
@@ -28,7 +28,15 @@
         DESC
     }
 
+    /**
+     * Accessor for the direction of the ordering with this expression.
+     * @return The direction
+     */
     OrderDirection getDirection();
 
+    /**
+     * Accessor for the expression being used for ordering.
+     * @return Ordering expression
+     */
     Expression getExpression();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-23 18:14:46 UTC (rev 10276)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-23 18:40:55 UTC (rev 10277)
@@ -54,7 +54,7 @@
     Q orderBy(OrderExpression... orderExprs);
 
     /**
-     * Method to set the range of any required results, using.
+     * Method to set the range of any required results, using expressions.
      * @param lowerInclExpr The position of the first result (inclusive)
      * @param upperExclExpr The position of the last result (exclusive)
      * @return The query
@@ -62,6 +62,14 @@
     Q range(NumericExpression lowerInclExpr, NumericExpression upperExclExpr);
 
     /**
+     * Method to set the range of any required results, using long values.
+     * @param lowerInclExpr The position of the first result (inclusive)
+     * @param upperExclExpr The position of the last result (exclusive)
+     * @return The query
+     */
+    Q range(long lowerIncl, long upperExcl);
+
+    /**
      * Method to set the range of any required results, using parameters.
      * @param paramLowerIncl The name of a parameter defining the position of the first result (inclusive)
      * @param paramUpperExcl The name of a parameter defining the position of the last result (exclusive)

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-06-23 18:14:46 UTC (rev 10276)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-06-23 18:40:55 UTC (rev 10277)
@@ -27,6 +27,13 @@
      * @param pos The position
      * @return Expression for the character
      */
+    StringExpression charAt(int pos);
+
+    /**
+     * Method to return an expression for the character at a position of this string expression.
+     * @param pos The position
+     * @return Expression for the character
+     */
     StringExpression charAt(NumericExpression pos);
 
     /**
@@ -37,6 +44,13 @@
     BooleanExpression endsWith(StringExpression expr);
 
     /**
+     * Method returning an expression for whether this string expression ends with the passed string expression.
+     * @param str The string that it ends with.
+     * @return Whether it ends with the other string
+     */
+    BooleanExpression endsWith(String str);
+
+    /**
      * Method to return an expression for the position of the passed string in this string.
      * @param expr The other string
      * @return Expression for the position of the passed string
@@ -44,6 +58,13 @@
     NumericExpression indexOf(StringExpression expr);
 
     /**
+     * Method to return an expression for the position of the passed string in this string.
+     * @param str The other string
+     * @return Expression for the position of the passed string
+     */
+    NumericExpression indexOf(String str);
+
+    /**
      * Method to return an expression for the position of the passed string in this string after a position.
      * @param expr The other string
      * @param pos Start point of the search
@@ -52,6 +73,30 @@
     NumericExpression indexOf(StringExpression expr, NumericExpression pos);
 
     /**
+     * Method to return an expression for the position of the passed string in this string after a position.
+     * @param str The other string
+     * @param pos Start point of the search
+     * @return Expression for the position of the passed string
+     */
+    NumericExpression indexOf(String str, NumericExpression pos);
+
+    /**
+     * Method to return an expression for the position of the passed string in this string after a position.
+     * @param str The other string
+     * @param pos Start point of the search
+     * @return Expression for the position of the passed string
+     */
+    NumericExpression indexOf(String str, int pos);
+
+    /**
+     * Method to return an expression for the position of the passed string in this string after a position.
+     * @param expr The other string
+     * @param pos Start point of the search
+     * @return Expression for the position of the passed string
+     */
+    NumericExpression indexOf(StringExpression expr, int pos);
+
+    /**
      * Method returning a expression for the length of this string.
      * @return Expression for the length
      */
@@ -65,6 +110,13 @@
     BooleanExpression startsWith(StringExpression expr);
 
     /**
+     * Method returning an expression for whether this string expression starts with the passed string.
+     * @param str The string that it starts with.
+     * @return Whether it starts with the other string
+     */
+    BooleanExpression startsWith(String str);
+
+    /**
      * Method to return an expression for the substring of this string expression.
      * @param pos The position of the start point of the substring
      * @return Expression for the substring
@@ -73,6 +125,13 @@
 
     /**
      * Method to return an expression for the substring of this string expression.
+     * @param pos The position of the start point of the substring
+     * @return Expression for the substring
+     */
+    StringExpression substring(int pos);
+
+    /**
+     * Method to return an expression for the substring of this string expression.
      * @param startPos The position of the start point of the substring (inclusive, origin 0)
      * @param endPos The position of the end point of the substring (exclusive, origin 0)
      * @return Expression for the substring
@@ -80,6 +139,14 @@
     StringExpression substring(NumericExpression startPos, NumericExpression endPos);
 
     /**
+     * Method to return an expression for the substring of this string expression.
+     * @param startPos The position of the start point of the substring (inclusive, origin 0)
+     * @param endPos The position of the end point of the substring (exclusive, origin 0)
+     * @return Expression for the substring
+     */
+    StringExpression substring(int startPos, int endPos);
+
+    /**
      * Method to return a StringExpression representing this string expression in lower case.
      * @return The lower case expression
      */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10278
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10278&view=rev
Author:   andy_jefferson
Date:     2010-06-24 06:35:54 +0000 (Thu, 24 Jun 2010)

Log Message:
-----------
genericised

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-06-23 18:40:55 UTC (rev 10277)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-06-24 06:35:54 UTC (rev 10278)
@@ -20,16 +20,23 @@
 /**
  * Representation of a collection in a query.
  */
-public interface CollectionExpression extends ComparableExpression
+public interface CollectionExpression<E> extends ComparableExpression
 {
     /**
-     * Method returning whether the specified expression is contained in this collection.
+     * Method returning whether the specified elementexpression is contained in this collection.
      * @param expr The element expression
      * @return Whether it is contained here
      */
     BooleanExpression contains(Expression expr);
 
     /**
+     * Method returning whether the specified element is contained in this collection.
+     * @param elem The element
+     * @return Whether it is contained here
+     */
+    BooleanExpression contains(E elem);
+
+    /**
      * Method returning whether the collection is empty.
      * @return Whether it is empty
      */

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-06-23 18:40:55 UTC (rev 10277)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-06-24 06:35:54 UTC (rev 10278)
@@ -17,10 +17,12 @@
 **********************************************************************/
 package org.datanucleus.query.typesafe;
 
+import java.util.Map;
+
 /**
  * Representation of a map in a query.
  */
-public interface MapExpression extends ComparableExpression
+public interface MapExpression<K, V> extends ComparableExpression
 {
     /**
      * Method returning whether the specified key expression is contained in this map.
@@ -30,6 +32,13 @@
     BooleanExpression containsKey(Expression expr);
 
     /**
+     * Method returning whether the specified key is contained in this map.
+     * @param key The key
+     * @return Whether it is contained here
+     */
+    BooleanExpression containsKey(K key);
+
+    /**
      * Method returning whether the specified value expression is contained in this map.
      * @param expr The value expression
      * @return Whether it is contained here
@@ -37,6 +46,13 @@
     BooleanExpression containsValue(Expression expr);
 
     /**
+     * Method returning whether the specified value is contained in this map.
+     * @param value The value
+     * @return Whether it is contained here
+     */
+    BooleanExpression containsValue(V value);
+
+    /**
      * Method returning whether the specified entry expression is contained in this map.
      * @param expr The entry expression
      * @return Whether it is contained here
@@ -44,6 +60,13 @@
     BooleanExpression containsEntry(Expression expr);
 
     /**
+     * Method returning whether the specified entry is contained in this map.
+     * @param entry The entry expression
+     * @return Whether it is contained here
+     */
+    BooleanExpression containsEntry(Map.Entry<K, V> entry);
+
+    /**
      * Method returning whether the map is empty.
      * @return Whether it is empty
      */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10341
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10341&view=rev
Author:   andy_jefferson
Date:     2010-06-28 07:03:47 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
[NUCCORE-545] Placeholder for the DN implementation of typesafe queries, and the annotation processor

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/JDOQueryProcessor.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/package.html

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/JDOQueryProcessor.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/JDOQueryProcessor.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/JDOQueryProcessor.java	2010-06-28 07:03:47 UTC (rev 10341)
@@ -0,0 +1,163 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe.impl;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Set;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Elements;
+import javax.lang.model.util.Types;
+import javax.tools.JavaFileObject;
+
+/**
+ * Annotation processor for JDO to generate "dummy" classes for all persistable classes for use with the 
+ * Typesafe Query API. Any class ({MyClass}) that has a JDO "class" annotation will have a stub class 
+ * (Q{MyClass}) generated.
+ * <ul>
+ * <li>For each managed class X in package p, a metamodel class QX in package p is created.</li>
+ * <li>The name of the metamodel class is derived from the name of the managed class by prepending "Q" 
+ * to the name of the managed class.</li>
+ * </ul>
+ */
+@SupportedAnnotationTypes({"javax.jdo.annotations.PersistenceCapable"})
+@SupportedSourceVersion(SourceVersion.RELEASE_6)
+public class JDOQueryProcessor extends AbstractProcessor
+{
+    String prefix = "Q";
+
+    Types typesHandler;
+
+    /* (non-Javadoc)
+     * @see javax.annotation.processing.AbstractProcessor#process(java.util.Set, javax.annotation.processing.RoundEnvironment)
+     */
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv)
+    {
+        if (roundEnv.processingOver())
+        {
+            return false;
+        }
+
+        typesHandler = processingEnv.getTypeUtils();
+        Set<? extends Element> elements = roundEnv.getRootElements();
+        for (Element e : elements)
+        {
+            processClass((TypeElement)e);
+        }
+        return false;
+    }
+
+    /**
+     * Handler for processing a JPA annotated class to create the criteria class stub.
+     * @param el The class element
+     */
+    protected void processClass(TypeElement el)
+    {
+        if (el == null)
+        {
+            return;
+        }
+
+        // TODO Set imports to only include the classes we require
+        // TODO Set references to other classes to be the class name and put the package in the imports
+        // TODO Support specification of the location for writing the class source files
+        Elements elementUtils = processingEnv.getElementUtils();
+        String className = elementUtils.getBinaryName(el).toString();
+        String pkgName = className.substring(0, className.lastIndexOf('.'));
+        String classSimpleName = className.substring(className.lastIndexOf('.') + 1);
+        String classNameNew = prefix + className;
+        System.out.println("JDO QueryProcessor orig=" + className + " new=" + classNameNew);
+
+        TypeElement superEl = getPersistentSupertype(el);
+        try
+        {
+            JavaFileObject javaFile = processingEnv.getFiler().createSourceFile(classNameNew);
+            Writer w = javaFile.openWriter();
+            try
+            {
+                w.append("package " + pkgName + ";\n");
+                w.append("\n");
+                w.append("public class " + prefix + classSimpleName);
+                if (superEl != null)
+                {
+                    String superClassName = elementUtils.getBinaryName(superEl).toString();
+                    w.append(" extends ").append(prefix + superClassName);
+                }
+                w.append("\n");
+                w.append("{\n");
+
+                // Find the members to use for persistence processing
+
+                w.append("}\n");
+                w.flush();
+            }
+            finally
+            {
+                w.close();
+            }
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+    }
+    /**
+     * Method to find the next persistent supertype above this one.
+     * @param element The element
+     * @return Its next parent that is persistable (or null if no persistable predecessors)
+     */
+    public TypeElement getPersistentSupertype(TypeElement element)
+    {
+        TypeMirror superType = element.getSuperclass();
+        if (superType == null || (element != null && "java.lang.Object".equals(element.toString())))
+        {
+            return null;
+        }
+
+        TypeElement superElement = (TypeElement) processingEnv.getTypeUtils().asElement(superType);
+        if (isJDOAnnotated(superElement))
+        {
+            return superElement;
+        }
+        return getPersistentSupertype(superElement);
+    }
+
+    /**
+     * Convenience method to return if this class element has any of the defining JDO annotations.
+     * @param el The class element
+     * @return Whether it is to be considered a JDO annotated class
+     */
+    public static boolean isJDOAnnotated(TypeElement el)
+    {
+        if ((el.getAnnotation(PersistenceCapable.class) != null))
+        {
+            return true;
+        }
+        return false;
+    }
+}
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/package.html
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/package.html	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/package.html	2010-06-28 07:03:47 UTC (rev 10341)
@@ -0,0 +1,3 @@
+<BODY>
+    Package providing DataNucleus' implementation of a typesafe query mechanism, primarily JDOQL.
+</BODY>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10345
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10345&view=rev
Author:   andy_jefferson
Date:     2010-06-28 11:21:49 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
[NUCCORE-545] Genericised

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java	2010-06-28 08:48:24 UTC (rev 10344)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
@@ -20,7 +20,7 @@
 /**
  * Representation of a boolean expression.
  */
-public interface BooleanExpression extends ComparableExpression
+public interface BooleanExpression<T> extends ComparableExpression<T>
 {
     /**
      * Method to return the AND of this expression and the other expression.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-06-28 08:48:24 UTC (rev 10344)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
@@ -19,8 +19,11 @@
 
 /**
  * Representation of a collection in a query.
+ * 
+ * @param <T> Java type being represented here
+ * @param <E> Element type of the collection being represented here
  */
-public interface CollectionExpression<E> extends ComparableExpression
+public interface CollectionExpression<T, E> extends ComparableExpression<T>
 {
     /**
      * Method returning whether the specified elementexpression is contained in this collection.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	2010-06-28 08:48:24 UTC (rev 10344)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
@@ -20,7 +20,7 @@
 /**
  * Representation of an expression that is comparable.
  */
-public interface ComparableExpression extends Expression
+public interface ComparableExpression<T> extends Expression<T>
 {
     /**
      * Method returning whether this expression equals the other expression.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-06-28 08:48:24 UTC (rev 10344)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
@@ -21,7 +21,7 @@
  * Representation of a date in a query.
  * TODO Consider splitting this into time and date and datetime expressions
  */
-public interface DateExpression extends ComparableExpression
+public interface DateExpression<T> extends ComparableExpression<T>
 {
     /**
      * Accessor for the year of this date.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-06-28 08:48:24 UTC (rev 10344)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-06-28 11:21:49 UTC (rev 10345)
@@ -19,8 +19,10 @@
 
 /**
  * Representation of an expression in a query.
+ * 
+ * @param <T> Java type being represented here
  */
-public interface Expression
+public interface Expression<T>
 {
     /**
      * Accessor for the path to this expression.
@@ -32,7 +34,7 @@
      * Get the Java type for this expression.
      * @return The java type
      */
-    Class getType();
+    Class<? extends T> getType();
 
     /**
      * Method to return an order expression for this expression in ascending order.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java	2010-06-28 08:48:24 UTC (rev 10344)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
@@ -20,7 +20,7 @@
 /**
  * Representation of a List in a query.
  */
-public interface ListExpression extends CollectionExpression
+public interface ListExpression<T, E> extends CollectionExpression<T, E>
 {
     /**
      * Method returning the element at this position in the List.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-06-28 08:48:24 UTC (rev 10344)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
@@ -21,8 +21,12 @@
 
 /**
  * Representation of a map in a query.
+ * 
+ * @param <T> Java type being represented here
+ * @param <K> Key type of the map being represented here
+ * @param <V> Value type of the map being represented here
  */
-public interface MapExpression<K, V> extends ComparableExpression
+public interface MapExpression<T, K, V> extends ComparableExpression<T>
 {
     /**
      * Method returning whether the specified key expression is contained in this map.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-06-28 08:48:24 UTC (rev 10344)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
@@ -20,7 +20,7 @@
 /**
  * Representation of a numeric expression.
  */
-public interface NumericExpression extends ComparableExpression
+public interface NumericExpression<T> extends ComparableExpression<T>
 {
 
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java	2010-06-28 08:48:24 UTC (rev 10344)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
@@ -20,17 +20,11 @@
 /**
  * Representation of a parameter in a query.
  */
-public interface ParameterExpression extends ComparableExpression
+public interface ParameterExpression<T> extends ComparableExpression<T>
 {
     /**
      * Accessor for the name of the parameter.
      * @return Parameter name
      */
     String getName();
-
-    /**
-     * Accessor for the type of the parameter (if known).
-     * @return Parameter type
-     */
-    Class getType();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-06-28 08:48:24 UTC (rev 10344)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
@@ -20,7 +20,7 @@
 /**
  * Representation of a string in a query.
  */
-public interface StringExpression extends ComparableExpression
+public interface StringExpression<T> extends ComparableExpression<T>
 {
     /**
      * Method to return an expression for the character at a position of this string expression.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java	2010-06-28 08:48:24 UTC (rev 10344)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
@@ -20,17 +20,11 @@
 /**
  * Representation of a variable in a query.
  */
-public interface VariableExpression extends ComparableExpression
+public interface VariableExpression<T> extends ComparableExpression<T>
 {
     /**
      * Accessor for the name of the variable.
      * @return Variable name
      */
     String getName();
-
-    /**
-     * Accessor for the type of the variable (if known).
-     * @return Variable type (implicit variable will return null)
-     */
-    Class getType();
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10346
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10346&view=rev
Author:   andy_jefferson
Date:     2010-06-28 12:45:23 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
[NUCCORE-545] More generics, and types of basic expressions

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java	2010-06-28 12:45:23 UTC (rev 10346)
@@ -19,8 +19,10 @@
 
 /**
  * Representation of a boolean expression.
+ * 
+ * @param <T> Boolean type
  */
-public interface BooleanExpression<T> extends ComparableExpression<T>
+public interface BooleanExpression<T> extends ComparableExpression<Boolean>
 {
     /**
      * Method to return the AND of this expression and the other expression.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	2010-06-28 12:45:23 UTC (rev 10346)
@@ -19,6 +19,8 @@
 
 /**
  * Representation of an expression that is comparable.
+ * 
+ * @param <T> Java type being represented here
  */
 public interface ComparableExpression<T> extends Expression<T>
 {
@@ -27,40 +29,40 @@
      * @param expr Other expression
      * @return Whether they are equal
      */
-    ComparableExpression eq(ComparableExpression expr);
+    BooleanExpression eq(ComparableExpression expr);
 
     /**
      * Method returning whether this expression doesn't equal the other expression.
      * @param expr Other expression
      * @return Whether they are not equal
      */
-    ComparableExpression ne(ComparableExpression expr);
+    BooleanExpression ne(ComparableExpression expr);
 
     /**
      * Method returning whether this expression is less than the other expression.
      * @param expr Other expression
      * @return Whether this is less than the other
      */
-    ComparableExpression lt(ComparableExpression expr);
+    BooleanExpression lt(ComparableExpression expr);
 
     /**
      * Method returning whether this expression is less than or equal the other expression.
      * @param expr Other expression
      * @return Whether this is less than or equal the other
      */
-    ComparableExpression lteq(ComparableExpression expr);
+    BooleanExpression lteq(ComparableExpression expr);
 
     /**
      * Method returning whether this expression is greater than the other expression.
      * @param expr Other expression
      * @return Whether this is greater than the other
      */
-    ComparableExpression gt(ComparableExpression expr);
+    BooleanExpression gt(ComparableExpression expr);
 
     /**
      * Method returning whether this expression is greater than or equal the other expression.
      * @param expr Other expression
      * @return Whether this is greater than or equal to the other
      */
-    ComparableExpression gteq(ComparableExpression expr);
+    BooleanExpression gteq(ComparableExpression expr);
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-06-28 12:45:23 UTC (rev 10346)
@@ -19,6 +19,8 @@
 
 /**
  * Representation of a date in a query.
+ * 
+ * @param <T> Date type
  * TODO Consider splitting this into time and date and datetime expressions
  */
 public interface DateExpression<T> extends ComparableExpression<T>

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java	2010-06-28 12:45:23 UTC (rev 10346)
@@ -19,6 +19,9 @@
 
 /**
  * Representation of a List in a query.
+ * 
+ * @param <T> Java type being represented here
+ * @param <E> Element type of the List being represented here
  */
 public interface ListExpression<T, E> extends CollectionExpression<T, E>
 {

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-06-28 12:45:23 UTC (rev 10346)
@@ -19,8 +19,10 @@
 
 /**
  * Representation of a numeric expression.
+ * 
+ * @param <T> Number type
  */
-public interface NumericExpression<T> extends ComparableExpression<T>
+public interface NumericExpression<T> extends ComparableExpression<Number>
 {
 
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/OrderExpression.java	2010-06-28 12:45:23 UTC (rev 10346)
@@ -19,8 +19,10 @@
 
 /**
  * Expression representing the ordering using an expression and a direction.
+ * 
+ * @param <T> Java type of the expression being represented here
  */
-public interface OrderExpression
+public interface OrderExpression<T>
 {
     public enum OrderDirection
     {
@@ -38,5 +40,5 @@
      * Accessor for the expression being used for ordering.
      * @return Ordering expression
      */
-    Expression getExpression();
+    Expression<T> getExpression();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java	2010-06-28 12:45:23 UTC (rev 10346)
@@ -19,6 +19,8 @@
 
 /**
  * Representation of a parameter in a query.
+ * 
+ * @param <T> Java type being represented here
  */
 public interface ParameterExpression<T> extends ComparableExpression<T>
 {

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-06-28 12:45:23 UTC (rev 10346)
@@ -19,8 +19,10 @@
 
 /**
  * Representation of a string in a query.
+ * 
+ * @param <T> String type
  */
-public interface StringExpression<T> extends ComparableExpression<T>
+public interface StringExpression<T> extends ComparableExpression<String>
 {
     /**
      * Method to return an expression for the character at a position of this string expression.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java	2010-06-28 11:21:49 UTC (rev 10345)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java	2010-06-28 12:45:23 UTC (rev 10346)
@@ -19,6 +19,8 @@
 
 /**
  * Representation of a variable in a query.
+ * 
+ * @param <T> Java type being represented here
  */
 public interface VariableExpression<T> extends ComparableExpression<T>
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10348
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10348&view=rev
Author:   andy_jefferson
Date:     2010-06-28 14:05:41 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
[NUCCORE-545] more generics

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-06-28 12:49:33 UTC (rev 10347)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-06-28 14:05:41 UTC (rev 10348)
@@ -49,5 +49,5 @@
      * Method returning an expression for the size of the collection
      * @return The size
      */
-    NumericExpression size();
+    NumericExpression<Integer> size();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-06-28 12:49:33 UTC (rev 10347)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-06-28 14:05:41 UTC (rev 10348)
@@ -17,47 +17,49 @@
 **********************************************************************/
 package org.datanucleus.query.typesafe;
 
+import java.util.Date;
+
 /**
  * Representation of a date in a query.
  * 
  * @param <T> Date type
  * TODO Consider splitting this into time and date and datetime expressions
  */
-public interface DateExpression<T> extends ComparableExpression<T>
+public interface DateExpression<T> extends ComparableExpression<Date>
 {
     /**
      * Accessor for the year of this date.
      * @return Expression for the year
      */
-    NumericExpression getYear();
+    NumericExpression<Integer> getYear();
 
     /**
      * Accessor for the month of this date.
      * @return Expression for the month
      */
-    NumericExpression getMonth();
+    NumericExpression<Integer> getMonth();
 
     /**
      * Accessor for the day (of the month) of this date.
      * @return Expression for the day of the month
      */
-    NumericExpression getDay();
+    NumericExpression<Integer> getDay();
 
     /**
      * Accessor for the hour of this date.
      * @return Expression for the hour
      */
-    NumericExpression getHour();
+    NumericExpression<Integer> getHour();
 
     /**
      * Accessor for the minute of this date.
      * @return Expression for the minute
      */
-    NumericExpression getMinute();
+    NumericExpression<Integer> getMinute();
 
     /**
      * Accessor for the second of this date.
      * @return Expression for the second
      */
-    NumericExpression getSecond();
+    NumericExpression<Integer> getSecond();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java	2010-06-28 12:49:33 UTC (rev 10347)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java	2010-06-28 14:05:41 UTC (rev 10348)
@@ -30,7 +30,7 @@
      * @param posExpr The position expression
      * @return The element at this position in the List
      */
-    Expression get(NumericExpression posExpr);
+    Expression get(NumericExpression<Integer> posExpr);
 
     /**
      * Method returning the element at this position in the List.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-06-28 12:49:33 UTC (rev 10347)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-06-28 14:05:41 UTC (rev 10348)
@@ -80,5 +80,5 @@
      * Method returning an expression for the size of the map
      * @return The size
      */
-    NumericExpression size();
+    NumericExpression<Integer> size();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-28 12:49:33 UTC (rev 10347)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-06-28 14:05:41 UTC (rev 10348)
@@ -134,9 +134,9 @@
      * Method to execute the query where there is a single row and we are returning either a result type
      * or the candidate type.
      * @param resultCls Result class
-     * @return The results
+     * @return The result
      */
-    <T> T[] executeUnique(T resultCls);
+    <T> T executeUnique(T resultCls);
 
     /**
      * Method to execute the query where there is a single row and we have a result defined

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java	2010-06-28 12:49:33 UTC (rev 10347)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java	2010-06-28 14:05:41 UTC (rev 10348)
@@ -28,7 +28,7 @@
      * @param type Type of the parameter
      * @return The parameter expression
      */
-    ParameterExpression createParameter(String name, Class type);
+    <T> ParameterExpression<T> createParameter(String name, T type);
 
     /**
      * Method to create and return a positional parameter.
@@ -36,7 +36,7 @@
      * @param type Type of the parameter
      * @return Parameter expression
      */
-    ParameterExpression createParameter(int position, Class type);
+    <T> ParameterExpression<T> createParameter(int position, T type);
 
     /**
      * Method to create and return a named implicit parameter.
@@ -51,7 +51,7 @@
      * @param type Type of the variable
      * @return Variable expression
      */
-    VariableExpression createVariable(String name, Class type);
+    <T> VariableExpression<T> createVariable(String name, T type);
 
     /**
      * Method to create and return a named implicit variable.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10381
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10381&view=rev
Author:   andy_jefferson
Date:     2010-07-01 13:10:10 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------
[NUCCORE-545] Change parameter/variable to be generated by the Query (no need for QueryBuilder), and to be of the particular expression type (could be StringExpression, PathExpression, NumericExpression, etc).

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java

Removed Paths:
-------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-01 10:57:04 UTC (rev 10380)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-01 13:10:10 UTC (rev 10381)
@@ -53,4 +53,16 @@
      * @return The string form
      */
     String toString();
+
+    /**
+     * Whether this expression represents a parameter.
+     * @return Whether it is a parameter
+     */
+    boolean isParameter();
+
+    /**
+     * Whether this expression represents a variable.
+     * @return Whether it is a variable
+     */
+    boolean isVariable();
 }
\ No newline at end of file

Deleted: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java	2010-07-01 10:57:04 UTC (rev 10380)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ParameterExpression.java	2010-07-01 13:10:10 UTC (rev 10381)
@@ -1,32 +0,0 @@
-/**********************************************************************
-Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-   ...
-**********************************************************************/
-package org.datanucleus.query.typesafe;
-
-/**
- * Representation of a parameter in a query.
- * 
- * @param <T> Java type being represented here
- */
-public interface ParameterExpression<T> extends ComparableExpression<T>
-{
-    /**
-     * Accessor for the name of the parameter.
-     * @return Parameter name
-     */
-    String getName();
-}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-07-01 10:57:04 UTC (rev 10380)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-07-01 13:10:10 UTC (rev 10381)
@@ -28,6 +28,28 @@
 public interface Query<Q extends Query<Q>>
 {
     /**
+     * Method to return an expression for the candidate of the query.
+     * @return Expression for the candidate
+     */
+    Expression candidate();
+
+    /**
+     * Method to return a parameter for the query.
+     * @param name Name of the parameter
+     * @param type Java type of the parameter
+     * @return Expression for the parameter
+     */
+    Expression parameter(String name, Class type);
+
+    /**
+     * Method to return a variable for this query.
+     * @param name Name of the variable
+     * @param type Type of the variable
+     * @return Expression for the variable
+     */
+    Expression variable(String name, Class type);
+
+    /**
      * Method to set the FetchPlan to use.
      * @param fp FetchPlan
      * @return The query
@@ -105,7 +127,7 @@
      * @param value The value
      * @return The query
      */
-    Q setParameter(ParameterExpression paramExpr, Object value);
+    Q setParameter(Expression paramExpr, Object value);
 
     /**
      * Method to set a parameter value for use when executing the query.

Deleted: platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java	2010-07-01 10:57:04 UTC (rev 10380)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/QueryBuilder.java	2010-07-01 13:10:10 UTC (rev 10381)
@@ -1,62 +0,0 @@
-/**********************************************************************
-Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-   ...
-**********************************************************************/
-package org.datanucleus.query.typesafe;
-
-/**
- * Interface providing factory methods to return expressions for use in typesafe queries.
- */
-public interface QueryBuilder
-{
-    /**
-     * Method to create and return a named parameter.
-     * @param name Name of the parameter
-     * @param type Type of the parameter
-     * @return The parameter expression
-     */
-    <T> ParameterExpression<T> createParameter(String name, T type);
-
-    /**
-     * Method to create and return a positional parameter.
-     * @param position Position of the parameter
-     * @param type Type of the parameter
-     * @return Parameter expression
-     */
-    <T> ParameterExpression<T> createParameter(int position, T type);
-
-    /**
-     * Method to create and return a named implicit parameter.
-     * @param name Name of the parameter
-     * @return The parameter expression
-     */
-    ParameterExpression createParameter(String name);
-
-    /**
-     * Method to create and return a named variable.
-     * @param name Name of the variable
-     * @param type Type of the variable
-     * @return Variable expression
-     */
-    <T> VariableExpression<T> createVariable(String name, T type);
-
-    /**
-     * Method to create and return a named implicit variable.
-     * @param name Name of the variable
-     * @return Variable expression
-     */
-    VariableExpression createVariable(String name);
-}
\ No newline at end of file

Deleted: platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java	2010-07-01 10:57:04 UTC (rev 10380)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/VariableExpression.java	2010-07-01 13:10:10 UTC (rev 10381)
@@ -1,32 +0,0 @@
-/**********************************************************************
-Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-   ...
-**********************************************************************/
-package org.datanucleus.query.typesafe;
-
-/**
- * Representation of a variable in a query.
- * 
- * @param <T> Java type being represented here
- */
-public interface VariableExpression<T> extends ComparableExpression<T>
-{
-    /**
-     * Accessor for the name of the variable.
-     * @return Variable name
-     */
-    String getName();
-}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10383
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10383&view=rev
Author:   andy_jefferson
Date:     2010-07-01 13:50:46 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------
expression for "other" types

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java	2010-07-01 13:50:46 UTC (rev 10383)
@@ -0,0 +1,29 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of an Object as an expression.
+ * This handles all remaining Java types not handled by String, Numeric, Enum, Boolean, Collection, Map, etc.
+ * 
+ * @param <T> Java type
+ */
+public interface ObjectExpression<T> extends ComparableExpression<Number>
+{
+
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html	2010-07-01 13:28:06 UTC (rev 10382)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html	2010-07-01 13:50:46 UTC (rev 10383)
@@ -1,14 +1,14 @@
 <BODY>
     Package providing a typesafe query mechanism, primarily for JDO.
-    Fields of non-relational types, or literals are represented by
+    Fields/Params/Vars of a persistable type are represented as <i>PathExpression</i>.
+    Fields/Params/Vars of a container type are represented as <i>CollectionExpression</i>, <i>MapExpression</i>
+    Fields/Params/Vars of other types, or literals are represented by
     <ul>
         <li>StringExpression</li>
         <li>EnumExpression</li>
         <li>NumericExpression</li>
         <li>BooleanExpression</li>
         <li>DateExpression</li>
+        <li>ObjectExpression</li>
     </ul>
-    Likely need further types here for byte, UUID, URI, URL, etc etc.
-    Fields of a persistable type are represented as <i>PathExpression</i>.
-    Fields of a container type are represented as <i>CollectionExpression</i>, <i>MapExpression</i>
 </BODY>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10397
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10397&view=rev
Author:   andy_jefferson
Date:     2010-07-05 12:45:31 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
missing types

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java	2010-07-05 12:45:31 UTC (rev 10397)
@@ -0,0 +1,27 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a byte expression.
+ * 
+ * @param <T> Byte type
+ */
+public interface ByteExpression<T> extends ComparableExpression<Byte>
+{
+}
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java	2010-07-05 12:45:31 UTC (rev 10397)
@@ -0,0 +1,27 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a character expression.
+ * 
+ * @param <T> Character type
+ */
+public interface CharacterExpression<T> extends ComparableExpression<Character>
+{
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html	2010-07-05 11:14:34 UTC (rev 10396)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html	2010-07-05 12:45:31 UTC (rev 10397)
@@ -8,6 +8,8 @@
         <li>EnumExpression</li>
         <li>NumericExpression</li>
         <li>BooleanExpression</li>
+        <li>ByteExpression</li>
+        <li>CharacterExpression</li>
         <li>DateExpression</li>
         <li>ObjectExpression</li>
     </ul>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10398
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10398&view=rev
Author:   andy_jefferson
Date:     2010-07-05 13:05:39 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
placeholders for other operations

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-05 12:45:31 UTC (rev 10397)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-05 13:05:39 UTC (rev 10398)
@@ -49,6 +49,41 @@
     OrderExpression desc();
 
     /**
+     * Method to return an expression for this expression added to the passed expression.
+     * @param expr The other expression
+     * @return The summation
+     */
+    Expression<T> add(Expression expr);
+
+    /**
+     * Method to return an expression for this expression subtracting the passed expression.
+     * @param expr The other expression
+     * @return The difference
+     */
+    Expression<T> sub(Expression expr);
+
+    /**
+     * Method to return an expression for this expression multiplied by the passed expression.
+     * @param expr The other expression
+     * @return The multiplication
+     */
+    Expression<T> mul(Expression expr);
+
+    /**
+     * Method to return an expression for this expression divided by the passed expression.
+     * @param expr The other expression
+     * @return The division
+     */
+    Expression<T> div(Expression expr);
+
+    /**
+     * Method to return an expression for this expression modulus the passed expression (<pre>a % b</pre>).
+     * @param expr The other expression
+     * @return The modulus
+     */
+    Expression<T> mod(Expression expr);
+
+    /**
      * Method to return this expression as a String form.
      * @return The string form
      */

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-07-05 12:45:31 UTC (rev 10397)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-07-05 13:05:39 UTC (rev 10398)
@@ -29,12 +29,14 @@
 {
     /**
      * Method to return an expression for the candidate of the query.
+     * Cast the returned expression to the candidate "Q" type to be able to call methods on it.
      * @return Expression for the candidate
      */
     Expression candidate();
 
     /**
      * Method to return a parameter for the query.
+     * Cast the returned parameter to the right type to be able to call methods on it.
      * @param name Name of the parameter
      * @param type Java type of the parameter
      * @return Expression for the parameter
@@ -43,6 +45,7 @@
 
     /**
      * Method to return a variable for this query.
+     * Cast the returned variable to the right type to be able to call methods on it.
      * @param name Name of the variable
      * @param type Type of the variable
      * @return Expression for the variable


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10413
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10413&view=rev
Author:   andy_jefferson
Date:     2010-07-07 09:01:41 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
Merge ComparableExpression into Expression since every type is "comparable" in Java.

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/EnumExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html

Removed Paths:
-------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -22,7 +22,7 @@
  * 
  * @param <T> Boolean type
  */
-public interface BooleanExpression<T> extends ComparableExpression<Boolean>
+public interface BooleanExpression<T> extends Expression<Boolean>
 {
     /**
      * Method to return the AND of this expression and the other expression.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -22,6 +22,6 @@
  * 
  * @param <T> Byte type
  */
-public interface ByteExpression<T> extends ComparableExpression<Byte>
+public interface ByteExpression<T> extends Expression<Byte>
 {
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -22,6 +22,6 @@
  * 
  * @param <T> Character type
  */
-public interface CharacterExpression<T> extends ComparableExpression<Character>
+public interface CharacterExpression<T> extends Expression<Character>
 {
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -23,7 +23,7 @@
  * @param <T> Java type being represented here
  * @param <E> Element type of the collection being represented here
  */
-public interface CollectionExpression<T, E> extends ComparableExpression<T>
+public interface CollectionExpression<T, E> extends Expression<T>
 {
     /**
      * Method returning whether the specified elementexpression is contained in this collection.

Deleted: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -1,110 +0,0 @@
-/**********************************************************************
-Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-   ...
-**********************************************************************/
-package org.datanucleus.query.typesafe;
-
-/**
- * Representation of an expression that is comparable.
- * 
- * @param <T> Java type being represented here
- */
-public interface ComparableExpression<T> extends Expression<T>
-{
-    /**
-     * Method returning whether this expression equals the other expression.
-     * @param expr Other expression
-     * @return Whether they are equal
-     */
-    BooleanExpression eq(ComparableExpression expr);
-
-    /**
-     * Method returning whether this expression equals the literal.
-     * @param t Literal
-     * @return Whether they are equal
-     */
-    BooleanExpression eq(T t);
-
-    /**
-     * Method returning whether this expression doesn't equal the other expression.
-     * @param expr Other expression
-     * @return Whether they are not equal
-     */
-    BooleanExpression ne(ComparableExpression expr);
-
-    /**
-     * Method returning whether this expression doesn't equal the literal.
-     * @param t literal
-     * @return Whether they are not equal
-     */
-    BooleanExpression ne(T t);
-
-    /**
-     * Method returning whether this expression is less than the other expression.
-     * @param expr Other expression
-     * @return Whether this is less than the other
-     */
-    BooleanExpression lt(ComparableExpression expr);
-
-    /**
-     * Method returning whether this expression is less than the literal.
-     * @param t literal
-     * @return Whether this is less than the other
-     */
-    BooleanExpression lt(T t);
-
-    /**
-     * Method returning whether this expression is less than or equal the other expression.
-     * @param expr Other expression
-     * @return Whether this is less than or equal the other
-     */
-    BooleanExpression lteq(ComparableExpression expr);
-
-    /**
-     * Method returning whether this expression is less than or equal the literal.
-     * @param t literal
-     * @return Whether this is less than or equal the other
-     */
-    BooleanExpression lteq(T t);
-
-    /**
-     * Method returning whether this expression is greater than the other expression.
-     * @param expr Other expression
-     * @return Whether this is greater than the other
-     */
-    BooleanExpression gt(ComparableExpression expr);
-
-    /**
-     * Method returning whether this expression is greater than the literal.
-     * @param t literal
-     * @return Whether this is greater than the other
-     */
-    BooleanExpression gt(T t);
-
-    /**
-     * Method returning whether this expression is greater than or equal the other expression.
-     * @param expr Other expression
-     * @return Whether this is greater than or equal to the other
-     */
-    BooleanExpression gteq(ComparableExpression expr);
-
-    /**
-     * Method returning whether this expression is greater than or equal the literal.
-     * @param t literal
-     * @return Whether this is greater than or equal to the other
-     */
-    BooleanExpression gteq(T t);
-}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -25,7 +25,7 @@
  * @param <T> Date type
  * TODO Consider splitting this into time and date and datetime expressions
  */
-public interface DateExpression<T> extends ComparableExpression<Date>
+public interface DateExpression<T> extends Expression<Date>
 {
     /**
      * Accessor for the year of this date.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/EnumExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/EnumExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/EnumExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -22,7 +22,7 @@
  * 
  * @param <T> Enum type
  */
-public interface EnumExpression<T> extends ComparableExpression<Enum>
+public interface EnumExpression<T> extends Expression<Enum>
 {
     /**
      * Method to return an expression for the ordinal of this enum.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -49,6 +49,90 @@
     OrderExpression desc();
 
     /**
+     * Method returning whether this expression equals the other expression.
+     * @param expr Other expression
+     * @return Whether they are equal
+     */
+    BooleanExpression eq(Expression expr);
+
+    /**
+     * Method returning whether this expression equals the literal.
+     * @param t Literal
+     * @return Whether they are equal
+     */
+    BooleanExpression eq(T t);
+
+    /**
+     * Method returning whether this expression doesn't equal the other expression.
+     * @param expr Other expression
+     * @return Whether they are not equal
+     */
+    BooleanExpression ne(Expression expr);
+
+    /**
+     * Method returning whether this expression doesn't equal the literal.
+     * @param t literal
+     * @return Whether they are not equal
+     */
+    BooleanExpression ne(T t);
+
+    /**
+     * Method returning whether this expression is less than the other expression.
+     * @param expr Other expression
+     * @return Whether this is less than the other
+     */
+    BooleanExpression lt(Expression expr);
+
+    /**
+     * Method returning whether this expression is less than the literal.
+     * @param t literal
+     * @return Whether this is less than the other
+     */
+    BooleanExpression lt(T t);
+
+    /**
+     * Method returning whether this expression is less than or equal the other expression.
+     * @param expr Other expression
+     * @return Whether this is less than or equal the other
+     */
+    BooleanExpression lteq(Expression expr);
+
+    /**
+     * Method returning whether this expression is less than or equal the literal.
+     * @param t literal
+     * @return Whether this is less than or equal the other
+     */
+    BooleanExpression lteq(T t);
+
+    /**
+     * Method returning whether this expression is greater than the other expression.
+     * @param expr Other expression
+     * @return Whether this is greater than the other
+     */
+    BooleanExpression gt(Expression expr);
+
+    /**
+     * Method returning whether this expression is greater than the literal.
+     * @param t literal
+     * @return Whether this is greater than the other
+     */
+    BooleanExpression gt(T t);
+
+    /**
+     * Method returning whether this expression is greater than or equal the other expression.
+     * @param expr Other expression
+     * @return Whether this is greater than or equal to the other
+     */
+    BooleanExpression gteq(Expression expr);
+
+    /**
+     * Method returning whether this expression is greater than or equal the literal.
+     * @param t literal
+     * @return Whether this is greater than or equal to the other
+     */
+    BooleanExpression gteq(T t);
+
+    /**
      * Method to return an expression for this expression added to the passed expression.
      * @param expr The other expression
      * @return The summation

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -26,7 +26,7 @@
  * @param <K> Key type of the map being represented here
  * @param <V> Value type of the map being represented here
  */
-public interface MapExpression<T, K, V> extends ComparableExpression<T>
+public interface MapExpression<T, K, V> extends Expression<T>
 {
     /**
      * Method returning whether the specified key expression is contained in this map.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -22,7 +22,7 @@
  * 
  * @param <T> Number type
  */
-public interface NumericExpression<T> extends ComparableExpression<Number>
+public interface NumericExpression<T> extends Expression<Number>
 {
 
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -23,7 +23,7 @@
  * 
  * @param <T> Java type
  */
-public interface ObjectExpression<T> extends ComparableExpression<Number>
+public interface ObjectExpression<T> extends Expression<Number>
 {
 
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -20,7 +20,7 @@
 /**
  * Expression representing a path in a query (e.g alias.field).
  */
-public interface PathExpression extends Expression
+public interface PathExpression<T> extends Expression<T>
 {
     /**
      * Expression for the parent path expression (if any).

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
@@ -22,7 +22,7 @@
  * 
  * @param <T> String type
  */
-public interface StringExpression<T> extends ComparableExpression<String>
+public interface StringExpression<T> extends Expression<String>
 {
     /**
      * Method to return an expression for the character at a position of this string expression.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html	2010-07-07 07:21:31 UTC (rev 10412)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html	2010-07-07 09:01:41 UTC (rev 10413)
@@ -1,6 +1,7 @@
 <BODY>
     Package providing a typesafe query mechanism, primarily for JDO.
-    Fields/Params/Vars of a persistable type are represented as <i>PathExpression</i>.
+    Fields/Params/Vars of a persistable type are represented as <i>PathExpression</i>. This type is extended
+    by all "Q" classes, to provide access to persistable fields.
     Fields/Params/Vars of a container type are represented as <i>CollectionExpression</i>, <i>MapExpression</i>
     Fields/Params/Vars of other types, or literals are represented by
     <ul>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10414
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10414&view=rev
Author:   andy_jefferson
Date:     2010-07-07 09:15:34 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
generic types

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/CollectionExpression.java	2010-07-07 09:15:34 UTC (rev 10414)
@@ -17,13 +17,15 @@
 **********************************************************************/
 package org.datanucleus.query.typesafe;
 
+import java.util.Collection;
+
 /**
  * Representation of a collection in a query.
  * 
  * @param <T> Java type being represented here
  * @param <E> Element type of the collection being represented here
  */
-public interface CollectionExpression<T, E> extends Expression<T>
+public interface CollectionExpression<T extends Collection<E>, E> extends Expression<T>
 {
     /**
      * Method returning whether the specified elementexpression is contained in this collection.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ListExpression.java	2010-07-07 09:15:34 UTC (rev 10414)
@@ -17,13 +17,15 @@
 **********************************************************************/
 package org.datanucleus.query.typesafe;
 
+import java.util.List;
+
 /**
  * Representation of a List in a query.
  * 
  * @param <T> Java type being represented here
  * @param <E> Element type of the List being represented here
  */
-public interface ListExpression<T, E> extends CollectionExpression<T, E>
+public interface ListExpression<T extends List<E>, E> extends CollectionExpression<T, E>
 {
     /**
      * Method returning the element at this position in the List.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-07-07 09:01:41 UTC (rev 10413)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/MapExpression.java	2010-07-07 09:15:34 UTC (rev 10414)
@@ -26,7 +26,7 @@
  * @param <K> Key type of the map being represented here
  * @param <V> Value type of the map being represented here
  */
-public interface MapExpression<T, K, V> extends Expression<T>
+public interface MapExpression<T extends Map<K, V>, K, V> extends Expression<T>
 {
     /**
      * Method returning whether the specified key expression is contained in this map.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10416
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10416&view=rev
Author:   andy_jefferson
Date:     2010-07-07 15:03:30 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
tidy up interface for parent path, and name of field/property/parameter/variable.

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-07 10:04:15 UTC (rev 10415)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-07 15:03:30 UTC (rev 10416)
@@ -25,12 +25,21 @@
 public interface Expression<T>
 {
     /**
-     * Accessor for the path to this expression.
-     * @return The path
+     * Accessor for the path to this expression (alternatively known as the parent).
+     * @return The (parent) path
      */
     PathExpression getPathExpression();
 
     /**
+     * Accessor for the name for this expression, if applicable.
+     * If this is a field/property of a persistable object then the <i>name</i> is the field/property name, 
+     * if this is a parameter then the <i>name</i> is the parameter name,
+     * and if this is a variable then the <i>name</i> is the variable name,
+     * @return Name (if defined)
+     */
+    String name();
+
+    /**
      * Get the Java type for this expression.
      * @return The java type
      */

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java	2010-07-07 10:04:15 UTC (rev 10415)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java	2010-07-07 15:03:30 UTC (rev 10416)
@@ -19,13 +19,10 @@
 
 /**
  * Expression representing a path in a query (e.g alias.field).
+ * Use the <pre>getPathExpression()</pre> accessor to get the parent path expression for this expression.
+ *
+ * @param <T> Java type being represented here
  */
 public interface PathExpression<T> extends Expression<T>
 {
-    /**
-     * Expression for the parent path expression (if any).
-     * If this expression represents "a.b" then the parent expression represents "a".
-     * @return Parent path expression
-     */
-    PathExpression getParentExpression();
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10441
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10441&view=rev
Author:   andy_jefferson
Date:     2010-07-11 10:02:13 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
[NUCCORE-545] Insert ComparableExpression to represent any type implementing java.lang.Comparable

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java	2010-07-11 09:06:24 UTC (rev 10440)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/BooleanExpression.java	2010-07-11 10:02:13 UTC (rev 10441)
@@ -22,7 +22,7 @@
  * 
  * @param <T> Boolean type
  */
-public interface BooleanExpression<T> extends Expression<Boolean>
+public interface BooleanExpression<T> extends ComparableExpression<Boolean>
 {
     /**
      * Method to return the AND of this expression and the other expression.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java	2010-07-11 09:06:24 UTC (rev 10440)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ByteExpression.java	2010-07-11 10:02:13 UTC (rev 10441)
@@ -22,6 +22,6 @@
  * 
  * @param <T> Byte type
  */
-public interface ByteExpression<T> extends Expression<Byte>
+public interface ByteExpression<T> extends ComparableExpression<Byte>
 {
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java	2010-07-11 09:06:24 UTC (rev 10440)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/CharacterExpression.java	2010-07-11 10:02:13 UTC (rev 10441)
@@ -22,6 +22,6 @@
  * 
  * @param <T> Character type
  */
-public interface CharacterExpression<T> extends Expression<Character>
+public interface CharacterExpression<T> extends ComparableExpression<Character>
 {
 }
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	2010-07-11 10:02:13 UTC (rev 10441)
@@ -0,0 +1,82 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of an expression for a Java type that implements <pre>java.lang.Comparable</pre>.
+ *
+ * @param <T> Java type being represented here
+ */
+public interface ComparableExpression<T> extends Expression<T>
+{
+    /**
+     * Method returning whether this expression is less than the other expression.
+     * @param expr Other expression
+     * @return Whether this is less than the other
+     */
+    BooleanExpression lt(ComparableExpression expr);
+
+    /**
+     * Method returning whether this expression is less than the literal.
+     * @param t literal
+     * @return Whether this is less than the other
+     */
+    BooleanExpression lt(T t);
+
+    /**
+     * Method returning whether this expression is less than or equal the other expression.
+     * @param expr Other expression
+     * @return Whether this is less than or equal the other
+     */
+    BooleanExpression lteq(ComparableExpression expr);
+
+    /**
+     * Method returning whether this expression is less than or equal the literal.
+     * @param t literal
+     * @return Whether this is less than or equal the other
+     */
+    BooleanExpression lteq(T t);
+
+    /**
+     * Method returning whether this expression is greater than the other expression.
+     * @param expr Other expression
+     * @return Whether this is greater than the other
+     */
+    BooleanExpression gt(ComparableExpression expr);
+
+    /**
+     * Method returning whether this expression is greater than the literal.
+     * @param t literal
+     * @return Whether this is greater than the other
+     */
+    BooleanExpression gt(T t);
+
+    /**
+     * Method returning whether this expression is greater than or equal the other expression.
+     * @param expr Other expression
+     * @return Whether this is greater than or equal to the other
+     */
+    BooleanExpression gteq(ComparableExpression expr);
+
+    /**
+     * Method returning whether this expression is greater than or equal the literal.
+     * @param t literal
+     * @return Whether this is greater than or equal to the other
+     */
+    BooleanExpression gteq(T t);
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-07-11 09:06:24 UTC (rev 10440)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-07-11 10:02:13 UTC (rev 10441)
@@ -25,7 +25,7 @@
  * @param <T> Date type
  * TODO Consider splitting this into time and date and datetime expressions
  */
-public interface DateExpression<T> extends Expression<Date>
+public interface DateExpression<T> extends ComparableExpression<Date>
 {
     /**
      * Accessor for the year of this date.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-11 09:06:24 UTC (rev 10440)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-11 10:02:13 UTC (rev 10441)
@@ -86,62 +86,6 @@
     BooleanExpression ne(T t);
 
     /**
-     * Method returning whether this expression is less than the other expression.
-     * @param expr Other expression
-     * @return Whether this is less than the other
-     */
-    BooleanExpression lt(Expression expr);
-
-    /**
-     * Method returning whether this expression is less than the literal.
-     * @param t literal
-     * @return Whether this is less than the other
-     */
-    BooleanExpression lt(T t);
-
-    /**
-     * Method returning whether this expression is less than or equal the other expression.
-     * @param expr Other expression
-     * @return Whether this is less than or equal the other
-     */
-    BooleanExpression lteq(Expression expr);
-
-    /**
-     * Method returning whether this expression is less than or equal the literal.
-     * @param t literal
-     * @return Whether this is less than or equal the other
-     */
-    BooleanExpression lteq(T t);
-
-    /**
-     * Method returning whether this expression is greater than the other expression.
-     * @param expr Other expression
-     * @return Whether this is greater than the other
-     */
-    BooleanExpression gt(Expression expr);
-
-    /**
-     * Method returning whether this expression is greater than the literal.
-     * @param t literal
-     * @return Whether this is greater than the other
-     */
-    BooleanExpression gt(T t);
-
-    /**
-     * Method returning whether this expression is greater than or equal the other expression.
-     * @param expr Other expression
-     * @return Whether this is greater than or equal to the other
-     */
-    BooleanExpression gteq(Expression expr);
-
-    /**
-     * Method returning whether this expression is greater than or equal the literal.
-     * @param t literal
-     * @return Whether this is greater than or equal to the other
-     */
-    BooleanExpression gteq(T t);
-
-    /**
      * Method to return an expression for this expression added to the passed expression.
      * @param expr The other expression
      * @return The summation

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-11 09:06:24 UTC (rev 10440)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-11 10:02:13 UTC (rev 10441)
@@ -22,7 +22,7 @@
  * 
  * @param <T> Number type
  */
-public interface NumericExpression<T> extends Expression<Number>
+public interface NumericExpression<T> extends ComparableExpression<Number>
 {
 
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-07-11 09:06:24 UTC (rev 10440)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-07-11 10:02:13 UTC (rev 10441)
@@ -22,7 +22,7 @@
  * 
  * @param <T> String type
  */
-public interface StringExpression<T> extends Expression<String>
+public interface StringExpression<T> extends ComparableExpression<String>
 {
     /**
      * Method to return an expression for the character at a position of this string expression.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java	2010-07-11 09:06:24 UTC (rev 10440)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java	2010-07-11 10:02:13 UTC (rev 10441)
@@ -18,6 +18,7 @@
 package org.datanucleus.query.typesafe.impl;
 
 import org.datanucleus.query.typesafe.BooleanExpression;
+import org.datanucleus.query.typesafe.ComparableExpression;
 import org.datanucleus.query.typesafe.Expression;
 import org.datanucleus.query.typesafe.NumericExpression;
 import org.datanucleus.query.typesafe.OrderExpression;
@@ -142,7 +143,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#gt(org.datanucleus.query.typesafe.Expression)
      */
-    public BooleanExpression gt(Expression expr)
+    public BooleanExpression gt(ComparableExpression expr)
     {
         // TODO Auto-generated method stub
         return null;
@@ -160,7 +161,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#gteq(org.datanucleus.query.typesafe.Expression)
      */
-    public BooleanExpression gteq(Expression expr)
+    public BooleanExpression gteq(ComparableExpression expr)
     {
         // TODO Auto-generated method stub
         return null;
@@ -178,7 +179,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#lt(org.datanucleus.query.typesafe.Expression)
      */
-    public BooleanExpression lt(Expression expr)
+    public BooleanExpression lt(ComparableExpression expr)
     {
         // TODO Auto-generated method stub
         return null;
@@ -196,7 +197,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#lteq(org.datanucleus.query.typesafe.Expression)
      */
-    public BooleanExpression lteq(Expression expr)
+    public BooleanExpression lteq(ComparableExpression expr)
     {
         // TODO Auto-generated method stub
         return null;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10442
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10442&view=rev
Author:   andy_jefferson
Date:     2010-07-11 10:13:02 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
[NUCCORE-545] Move numeric ops onto the classes that need them

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/BooleanExpressionImpl.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/StringExpressionImpl.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ComparableExpressionImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-11 10:02:13 UTC (rev 10441)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-11 10:13:02 UTC (rev 10442)
@@ -86,41 +86,6 @@
     BooleanExpression ne(T t);
 
     /**
-     * Method to return an expression for this expression added to the passed expression.
-     * @param expr The other expression
-     * @return The summation
-     */
-    Expression<T> add(Expression expr);
-
-    /**
-     * Method to return an expression for this expression subtracting the passed expression.
-     * @param expr The other expression
-     * @return The difference
-     */
-    Expression<T> sub(Expression expr);
-
-    /**
-     * Method to return an expression for this expression multiplied by the passed expression.
-     * @param expr The other expression
-     * @return The multiplication
-     */
-    Expression<T> mul(Expression expr);
-
-    /**
-     * Method to return an expression for this expression divided by the passed expression.
-     * @param expr The other expression
-     * @return The division
-     */
-    Expression<T> div(Expression expr);
-
-    /**
-     * Method to return an expression for this expression modulus the passed expression (<pre>a % b</pre>).
-     * @param expr The other expression
-     * @return The modulus
-     */
-    Expression<T> mod(Expression expr);
-
-    /**
      * Method to return a numeric expression representing the aggregated count of this expression.
      * @return Numeric expression for the count
      */

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-11 10:02:13 UTC (rev 10441)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-11 10:13:02 UTC (rev 10442)
@@ -24,5 +24,38 @@
  */
 public interface NumericExpression<T> extends ComparableExpression<Number>
 {
+    /**
+     * Method to return an expression for this expression added to the passed expression.
+     * @param expr The other expression
+     * @return The summation
+     */
+    Expression<Number> add(Expression expr);
 
+    /**
+     * Method to return an expression for this expression subtracting the passed expression.
+     * @param expr The other expression
+     * @return The difference
+     */
+    Expression<Number> sub(Expression expr);
+
+    /**
+     * Method to return an expression for this expression multiplied by the passed expression.
+     * @param expr The other expression
+     * @return The multiplication
+     */
+    Expression<Number> mul(Expression expr);
+
+    /**
+     * Method to return an expression for this expression divided by the passed expression.
+     * @param expr The other expression
+     * @return The division
+     */
+    Expression<Number> div(Expression expr);
+
+    /**
+     * Method to return an expression for this expression modulus the passed expression (<pre>a % b</pre>).
+     * @param expr The other expression
+     * @return The modulus
+     */
+    Expression<Number> mod(Expression expr);
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-07-11 10:02:13 UTC (rev 10441)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-07-11 10:13:02 UTC (rev 10442)
@@ -25,6 +25,13 @@
 public interface StringExpression<T> extends ComparableExpression<String>
 {
     /**
+     * Method to return an expression for this expression added to the passed expression (String concatenation).
+     * @param expr The other expression
+     * @return The summation
+     */
+    StringExpression add(Expression expr);
+
+    /**
      * 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: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/BooleanExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/BooleanExpressionImpl.java	2010-07-11 10:02:13 UTC (rev 10441)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/BooleanExpressionImpl.java	2010-07-11 10:13:02 UTC (rev 10442)
@@ -22,7 +22,7 @@
 /**
  * Implementation of a BooleanExpression
  */
-public class BooleanExpressionImpl<T> extends ExpressionImpl<Boolean> implements BooleanExpression<T>
+public class BooleanExpressionImpl<T> extends ComparableExpressionImpl<Boolean> implements BooleanExpression<T>
 {
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.BooleanExpression#and(org.datanucleus.query.typesafe.BooleanExpression)

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ComparableExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ComparableExpressionImpl.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ComparableExpressionImpl.java	2010-07-11 10:13:02 UTC (rev 10442)
@@ -0,0 +1,99 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe.impl;
+
+import org.datanucleus.query.typesafe.BooleanExpression;
+import org.datanucleus.query.typesafe.ComparableExpression;
+
+/**
+ * Implementation of the methods for ComparableExpression.
+ */
+public class ComparableExpressionImpl<T> extends ExpressionImpl<T> implements ComparableExpression<T>
+{
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#gt(org.datanucleus.query.typesafe.Expression)
+     */
+    public BooleanExpression gt(ComparableExpression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#gt(java.lang.Object)
+     */
+    public BooleanExpression gt(T t)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#gteq(org.datanucleus.query.typesafe.Expression)
+     */
+    public BooleanExpression gteq(ComparableExpression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#gteq(java.lang.Object)
+     */
+    public BooleanExpression gteq(T t)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#lt(org.datanucleus.query.typesafe.Expression)
+     */
+    public BooleanExpression lt(ComparableExpression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#lt(java.lang.Object)
+     */
+    public BooleanExpression lt(T t)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#lteq(org.datanucleus.query.typesafe.Expression)
+     */
+    public BooleanExpression lteq(ComparableExpression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#lteq(java.lang.Object)
+     */
+    public BooleanExpression lteq(T t)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java	2010-07-11 10:02:13 UTC (rev 10441)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java	2010-07-11 10:13:02 UTC (rev 10442)
@@ -18,7 +18,6 @@
 package org.datanucleus.query.typesafe.impl;
 
 import org.datanucleus.query.typesafe.BooleanExpression;
-import org.datanucleus.query.typesafe.ComparableExpression;
 import org.datanucleus.query.typesafe.Expression;
 import org.datanucleus.query.typesafe.NumericExpression;
 import org.datanucleus.query.typesafe.OrderExpression;
@@ -78,51 +77,6 @@
     }
 
     /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#add(org.datanucleus.query.typesafe.Expression)
-     */
-    public Expression<T> add(Expression expr)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#mul(org.datanucleus.query.typesafe.Expression)
-     */
-    public Expression<T> mul(Expression expr)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#sub(org.datanucleus.query.typesafe.Expression)
-     */
-    public Expression<T> sub(Expression expr)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#div(org.datanucleus.query.typesafe.Expression)
-     */
-    public Expression<T> div(Expression expr)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#mod(org.datanucleus.query.typesafe.Expression)
-     */
-    public Expression<T> mod(Expression expr)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#eq(org.datanucleus.query.typesafe.Expression)
      */
     public BooleanExpression eq(Expression expr)
@@ -141,78 +95,6 @@
     }
 
     /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#gt(org.datanucleus.query.typesafe.Expression)
-     */
-    public BooleanExpression gt(ComparableExpression expr)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#gt(java.lang.Object)
-     */
-    public BooleanExpression gt(T t)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#gteq(org.datanucleus.query.typesafe.Expression)
-     */
-    public BooleanExpression gteq(ComparableExpression expr)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#gteq(java.lang.Object)
-     */
-    public BooleanExpression gteq(T t)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#lt(org.datanucleus.query.typesafe.Expression)
-     */
-    public BooleanExpression lt(ComparableExpression expr)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#lt(java.lang.Object)
-     */
-    public BooleanExpression lt(T t)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#lteq(org.datanucleus.query.typesafe.Expression)
-     */
-    public BooleanExpression lteq(ComparableExpression expr)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#lteq(java.lang.Object)
-     */
-    public BooleanExpression lteq(T t)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#ne(org.datanucleus.query.typesafe.Expression)
      */
     public BooleanExpression ne(Expression expr)

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java	2010-07-11 10:02:13 UTC (rev 10441)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java	2010-07-11 10:13:02 UTC (rev 10442)
@@ -17,12 +17,56 @@
 **********************************************************************/
 package org.datanucleus.query.typesafe.impl;
 
+import org.datanucleus.query.typesafe.Expression;
 import org.datanucleus.query.typesafe.NumericExpression;
 
 /**
  * Implementation of a NumericExpression.
  */
-public class NumericExpressionImpl<T> extends ExpressionImpl<Number> implements NumericExpression<T>
+public class NumericExpressionImpl<T> extends ComparableExpressionImpl<Number> implements NumericExpression<T>
 {
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#add(org.datanucleus.query.typesafe.Expression)
+     */
+    public NumericExpression add(Expression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
 
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#mul(org.datanucleus.query.typesafe.Expression)
+     */
+    public NumericExpression mul(Expression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#sub(org.datanucleus.query.typesafe.Expression)
+     */
+    public NumericExpression sub(Expression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#div(org.datanucleus.query.typesafe.Expression)
+     */
+    public NumericExpression div(Expression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#mod(org.datanucleus.query.typesafe.Expression)
+     */
+    public NumericExpression mod(Expression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/StringExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/StringExpressionImpl.java	2010-07-11 10:02:13 UTC (rev 10441)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/StringExpressionImpl.java	2010-07-11 10:13:02 UTC (rev 10442)
@@ -18,14 +18,25 @@
 package org.datanucleus.query.typesafe.impl;
 
 import org.datanucleus.query.typesafe.BooleanExpression;
+import org.datanucleus.query.typesafe.Expression;
 import org.datanucleus.query.typesafe.NumericExpression;
 import org.datanucleus.query.typesafe.StringExpression;
 
 /**
  * Implementation of a StringExpression
  */
-public class StringExpressionImpl<T> extends ExpressionImpl<String> implements StringExpression<T>
+public class StringExpressionImpl<T> extends ComparableExpressionImpl<String> implements StringExpression<T>
 {
+    /**
+     * Method to return an expression for this expression added to the passed expression (String concatenation).
+     * @param expr The other expression
+     * @return The summation
+     */
+    public StringExpression add(Expression expr)
+    {
+        return null;
+    }
+
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.StringExpression#charAt(int)
      */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10443
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10443&view=rev
Author:   andy_jefferson
Date:     2010-07-11 10:48:40 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
[NUCCORE-545] Further numeric ops

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ComparableExpressionImpl.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	2010-07-11 10:13:02 UTC (rev 10442)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ComparableExpression.java	2010-07-11 10:48:40 UTC (rev 10443)
@@ -18,7 +18,7 @@
 package org.datanucleus.query.typesafe;
 
 /**
- * Representation of an expression for a Java type that implements <pre>java.lang.Comparable</pre>.
+ * Representation of an expression for a Java type that implements java.lang.Comparable.
  *
  * @param <T> Java type being represented here
  */
@@ -79,4 +79,28 @@
      * @return Whether this is greater than or equal to the other
      */
     BooleanExpression gteq(T t);
+
+    /**
+     * Method to return a numeric expression representing the aggregated minimum of this expression.
+     * @return Numeric expression for the minimum
+     */
+    NumericExpression min();
+
+    /**
+     * Method to return a numeric expression representing the aggregated maximum of this expression.
+     * @return Numeric expression for the maximum
+     */
+    NumericExpression max();
+
+    /**
+     * Method to return an order expression for this expression in ascending order.
+     * @return The order expression
+     */
+    OrderExpression 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

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-11 10:13:02 UTC (rev 10442)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-11 10:48:40 UTC (rev 10443)
@@ -46,18 +46,6 @@
     Class<? extends T> getType();
 
     /**
-     * Method to return an order expression for this expression in ascending order.
-     * @return The order expression
-     */
-    OrderExpression asc();
-
-    /**
-     * Method to return an order expression for this expression in descending order.
-     * @return The order expression
-     */
-    OrderExpression desc();
-
-    /**
      * Method returning whether this expression equals the other expression.
      * @param expr Other expression
      * @return Whether they are equal
@@ -98,30 +86,6 @@
     NumericExpression<T> countDistinct();
 
     /**
-     * Method to return a numeric expression representing the aggregated average of this expression.
-     * @return Numeric expression for the average
-     */
-    NumericExpression<Double> avg();
-
-    /**
-     * Method to return a numeric expression representing the aggregated minimum of this expression.
-     * @return Numeric expression for the minimum
-     */
-    NumericExpression min();
-
-    /**
-     * Method to return a numeric expression representing the aggregated maximum of this expression.
-     * @return Numeric expression for the maximum
-     */
-    NumericExpression max();
-
-    /**
-     * Method to return a numeric expression representing the aggregated sum of this expression.
-     * @return Numeric expression for the sum
-     */
-    NumericExpression<T> sum();
-
-    /**
      * Method to return this expression as a String form.
      * @return The string form
      */

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-11 10:13:02 UTC (rev 10442)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-11 10:48:40 UTC (rev 10443)
@@ -32,6 +32,13 @@
     Expression<Number> add(Expression expr);
 
     /**
+     * Method to return an expression for this expression added to the passed number.
+     * @param num Number to add
+     * @return The summation
+     */
+    Expression<Number> add(Number num);
+
+    /**
      * Method to return an expression for this expression subtracting the passed expression.
      * @param expr The other expression
      * @return The difference
@@ -39,6 +46,13 @@
     Expression<Number> sub(Expression expr);
 
     /**
+     * Method to return an expression for this expression subtracting the passed number.
+     * @param num Number to subtract
+     * @return The difference
+     */
+    Expression<Number> sub(Number num);
+
+    /**
      * Method to return an expression for this expression multiplied by the passed expression.
      * @param expr The other expression
      * @return The multiplication
@@ -46,6 +60,13 @@
     Expression<Number> mul(Expression expr);
 
     /**
+     * Method to return an expression for this expression multiplied by the passed number.
+     * @param num Number
+     * @return The multiplication
+     */
+    Expression<Number> mul(Number num);
+
+    /**
      * Method to return an expression for this expression divided by the passed expression.
      * @param expr The other expression
      * @return The division
@@ -53,9 +74,35 @@
     Expression<Number> div(Expression expr);
 
     /**
+     * Method to return an expression for this expression divided by the passed number.
+     * @param num Number to divide by
+     * @return The division
+     */
+    Expression<Number> div(Number num);
+
+    /**
      * Method to return an expression for this expression modulus the passed expression (<pre>a % b</pre>).
      * @param expr The other expression
      * @return The modulus
      */
     Expression<Number> mod(Expression expr);
+
+    /**
+     * Method to return an expression for this expression modulus the passed number.
+     * @param num Number
+     * @return The modulus
+     */
+    Expression<Number> mod(Number num);
+
+    /**
+     * Method to return a numeric expression representing the aggregated average of this expression.
+     * @return Numeric expression for the average
+     */
+    NumericExpression<Double> avg();
+
+    /**
+     * Method to return a numeric expression representing the aggregated sum of this expression.
+     * @return Numeric expression for the sum
+     */
+    NumericExpression<T> sum();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java	2010-07-11 10:13:02 UTC (rev 10442)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/ObjectExpression.java	2010-07-11 10:48:40 UTC (rev 10443)
@@ -23,7 +23,7 @@
  * 
  * @param <T> Java type
  */
-public interface ObjectExpression<T> extends Expression<Number>
+public interface ObjectExpression<T> extends Expression<T>
 {
 
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ComparableExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ComparableExpressionImpl.java	2010-07-11 10:13:02 UTC (rev 10442)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ComparableExpressionImpl.java	2010-07-11 10:48:40 UTC (rev 10443)
@@ -19,6 +19,8 @@
 
 import org.datanucleus.query.typesafe.BooleanExpression;
 import org.datanucleus.query.typesafe.ComparableExpression;
+import org.datanucleus.query.typesafe.NumericExpression;
+import org.datanucleus.query.typesafe.OrderExpression;
 
 /**
  * Implementation of the methods for ComparableExpression.
@@ -96,4 +98,40 @@
         // TODO Auto-generated method stub
         return null;
     }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#max()
+     */
+    public NumericExpression max()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#min()
+     */
+    public NumericExpression min()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#asc()
+     */
+    public OrderExpression asc()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#desc()
+     */
+    public OrderExpression desc()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java	2010-07-11 10:13:02 UTC (rev 10442)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java	2010-07-11 10:48:40 UTC (rev 10443)
@@ -20,7 +20,6 @@
 import org.datanucleus.query.typesafe.BooleanExpression;
 import org.datanucleus.query.typesafe.Expression;
 import org.datanucleus.query.typesafe.NumericExpression;
-import org.datanucleus.query.typesafe.OrderExpression;
 import org.datanucleus.query.typesafe.PathExpression;
 
 /**
@@ -113,15 +112,6 @@
     }
 
     /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#avg()
-     */
-    public NumericExpression<Double> avg()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#count()
      */
     public NumericExpression<T> count()
@@ -138,49 +128,4 @@
         // TODO Auto-generated method stub
         return null;
     }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#max()
-     */
-    public NumericExpression max()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#min()
-     */
-    public NumericExpression min()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#sum()
-     */
-    public NumericExpression<T> sum()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#asc()
-     */
-    public OrderExpression asc()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#desc()
-     */
-    public OrderExpression desc()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java	2010-07-11 10:13:02 UTC (rev 10442)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java	2010-07-11 10:48:40 UTC (rev 10443)
@@ -35,6 +35,15 @@
     }
 
     /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.NumericExpression#add(java.lang.Number)
+     */
+    public Expression<Number> add(Number num)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#mul(org.datanucleus.query.typesafe.Expression)
      */
     public NumericExpression mul(Expression expr)
@@ -44,6 +53,15 @@
     }
 
     /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.NumericExpression#mul(java.lang.Number)
+     */
+    public Expression<Number> mul(Number num)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#sub(org.datanucleus.query.typesafe.Expression)
      */
     public NumericExpression sub(Expression expr)
@@ -53,6 +71,15 @@
     }
 
     /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.NumericExpression#sub(java.lang.Number)
+     */
+    public Expression<Number> sub(Number num)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#div(org.datanucleus.query.typesafe.Expression)
      */
     public NumericExpression div(Expression expr)
@@ -62,6 +89,15 @@
     }
 
     /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.NumericExpression#div(java.lang.Number)
+     */
+    public Expression<Number> div(Number num)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#mod(org.datanucleus.query.typesafe.Expression)
      */
     public NumericExpression mod(Expression expr)
@@ -69,4 +105,31 @@
         // TODO Auto-generated method stub
         return null;
     }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.NumericExpression#mod(java.lang.Number)
+     */
+    public Expression<Number> mod(Number num)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#avg()
+     */
+    public NumericExpression<Double> avg()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Expression#sum()
+     */
+    public NumericExpression<T> sum()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10445
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10445&view=rev
Author:   andy_jefferson
Date:     2010-07-11 14:39:40 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
avg return is same as the expression

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-11 14:22:25 UTC (rev 10444)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-11 14:39:40 UTC (rev 10445)
@@ -29,80 +29,80 @@
      * @param expr The other expression
      * @return The summation
      */
-    Expression<Number> add(Expression expr);
+    NumericExpression add(Expression expr);
 
     /**
      * Method to return an expression for this expression added to the passed number.
      * @param num Number to add
      * @return The summation
      */
-    Expression<Number> add(Number num);
+    NumericExpression add(Number num);
 
     /**
      * Method to return an expression for this expression subtracting the passed expression.
      * @param expr The other expression
      * @return The difference
      */
-    Expression<Number> sub(Expression expr);
+    NumericExpression sub(Expression expr);
 
     /**
      * Method to return an expression for this expression subtracting the passed number.
      * @param num Number to subtract
      * @return The difference
      */
-    Expression<Number> sub(Number num);
+    NumericExpression sub(Number num);
 
     /**
      * Method to return an expression for this expression multiplied by the passed expression.
      * @param expr The other expression
      * @return The multiplication
      */
-    Expression<Number> mul(Expression expr);
+    NumericExpression mul(Expression expr);
 
     /**
      * Method to return an expression for this expression multiplied by the passed number.
      * @param num Number
      * @return The multiplication
      */
-    Expression<Number> mul(Number num);
+    NumericExpression mul(Number num);
 
     /**
      * Method to return an expression for this expression divided by the passed expression.
      * @param expr The other expression
      * @return The division
      */
-    Expression<Number> div(Expression expr);
+    NumericExpression div(Expression expr);
 
     /**
      * Method to return an expression for this expression divided by the passed number.
      * @param num Number to divide by
      * @return The division
      */
-    Expression<Number> div(Number num);
+    NumericExpression div(Number num);
 
     /**
      * Method to return an expression for this expression modulus the passed expression (<pre>a % b</pre>).
      * @param expr The other expression
      * @return The modulus
      */
-    Expression<Number> mod(Expression expr);
+    NumericExpression mod(Expression expr);
 
     /**
      * Method to return an expression for this expression modulus the passed number.
      * @param num Number
      * @return The modulus
      */
-    Expression<Number> mod(Number num);
+    NumericExpression mod(Number num);
 
     /**
      * Method to return a numeric expression representing the aggregated average of this expression.
      * @return Numeric expression for the average
      */
-    NumericExpression<Double> avg();
+    NumericExpression avg();
 
     /**
      * Method to return a numeric expression representing the aggregated sum of this expression.
      * @return Numeric expression for the sum
      */
-    NumericExpression<T> sum();
+    NumericExpression sum();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java	2010-07-11 14:22:25 UTC (rev 10444)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java	2010-07-11 14:39:40 UTC (rev 10445)
@@ -37,7 +37,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.NumericExpression#add(java.lang.Number)
      */
-    public Expression<Number> add(Number num)
+    public NumericExpression add(Number num)
     {
         // TODO Auto-generated method stub
         return null;
@@ -55,7 +55,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.NumericExpression#mul(java.lang.Number)
      */
-    public Expression<Number> mul(Number num)
+    public NumericExpression mul(Number num)
     {
         // TODO Auto-generated method stub
         return null;
@@ -73,7 +73,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.NumericExpression#sub(java.lang.Number)
      */
-    public Expression<Number> sub(Number num)
+    public NumericExpression sub(Number num)
     {
         // TODO Auto-generated method stub
         return null;
@@ -91,7 +91,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.NumericExpression#div(java.lang.Number)
      */
-    public Expression<Number> div(Number num)
+    public NumericExpression div(Number num)
     {
         // TODO Auto-generated method stub
         return null;
@@ -109,7 +109,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.NumericExpression#mod(java.lang.Number)
      */
-    public Expression<Number> mod(Number num)
+    public NumericExpression mod(Number num)
     {
         // TODO Auto-generated method stub
         return null;
@@ -118,7 +118,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#avg()
      */
-    public NumericExpression<Double> avg()
+    public NumericExpression avg()
     {
         // TODO Auto-generated method stub
         return null;
@@ -127,7 +127,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#sum()
      */
-    public NumericExpression<T> sum()
+    public NumericExpression sum()
     {
         // TODO Auto-generated method stub
         return null;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10446
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10446&view=rev
Author:   andy_jefferson
Date:     2010-07-11 14:52:50 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
[NUCCORE-545] Rename PathExpression to PersistableExpression since that is what is represented

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/PersistableExpression.java

Removed Paths:
-------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-11 14:39:40 UTC (rev 10445)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-11 14:52:50 UTC (rev 10446)
@@ -19,6 +19,7 @@
 
 /**
  * Representation of an expression in a query.
+ * Use the <pre>getPathExpression()</pre> accessor to get the parent expression for this expression (if any).
  * 
  * @param <T> Java type being represented here
  */
@@ -28,7 +29,7 @@
      * Accessor for the path to this expression (alternatively known as the parent).
      * @return The (parent) path
      */
-    PathExpression getPathExpression();
+    PersistableExpression getPathExpression();
 
     /**
      * Accessor for the name for this expression, if applicable.

Deleted: platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java	2010-07-11 14:39:40 UTC (rev 10445)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java	2010-07-11 14:52:50 UTC (rev 10446)
@@ -1,28 +0,0 @@
-/**********************************************************************
-Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-   ...
-**********************************************************************/
-package org.datanucleus.query.typesafe;
-
-/**
- * Expression representing a path in a query (e.g alias.field).
- * Use the <pre>getPathExpression()</pre> accessor to get the parent path expression for this expression.
- *
- * @param <T> Java type being represented here
- */
-public interface PathExpression<T> extends Expression<T>
-{
-}
\ No newline at end of file

Copied: platform/core/trunk/src/java/org/datanucleus/query/typesafe/PersistableExpression.java (from rev 10416, platform/core/trunk/src/java/org/datanucleus/query/typesafe/PathExpression.java)
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/PersistableExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/PersistableExpression.java	2010-07-11 14:52:50 UTC (rev 10446)
@@ -0,0 +1,27 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Expression representing a persistable object in a query (e.g alias.persistableField).
+ *
+ * @param <T> (Persistable) Java type being represented here
+ */
+public interface PersistableExpression<T> extends Expression<T>
+{
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java	2010-07-11 14:39:40 UTC (rev 10445)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java	2010-07-11 14:52:50 UTC (rev 10446)
@@ -20,7 +20,7 @@
 import org.datanucleus.query.typesafe.BooleanExpression;
 import org.datanucleus.query.typesafe.Expression;
 import org.datanucleus.query.typesafe.NumericExpression;
-import org.datanucleus.query.typesafe.PathExpression;
+import org.datanucleus.query.typesafe.PersistableExpression;
 
 /**
  * Implementation of the methods for Expression, to be extended by the XXXExpressionImpl classes.
@@ -33,7 +33,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Expression#getPathExpression()
      */
-    public PathExpression getPathExpression()
+    public PersistableExpression getPathExpression()
     {
         // TODO Auto-generated method stub
         return null;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10450
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10450&view=rev
Author:   andy_jefferson
Date:     2010-07-12 09:11:22 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
rename accessor

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-12 08:56:16 UTC (rev 10449)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Expression.java	2010-07-12 09:11:22 UTC (rev 10450)
@@ -19,7 +19,8 @@
 
 /**
  * Representation of an expression in a query.
- * Use the <pre>getPathExpression()</pre> accessor to get the parent expression for this expression (if any).
+ * Use the <pre>getParentExpression()</pre> accessor to get the parent expression for this expression (if any).
+ * If an expression is something like "a.b" then the parent expression will be "a" and the name here is "b".
  * 
  * @param <T> Java type being represented here
  */
@@ -29,7 +30,7 @@
      * Accessor for the path to this expression (alternatively known as the parent).
      * @return The (parent) path
      */
-    PersistableExpression getPathExpression();
+    PersistableExpression getParentExpression();
 
     /**
      * Accessor for the name for this expression, if applicable.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java	2010-07-12 08:56:16 UTC (rev 10449)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/ExpressionImpl.java	2010-07-12 09:11:22 UTC (rev 10450)
@@ -31,9 +31,9 @@
     org.datanucleus.query.expression.Expression queryExpr;
 
     /* (non-Javadoc)
-     * @see org.datanucleus.query.typesafe.Expression#getPathExpression()
+     * @see org.datanucleus.query.typesafe.Expression#getParentExpression()
      */
-    public PersistableExpression getPathExpression()
+    public PersistableExpression getParentExpression()
     {
         // TODO Auto-generated method stub
         return null;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10452
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10452&view=rev
Author:   andy_jefferson
Date:     2010-07-12 12:41:21 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
[NUCCORE-545] Add Math.abs, Math.sqrt methods to numeric expression so we can do "a.numField.abs()"

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-12 10:08:33 UTC (rev 10451)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/NumericExpression.java	2010-07-12 12:41:21 UTC (rev 10452)
@@ -105,4 +105,16 @@
      * @return Numeric expression for the sum
      */
     NumericExpression sum();
+
+    /**
+     * Method to return the absolute value expression of this expression.
+     * @return The absolute value expression
+     */
+    NumericExpression abs();
+
+    /**
+     * Method to return the square-root value expression of this expression.
+     * @return The square-root value expression
+     */
+    NumericExpression sqrt();
 }
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java	2010-07-12 10:08:33 UTC (rev 10451)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/NumericExpressionImpl.java	2010-07-12 12:41:21 UTC (rev 10452)
@@ -132,4 +132,22 @@
         // TODO Auto-generated method stub
         return null;
     }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.NumericExpression#abs()
+     */
+    public NumericExpression abs()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.NumericExpression#sqrt()
+     */
+    public NumericExpression sqrt()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10455
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10455&view=rev
Author:   andy_jefferson
Date:     2010-07-13 07:28:14 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
[NUCCORE-545] Placeholder for typesafe query implementation. Drop unique() method since done in the execute() methods

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-07-12 13:41:29 UTC (rev 10454)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-07-13 07:28:14 UTC (rev 10455)
@@ -112,13 +112,6 @@
     Q range(String paramLowerIncl, String paramUpperExcl);
 
     /**
-     * Method to set if the result is unique (i.e a single result).
-     * @param unique Whether the result is unique
-     * @return The query
-     */
-    Q unique(boolean unique);
-
-    /**
      * Method to set the result components of the query.
      * @return The query
      */

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java	2010-07-13 07:28:14 UTC (rev 10455)
@@ -0,0 +1,210 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe.impl;
+
+import java.util.List;
+
+import javax.jdo.FetchPlan;
+
+import org.datanucleus.query.typesafe.BooleanExpression;
+import org.datanucleus.query.typesafe.Expression;
+import org.datanucleus.query.typesafe.NumericExpression;
+import org.datanucleus.query.typesafe.OrderExpression;
+import org.datanucleus.query.typesafe.Query;
+
+/**
+ * Implementation of a typesafe Query.
+ */
+public class TypesafeQueryImpl<Q extends Query<Q>> implements Query<Q>
+{
+    public TypesafeQueryImpl()
+    {
+        
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#candidate()
+     */
+    public Expression candidate()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#parameter(java.lang.String, java.lang.Class)
+     */
+    public Expression parameter(String name, Class type)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#variable(java.lang.String, java.lang.Class)
+     */
+    public Expression variable(String name, Class type)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#filter(org.datanucleus.query.typesafe.BooleanExpression)
+     */
+    public Q filter(BooleanExpression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#groupBy(org.datanucleus.query.typesafe.Expression[])
+     */
+    public Q groupBy(Expression... exprs)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#having(org.datanucleus.query.typesafe.Expression)
+     */
+    public Q having(Expression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#orderBy(org.datanucleus.query.typesafe.OrderExpression[])
+     */
+    public Q orderBy(OrderExpression... orderExprs)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#range(long, long)
+     */
+    public Q range(long lowerIncl, long upperExcl)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#range(org.datanucleus.query.typesafe.NumericExpression, org.datanucleus.query.typesafe.NumericExpression)
+     */
+    public Q range(NumericExpression lowerInclExpr, NumericExpression upperExclExpr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#range(java.lang.String, java.lang.String)
+     */
+    public Q range(String paramLowerIncl, String paramUpperExcl)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#result(org.datanucleus.query.typesafe.Expression[])
+     */
+    public Q result(Expression... exprs)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#setFetchPlan(javax.jdo.FetchPlan)
+     */
+    public Q setFetchPlan(FetchPlan fp)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#setParameter(org.datanucleus.query.typesafe.Expression, java.lang.Object)
+     */
+    public Q setParameter(Expression paramExpr, Object value)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#setParameter(java.lang.String, java.lang.Object)
+     */
+    public Q setParameter(String paramName, Object value)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#executeList()
+     */
+    public Object[] executeList()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#executeList(java.lang.Object)
+     */
+    public <T> List<T> executeList(T resultCls)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#executeUnique()
+     */
+    public Object[] executeUnique()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#executeUnique(java.lang.Object)
+     */
+    public <T> T executeUnique(T resultCls)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.Query#deletePersistentAll()
+     */
+    public long deletePersistentAll()
+    {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10456
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10456&view=rev
Author:   andy_jefferson
Date:     2010-07-13 13:33:46 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
Remove parameterisation on Query API

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-07-13 07:28:14 UTC (rev 10455)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-07-13 13:33:46 UTC (rev 10456)
@@ -25,7 +25,7 @@
  * Interface for a type-safe query, using a fluent API.
  * Designed to handle JDO query requirements as a whole.
  */
-public interface Query<Q extends Query<Q>>
+public interface Query
 {
     /**
      * Method to return an expression for the candidate of the query.
@@ -57,35 +57,35 @@
      * @param fp FetchPlan
      * @return The query
      */
-    Q setFetchPlan(FetchPlan fp);
+    Query setFetchPlan(FetchPlan fp);
 
     /**
      * Method to set the filter of the query.
      * @param expr Filter expression
      * @return The query
      */
-    Q filter(BooleanExpression expr);
+    Query filter(BooleanExpression expr);
 
     /**
      * Method to set the grouping(s) for the query.
      * @param exprs Grouping expression(s)
      * @return The query
      */
-    Q groupBy(Expression... exprs);
+    Query groupBy(Expression... exprs);
 
     /**
      * Method to set the having clause of the query.
      * @param expr Having expression
      * @return The query
      */
-    Q having(Expression expr);
+    Query having(Expression expr);
 
     /**
      * Method to set the ordering of the query.
      * @param orderExprs Ordering expression(s)
      * @return The query
      */
-    Q orderBy(OrderExpression... orderExprs);
+    Query orderBy(OrderExpression... orderExprs);
 
     /**
      * Method to set the range of any required results, using expressions.
@@ -93,7 +93,7 @@
      * @param upperExclExpr The position of the last result (exclusive)
      * @return The query
      */
-    Q range(NumericExpression lowerInclExpr, NumericExpression upperExclExpr);
+    Query range(NumericExpression lowerInclExpr, NumericExpression upperExclExpr);
 
     /**
      * Method to set the range of any required results, using long values.
@@ -101,7 +101,7 @@
      * @param upperExcl The position of the last result (exclusive)
      * @return The query
      */
-    Q range(long lowerIncl, long upperExcl);
+    Query range(long lowerIncl, long upperExcl);
 
     /**
      * Method to set the range of any required results, using parameters.
@@ -109,13 +109,13 @@
      * @param paramUpperExcl The name of a parameter defining the position of the last result (exclusive)
      * @return The query
      */
-    Q range(String paramLowerIncl, String paramUpperExcl);
+    Query range(String paramLowerIncl, String paramUpperExcl);
 
     /**
      * Method to set the result components of the query.
      * @return The query
      */
-    Q result(Expression... exprs);
+    Query result(Expression... exprs);
 
     /**
      * Method to set a parameter value for use when executing the query.
@@ -123,7 +123,7 @@
      * @param value The value
      * @return The query
      */
-    Q setParameter(Expression paramExpr, Object value);
+    Query setParameter(Expression paramExpr, Object value);
 
     /**
      * Method to set a parameter value for use when executing the query.
@@ -131,7 +131,7 @@
      * @param value The value
      * @return The query
      */
-    Q setParameter(String paramName, Object value);
+    Query setParameter(String paramName, Object value);
 
     /**
      * Method to execute the query where there are (potentially) multiple rows and we are returning either a

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java	2010-07-13 07:28:14 UTC (rev 10455)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java	2010-07-13 13:33:46 UTC (rev 10456)
@@ -21,6 +21,7 @@
 
 import javax.jdo.FetchPlan;
 
+import org.datanucleus.ObjectManager;
 import org.datanucleus.query.typesafe.BooleanExpression;
 import org.datanucleus.query.typesafe.Expression;
 import org.datanucleus.query.typesafe.NumericExpression;
@@ -30,11 +31,19 @@
 /**
  * Implementation of a typesafe Query.
  */
-public class TypesafeQueryImpl<Q extends Query<Q>> implements Query<Q>
+public class TypesafeQueryImpl implements Query
 {
-    public TypesafeQueryImpl()
+    ObjectManager om;
+    Class candidateCls;
+
+    /**
+     * Constructor for a typesafe query.
+     * @param om Object Manager
+     */
+    public TypesafeQueryImpl(ObjectManager om, Class cls)
     {
-        
+        this.om = om;
+        this.candidateCls = cls;
     }
 
     /* (non-Javadoc)
@@ -67,100 +76,100 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#filter(org.datanucleus.query.typesafe.BooleanExpression)
      */
-    public Q filter(BooleanExpression expr)
+    public Query filter(BooleanExpression expr)
     {
         // TODO Auto-generated method stub
-        return null;
+        return this;
     }
 
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#groupBy(org.datanucleus.query.typesafe.Expression[])
      */
-    public Q groupBy(Expression... exprs)
+    public Query groupBy(Expression... exprs)
     {
         // TODO Auto-generated method stub
-        return null;
+        return this;
     }
 
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#having(org.datanucleus.query.typesafe.Expression)
      */
-    public Q having(Expression expr)
+    public Query having(Expression expr)
     {
         // TODO Auto-generated method stub
-        return null;
+        return this;
     }
 
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#orderBy(org.datanucleus.query.typesafe.OrderExpression[])
      */
-    public Q orderBy(OrderExpression... orderExprs)
+    public Query orderBy(OrderExpression... orderExprs)
     {
         // TODO Auto-generated method stub
-        return null;
+        return this;
     }
 
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#range(long, long)
      */
-    public Q range(long lowerIncl, long upperExcl)
+    public Query range(long lowerIncl, long upperExcl)
     {
         // TODO Auto-generated method stub
-        return null;
+        return this;
     }
 
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#range(org.datanucleus.query.typesafe.NumericExpression, org.datanucleus.query.typesafe.NumericExpression)
      */
-    public Q range(NumericExpression lowerInclExpr, NumericExpression upperExclExpr)
+    public Query range(NumericExpression lowerInclExpr, NumericExpression upperExclExpr)
     {
         // TODO Auto-generated method stub
-        return null;
+        return this;
     }
 
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#range(java.lang.String, java.lang.String)
      */
-    public Q range(String paramLowerIncl, String paramUpperExcl)
+    public Query range(String paramLowerIncl, String paramUpperExcl)
     {
         // TODO Auto-generated method stub
-        return null;
+        return this;
     }
 
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#result(org.datanucleus.query.typesafe.Expression[])
      */
-    public Q result(Expression... exprs)
+    public Query result(Expression... exprs)
     {
         // TODO Auto-generated method stub
-        return null;
+        return this;
     }
 
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#setFetchPlan(javax.jdo.FetchPlan)
      */
-    public Q setFetchPlan(FetchPlan fp)
+    public Query setFetchPlan(FetchPlan fp)
     {
         // TODO Auto-generated method stub
-        return null;
+        return this;
     }
 
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#setParameter(org.datanucleus.query.typesafe.Expression, java.lang.Object)
      */
-    public Q setParameter(Expression paramExpr, Object value)
+    public Query setParameter(Expression paramExpr, Object value)
     {
         // TODO Auto-generated method stub
-        return null;
+        return this;
     }
 
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#setParameter(java.lang.String, java.lang.Object)
      */
-    public Q setParameter(String paramName, Object value)
+    public Query setParameter(String paramName, Object value)
     {
         // TODO Auto-generated method stub
-        return null;
+        return this;
     }
 
     /* (non-Javadoc)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10458
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10458&view=rev
Author:   andy_jefferson
Date:     2010-07-13 15:39:54 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
bit more on typesafe query

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-07-13 15:39:36 UTC (rev 10457)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-07-13 15:39:54 UTC (rev 10458)
@@ -32,7 +32,7 @@
      * Cast the returned expression to the candidate "Q" type to be able to call methods on it.
      * @return Expression for the candidate
      */
-    Expression candidate();
+    PersistableExpression candidate();
 
     /**
      * Method to return a parameter for the query.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java	2010-07-13 15:39:36 UTC (rev 10457)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java	2010-07-13 15:39:54 UTC (rev 10458)
@@ -26,6 +26,7 @@
 import org.datanucleus.query.typesafe.Expression;
 import org.datanucleus.query.typesafe.NumericExpression;
 import org.datanucleus.query.typesafe.OrderExpression;
+import org.datanucleus.query.typesafe.PersistableExpression;
 import org.datanucleus.query.typesafe.Query;
 
 /**
@@ -49,7 +50,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#candidate()
      */
-    public Expression candidate()
+    public PersistableExpression candidate()
     {
         // TODO Auto-generated method stub
         return null;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10471
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10471&view=rev
Author:   andy_jefferson
Date:     2010-07-14 13:36:46 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
[NUCCORE-545] String.equalsIgnoreCase - although could do this via strField.toUpperCase().eq(other.toUpperCase())

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/StringExpressionImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-07-14 12:51:40 UTC (rev 10470)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/StringExpression.java	2010-07-14 13:36:46 UTC (rev 10471)
@@ -60,6 +60,22 @@
     BooleanExpression endsWith(String str);
 
     /**
+     * Method returning an expression for whether this string expression is equal to (ignoring case) the 
+     * passed string expression.
+     * @param expr The expression
+     * @return Whether they are equal
+     */
+    BooleanExpression equalsIgnoreCase(StringExpression expr);
+
+    /**
+     * Method returning an expression for whether this string expression is equal to (ignoring case) the 
+     * passed string.
+     * @param str The string
+     * @return Whether they are equal
+     */
+    BooleanExpression equalsIgnoreCase(String str);
+
+    /**
      * Method to return an expression for the position of the passed string in this string.
      * @param expr The other string
      * @return Expression for the position of the passed string

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/StringExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/StringExpressionImpl.java	2010-07-14 12:51:40 UTC (rev 10470)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/StringExpressionImpl.java	2010-07-14 13:36:46 UTC (rev 10471)
@@ -74,6 +74,24 @@
     }
 
     /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.StringExpression#equalsIgnoreCase(java.lang.String)
+     */
+    public BooleanExpression equalsIgnoreCase(String str)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.query.typesafe.StringExpression#equalsIgnoreCase(org.datanucleus.query.typesafe.StringExpression)
+     */
+    public BooleanExpression equalsIgnoreCase(StringExpression expr)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.StringExpression#indexOf(java.lang.String, int)
      */
     public NumericExpression indexOf(String str, int pos)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10529
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10529&view=rev
Author:   andy_jefferson
Date:     2010-09-22 08:46:04 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
Add temporal expression interface and sub interfaces

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/DateExpressionImpl.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateTimeExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/TemporalExpression.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/TimeExpression.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-09-22 06:58:15 UTC (rev 10528)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java	2010-09-22 08:46:04 UTC (rev 10529)
@@ -17,15 +17,12 @@
 **********************************************************************/
 package org.datanucleus.query.typesafe;
 
-import java.util.Date;
-
 /**
  * Representation of a date in a query.
  * 
  * @param <T> Date type
- * TODO Consider splitting this into time and date and datetime expressions
  */
-public interface DateExpression<T> extends ComparableExpression<Date>
+public interface DateExpression<T> extends TemporalExpression<T>
 {
     /**
      * Accessor for the year of this date.
@@ -44,22 +41,4 @@
      * @return Expression for the day of the month
      */
     NumericExpression<Integer> getDay();
-
-    /**
-     * Accessor for the hour of this date.
-     * @return Expression for the hour
-     */
-    NumericExpression<Integer> getHour();
-
-    /**
-     * Accessor for the minute of this date.
-     * @return Expression for the minute
-     */
-    NumericExpression<Integer> getMinute();
-
-    /**
-     * Accessor for the second of this date.
-     * @return Expression for the second
-     */
-    NumericExpression<Integer> getSecond();
 }
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateTimeExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateTimeExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateTimeExpression.java	2010-09-22 08:46:04 UTC (rev 10529)
@@ -0,0 +1,62 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a date-time type in a query.
+ * 
+ * @param <T> Date-time type
+ */
+public interface DateTimeExpression<T> extends TemporalExpression<T>
+{
+    /**
+     * Accessor for the year of this date-time.
+     * @return Expression for the year
+     */
+    NumericExpression<Integer> getYear();
+
+    /**
+     * Accessor for the month of this date-time.
+     * @return Expression for the month
+     */
+    NumericExpression<Integer> getMonth();
+
+    /**
+     * Accessor for the day (of the month) of this date-time.
+     * @return Expression for the day of the month
+     */
+    NumericExpression<Integer> getDay();
+
+    /**
+     * Accessor for the hour of this date-time.
+     * @return Expression for the hour
+     */
+    NumericExpression<Integer> getHour();
+
+    /**
+     * Accessor for the minute of this date-time.
+     * @return Expression for the minute
+     */
+    NumericExpression<Integer> getMinute();
+
+    /**
+     * Accessor for the second of this date-time.
+     * @return Expression for the second
+     */
+    NumericExpression<Integer> getSecond();
+}
\ No newline at end of file

Copied: platform/core/trunk/src/java/org/datanucleus/query/typesafe/TemporalExpression.java (from rev 10512, platform/core/trunk/src/java/org/datanucleus/query/typesafe/DateExpression.java)
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/TemporalExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/TemporalExpression.java	2010-09-22 08:46:04 UTC (rev 10529)
@@ -0,0 +1,29 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+import java.util.Date;
+
+/**
+ * Representation of a temporal type in a query.
+ * 
+ * @param <T> Temporal type
+ */
+public interface TemporalExpression<T> extends ComparableExpression<Date>
+{
+}
\ No newline at end of file

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/TimeExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/TimeExpression.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/TimeExpression.java	2010-09-22 08:46:04 UTC (rev 10529)
@@ -0,0 +1,44 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+/**
+ * Representation of a time in a query.
+ * 
+ * @param <T> time type
+ */
+public interface TimeExpression<T> extends TemporalExpression<T>
+{
+    /**
+     * Accessor for the hour of this time.
+     * @return Expression for the hour
+     */
+    NumericExpression<Integer> getHour();
+
+    /**
+     * Accessor for the minute of this time.
+     * @return Expression for the minute
+     */
+    NumericExpression<Integer> getMinute();
+
+    /**
+     * Accessor for the second of this time.
+     * @return Expression for the second
+     */
+    NumericExpression<Integer> getSecond();
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/DateExpressionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/DateExpressionImpl.java	2010-09-22 06:58:15 UTC (rev 10528)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/DateExpressionImpl.java	2010-09-22 08:46:04 UTC (rev 10529)
@@ -19,13 +19,13 @@
 
 import java.util.Date;
 
-import org.datanucleus.query.typesafe.DateExpression;
+import org.datanucleus.query.typesafe.TemporalExpression;
 import org.datanucleus.query.typesafe.NumericExpression;
 
 /**
  * Implementation of a Date expression.
  */
-public class DateExpressionImpl<T> extends ComparableExpressionImpl<Date> implements DateExpression<Date>
+public class DateExpressionImpl<T> extends ComparableExpressionImpl<Date> implements TemporalExpression<Date>
 {
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.DateExpression#getDay()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10552
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10552&view=rev
Author:   andy_jefferson
Date:     2010-09-29 14:09:52 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
[NUCCORE-545] Store expressions internal to TypesafeQueryImpl for the different components

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-09-29 09:38:50 UTC (rev 10551)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-09-29 14:09:52 UTC (rev 10552)
@@ -104,12 +104,12 @@
     Query range(long lowerIncl, long upperExcl);
 
     /**
-     * Method to set the range of any required results, using parameters.
-     * @param paramLowerIncl The name of a parameter defining the position of the first result (inclusive)
-     * @param paramUpperExcl The name of a parameter defining the position of the last result (exclusive)
+     * Method to set the range of any required results, using parameters (expressions).
+     * @param paramLowerInclExpr Expression for a parameter defining the position of the first result (inclusive)
+     * @param paramUpperExclExpr Expression for a parameter defining the position of the last result (exclusive)
      * @return The query
      */
-    Query range(String paramLowerIncl, String paramUpperExcl);
+    Query range(Expression paramLowerInclExpr, Expression paramUpperExclExpr);
 
     /**
      * Method to set the result components of the query.

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java	2010-09-29 09:38:50 UTC (rev 10551)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java	2010-09-29 14:09:52 UTC (rev 10552)
@@ -37,6 +37,16 @@
     ObjectManager om;
     Class candidateCls;
 
+    FetchPlan fp;
+
+    Expression[] resultExprs;
+    BooleanExpression filterExpr;
+    Expression[] groupingExprs;
+    Expression havingExpr;
+    OrderExpression[] orderExprs;
+    Expression rangeLowerExpr;
+    Expression rangeUpperExpr;
+
     /**
      * Constructor for a typesafe query.
      * @param om Object Manager
@@ -79,7 +89,7 @@
      */
     public Query filter(BooleanExpression expr)
     {
-        // TODO Auto-generated method stub
+        this.filterExpr = expr;
         return this;
     }
 
@@ -88,7 +98,7 @@
      */
     public Query groupBy(Expression... exprs)
     {
-        // TODO Auto-generated method stub
+        this.groupingExprs = exprs;
         return this;
     }
 
@@ -97,7 +107,7 @@
      */
     public Query having(Expression expr)
     {
-        // TODO Auto-generated method stub
+        this.havingExpr = expr;
         return this;
     }
 
@@ -106,7 +116,7 @@
      */
     public Query orderBy(OrderExpression... orderExprs)
     {
-        // TODO Auto-generated method stub
+        this.orderExprs = orderExprs;
         return this;
     }
 
@@ -115,7 +125,7 @@
      */
     public Query range(long lowerIncl, long upperExcl)
     {
-        // TODO Auto-generated method stub
+        // TODO Auto-generated method stub - create NumericExpressions internally
         return this;
     }
 
@@ -124,16 +134,18 @@
      */
     public Query range(NumericExpression lowerInclExpr, NumericExpression upperExclExpr)
     {
-        // TODO Auto-generated method stub
+        this.rangeLowerExpr = lowerInclExpr;
+        this.rangeUpperExpr = upperExclExpr;
         return this;
     }
 
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#range(java.lang.String, java.lang.String)
      */
-    public Query range(String paramLowerIncl, String paramUpperExcl)
+    public Query range(Expression paramLowerInclExpr, Expression paramUpperExclExpr)
     {
-        // TODO Auto-generated method stub
+        this.rangeLowerExpr = paramLowerInclExpr;
+        this.rangeUpperExpr = paramUpperExclExpr;
         return this;
     }
 
@@ -142,7 +154,7 @@
      */
     public Query result(Expression... exprs)
     {
-        // TODO Auto-generated method stub
+        this.resultExprs = exprs;
         return this;
     }
 
@@ -151,7 +163,7 @@
      */
     public Query setFetchPlan(FetchPlan fp)
     {
-        // TODO Auto-generated method stub
+        this.fp = fp;
         return this;
     }
 
@@ -217,4 +229,14 @@
         // TODO Auto-generated method stub
         return 0;
     }
+
+    /**
+     * Method to return the single-string form of this JDOQL query.
+     * @return Single-string form of the query
+     */
+    public String toString()
+    {
+        // TODO Implement this
+        return null;
+    }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10563
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10563&view=rev
Author:   andy_jefferson
Date:     2010-10-01 09:43:24 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
packaging

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/package.html
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/package.html
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/package.html	2010-10-01 09:27:54 UTC (rev 10562)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/package.html	2010-10-01 09:43:24 UTC (rev 10563)
@@ -1,3 +1,7 @@
 <BODY>
     Package providing DataNucleus' implementation of a typesafe query mechanism, primarily JDOQL.
+    <p>
+        This package is likely to be renamed "org.datanucleus.jdo.query" in the future when the process
+        makes its way into JDO.
+    </p>
 </BODY>
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html	2010-10-01 09:27:54 UTC (rev 10562)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/package.html	2010-10-01 09:43:24 UTC (rev 10563)
@@ -14,4 +14,7 @@
         <li>DateExpression</li>
         <li>ObjectExpression</li>
     </ul>
+    <p>
+        This package is likely to be renamed "javax.jdo.query" in the future when it makes its way into JDO.
+    </p>
 </BODY>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10565
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10565&view=rev
Author:   andy_jefferson
Date:     2010-10-04 08:10:13 +0000 (Mon, 04 Oct 2010)

Log Message:
-----------
more work around typesafe queries ... start to implement PersistableExpression in annotation processor

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/JDOQueryProcessor.java
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-10-04 07:04:46 UTC (rev 10564)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/Query.java	2010-10-04 08:10:13 UTC (rev 10565)
@@ -133,30 +133,32 @@
      */
     Query setParameter(String paramName, Object value);
 
+    // TODO Methods to execute and return instances of candidate type T
+
     /**
      * Method to execute the query where there are (potentially) multiple rows and we are returning either a
      * result type or the candidate type.
      * @param resultCls Result class
      * @return The results
      */
-    <T> List<T> executeList(T resultCls);
+    <R> List<R> executeList(R resultCls);
 
     /**
-     * Method to execute the query where there are (potentially) multiple rows and we have a result defined
-     * but no result class.
-     * @return The results
-     */
-    Object[] executeList();
-
-    /**
      * Method to execute the query where there is a single row and we are returning either a result type
      * or the candidate type.
      * @param resultCls Result class
      * @return The result
      */
-    <T> T executeUnique(T resultCls);
+    <R> R executeUnique(R resultCls);
 
     /**
+     * Method to execute the query where there are (potentially) multiple rows and we have a result defined
+     * but no result class.
+     * @return The results
+     */
+    List<Object[]> executeList();
+
+    /**
      * Method to execute the query where there is a single row and we have a result defined
      * but no result class.
      * @return The results

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/JDOQueryProcessor.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/JDOQueryProcessor.java	2010-10-04 07:04:46 UTC (rev 10564)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/JDOQueryProcessor.java	2010-10-04 08:10:13 UTC (rev 10565)
@@ -34,6 +34,8 @@
 import javax.lang.model.util.Types;
 import javax.tools.JavaFileObject;
 
+import org.datanucleus.query.typesafe.PersistableExpression;
+
 /**
  * Annotation processor for JDO to generate "dummy" classes for all persistable classes for use with the 
  * Typesafe Query API. Any class ({MyClass}) that has a JDO "class" annotation will have a stub class 
@@ -90,7 +92,7 @@
         String className = elementUtils.getBinaryName(el).toString();
         String pkgName = className.substring(0, className.lastIndexOf('.'));
         String classSimpleName = className.substring(className.lastIndexOf('.') + 1);
-        String classNameNew = prefix + className;
+        String classNameNew = pkgName + "." + prefix + classSimpleName;
         System.out.println("JDO QueryProcessor orig=" + className + " new=" + classNameNew);
 
         TypeElement superEl = getPersistentSupertype(el);
@@ -100,20 +102,44 @@
             Writer w = javaFile.openWriter();
             try
             {
+                // Package declaration
                 w.append("package " + pkgName + ";\n");
                 w.append("\n");
+
+                // Imports
+                String typesafeCls = PersistableExpression.class.getName();
+                String typesafePkg = typesafeCls.substring(0, typesafeCls.lastIndexOf('.'));
+                w.append("import " + typesafePkg + ".*;\n");
+                w.append("\n");
+
+                // Class declaration
                 w.append("public class " + prefix + classSimpleName);
                 if (superEl != null)
                 {
                     String superClassName = elementUtils.getBinaryName(superEl).toString();
                     w.append(" extends ").append(prefix + superClassName);
                 }
-                // TODO implements PathExpression
+                w.append(" implements ").append(PersistableExpression.class.getSimpleName());
                 w.append("\n");
                 w.append("{\n");
 
+                String indent = "    ";
+
                 // Find the members to use for persistence processing
+                // TODO Add field for each persistable member
 
+                // Implement PersistableExpression
+                w.append(indent).append("public Expression jdoObjectId()\n");
+                w.append(indent).append("{\n");
+                w.append(indent).append("    return null;\n"); // TODO Implement this
+                w.append(indent).append("}\n");
+                w.append(indent).append("public Expression jdoVersion()\n");
+                w.append(indent).append("{\n");
+                w.append(indent).append("    return null;\n"); // TODO Implement this
+                w.append(indent).append("}\n");
+
+                // Implement Expression TODO Add these methods
+
                 w.append("}\n");
                 w.flush();
             }

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java	2010-10-04 07:04:46 UTC (rev 10564)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/impl/TypesafeQueryImpl.java	2010-10-04 08:10:13 UTC (rev 10565)
@@ -20,8 +20,12 @@
 import java.util.List;
 
 import javax.jdo.FetchPlan;
+import javax.jdo.JDOUserException;
 
+import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.ObjectManager;
+import org.datanucleus.metadata.MetaDataManager;
+import org.datanucleus.query.compiler.QueryCompilation;
 import org.datanucleus.query.typesafe.BooleanExpression;
 import org.datanucleus.query.typesafe.Expression;
 import org.datanucleus.query.typesafe.NumericExpression;
@@ -47,14 +51,21 @@
     Expression rangeLowerExpr;
     Expression rangeUpperExpr;
 
+    /** The single-string query that this equates to (cached). */
+    String queryString = null;
+
+    /** The generic query compilation that this equates to (cached). */
+    QueryCompilation compilation = null;
+
     /**
      * Constructor for a typesafe query.
      * @param om Object Manager
+     * @param candidateClass The candidate class
      */
-    public TypesafeQueryImpl(ObjectManager om, Class cls)
+    public TypesafeQueryImpl(ObjectManager om, Class candidateClass)
     {
         this.om = om;
-        this.candidateCls = cls;
+        this.candidateCls = candidateClass;
     }
 
     /* (non-Javadoc)
@@ -71,6 +82,7 @@
      */
     public Expression parameter(String name, Class type)
     {
+        discardCompiled();
         // TODO Auto-generated method stub
         return null;
     }
@@ -80,6 +92,7 @@
      */
     public Expression variable(String name, Class type)
     {
+        discardCompiled();
         // TODO Auto-generated method stub
         return null;
     }
@@ -89,6 +102,7 @@
      */
     public Query filter(BooleanExpression expr)
     {
+        discardCompiled();
         this.filterExpr = expr;
         return this;
     }
@@ -98,6 +112,7 @@
      */
     public Query groupBy(Expression... exprs)
     {
+        discardCompiled();
         this.groupingExprs = exprs;
         return this;
     }
@@ -107,6 +122,7 @@
      */
     public Query having(Expression expr)
     {
+        discardCompiled();
         this.havingExpr = expr;
         return this;
     }
@@ -116,6 +132,7 @@
      */
     public Query orderBy(OrderExpression... orderExprs)
     {
+        discardCompiled();
         this.orderExprs = orderExprs;
         return this;
     }
@@ -125,6 +142,7 @@
      */
     public Query range(long lowerIncl, long upperExcl)
     {
+        discardCompiled();
         // TODO Auto-generated method stub - create NumericExpressions internally
         return this;
     }
@@ -134,6 +152,7 @@
      */
     public Query range(NumericExpression lowerInclExpr, NumericExpression upperExclExpr)
     {
+        discardCompiled();
         this.rangeLowerExpr = lowerInclExpr;
         this.rangeUpperExpr = upperExclExpr;
         return this;
@@ -144,6 +163,15 @@
      */
     public Query range(Expression paramLowerInclExpr, Expression paramUpperExclExpr)
     {
+        discardCompiled();
+        if (!paramLowerInclExpr.isParameter())
+        {
+            throw new JDOUserException("lower inclusive expression should be a parameter");
+        }
+        else if (!paramUpperExclExpr.isParameter())
+        {
+            throw new JDOUserException("upper exclusive expression should be a parameter");
+        }
         this.rangeLowerExpr = paramLowerInclExpr;
         this.rangeUpperExpr = paramUpperExclExpr;
         return this;
@@ -154,6 +182,7 @@
      */
     public Query result(Expression... exprs)
     {
+        discardCompiled();
         this.resultExprs = exprs;
         return this;
     }
@@ -163,6 +192,7 @@
      */
     public Query setFetchPlan(FetchPlan fp)
     {
+        discardCompiled();
         this.fp = fp;
         return this;
     }
@@ -172,6 +202,7 @@
      */
     public Query setParameter(Expression paramExpr, Object value)
     {
+        discardCompiled();
         // TODO Auto-generated method stub
         return this;
     }
@@ -181,6 +212,7 @@
      */
     public Query setParameter(String paramName, Object value)
     {
+        discardCompiled();
         // TODO Auto-generated method stub
         return this;
     }
@@ -188,7 +220,7 @@
     /* (non-Javadoc)
      * @see org.datanucleus.query.typesafe.Query#executeList()
      */
-    public Object[] executeList()
+    public List<Object[]> executeList()
     {
         // TODO Auto-generated method stub
         return null;
@@ -231,12 +263,37 @@
     }
 
     /**
+     * Called when something is set on the query making any compilation invalid.
+     */
+    protected void discardCompiled()
+    {
+        compilation = null;
+        queryString = null;
+    }
+
+    /**
+     * Accessor for the generic compilation that this criteria query equates to.
+     * @return The generic compilation
+     */
+    public QueryCompilation getCompilation(MetaDataManager mmgr, ClassLoaderResolver clr)
+    {
+        if (compilation == null)
+        {
+            // TODO Implement this
+        }
+        return compilation;
+    }
+
+    /**
      * Method to return the single-string form of this JDOQL query.
      * @return Single-string form of the query
      */
     public String toString()
     {
-        // TODO Implement this
-        return null;
+        if (queryString == null)
+        {
+            // TODO Implement this
+        }
+        return queryString;
     }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10961
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=10961&view=rev
Author:   andy_jefferson
Date:     2010-11-05 09:36:51 +0000 (Fri, 05 Nov 2010)

Log Message:
-----------
[NUCCORE-545] Provide abstract base of typesafeQuery and typesafeSubquery

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/TypesafeSubquery.java

Added Paths:
-----------
    platform/core/trunk/src/java/org/datanucleus/query/typesafe/JDOTypesafeQueryBase.java

Added: platform/core/trunk/src/java/org/datanucleus/query/typesafe/JDOTypesafeQueryBase.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/JDOTypesafeQueryBase.java	                        (rev 0)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/JDOTypesafeQueryBase.java	2010-11-05 09:36:51 UTC (rev 10961)
@@ -0,0 +1,70 @@
+/**********************************************************************
+Copyright (c) 2010 Andy Jefferson and others. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.query.typesafe;
+
+import java.util.List;
+
+import javax.jdo.PersistenceManager;
+
+import org.datanucleus.ObjectManager;
+import org.datanucleus.jdo.JDOPersistenceManager;
+
+/**
+ * Abstract base for a typesafe query. Extended by JDOTypesafeQuery and JDOTypesafeSubquery.
+ */
+public abstract class JDOTypesafeQueryBase<T>
+{
+    /** Candidate class for the query. */
+    protected Class candidateCls;
+
+    /** Result expression(s). */
+    protected List<Expression> result;
+
+    /** Whether the results are distinct (no dups). */
+    protected Boolean resultDistinct = null;
+
+    /** Filter expression. */
+    protected BooleanExpression filter;
+
+    /** Grouping expression(s). */
+    protected List<Expression> grouping;
+
+    /** Having expression. */
+    protected Expression having;
+
+    /** Ordering expression(s). */
+    protected List<OrderExpression> ordering;
+
+    /** Range : lower limit expression. */
+    protected Expression rangeLowerExpr;
+
+    /** Range : upper limit expression. */
+    protected Expression rangeUpperExpr;
+
+    protected PersistenceManager pm;
+
+    protected ObjectManager om;
+
+    public JDOTypesafeQueryBase(PersistenceManager pm, Class<T> candidateClass)
+    {
+        this.pm = pm;
+        this.om = ((JDOPersistenceManager)pm).getObjectManager();
+        this.candidateCls = candidateClass;
+    }
+}
\ No newline at end of file

Modified: platform/core/trunk/src/java/org/datanucleus/query/typesafe/TypesafeSubquery.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/typesafe/TypesafeSubquery.java	2010-11-05 09:10:30 UTC (rev 10960)
+++ platform/core/trunk/src/java/org/datanucleus/query/typesafe/TypesafeSubquery.java	2010-11-05 09:36:51 UTC (rev 10961)
@@ -22,8 +22,10 @@
  * Interface for a type-safe subquery, using a fluent API.
  * Users should call methods on the subquery instance and end with a select of what the subquery returns; this
  * returns the expression that they use to link it with the owning query.
+ * 
+ * <T> (Candidate) type being represented
  */
-public interface TypesafeSubquery
+public interface TypesafeSubquery<T>
 {
     /**
      * Method to set the filter of the query.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.