You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/04/13 17:18:36 UTC

[15/22] geode git commit: GEODE-1577: modified MultiRegionFunctionExecutor to fix compilation error

GEODE-1577: modified MultiRegionFunctionExecutor to fix compilation error


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/bd40bcac
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/bd40bcac
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/bd40bcac

Branch: refs/heads/feature/GEODE-2632
Commit: bd40bcac75aa61b128849d68b88cd8df08b40f3e
Parents: 4816d39
Author: Jason Huynh <hu...@gmail.com>
Authored: Wed Apr 12 11:08:42 2017 -0700
Committer: Jason Huynh <hu...@gmail.com>
Committed: Wed Apr 12 11:08:42 2017 -0700

----------------------------------------------------------------------
 .../internal/cache/execute/MultiRegionFunctionExecutor.java      | 4 ++--
 .../org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/bd40bcac/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
index 936781e..16baf46 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
@@ -151,7 +151,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution {
     return new MultiRegionFunctionExecutor(this, args);
   }
 
-  public Execution withCollector(ResultCollector<?, ?> rc) {
+  public Execution withCollector(ResultCollector rc) {
     if (rc == null) {
       throw new IllegalArgumentException(
           LocalizedStrings.ExecuteRegionFunction_THE_INPUT_0_FOR_THE_EXECUTE_FUNCTION_REQUEST_IS_NULL
@@ -160,7 +160,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution {
     return new MultiRegionFunctionExecutor(this, rc);
   }
 
-  public Execution withFilter(Set<?> filter) {
+  public Execution withFilter(Set filter) {
     throw new FunctionException(
         LocalizedStrings.ExecuteFunction_CANNOT_SPECIFY_0_FOR_ONREGIONS_FUNCTION
             .toLocalizedString("filter"));

http://git-wip-us.apache.org/repos/asf/geode/blob/bd40bcac/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java
index 8c9c798..73d84d7 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java
@@ -111,8 +111,7 @@ public class LuceneQueryImpl<K, V> implements LuceneQuery<K, V> {
     try {
       TopEntriesFunctionCollector collector = new TopEntriesFunctionCollector(context);
       ResultCollector<TopEntriesCollector, TopEntries<K>> rc =
-          onRegion().withArgs(context)
-              .withCollector(collector).execute(LuceneQueryFunction.ID);
+          onRegion().withArgs(context).withCollector(collector).execute(LuceneQueryFunction.ID);
       entries = rc.getResult();
     } catch (FunctionException e) {
       if (e.getCause() instanceof LuceneQueryException) {