You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2017/11/10 22:38:16 UTC

[geode] branch feature/GEODE-3940 updated: createRequest no longer takes a PrepareBackupFactory parameter

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

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


The following commit(s) were added to refs/heads/feature/GEODE-3940 by this push:
     new 566e44f  createRequest no longer takes a PrepareBackupFactory parameter
566e44f is described below

commit 566e44f17f3feae4cdbe5ff31def7c2f6c9888d1
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Fri Nov 10 14:37:46 2017 -0800

    createRequest no longer takes a PrepareBackupFactory parameter
---
 .../org/apache/geode/internal/cache/backup/PrepareBackupFactory.java | 5 ++---
 .../apache/geode/internal/cache/backup/PrepareBackupOperation.java   | 4 ++--
 .../apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java | 2 +-
 .../geode/internal/cache/backup/PrepareBackupOperationTest.java      | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/backup/PrepareBackupFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/backup/PrepareBackupFactory.java
index 10aa4e8..7b9c32e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/backup/PrepareBackupFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/backup/PrepareBackupFactory.java
@@ -30,9 +30,8 @@ class PrepareBackupFactory {
   }
 
   PrepareBackupRequest createRequest(InternalDistributedMember sender,
-      Set<InternalDistributedMember> recipients, int processorId,
-      PrepareBackupFactory prepareBackupFactory) {
-    return new PrepareBackupRequest(sender, recipients, processorId, prepareBackupFactory);
+      Set<InternalDistributedMember> recipients, int processorId) {
+    return new PrepareBackupRequest(sender, recipients, processorId, this);
   }
 
   PrepareBackup createPrepareBackup(InternalDistributedMember member, InternalCache cache) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/backup/PrepareBackupOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/backup/PrepareBackupOperation.java
index a8c0f65..9ebedb8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/backup/PrepareBackupOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/backup/PrepareBackupOperation.java
@@ -55,8 +55,8 @@ class PrepareBackupOperation implements PrepareBackupResultCollector {
   Map<DistributedMember, Set<PersistentID>> send() {
     PrepareBackupReplyProcessor replyProcessor =
         prepareBackupFactory.createReplyProcessor(this, dm, recipients);
-    PrepareBackupRequest request = prepareBackupFactory.createRequest(member, recipients,
-        replyProcessor.getProcessorId(), prepareBackupFactory);
+    PrepareBackupRequest request =
+        prepareBackupFactory.createRequest(member, recipients, replyProcessor.getProcessorId());
 
     dm.putOutgoing(request);
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
index ee4ed3d..8b4476d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
@@ -67,7 +67,7 @@ public class PrepareBackupFactoryTest {
 
   @Test
   public void createRequestReturnsPrepareBackupRequest() throws Exception {
-    assertThat(prepareBackupFactory.createRequest(sender, recipients, 1, prepareBackupFactory))
+    assertThat(prepareBackupFactory.createRequest(sender, recipients, 1))
         .isInstanceOf(PrepareBackupRequest.class);
   }
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupOperationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupOperationTest.java
index 29e6678..c0267cb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupOperationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupOperationTest.java
@@ -76,8 +76,8 @@ public class PrepareBackupOperationTest {
 
     when(prepareBackupFactory.createReplyProcessor(eq(prepareBackupOperation), eq(dm),
         eq(recipients))).thenReturn(prepareBackupReplyProcessor);
-    when(prepareBackupFactory.createRequest(eq(sender), eq(recipients), eq(42),
-        eq(prepareBackupFactory))).thenReturn(prepareBackupRequest);
+    when(prepareBackupFactory.createRequest(eq(sender), eq(recipients), eq(42)))
+        .thenReturn(prepareBackupRequest);
     when(prepareBackupFactory.createPrepareBackup(eq(sender), eq(cache))).thenReturn(prepareBackup);
   }
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].