jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1375075 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: api/SessionQueryEngine.java query/QueryEngineImpl.java query/SessionQueryEngineImpl.java
Date Mon, 20 Aug 2012 15:46:16 GMT
Author: mduerig
Date: Mon Aug 20 15:46:16 2012
New Revision: 1375075

URL: http://svn.apache.org/viewvc?rev=1375075&view=rev
Log:
OAK-263: Type of bindings should be covariant in SessionQueryEngine.executeQuery()

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/SessionQueryEngine.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SessionQueryEngineImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/SessionQueryEngine.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/SessionQueryEngine.java?rev=1375075&r1=1375074&r2=1375075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/SessionQueryEngine.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/SessionQueryEngine.java
Mon Aug 20 15:46:16 2012
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.api;
 import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 
 /**
@@ -59,7 +60,7 @@ public interface SessionQueryEngine {
      * @throws IllegalArgumentException if there was an error executing the query
      */
     Result executeQuery(String statement, String language,
-            long limit, long offset, Map<String, CoreValue> bindings,
+            long limit, long offset, Map<String, ? extends CoreValue> bindings,
             NamePathMapper namePathMapper) throws ParseException;
 
     // TODO pass namespace mapping

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java?rev=1375075&r1=1375074&r2=1375075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java
Mon Aug 20 15:46:16 2012
@@ -21,6 +21,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.oak.api.ContentSession;
 import org.apache.jackrabbit.oak.api.CoreValue;
@@ -91,7 +92,7 @@ public class QueryEngineImpl {
     }
 
     public ResultImpl executeQuery(String statement, String language, ContentSession session,
-            long limit, long offset, Map<String, CoreValue> bindings,
+            long limit, long offset, Map<String, ? extends CoreValue> bindings,
             NamePathMapper namePathMapper) throws ParseException {
         Query q = parseQuery(statement, language);
         q.setSession(session);
@@ -100,7 +101,7 @@ public class QueryEngineImpl {
         q.setOffset(offset);
         q.setMicroKernel(mk);
         if (bindings != null) {
-            for (Entry<String, CoreValue> e : bindings.entrySet()) {
+            for (Entry<String, ? extends CoreValue> e : bindings.entrySet()) {
                 q.bindValue(e.getKey(), e.getValue());
             }
         }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SessionQueryEngineImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SessionQueryEngineImpl.java?rev=1375075&r1=1375074&r2=1375075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SessionQueryEngineImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SessionQueryEngineImpl.java
Mon Aug 20 15:46:16 2012
@@ -19,10 +19,11 @@ package org.apache.jackrabbit.oak.query;
 import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.jackrabbit.oak.api.ContentSession;
 import org.apache.jackrabbit.oak.api.CoreValue;
-import org.apache.jackrabbit.oak.api.SessionQueryEngine;
 import org.apache.jackrabbit.oak.api.Result;
+import org.apache.jackrabbit.oak.api.SessionQueryEngine;
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 
 /**
@@ -51,7 +52,7 @@ public class SessionQueryEngineImpl impl
 
     @Override
     public Result executeQuery(String statement, String language, long limit,
-            long offset, Map<String, CoreValue> bindings,
+            long offset, Map<String, ? extends CoreValue> bindings,
             NamePathMapper namePathMapper) throws ParseException {
         return queryEngine.executeQuery(statement, language, session, limit,
                 offset, bindings, namePathMapper);



Mime
View raw message