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 5f9b9c01415a8000df6f79ac722352d9d399aaf2 Author: Jinmei Liao <jil...@pivotal.io> AuthorDate: Mon Mar 7 13:25:27 2022 -0800 rebase to develop --- .../org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java | 3 ++- .../java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java | 2 +- .../java/org/apache/geode/internal/cache/PartitionedRegionTest.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java index 597486d69c..ee0eef8bf6 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java @@ -517,7 +517,8 @@ public class FetchKeysMessage extends PartitionMessage { */ private volatile boolean lastChunkReceived; - public FetchKeysResponse(InternalDistributedSystem ds, Set<?> recipients) { + public FetchKeysResponse(InternalDistributedSystem ds, + Set<InternalDistributedMember> recipients) { super(ds, recipients); returnValue = new HashSet<>(); } diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java index 5b9737fcba..98d41dcac3 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionJUnitTest.java @@ -18,8 +18,8 @@ import static java.util.Collections.emptySet; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.anyLong; import static org.mockito.Mockito.doNothing; 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 4c24e7d8ed..f937775007 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 @@ -28,8 +28,8 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doCallRealMethod; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock;