You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2019/02/25 17:52:51 UTC
[geode] branch develop updated: GEODE-6174: rename
ClusterManagementResult methods to avoid confusion. (#3227)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new affee69 GEODE-6174: rename ClusterManagementResult methods to avoid confusion. (#3227)
affee69 is described below
commit affee6971f15e90e9298ac5b471f98d1b20d04a1
Author: jinmeiliao <ji...@pivotal.io>
AuthorDate: Mon Feb 25 09:52:42 2019 -0800
GEODE-6174: rename ClusterManagementResult methods to avoid confusion. (#3227)
---
.../ClusterManagementLocatorReconnectDunitTest.java | 4 ++--
.../internal/rest/RegionManagementDunitTest.java | 20 ++++++++++----------
.../internal/DisabledClusterConfigTest.java | 4 ++--
.../api/LocatorClusterManagementService.java | 2 +-
.../internal/api/ClusterManagementResultTest.java | 18 +++++++++---------
.../api/LocatorClusterManagementServiceTest.java | 6 +++---
.../management/api/ClusterManagementResult.java | 6 +++---
7 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClusterManagementLocatorReconnectDunitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClusterManagementLocatorReconnectDunitTest.java
index 7d70f08..29160df 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClusterManagementLocatorReconnectDunitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/ClusterManagementLocatorReconnectDunitTest.java
@@ -77,8 +77,8 @@ public class ClusterManagementLocatorReconnectDunitTest {
.hasStatusCode(201)
.getClusterManagementResult();
- assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
- assertThat(result.isSuccessfullyPersisted()).isTrue();
+ assertThat(result.isRealizedOnAllOrNone()).isTrue();
+ assertThat(result.isPersisted()).isTrue();
assertThat(result.getMemberStatuses()).containsKeys("server-1").hasSize(1);
// make sure region is created
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RegionManagementDunitTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RegionManagementDunitTest.java
index db5263a..9b03fb5 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RegionManagementDunitTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RegionManagementDunitTest.java
@@ -65,8 +65,8 @@ public class RegionManagementDunitTest {
.hasStatusCode(201)
.getClusterManagementResult();
- assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
- assertThat(result.isSuccessfullyPersisted()).isTrue();
+ assertThat(result.isRealizedOnAllOrNone()).isTrue();
+ assertThat(result.isPersisted()).isTrue();
assertThat(result.getMemberStatuses()).containsKeys("server-1").hasSize(1);
// make sure region is created
@@ -101,8 +101,8 @@ public class RegionManagementDunitTest {
// .hasStatusCode(201)
// .getClusterManagementResult();
//
- // assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
- // assertThat(result.isSuccessfullyPersisted()).isTrue();
+ // assertThat(result.isRealizedOnAllOrNone()).isTrue();
+ // assertThat(result.isPersisted()).isTrue();
// assertThat(result.getMemberStatuses()).containsKeys("server-1").hasSize(1);
//
// // make sure region is created
@@ -123,8 +123,8 @@ public class RegionManagementDunitTest {
.hasStatusCode(201)
.getClusterManagementResult();
- assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
- assertThat(result.isSuccessfullyPersisted()).isTrue();
+ assertThat(result.isRealizedOnAllOrNone()).isTrue();
+ assertThat(result.isPersisted()).isTrue();
assertThat(result.isSuccessful()).isTrue();
assertThat(result.getMemberStatuses()).containsKeys("server-1").hasSize(1);
@@ -138,8 +138,8 @@ public class RegionManagementDunitTest {
result = restClient.doPostAndAssert("/regions", json)
.hasStatusCode(200)
.getClusterManagementResult();
- assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
- assertThat(result.isSuccessfullyPersisted()).isTrue();
+ assertThat(result.isRealizedOnAllOrNone()).isTrue();
+ assertThat(result.isPersisted()).isTrue();
assertThat(result.isSuccessful()).isTrue();
}
@@ -152,8 +152,8 @@ public class RegionManagementDunitTest {
.hasStatusCode(500)
.getClusterManagementResult();
- assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
- assertThat(result.isSuccessfullyPersisted()).isFalse();
+ assertThat(result.isRealizedOnAllOrNone()).isTrue();
+ assertThat(result.isPersisted()).isFalse();
}
private static void verifyRegionPersisted(String regionName, String type) {
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/DisabledClusterConfigTest.java b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/DisabledClusterConfigTest.java
index d7af562..d8ba58c 100644
--- a/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/DisabledClusterConfigTest.java
+++ b/geode-assembly/src/integrationTest/java/org/apache/geode/management/internal/DisabledClusterConfigTest.java
@@ -48,8 +48,8 @@ public class DisabledClusterConfigTest {
.hasStatusCode(500)
.getClusterManagementResult();
assertThat(result.isSuccessful()).isFalse();
- assertThat(result.isSuccessfullyPersisted()).isFalse();
- assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
+ assertThat(result.isPersisted()).isFalse();
+ assertThat(result.isRealizedOnAllOrNone()).isTrue();
assertThat(result.getPersistenceStatus().getMessage())
.isEqualTo("Cluster configuration service needs to be enabled");
}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/api/LocatorClusterManagementService.java b/geode-core/src/main/java/org/apache/geode/management/internal/api/LocatorClusterManagementService.java
index c439f7c..e18a4eb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/api/LocatorClusterManagementService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/api/LocatorClusterManagementService.java
@@ -117,7 +117,7 @@ public class LocatorClusterManagementService implements ClusterManagementService
functionResult.isSuccessful(),
functionResult.getStatusMessage()));
- if (!result.isSuccessfullyAppliedOnMembers()) {
+ if (!result.isRealizedOnAllOrNone()) {
result.setPersistenceStatus(false, "Failed to apply the update on all members.");
return result;
}
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/api/ClusterManagementResultTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/api/ClusterManagementResultTest.java
index 3473d1e..440cd17 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/api/ClusterManagementResultTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/api/ClusterManagementResultTest.java
@@ -37,7 +37,7 @@ public class ClusterManagementResultTest {
result.addMemberStatus("member-1", true, "msg-1");
result.addMemberStatus("member-2", false, "msg-2");
result.setPersistenceStatus(true, "message");
- assertThat(result.isSuccessfullyAppliedOnMembers()).isFalse();
+ assertThat(result.isRealizedOnAllOrNone()).isFalse();
assertThat(result.isSuccessful()).isFalse();
}
@@ -46,14 +46,14 @@ public class ClusterManagementResultTest {
result.addMemberStatus("member-1", true, "msg-1");
result.addMemberStatus("member-2", true, "msg-2");
result.setPersistenceStatus(true, "message");
- assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
+ assertThat(result.isRealizedOnAllOrNone()).isTrue();
assertThat(result.isSuccessful()).isTrue();
}
@Test
public void emptyMemberStatus() {
- assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
- assertThat(result.isSuccessfullyPersisted()).isFalse();
+ assertThat(result.isRealizedOnAllOrNone()).isTrue();
+ assertThat(result.isPersisted()).isFalse();
assertThat(result.isSuccessful()).isFalse();
}
@@ -61,20 +61,20 @@ public class ClusterManagementResultTest {
@Test
public void failsWhenNotPersisted() {
result.setPersistenceStatus(false, "msg-1");
- assertThat(result.isSuccessfullyPersisted()).isFalse();
+ assertThat(result.isPersisted()).isFalse();
assertThat(result.isSuccessful()).isFalse();
}
@Test
public void whenNoMembersExists() {
result.setPersistenceStatus(false, "msg-1");
- assertThat(result.isSuccessfullyPersisted()).isFalse();
- assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
+ assertThat(result.isPersisted()).isFalse();
+ assertThat(result.isRealizedOnAllOrNone()).isTrue();
assertThat(result.isSuccessful()).isFalse();
result.setPersistenceStatus(true, "msg-1");
- assertThat(result.isSuccessfullyPersisted()).isTrue();
- assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
+ assertThat(result.isPersisted()).isTrue();
+ assertThat(result.isRealizedOnAllOrNone()).isTrue();
assertThat(result.isSuccessful()).isTrue();
}
}
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/api/LocatorClusterManagementServiceTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/api/LocatorClusterManagementServiceTest.java
index e3dbd39..8947235 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/api/LocatorClusterManagementServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/api/LocatorClusterManagementServiceTest.java
@@ -91,7 +91,7 @@ public class LocatorClusterManagementServiceTest {
doReturn(Collections.emptySet()).when(service).findMembers(any(), any());
result = service.create(regionConfig, "cluster");
assertThat(result.isSuccessful()).isFalse();
- assertThat(result.isSuccessfullyAppliedOnMembers()).isTrue();
+ assertThat(result.isRealizedOnAllOrNone()).isTrue();
assertThat(result.getPersistenceStatus().getMessage())
.contains("no members found to create cache element");
}
@@ -110,8 +110,8 @@ public class LocatorClusterManagementServiceTest {
regionConfig.setName("test");
result = service.create(regionConfig, "cluster");
assertThat(result.isSuccessful()).isFalse();
- assertThat(result.isSuccessfullyAppliedOnMembers()).isFalse();
- assertThat(result.isSuccessfullyPersisted()).isFalse();
+ assertThat(result.isRealizedOnAllOrNone()).isFalse();
+ assertThat(result.isPersisted()).isFalse();
assertThat(result.getPersistenceStatus().getMessage())
.contains("Failed to apply the update on all members");
}
diff --git a/geode-management/src/main/java/org/apache/geode/management/api/ClusterManagementResult.java b/geode-management/src/main/java/org/apache/geode/management/api/ClusterManagementResult.java
index 67bdd2c..edfef3c 100644
--- a/geode-management/src/main/java/org/apache/geode/management/api/ClusterManagementResult.java
+++ b/geode-management/src/main/java/org/apache/geode/management/api/ClusterManagementResult.java
@@ -48,18 +48,18 @@ public class ClusterManagementResult {
}
@JsonIgnore
- public boolean isSuccessfullyAppliedOnMembers() {
+ public boolean isRealizedOnAllOrNone() {
return memberStatuses.values().stream().allMatch(x -> x.success);
}
@JsonIgnore
- public boolean isSuccessfullyPersisted() {
+ public boolean isPersisted() {
return persistenceStatus.isSuccess();
}
@JsonIgnore
public boolean isSuccessful() {
- return isSuccessfullyPersisted() && isSuccessfullyAppliedOnMembers();
+ return isPersisted() && isRealizedOnAllOrNone();
}
}