r1342 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty - Wikitty-commits

19 Jan 2012

Author: echatellier
Date: 2012-01-19 18:17:50 +0100 (Thu, 19 Jan 2012)
New Revision: 1342

Url: http://nuiton.org/repositories/revision/wikitty/1342

Log:
Modification des noms criteria/query

Modified:
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java
===================================================================

--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java	2012-01-19 16:10:34 UTC (rev 1341)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java	2012-01-19 17:17:50 UTC (rev 1342)
@@ -676,13 +676,13 @@
      * @param <E> object type
      * Can be Wikitty, BusinessEntity, String, Date, Number (returned is BigDecimal), Boolean, byte[]
      * @param clazz entity class
-     * @param criterias criterias
+     * @param queries queries
      * @return paged result
      */
     public <E> List<WikittyQueryResult<E>> findAllByQuery(
-            Class<E> clazz, List<WikittyQuery> criterias) {
+            Class<E> clazz, List<WikittyQuery> queries) {
         long start = TimeLog.getTime();
-        List<WikittyQueryResult<E>> result = findAllByQuery(clazz, criterias, false);
+        List<WikittyQueryResult<E>> result = findAllByQuery(clazz, queries, false);
         timeLog.log(start, "findAllByQuery<E>(List)");
         return result;
     }
@@ -696,14 +696,14 @@
      * @param <E> object type
      * Can be Wikitty, BusinessEntity, String, Date, Number (returned is BigDecimal), Boolean, byte[]
      * @param clazz entity class
-     * @param criteria criteria
+     * @param query query
      * @return paged result
      */
     public <E> WikittyQueryResult<E> findAllByQuery(
-            Class<E> clazz, WikittyQuery criteria) {
+            Class<E> clazz, WikittyQuery query) {
         long start = TimeLog.getTime();
         WikittyQueryResult<E> result = findAllByQuery(clazz,
-                Collections.singletonList(criteria), false).get(0);
+                Collections.singletonList(query), false).get(0);
         timeLog.log(start, "findAllByQuery<E>(One)");
         return result;
     }
@@ -718,21 +718,21 @@
      * @param <E> object type
      * Can be Wikitty, BusinessEntity, String, Date, Number (returned is BigDecimal), Boolean, byte[]
      * @param clazz entity class
-     * @param c1 criteria 1
-     * @param c2 criteria 2
-     * @param otherCriteria otherCriteria
+     * @param q1 query 1
+     * @param q2 query 2
+     * @param otherQueries otherQueries
      * @return paged result
      */
     public <E> WikittyQueryResult<E>[] findAllByQuery(
-            Class<E> clazz, WikittyQuery c1, WikittyQuery c2, WikittyQuery... otherCriteria) {
+            Class<E> clazz, WikittyQuery q1, WikittyQuery q2, WikittyQuery... otherQueries) {
         long start = TimeLog.getTime();
-        List<WikittyQuery> criterias = new ArrayList<WikittyQuery>(otherCriteria.length + 2);
-        Collections.addAll(criterias, c1, c2);
-        Collections.addAll(criterias, otherCriteria);
+        List<WikittyQuery> queries = new ArrayList<WikittyQuery>(otherQueries.length + 2);
+        Collections.addAll(queries, q1, q2);
+        Collections.addAll(queries, otherQueries);
 
-        List<WikittyQueryResult<E>> resultList = findAllByQuery(clazz, criterias, false);
-        WikittyQueryResult<E>[] result = resultList.toArray(new WikittyQueryResult[criterias.size()]);
-        timeLog.log(start, "findAllByCriteria<Business>(Varargs)");
+        List<WikittyQueryResult<E>> resultList = findAllByQuery(clazz, queries, false);
+        WikittyQueryResult<E>[] result = resultList.toArray(new WikittyQueryResult[queries.size()]);
+        timeLog.log(start, "findAllByQuery<Business>(Varargs)");
         return result;
     }
 
@@ -742,11 +742,11 @@
     //
     ///////////////////////////////////////////////////////////////////////////
 
-    public <E> List<E> findByQuery(Class<E> clazz, List<WikittyQuery> criterias) {
+    public <E> List<E> findByQuery(Class<E> clazz, List<WikittyQuery> queries) {
         long start = TimeLog.getTime();
 
         List<WikittyQueryResult<E>> queryResult =
-                findAllByQuery(clazz, criterias, true);
+                findAllByQuery(clazz, queries, true);
         List<E> result = new ArrayList<E>(queryResult.size());
         for (WikittyQueryResult<E> r : queryResult) {
             if (r.size() > 0) {
@@ -756,32 +756,32 @@
             }
         }
 
-        timeLog.log(start, "multiFindByCriteria<E>(List>");
+        timeLog.log(start, "findByQuery<E>(List)");
         return result;
     }
 
-    public <E> E findByQuery(Class<E> clazz, WikittyQuery criteria) {
+    public <E> E findByQuery(Class<E> clazz, WikittyQuery query) {
         long start = TimeLog.getTime();
         E result = null;
-        if (criteria != null) {
-            result = findByQuery(clazz, Collections.singletonList(criteria)).get(0);
+        if (query != null) {
+            result = findByQuery(clazz, Collections.singletonList(query)).get(0);
         }
         timeLog.log(start, "findByQuery<E>(One)");
         return result;
     }
 
     public <E> E[] findByQuery(
-            Class<E> clazz, WikittyQuery c1, WikittyQuery c2, WikittyQuery... otherCriteria) {
+            Class<E> clazz, WikittyQuery q1, WikittyQuery q2, WikittyQuery... otherQueries) {
         long start = TimeLog.getTime();
 
-        List<WikittyQuery> criterias = new ArrayList<WikittyQuery>(otherCriteria.length + 2);
-        Collections.addAll(criterias, c1, c2);
-        Collections.addAll(criterias, otherCriteria);
+        List<WikittyQuery> queries = new ArrayList<WikittyQuery>(otherQueries.length + 2);
+        Collections.addAll(queries, q1, q2);
+        Collections.addAll(queries, otherQueries);
 
-        List<E> resultList = findByQuery(clazz, criterias);
+        List<E> resultList = findByQuery(clazz, queries);
         E[] result = resultList.toArray((E[])Array.newInstance(clazz, resultList.size()));
 
-        timeLog.log(start, "findByCriteria<E>(Varargs)");
+        timeLog.log(start, "findByQuery<E>(Varargs)");
         return result;
     }
 
@@ -791,24 +791,24 @@
     //
     ///////////////////////////////////////////////////////////////////////////
 
-    public List<WikittyQueryResult<String>> findAllByQuery(List<WikittyQuery> criteria) {
+    public List<WikittyQueryResult<String>> findAllByQuery(List<WikittyQuery> query) {
         long start = TimeLog.getTime();
         List<WikittyQueryResult<String>> result = null;
-        if (criteria != null) {
-            result = wikittyService.findAllByQuery(securityToken, criteria);
+        if (query != null) {
+            result = wikittyService.findAllByQuery(securityToken, query);
         }
-        timeLog.log(start, "findAllByCriteria(List)");
+        timeLog.log(start, "findAllByQuery(List)");
         return result;
     }
 
-    public WikittyQueryResult<String> findAllByQuery(WikittyQuery criteria) {
+    public WikittyQueryResult<String> findAllByQuery(WikittyQuery query) {
         long start = TimeLog.getTime();
         WikittyQueryResult<String> result = null;
-        if (criteria != null) {
+        if (query != null) {
             result = findAllByQuery(
-                    Collections.singletonList(criteria)).get(0);
+                    Collections.singletonList(query)).get(0);
         }
-        timeLog.log(start, "findAllByCriteria(One)");
+        timeLog.log(start, "findAllByQuery(One)");
     	return result;
     }
 
@@ -833,38 +833,38 @@
     //
     ///////////////////////////////////////////////////////////////////////////
 
-    public List<String> findByQuery(List<WikittyQuery> criteria) {
+    public List<String> findByQuery(List<WikittyQuery> query) {
         long start = TimeLog.getTime();
         List<String> result = null;
-        if (criteria != null) {
-            result = wikittyService.findByQuery(securityToken, criteria);
+        if (query != null) {
+            result = wikittyService.findByQuery(securityToken, query);
         }
-        timeLog.log(start, "findByCriteria(List)");
+        timeLog.log(start, "findByQuery(List)");
     	return result;
     }
 
-    public String findByQuery(WikittyQuery criteria) {
+    public String findByQuery(WikittyQuery query) {
         long start = TimeLog.getTime();
         String result = null;
-        if (criteria != null) {
-            result = findByQuery(Collections.singletonList(criteria)).get(0);
+        if (query != null) {
+            result = findByQuery(Collections.singletonList(query)).get(0);
         }
-        timeLog.log(start, "findByCriteria(One)");
+        timeLog.log(start, "findByQuery(One)");
     	return result;
     }
 
     public String[] findByQuery(
-            WikittyQuery c1, WikittyQuery c2, WikittyQuery... otherCriteria) {
+            WikittyQuery q1, WikittyQuery q2, WikittyQuery... otherQueries) {
         long start = TimeLog.getTime();
 
-        List<WikittyQuery> criterias = new ArrayList<WikittyQuery>(otherCriteria.length + 2);
-        Collections.addAll(criterias, c1, c2);
-        Collections.addAll(criterias, otherCriteria);
+        List<WikittyQuery> queries = new ArrayList<WikittyQuery>(otherQueries.length + 2);
+        Collections.addAll(queries, q1, q2);
+        Collections.addAll(queries, otherQueries);
 
-        List<String> resultList = findByQuery(criterias);
-        String[] result = resultList.toArray(new String[criterias.size()]);
+        List<String> resultList = findByQuery(queries);
+        String[] result = resultList.toArray(new String[queries.size()]);
 
-        timeLog.log(start, "findByCriteria(Varargs)");
+        timeLog.log(start, "findByQuery(Varargs)");
         return result;
     }

    

r1342 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty

echatellier＠users.nuiton.org

tags

participants (1)