[Topia-commits] r2947 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence

20 Dec 2013

Author: tchemit
Date: 2013-12-20 12:31:25 +0100 (Fri, 20 Dec 2013)
New Revision: 2947

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

Log:
rename some internal inner classes

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

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-12-20 11:31:10 UTC (rev 2946)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java	2013-12-20 11:31:25 UTC (rev 2947)
@@ -348,46 +348,46 @@
         return result;
     }
 
-    protected TopiaQueryBuilderRunQueryStep<E> forHql(String hql) {
+    protected InnerTopiaQueryBuilderRunQueryStep<E> forHql(String hql) {
         Map<String, Object> properties = Collections.emptyMap();
-        TopiaQueryBuilderRunQueryStep<E> result = forHql(hql, properties);
+        InnerTopiaQueryBuilderRunQueryStep<E> result = forHql(hql, properties);
         return result;
     }
 
-    protected TopiaQueryBuilderRunQueryStep<E> forHql(String hql, Map<String, Object> hqlParameters) {
-        TopiaQueryBuilderRunQueryStep<E> result = new TopiaQueryBuilderRunQueryStep<E>(this, hql, hqlParameters);
+    protected InnerTopiaQueryBuilderRunQueryStep<E> forHql(String hql, Map<String, Object> hqlParameters) {
+        InnerTopiaQueryBuilderRunQueryStep<E> result = new InnerTopiaQueryBuilderRunQueryStep<E>(this, hql, hqlParameters);
         return result;
     }
 
-    protected TopiaQueryBuilderRunQueryStep<E> forHql(String hql, String parameterName,
+    protected InnerTopiaQueryBuilderRunQueryStep<E> forHql(String hql, String parameterName,
                                                       Object parameterValue,
                                                       Object... otherParameterNamesAndValues) {
         Map<String, Object> hqlParameters =
                 TopiaUtil.convertPropertiesArrayToMap(parameterName, parameterValue, otherParameterNamesAndValues);
-        TopiaQueryBuilderRunQueryStep<E> result = forHql(hql, hqlParameters);
+        InnerTopiaQueryBuilderRunQueryStep<E> result = forHql(hql, hqlParameters);
         return result;
     }
 
     @Override
-    public TopiaQueryBuilderAddCriteriaStep<E> forProperties(Map<String, Object> properties) {
+    public InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forProperties(Map<String, Object> properties) {
         HqlAndParametersBuilder<E> hqlAndParametersBuilder = getHqlForProperties(properties);
-        TopiaQueryBuilderAddCriteriaStep<E> result = new TopiaQueryBuilderAddCriteriaStep<E>(this, hqlAndParametersBuilder);
+        InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = new InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E>(this, hqlAndParametersBuilder);
         return result;
     }
 
     @Override
-    public TopiaQueryBuilderAddCriteriaStep<E> forProperties(String propertyName,
+    public InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forProperties(String propertyName,
                                                              Object propertyValue,
                                                              Object... otherPropertyNamesAndValues) {
         HqlAndParametersBuilder<E> hqlAndParametersBuilder = getHqlForProperties(propertyName, propertyValue, otherPropertyNamesAndValues);
-        TopiaQueryBuilderAddCriteriaStep<E> result = new TopiaQueryBuilderAddCriteriaStep<E>(this, hqlAndParametersBuilder);
+        InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = new InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E>(this, hqlAndParametersBuilder);
         return result;
     }
 
     @Override
-    public TopiaQueryBuilderAddCriteriaStep<E> newQueryBuilder() {
+    public InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E> newQueryBuilder() {
         HqlAndParametersBuilder<E> hqlAndParametersBuilder = newHqlAndParametersBuilder();
-        TopiaQueryBuilderAddCriteriaStep<E> result = new TopiaQueryBuilderAddCriteriaStep<E>(this, hqlAndParametersBuilder);
+        InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = new InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E>(this, hqlAndParametersBuilder);
         return result;
     }
 
@@ -708,25 +708,25 @@
         }
     }
 
-    public static class TopiaQueryBuilderAddCriteriaStep<E extends TopiaEntity> implements TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> {
+    public static class InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E extends TopiaEntity> implements TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> {
 
         protected AbstractTopiaDao<E> topiaDAO;
 
         protected HqlAndParametersBuilder<E> hqlAndParametersBuilder;
 
-        protected TopiaQueryBuilderAddCriteriaStep(AbstractTopiaDao<E> topiaDAO, HqlAndParametersBuilder<E> hqlAndParametersBuilder) {
+        protected InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep(AbstractTopiaDao<E> topiaDAO, HqlAndParametersBuilder<E> hqlAndParametersBuilder) {
             this.topiaDAO = topiaDAO;
             this.hqlAndParametersBuilder = hqlAndParametersBuilder;
         }
 
         @Override
-        public TopiaQueryBuilderRunQueryStep<E> setOrderByArguments(Set<String> orderByArguments) {
+        public InnerTopiaQueryBuilderRunQueryStep<E> setOrderByArguments(Set<String> orderByArguments) {
             hqlAndParametersBuilder.setOrderByArguments(orderByArguments);
             return getNextStep();
         }
 
         @Override
-        public TopiaQueryBuilderRunQueryStep<E> setOrderByArguments(String... orderByArguments) {
+        public InnerTopiaQueryBuilderRunQueryStep<E> setOrderByArguments(String... orderByArguments) {
             hqlAndParametersBuilder.setOrderByArguments(orderByArguments);
             return getNextStep();
         }
@@ -900,16 +900,16 @@
             return getNextStep().findAllIds();
         }
 
-        protected TopiaQueryBuilderRunQueryStep<E> getNextStep() {
+        protected InnerTopiaQueryBuilderRunQueryStep<E> getNextStep() {
             String hql = hqlAndParametersBuilder.getHql();
             Map<String, Object> hqlParameters = hqlAndParametersBuilder.getHqlParameters();
-            TopiaQueryBuilderRunQueryStep<E> nextStep = new TopiaQueryBuilderRunQueryStep<E>(topiaDAO, hql, hqlParameters);
+            InnerTopiaQueryBuilderRunQueryStep<E> nextStep = new InnerTopiaQueryBuilderRunQueryStep<E>(topiaDAO, hql, hqlParameters);
             return nextStep;
         }
 
     }
 
-    public static class TopiaQueryBuilderRunQueryStep<E extends TopiaEntity> implements org.nuiton.topia.persistence.TopiaQueryBuilderRunQueryStep<E> {
+    public static class InnerTopiaQueryBuilderRunQueryStep<E extends TopiaEntity> implements TopiaQueryBuilderRunQueryStep<E> {
 
         protected final String hql;
 
@@ -917,7 +917,7 @@
 
         protected final AbstractTopiaDao<E> topiaDAO;
 
-        protected TopiaQueryBuilderRunQueryStep(AbstractTopiaDao<E> topiaDAO, String hql, Map<String, Object> hqlParameters) {
+        protected InnerTopiaQueryBuilderRunQueryStep(AbstractTopiaDao<E> topiaDAO, String hql, Map<String, Object> hqlParameters) {
             this.hql = hql;
             this.hqlParameters = hqlParameters;
             this.topiaDAO = topiaDAO;

    

[Topia-commits] r2947 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence

tchemit＠users.nuiton.org