From 5bd8c1d533f23d9812c3c090cb36158e212499e8 Mon Sep 17 00:00:00 2001 From: Jinmei Liao Date: Fri, 1 Mar 2019 09:32:20 -0800 Subject: [PATCH] fix compiling error and tests --- .../internal/DisabledClusterConfigTest.java | 2 +- .../rest/RegionManagementIntegrationTest.java | 4 ++-- .../RegionManagementSecurityIntegrationTest.java | 16 ++++++++-------- .../rest/security/RestSecurityConfiguration.java | 3 ++- 4 files changed, 13 insertions(+), 12 deletions(-) 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 e5b610b251ac..c4b7e28887de 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,7 +48,7 @@ public void disabledClusterConfig() throws Exception { .hasStatusCode(500) .getClusterManagementResult(); assertThat(result.isSuccessful()).isFalse(); - assertThat(result.getPersistenceStatus().getMessage()) + assertThat(result.getStatusMessage()) .isEqualTo("Cluster configuration service needs to be enabled"); } } diff --git a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementIntegrationTest.java b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementIntegrationTest.java index 14ef4a25905e..1ccc0061c2fa 100644 --- a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementIntegrationTest.java +++ b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementIntegrationTest.java @@ -71,8 +71,8 @@ public void sanityCheck() throws Exception { .with(POST_PROCESSOR) .content(json)) .andExpect(status().isInternalServerError()) - .andExpect(jsonPath("$.persistenceStatus.success", is(false))) - .andExpect(jsonPath("$.persistenceStatus.message", + .andExpect(jsonPath("$.statusCode", is("ERROR"))) + .andExpect(jsonPath("$.statusMessage", is("no members found to create cache element"))); } diff --git a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementSecurityIntegrationTest.java b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementSecurityIntegrationTest.java index 0acce321f2c1..aabc8bcd9cad 100644 --- a/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementSecurityIntegrationTest.java +++ b/geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/RegionManagementSecurityIntegrationTest.java @@ -73,8 +73,8 @@ public void sanityCheck_not_authorized() throws Exception { .with(POST_PROCESSOR) .content(json)) .andExpect(status().isForbidden()) - .andExpect(jsonPath("$.persistenceStatus.success", is(false))) - .andExpect(jsonPath("$.persistenceStatus.message", + .andExpect(jsonPath("$.statusCode", is("UNAUTHORIZED"))) + .andExpect(jsonPath("$.statusMessage", is("user not authorized for DATA:MANAGE"))); } @@ -84,8 +84,8 @@ public void sanityCheckWithNoCredentials() throws Exception { .with(POST_PROCESSOR) .content(json)) .andExpect(status().isUnauthorized()) - .andExpect(jsonPath("$.persistenceStatus.success", is(false))) - .andExpect(jsonPath("$.persistenceStatus.message", + .andExpect(jsonPath("$.statusCode", is("UNAUTHENTICATED"))) + .andExpect(jsonPath("$.statusMessage", is("Full authentication is required to access this resource"))); } @@ -96,8 +96,8 @@ public void sanityCheckWithWrongCredentials() throws Exception { .with(POST_PROCESSOR) .content(json)) .andExpect(status().isUnauthorized()) - .andExpect(jsonPath("$.persistenceStatus.success", is(false))) - .andExpect(jsonPath("$.persistenceStatus.message", + .andExpect(jsonPath("$.statusCode", is("UNAUTHENTICATED"))) + .andExpect(jsonPath("$.statusMessage", is("Authentication error. Please check your credentials."))); } @@ -108,8 +108,8 @@ public void sanityCheck_success() throws Exception { .with(POST_PROCESSOR) .content(json)) .andExpect(status().isInternalServerError()) - .andExpect(jsonPath("$.persistenceStatus.success", is(false))) - .andExpect(jsonPath("$.persistenceStatus.message", + .andExpect(jsonPath("$.statusCode", is("ERROR"))) + .andExpect(jsonPath("$.statusMessage", is("no members found to create cache element"))); } diff --git a/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/security/RestSecurityConfiguration.java b/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/security/RestSecurityConfiguration.java index 1edbb7997def..a7b1f53f04f4 100644 --- a/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/security/RestSecurityConfiguration.java +++ b/geode-web-management/src/main/java/org/apache/geode/management/internal/rest/security/RestSecurityConfiguration.java @@ -82,7 +82,8 @@ public void commence(HttpServletRequest request, HttpServletResponse response, response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); response.setContentType(MediaType.APPLICATION_JSON_UTF8.getType()); ClusterManagementResult result = - new ClusterManagementResult(false, authException.getMessage()); + new ClusterManagementResult(ClusterManagementResult.StatusCode.UNAUTHENTICATED, + authException.getMessage()); objectMapper.writeValue(response.getWriter(), result); } });