[Misc] Rename parameters named with reserved keywords in Query and its implementations

xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/src/main/java/org/xwiki/query/Query.java

@@ -79,11 +79,11 @@ public interface Query
     /**
      * Bind named parameter var with value val in query statement.
      *
-     * @param var variable in query statement (:var).
+     * @param variable variable in query statement (:var).
      * @param val value of the variable.
      * @return this query
      */
-    Query bindValue(String var, Object val);
+    Query bindValue(String variable, Object val);
 
     /**
      * Bind a positional parameter present in the statement (?index in XWQL) with a value. It is recommended to use
@@ -122,19 +122,19 @@ default Query bindValues(Map<String, ?> values)
     }
 
     /**
-     * Bind named parameter var with a value that will be constructed using calls to
+     * Bind named parameter variable with a value that will be constructed using calls to
      * {@link QueryParameter#literal(String)}, {@link QueryParameter#anychar()} and {@link QueryParameter#anyChars()}.
      * In order to perserve the fluent API, it's also possible to call {@link QueryParameter#query()} to get back the
      * {@link Query}.
      *
-     * @param var the variable in the query statement ({@code :var}).
+     * @param variable the variable in the query statement ({@code :variable}).
      * @return an empty {@link QueryParameter} that needs to be populated by calling
      *         {@link QueryParameter#literal(String)}, {@link QueryParameter#anychar()} and
      *         {@link QueryParameter#anyChars()}
      * @since 8.4.5
      * @since 9.3RC1
      */
-    default QueryParameter bindValue(String var)
+    default QueryParameter bindValue(String variable)
     {
         throw new RuntimeException("Not implemented");
     }

xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/src/main/java/org/xwiki/query/WrappingQuery.java

@@ -81,9 +81,9 @@ public String getWiki()
     }
 
     @Override
-    public Query bindValue(String var, Object val)
+    public Query bindValue(String variable, Object val)
     {
-        return getWrappedQuery().bindValue(var, val);
+        return getWrappedQuery().bindValue(variable, val);
     }
 
     @Override
@@ -111,9 +111,9 @@ public Map<String, Object> getNamedParameters()
     }
 
     @Override
-    public QueryParameter bindValue(String var)
+    public QueryParameter bindValue(String variable)
     {
-        return getWrappedQuery().bindValue(var);
+        return getWrappedQuery().bindValue(variable);
     }
 
     @Override

xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/src/main/java/org/xwiki/query/internal/DefaultQuery.java

@@ -169,9 +169,9 @@ public String getWiki()
     }
 
     @Override
-    public Query bindValue(String var, Object val)
+    public Query bindValue(String variable, Object val)
     {
-        this.namedParameters.put(var, val);
+        this.namedParameters.put(variable, val);
         return this;
     }
 
@@ -209,10 +209,10 @@ public Query bindValues(Map<String, ?> values)
     }
 
     @Override
-    public QueryParameter bindValue(String var)
+    public QueryParameter bindValue(String variable)
     {
         QueryParameter parameter = new DefaultQueryParameter(this);
-        bindValue(var, parameter);
+        bindValue(variable, parameter);
         return parameter;
     }
 

xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/src/main/java/org/xwiki/query/internal/ScriptQuery.java

@@ -177,9 +177,9 @@ public String getWiki()
     }
 
     @Override
-    public Query bindValue(String var, Object val)
+    public Query bindValue(String variable, Object val)
     {
-        this.query.bindValue(var, val);
+        this.query.bindValue(variable, val);
         return this;
     }
 
@@ -205,9 +205,9 @@ public Query bindValues(Map<String, ?> values)
     }
 
     @Override
-    public QueryParameter bindValue(String var)
+    public QueryParameter bindValue(String variable)
     {
-        QueryParameter parameter = this.query.bindValue(var);
+        QueryParameter parameter = this.query.bindValue(variable);
         return new ScriptQueryParameter(this, parameter);
     }