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/03/29 21:48:24 UTC
[geode] branch feature/GEODE-6574-cms-list-members updated: list
one member
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a commit to branch feature/GEODE-6574-cms-list-members
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6574-cms-list-members by this push:
new 835939a list one member
835939a is described below
commit 835939ae7def774120d92590497b20a33ad88c26
Author: Jinmei Liao <ji...@pivotal.io>
AuthorDate: Fri Mar 29 14:48:03 2019 -0700
list one member
---
.../configuration/mutators/MemberConfigManager.java | 2 +-
.../internal/ClientClusterManagementService.java | 10 +++++-----
.../DescribeMemberManagementServiceDUnitTest.java | 10 +++++++++-
.../rest/controllers/MemberManagementController.java | 20 +++++++++++++-------
4 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/mutators/MemberConfigManager.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/mutators/MemberConfigManager.java
index 71d134a..47973ea 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/mutators/MemberConfigManager.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/mutators/MemberConfigManager.java
@@ -63,7 +63,7 @@ public class MemberConfigManager implements ConfigurationManager<MemberConfig> {
String coordinatorId = null;
Set<DistributedMember> members = cache.getDistributionManager().getDistributionManagerIds()
- .stream().filter(m -> (filter.getId() == null || filter.getId().equals(m.getId())))
+ .stream().filter(m -> (filter.getId() == null || filter.getId().equals(m.getName())))
.map(DistributedMember.class::cast).collect(Collectors.toSet());
for (DistributedMember member : members) {
diff --git a/geode-management/src/main/java/org/apache/geode/management/internal/ClientClusterManagementService.java b/geode-management/src/main/java/org/apache/geode/management/internal/ClientClusterManagementService.java
index 0c5c36c..2f97b7c 100644
--- a/geode-management/src/main/java/org/apache/geode/management/internal/ClientClusterManagementService.java
+++ b/geode-management/src/main/java/org/apache/geode/management/internal/ClientClusterManagementService.java
@@ -15,8 +15,6 @@
package org.apache.geode.management.internal;
-import java.util.HashMap;
-import java.util.Map;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
@@ -129,10 +127,12 @@ public class ClientClusterManagementService implements ClusterManagementService
public ClusterManagementResult list(CacheElement config) {
String endPoint = getEndpoint(config);
String id = config.getId();
- Map<String, String> params = new HashMap<>();
- params.put("id", id);
- return restTemplate.getForEntity(VERSION + endPoint, ClusterManagementResult.class, params)
+
+ return restTemplate
+ .getForEntity(VERSION + endPoint + ((id == null) ? "" : "/{id}"),
+ ClusterManagementResult.class, id)
.getBody();
+
}
public RestTemplate getRestTemplate() {
diff --git a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/DescribeMemberManagementServiceDUnitTest.java b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/DescribeMemberManagementServiceDUnitTest.java
index 27f26d5..8dc564e 100644
--- a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/DescribeMemberManagementServiceDUnitTest.java
+++ b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/DescribeMemberManagementServiceDUnitTest.java
@@ -69,7 +69,7 @@ public class DescribeMemberManagementServiceDUnitTest {
@Test
@WithMockUser
- public void describeMember() {
+ public void listMember() {
MemberConfig memberConfig = new MemberConfig();
ClusterManagementResult result = client.list(memberConfig);
@@ -77,4 +77,12 @@ public class DescribeMemberManagementServiceDUnitTest {
assertThat(result.getStatusCode()).isEqualTo(ClusterManagementResult.StatusCode.OK);
assertThat(result.getResult().size()).isEqualTo(2);
}
+
+ @Test
+ @WithMockUser
+ public void getOneMember() throws Exception {
+ MemberConfig config = new MemberConfig();
+ config.setId("locator");
+ client.list(config);
+ }
}
diff --git a/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/MemberManagementController.java b/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/MemberManagementController.java
index 4e2f61e..38156ee 100644
--- a/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/MemberManagementController.java
+++ b/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/MemberManagementController.java
@@ -22,9 +22,9 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.apache.geode.management.api.ClusterManagementResult;
import org.apache.geode.management.configuration.MemberConfig;
@@ -32,19 +32,25 @@ import org.apache.geode.management.configuration.MemberConfig;
@Controller("members")
@RequestMapping(MANAGEMENT_API_VERSION)
public class MemberManagementController extends AbstractManagementController {
-
@PreAuthorize("@securityService.authorize('CLUSTER', 'READ')")
- @RequestMapping(method = RequestMethod.GET, value = MEMBER_CONFIG_ENDPOINT)
- public ResponseEntity<ClusterManagementResult> listMembers(
- @RequestParam(required = false) String id) {
+ @RequestMapping(method = RequestMethod.GET, value = MEMBER_CONFIG_ENDPOINT + "/{id}")
+ public ResponseEntity<ClusterManagementResult> getMember(
+ @PathVariable(name = "id", required = false) String id) {
MemberConfig config = new MemberConfig();
config.setId(id);
ClusterManagementResult result = clusterManagementService.list(config);
- ResponseEntity<ClusterManagementResult> r = new ResponseEntity<>(result,
+ return new ResponseEntity<>(result,
result.isSuccessful() ? HttpStatus.OK : HttpStatus.INTERNAL_SERVER_ERROR);
+ }
- return r;
+ @PreAuthorize("@securityService.authorize('CLUSTER', 'READ')")
+ @RequestMapping(method = RequestMethod.GET, value = MEMBER_CONFIG_ENDPOINT)
+ public ResponseEntity<ClusterManagementResult> listMembers() {
+ ClusterManagementResult result = clusterManagementService.list(new MemberConfig());
+
+ return new ResponseEntity<>(result,
+ result.isSuccessful() ? HttpStatus.OK : HttpStatus.INTERNAL_SERVER_ERROR);
}
}