[geode] 22/22: rebase to develop

[jinmeiliao]

This is an automated email from the ASF dual-hosted git repository.

jinmeiliao pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 0a3041ef66d4fb2b10ca113e357bc522d95cfffd
Author: Jinmei Liao <jil...@pivotal.io>
AuthorDate: Wed Jun 8 15:38:35 2022 -0700

    rebase to develop
---
 .../java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java | 2 +-
 .../java/org/apache/geode/internal/cache/PartitionedRegionTest.java     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
index 10794b8df0..38648efe5d 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
@@ -879,7 +879,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor 
{
   };
 
   @Immutable
-  private static final Filter prServerWithCqFilter = profile -> {
+  private static final Predicate<Profile> prServerWithCqFilter = profile -> {
     CacheProfile prof = (CacheProfile) profile;
     return prof.isPartitioned && prof.hasCacheServer && prof.filterProfile != 
null
         && prof.filterProfile.hasCQs();
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTest.java
index f937775007..cdf9ff675c 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTest.java
@@ -85,7 +85,6 @@ import 
org.apache.geode.distributed.internal.InternalDistributedSystem;
 import 
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.control.InternalResourceManager;
 import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
-import org.apache.geode.internal.cache.partitioned.ClearPRMessage;
 import 
org.apache.geode.internal.cache.partitioned.colocation.ColocationLoggerFactory;
 import org.apache.geode.test.junit.runners.GeodeParamsRunner;