r2853 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: generator persistence - Topia-commits

31 Oct 2013

Author: bleny
Date: 2013-10-31 15:59:51 +0100 (Thu, 31 Oct 2013)
New Revision: 2853

Url: http://nuiton.org/projects/topia/repository/revisions/2853

Log:
refs #2086 allow adding criteria to query after using a generated dao method (ie forActive(true)...)

Modified:
   trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDaoTransformer.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDaoTransformer.java
===================================================================

--- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDaoTransformer.java	2013-10-30 17:42:49 UTC (rev 2852)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDaoTransformer.java	2013-10-31 14:59:51 UTC (rev 2853)
@@ -47,6 +47,7 @@
 import org.nuiton.eugene.models.object.ObjectModelOperation;
 import org.nuiton.topia.TopiaException;
 import org.nuiton.topia.persistence.TopiaEntity;
+import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -426,6 +427,7 @@
         }
         addImport(daoAbstractClass, List.class);
         addImport(daoAbstractClass, TopiaException.class);
+        addImport(daoAbstractClass, TopiaQueryBuilderAddCriteriaOrRunQueryStep.class);
 
         ObjectModelOperation op;
 
@@ -887,24 +889,24 @@
         ObjectModelOperation op;
         op = addOperation(result,
                 getJavaBeanMethodName("for", attrName, "In"),
-                "TopiaQueryBuilderRunQueryStep<E>",
+                "TopiaQueryBuilderAddCriteriaOrRunQueryStep<E>",
                 ObjectModelJavaModifier.PUBLIC);
         addParameter(op, "Iterable<" + attrTypeForGeneric + ">", "v");
         setOperationBody(op, ""
 /*{
-        TopiaQueryBuilderRunQueryStep<E> result = forIn(<%=propertyName%>, (Iterable) v);
+        TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = forIn(<%=propertyName%>, (Iterable) v);
         return result;
     }*/
         );
 
         op = addOperation(result,
                 getJavaBeanMethodName("for", attrName, "Equals"),
-                "TopiaQueryBuilderRunQueryStep<E>",
+                "TopiaQueryBuilderAddCriteriaOrRunQueryStep<E>",
                 ObjectModelJavaModifier.PUBLIC);
         addParameter(op, attrType, "v");
         setOperationBody(op, ""
 /*{
-        TopiaQueryBuilderRunQueryStep<E> result = forEquals(<%=propertyName%>, v);
+        TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = forEquals(<%=propertyName%>, v);
         return result;
     }*/
         );
@@ -981,7 +983,7 @@
 
         op = addOperation(result,
                 getJavaBeanMethodName("for", attrName, "Contains"),
-                "TopiaQueryBuilderRunQueryStep<E>",
+                "TopiaQueryBuilderAddCriteriaOrRunQueryStep<E>",
                 ObjectModelJavaModifier.PUBLIC);
         addParameter(op, attrType, "v");
         setOperationBody(op, ""

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java	2013-10-30 17:42:49 UTC (rev 2852)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java	2013-10-31 14:59:51 UTC (rev 2853)
@@ -382,20 +382,20 @@
     }
 
     @Override
-    public TopiaQueryBuilderRunQueryStep<E> forContains(String propertyName, Object propertyValue) {
-        TopiaQueryBuilderRunQueryStep<E> result = newQueryBuilder().addContains(propertyName, propertyValue).getNextStep();
+    public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forContains(String propertyName, Object propertyValue) {
+        TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = newQueryBuilder().addContains(propertyName, propertyValue);
         return result;
     }
 
     @Override
-    public TopiaQueryBuilderRunQueryStep<E> forEquals(String propertyName, Object propertyValue) {
-        TopiaQueryBuilderRunQueryStep<E> result = newQueryBuilder().addEquals(propertyName, propertyValue).getNextStep();
+    public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forEquals(String propertyName, Object propertyValue) {
+        TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = newQueryBuilder().addEquals(propertyName, propertyValue);
         return result;
     }
 
     @Override
-    public TopiaQueryBuilderRunQueryStep<E> forIn(String propertyName, Iterable<Object> propertyValues) {
-        TopiaQueryBuilderRunQueryStep<E> result = newQueryBuilder().addIn(propertyName, propertyValues).getNextStep();
+    public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forIn(String propertyName, Iterable<Object> propertyValues) {
+        TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = newQueryBuilder().addIn(propertyName, propertyValues);
         return result;
     }
 
@@ -614,16 +614,16 @@
     }
 
     @Override
-    public TopiaQueryBuilderRunQueryStep<E> forTopiaIdEquals(String topiaId) {
+    public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forTopiaIdEquals(String topiaId) {
         Preconditions.checkNotNull(topiaId, "given topiaId is null");
-        TopiaQueryBuilderRunQueryStep<E> result = forEquals(TopiaEntity.PROPERTY_TOPIA_ID, topiaId);
+        TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = forEquals(TopiaEntity.PROPERTY_TOPIA_ID, topiaId);
         return result;
     }
 
     @Override
-    public TopiaQueryBuilderRunQueryStep<E> forTopiaIdIn(Iterable<String> topiaIds) {
+    public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forTopiaIdIn(Iterable<String> topiaIds) {
         Preconditions.checkNotNull(topiaIds, "given topiaIds is null");
-        TopiaQueryBuilderRunQueryStep<E> result = forIn(TopiaEntity.PROPERTY_TOPIA_ID, (Iterable) topiaIds);
+        TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = forIn(TopiaEntity.PROPERTY_TOPIA_ID, (Iterable) topiaIds);
         return result;
     }
 
@@ -797,37 +797,37 @@
         }
 
         @Override
-        public TopiaQueryBuilderAddCriteriaStep<E> addEquals(String property, Object value) {
+        public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addEquals(String property, Object value) {
             hqlAndParametersBuilder.addEquals(property, value);
             return this;
         }
 
         @Override
-        public TopiaQueryBuilderAddCriteriaStep<E> addIn(String property, Iterable<Object> values) {
+        public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addIn(String property, Iterable<Object> values) {
             hqlAndParametersBuilder.addIn(property, values);
             return this;
         }
 
         @Override
-        public TopiaQueryBuilderAddCriteriaStep<E> addContains(String property, Object value) {
+        public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addContains(String property, Object value) {
             hqlAndParametersBuilder.addContains(property, value);
             return this;
         }
 
         @Override
-        public TopiaQueryBuilderAddCriteriaStep<E> addNull(String property) {
+        public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNull(String property) {
             hqlAndParametersBuilder.addNull(property);
             return this;
         }
 
         @Override
-        public TopiaQueryBuilderAddCriteriaStep<E> addTopiaIdEquals(String property, String topiaId) {
+        public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdEquals(String property, String topiaId) {
             hqlAndParametersBuilder.addTopiaIdEquals(property, topiaId);
             return this;
         }
 
         @Override
-        public TopiaQueryBuilderAddCriteriaStep<E> addTopiaIdIn(String property, Iterable<String> topiaIds) {
+        public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdIn(String property, Iterable<String> topiaIds) {
             hqlAndParametersBuilder.addTopiaIdIn(property, topiaIds);
             return this;
         }

    

r2853 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: generator persistence

bleny＠users.nuiton.org

tags

participants (1)