diff --git a/bpm/bonita-core/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ServerAPIImpl.java b/bpm/bonita-core/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ServerAPIImpl.java index 74a7a7bcd4..ffb2814c12 100644 --- a/bpm/bonita-core/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ServerAPIImpl.java +++ b/bpm/bonita-core/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ServerAPIImpl.java @@ -70,8 +70,9 @@ * valid, is on the right scope (tenant or platform), and renew it *
  • When the method is NOT annotated with {@link CustomTransactions}, it opens a transaction
  • *
  • When the method is deprecated, it print a warning
  • - *
  • When the method or class is annotated with {@link AvailableInMaintenanceMode}, it verifies the maintenance mode - * is enabled
  • + *
  • When the method or class is NOT annotated with {@link AvailableInMaintenanceMode}, it verifies the + * maintenance mode + * is disabled
  • *
  • When the method or class is annotated with {@link AvailableInMaintenanceMode} and onlyAvailableInMaintenanceMode * is set * to true, it verifies the maintenance mode is enabled
  • diff --git a/bpm/bonita-web-server/src/main/java/org/bonitasoft/console/common/server/login/filter/RestAPIAuthorizationFilter.java b/bpm/bonita-web-server/src/main/java/org/bonitasoft/console/common/server/login/filter/RestAPIAuthorizationFilter.java index efd89e6e59..46c72fcfe8 100644 --- a/bpm/bonita-web-server/src/main/java/org/bonitasoft/console/common/server/login/filter/RestAPIAuthorizationFilter.java +++ b/bpm/bonita-web-server/src/main/java/org/bonitasoft/console/common/server/login/filter/RestAPIAuthorizationFilter.java @@ -86,7 +86,7 @@ public void proceedWithFiltering(ServletRequest request, ServletResponse respons } } catch (final InvalidSessionException e) { if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Invalid Bonita engine session.", e.getMessage()); + LOGGER.debug("Invalid Bonita engine session: {}", e.getMessage()); } SessionUtil.sessionLogout(httpServletRequest.getSession()); ((HttpServletResponse) response).setStatus(HttpServletResponse.SC_UNAUTHORIZED); diff --git a/bpm/bonita-web-server/src/test/java/org/bonitasoft/console/common/server/login/filter/RestAPIAuthorizationFilterTest.java b/bpm/bonita-web-server/src/test/java/org/bonitasoft/console/common/server/login/filter/RestAPIAuthorizationFilterTest.java index 3c91be27e1..d0bb32b365 100644 --- a/bpm/bonita-web-server/src/test/java/org/bonitasoft/console/common/server/login/filter/RestAPIAuthorizationFilterTest.java +++ b/bpm/bonita-web-server/src/test/java/org/bonitasoft/console/common/server/login/filter/RestAPIAuthorizationFilterTest.java @@ -281,7 +281,7 @@ public void testFilterWithExcludedURL() throws Exception { } @Test - public void testMatchExcludePatterns() throws Exception { + public void testMatchExcludePatterns() { matchExcludePattern("http://host/bonita/portal/resource/page/API/system/i18ntranslation", true); matchExcludePattern("http://host/bonita/apps/app/API/system/i18ntranslation", true); matchExcludePattern("http://host/bonita/API/system/i18ntranslation", true); @@ -294,17 +294,17 @@ public void testMatchExcludePatterns() throws Exception { } @Test - public void testCompileNullPattern() throws Exception { + public void testCompileNullPattern() { assertThat(restAPIAuthorizationFilter.compilePattern(null)).isNull(); } @Test - public void testCompileWrongPattern() throws Exception { + public void testCompileWrongPattern() { assertThat(restAPIAuthorizationFilter.compilePattern("((((")).isNull(); } @Test - public void testCompileSimplePattern() throws Exception { + public void testCompileSimplePattern() { final String patternToCompile = "test"; assertThat(restAPIAuthorizationFilter.compilePattern(patternToCompile)).isNotNull().has(new Condition<>() { @@ -316,7 +316,7 @@ public boolean matches(final Pattern pattern) { } @Test - public void testCompileExcludePattern() throws Exception { + public void testCompileExcludePattern() { final String patternToCompile = RestAPIAuthorizationFilter.AUTHORIZATION_FILTER_EXCLUDED_PAGES_PATTERN; assertThat(restAPIAuthorizationFilter.compilePattern(patternToCompile)).isNotNull().has(new Condition<>() { diff --git a/platform/platform-resources/src/main/resources/tenant_template_portal/compound-permissions-mapping.properties b/platform/platform-resources/src/main/resources/tenant_template_portal/compound-permissions-mapping.properties index b537e8557b..8b790ac33b 100644 --- a/platform/platform-resources/src/main/resources/tenant_template_portal/compound-permissions-mapping.properties +++ b/platform/platform-resources/src/main/resources/tenant_template_portal/compound-permissions-mapping.properties @@ -27,7 +27,7 @@ custompage_adminBDMBonita=[bdm_access_control, bdm_management, bdm_visualization custompage_adminResourceListBonita=[application_visualization, form_visualization, page_management, profile_management, profile_visualization] custompage_adminApplicationListBonita=[application_management, application_visualization, organization_visualization, profile_visualization, tenant_platform_visualization] custompage_adminApplicationDetailsBonita=[application_management, application_visualization, organization_visualization, page_management, profile_visualization, tenant_platform_visualization] -custompage_adminLicenseBonita=[platform_management, tenant_platform_visualization] +custompage_adminLicenseBonita=[tenant_platform_visualization] custompage_tenantStatusBonita=[license, tenant_platform_management, tenant_platform_visualization] custompage_applicationDirectoryBonita=[application_visualization, organization_visualization, tenant_platform_visualization] custompage_home=[]