[geode] 06/18: Fix jq issues

[jasonhuynh]

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

jasonhuynh pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 44fb1ef1c8665545fd45b189b766c11705a7e155
Author: Joris Melchior <joris.melch...@gmail.com>
AuthorDate: Wed Jun 24 15:21:15 2020 -0400

    Fix jq issues
    
    (cherry picked from commit 7e5dc045e8effc180697ff64d7bcffabe0fe08ea)
---
 .../geode/management/client/CreateDiskStoreDUnitTest.java   | 13 ++++++-------
 .../internal/rest/controllers/DiskStoreController.java      |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git 
a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/CreateDiskStoreDUnitTest.java
 
b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/CreateDiskStoreDUnitTest.java
index d7364b9..95cf0d2 100644
--- 
a/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/CreateDiskStoreDUnitTest.java
+++ 
b/geode-web-management/src/distributedTest/java/org/apache/geode/management/client/CreateDiskStoreDUnitTest.java
@@ -20,11 +20,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.geode.test.junit.rules.TemporaryFileRule;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -82,7 +80,7 @@ public class CreateDiskStoreDUnitTest {
   private MemberVM server;
 
   @Before
-  public void before() throws Exception {
+  public void before() {
     cluster.setSkipLocalDistributedSystemCleanup(true);
     webContext = new LocatorWebContext(webApplicationContext);
     client = new ClusterManagementServiceBuilder().setTransport(
@@ -105,10 +103,11 @@ public class CreateDiskStoreDUnitTest {
     }
   }
 
-  private DiskStore createDiskStoreConfigObject(String diskStoreName) throws 
IOException {
+  private DiskStore createDiskStoreConfigObject(String diskStoreName) {
     DiskStore diskStore = new DiskStore();
     diskStore.setName(diskStoreName);
-    DiskDir diskDir = new DiskDir(temporaryFolder.getRoot().getAbsolutePath() 
+ File.pathSeparator + diskStoreName, null);
+    DiskDir diskDir = new DiskDir(
+        temporaryFolder.getRoot().getAbsolutePath() + File.pathSeparator + 
diskStoreName, null);
     List<DiskDir> directories = new ArrayList<>();
     directories.add(diskDir);
     diskStore.setDirectories(directories);
@@ -256,7 +255,7 @@ public class CreateDiskStoreDUnitTest {
   }
 
   @Test
-  public void listDiskStoresShouldReturnAllConfiguredDiskStores() throws 
Exception {
+  public void listDiskStoresShouldReturnAllConfiguredDiskStores() {
     assertThatThrownBy(() -> 
client.get(diskStore)).isInstanceOf(ClusterManagementException.class)
         .hasMessageContaining("ENTITY_NOT_FOUND");
 
@@ -268,7 +267,7 @@ public class CreateDiskStoreDUnitTest {
 
 
   @Test
-  public void listDiskStoresShouldReturnNonDeletedDiskStores() throws 
Exception {
+  public void listDiskStoresShouldReturnNonDeletedDiskStores() {
     assertThatThrownBy(() -> 
client.get(diskStore)).isInstanceOf(ClusterManagementException.class)
         .hasMessageContaining("ENTITY_NOT_FOUND");
 
diff --git 
a/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/DiskStoreController.java
 
b/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/DiskStoreController.java
index 707e2e4..0298e5e 100644
--- 
a/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/DiskStoreController.java
+++ 
b/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/DiskStoreController.java
@@ -67,7 +67,7 @@ public class DiskStoreController extends 
AbstractManagementController {
   @ApiOperation(value = "list disk-stores",
       extensions = {@Extension(properties = {
           @ExtensionProperty(name = "jqFilter",
-              value = ".result[] | .groups[] | .runtimeInfo[] + .configuration 
| {name:.name,type:.type,entryCount:.entryCount}")})})
+              value = ".result[] | .groups[] | .runtimeInfo[] + .configuration 
| {Member:.memberName,\"Disk Store Name\":.name}")})})
   @PreAuthorize("@securityService.authorize('CLUSTER', 'READ')")
   @GetMapping(DISK_STORE_CONFIG_ENDPOINT)
   public ClusterManagementListResult<DiskStore, DiskStoreInfo> listDiskStores(
@@ -86,7 +86,7 @@ public class DiskStoreController extends 
AbstractManagementController {
   @ApiOperation(value = "get disk-store",
       extensions = {@Extension(properties = {
           @ExtensionProperty(name = "jqFilter",
-              value = ".result | .groups[] | .runtimeInfo[] + .configuration | 
{name:.name,type:.type,entryCount:.entryCount}")})})
+              value = ".result[] | .groups[] | .runtimeInfo[] + .configuration 
| {Member:.memberName,\"Disk Store Name\":.name}")})})
   @GetMapping(DISK_STORE_CONFIG_ENDPOINT + "/{id}")
   public ClusterManagementGetResult<DiskStore, DiskStoreInfo> getDiskStore(
       @PathVariable(name = "id") String id) {