From 0d6972bbf25260a4fff5c3ef34387ebae7a8c7e3 Mon Sep 17 00:00:00 2001 From: Aurelien Poscia Date: Thu, 30 Mar 2023 16:11:18 +0200 Subject: [PATCH] NO-JIRA remove Optional<> method parameter --- .../java/org/sonar/server/usergroups/ws/SearchAction.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java index 5cc43f25ef7..fc91e750c0a 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/usergroups/ws/SearchAction.java @@ -125,7 +125,7 @@ public class SearchAction implements UserGroupsWsAction { private GroupQuery buildGroupQuery(Request request) { String textQuery = request.param(Param.TEXT_QUERY); - Optional managed = Optional.ofNullable(request.paramAsBoolean(MANAGED_PARAM)); + Boolean managed = request.paramAsBoolean(MANAGED_PARAM); GroupQuery.GroupQueryBuilder queryBuilder = GroupQuery.builder() .searchText(textQuery); @@ -133,7 +133,7 @@ public class SearchAction implements UserGroupsWsAction { if (managedInstanceService.isInstanceExternallyManaged()) { String managedInstanceSql = getManagedInstanceSql(managed); queryBuilder.isManagedClause(managedInstanceSql); - } else if (managed.isPresent()) { + } else if (TRUE.equals(managed)) { throw BadRequestException.create("The 'managed' parameter is only available for managed instances."); } return queryBuilder.build(); @@ -141,8 +141,8 @@ public class SearchAction implements UserGroupsWsAction { } @Nullable - private String getManagedInstanceSql(Optional managed) { - return managed + private String getManagedInstanceSql(@Nullable Boolean managed) { + return Optional.ofNullable(managed) .map(managedInstanceService::getManagedGroupsSqlFilter) .orElse(null); } -- 2.39.5