diff --git a/src/application/authorization-impl/src/main/java/org/geoserver/acl/authorization/AuthorizationServiceImpl.java b/src/application/authorization-impl/src/main/java/org/geoserver/acl/authorization/AuthorizationServiceImpl.java index 55e29a3..6754225 100644 --- a/src/application/authorization-impl/src/main/java/org/geoserver/acl/authorization/AuthorizationServiceImpl.java +++ b/src/application/authorization-impl/src/main/java/org/geoserver/acl/authorization/AuthorizationServiceImpl.java @@ -44,7 +44,6 @@ import java.util.Map.Entry; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; /** * Note: service and request params are usually set by the client, and by @@ -76,7 +75,7 @@ private List flatten(Map> found) { .flatMap(List::stream) .sorted((r1, r2) -> Long.compare(r1.getPriority(), r2.getPriority())) .distinct() - .collect(Collectors.toList()); + .toList(); } @Override @@ -113,8 +112,7 @@ public AccessInfo getAccessInfo(AccessRequest request) { } log.debug("Returning {} for {}", ret, request); - List matchingIds = - flatten(groupedRules).stream().map(Rule::getId).collect(Collectors.toList()); + List matchingIds = flatten(groupedRules).stream().map(Rule::getId).toList(); return ret.withMatchingRules(matchingIds); } @@ -500,8 +498,7 @@ protected Map> getMatchingRulesByRole(AccessRequest request) filter = filter.clone(); filter.getRole().setType(SpecialFilterType.DEFAULT); } - List found = - ruleService.getAll(RuleQuery.of(filter)).collect(Collectors.toList()); + List found = ruleService.getAll(RuleQuery.of(filter)).toList(); ret.put(null, found); } else { for (String role : finalRoleFilter) { @@ -516,7 +513,7 @@ private List getRulesByRole(RuleFilter filter, String role) { filter = filter.clone(); filter.setRole(role); filter.getRole().setIncludeDefault(true); - return ruleService.getAll(RuleQuery.of(filter)).collect(Collectors.toList()); + return ruleService.getAll(RuleQuery.of(filter)).toList(); } /** diff --git a/src/application/authorization-impl/src/test/java/org/geoserver/acl/authorization/AuthorizationServiceImplTest.java b/src/application/authorization-impl/src/test/java/org/geoserver/acl/authorization/AuthorizationServiceImplTest.java index 5fa2684..3f78171 100644 --- a/src/application/authorization-impl/src/test/java/org/geoserver/acl/authorization/AuthorizationServiceImplTest.java +++ b/src/application/authorization-impl/src/test/java/org/geoserver/acl/authorization/AuthorizationServiceImplTest.java @@ -37,7 +37,6 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; /** * {@link AuthorizationService} integration/conformance test @@ -607,12 +606,9 @@ private void assertGetMatchingRules( private void assertMatchingRules(AccessRequest request, Integer... expectedPriorities) { List rules = authorizationService.getMatchingRules(request); - List pri = - rules.stream().map(r -> r.getPriority()).sorted().collect(Collectors.toList()); + List pri = rules.stream().map(r -> r.getPriority()).sorted().toList(); List exp = - Arrays.asList(expectedPriorities).stream() - .map(i -> i.longValue()) - .collect(Collectors.toList()); + Arrays.asList(expectedPriorities).stream().map(i -> i.longValue()).toList(); assertEquals(exp, pri, "Bad rule set selected for filter " + request); } diff --git a/src/artifacts/api/src/main/java/org/geoserver/acl/autoconfigure/security/PreAuthenticationSecurityAutoConfiguration.java b/src/artifacts/api/src/main/java/org/geoserver/acl/autoconfigure/security/PreAuthenticationSecurityAutoConfiguration.java index 10006e3..0188577 100644 --- a/src/artifacts/api/src/main/java/org/geoserver/acl/autoconfigure/security/PreAuthenticationSecurityAutoConfiguration.java +++ b/src/artifacts/api/src/main/java/org/geoserver/acl/autoconfigure/security/PreAuthenticationSecurityAutoConfiguration.java @@ -102,9 +102,7 @@ public UserDetails loadUserDetails(PreAuthenticatedAuthenticationToken token) } List authorities = - credentials.stream() - .map(SimpleGrantedAuthority::new) - .collect(Collectors.toList()); + credentials.stream().map(SimpleGrantedAuthority::new).toList(); return new User(principal, "", authorities); } diff --git a/src/artifacts/api/src/main/java/org/geoserver/acl/autoconfigure/security/SecurityConfigProperties.java b/src/artifacts/api/src/main/java/org/geoserver/acl/autoconfigure/security/SecurityConfigProperties.java index 37f77a5..ac2366a 100644 --- a/src/artifacts/api/src/main/java/org/geoserver/acl/autoconfigure/security/SecurityConfigProperties.java +++ b/src/artifacts/api/src/main/java/org/geoserver/acl/autoconfigure/security/SecurityConfigProperties.java @@ -12,7 +12,6 @@ import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import java.util.stream.Stream; @Data @@ -41,7 +40,7 @@ public boolean enabled() { public List authorities() { return Stream.of(admin ? "ROLE_ADMIN" : "ROLE_USER") .map(SimpleGrantedAuthority::new) - .collect(Collectors.toList()); + .toList(); } } } diff --git a/src/domain/rule-management/src/main/java/org/geoserver/acl/domain/rules/RuleAdminServiceImpl.java b/src/domain/rule-management/src/main/java/org/geoserver/acl/domain/rules/RuleAdminServiceImpl.java index 1ae3783..cd5d0a9 100644 --- a/src/domain/rule-management/src/main/java/org/geoserver/acl/domain/rules/RuleAdminServiceImpl.java +++ b/src/domain/rule-management/src/main/java/org/geoserver/acl/domain/rules/RuleAdminServiceImpl.java @@ -18,7 +18,6 @@ import java.util.Optional; import java.util.Set; import java.util.function.Consumer; -import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -182,7 +181,7 @@ public Stream getAll(@NonNull RuleQuery query) { @Override public Optional getRule(@NonNull RuleFilter filter) throws IllegalArgumentException { RuleQuery query = RuleQuery.of(filter).setLimit(2); - List found = ruleRepository.findAll(query).collect(Collectors.toList()); + List found = ruleRepository.findAll(query).toList(); if (found.size() > 1) { throw new IllegalArgumentException( "Unexpected rule count for filter " + filter + " : " + found.size()); diff --git a/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/MemoryPriorityRepository.java b/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/MemoryPriorityRepository.java index 8938a0d..976525a 100644 --- a/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/MemoryPriorityRepository.java +++ b/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/MemoryPriorityRepository.java @@ -11,7 +11,6 @@ import java.util.Optional; import java.util.SortedSet; import java.util.TreeSet; -import java.util.stream.Collectors; import java.util.stream.Stream; public abstract class MemoryPriorityRepository { @@ -73,7 +72,7 @@ protected int shiftPrioritiesBetween(long min, long max, long offset) { long p = getPriority(r); return p >= min && p <= max; }) - .collect(Collectors.toList()); + .toList(); rules.removeAll(matches); matches.forEach( diff --git a/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/RuleAdminServiceIT.java b/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/RuleAdminServiceIT.java index a7b6b85..9b6eb23 100644 --- a/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/RuleAdminServiceIT.java +++ b/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/RuleAdminServiceIT.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.IntStream; public class RuleAdminServiceIT { @@ -236,7 +235,7 @@ void testGetAll() { ruleAdminService.setLayerDetails(r2.getId(), details2); List expected = List.of(r1, r2); - List actual = ruleAdminService.getAll().collect(Collectors.toList()); + List actual = ruleAdminService.getAll().toList(); assertThat(actual).isEqualTo(expected); } @@ -259,7 +258,7 @@ void testGetAll_and_GetList_paginated() { String nextCursorId = null; for (int page = 0; page < maxPages; page++) { query.setNextId(nextCursorId); - List result = ruleAdminService.getAll(query).collect(Collectors.toList()); + List result = ruleAdminService.getAll(query).toList(); if (result.size() > pageSize) { assertThat(result.size()).isEqualTo(1 + pageSize); nextCursorId = result.get(pageSize).getId(); @@ -589,7 +588,7 @@ void testUpdateRuleById_shifts_other_priorities_if_needed() { r1 = r1.withPriority(4); r4 = r4.withPriority(5); assertThat(ruleAdminService.update(r3)).isEqualTo(r3); - List collect = ruleAdminService.getAll().collect(Collectors.toList()); + List collect = ruleAdminService.getAll().toList(); assertGet(r2).as("r2 should have kept priority 2").isEqualTo(r2); @@ -673,7 +672,7 @@ private void assertPriorities(List expectedOrder, List expectedPr assertThat(expectedOrder.size()) .as("mismatch in expectations") .isEqualTo(expectedPriorities.size()); - List all = ruleAdminService.getAll().collect(Collectors.toList()); + List all = ruleAdminService.getAll().toList(); assertThat(all.size()).isEqualTo(expectedPriorities.size()); for (int i = 0; i < expectedOrder.size(); i++) { diff --git a/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/RuleAdminServiceImplTest.java b/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/RuleAdminServiceImplTest.java index 8fbc72f..efbb0f5 100644 --- a/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/RuleAdminServiceImplTest.java +++ b/src/domain/rule-management/src/test/java/org/geoserver/acl/domain/rules/RuleAdminServiceImplTest.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.Stream; class RuleAdminServiceImplTest { @@ -176,7 +175,7 @@ void getAll() { List expected = List.of(Rule.allow(), Rule.deny(), Rule.limit()); when(repository.findAll()).thenReturn(expected.stream()); - List actual = service.getAll().collect(Collectors.toList()); + List actual = service.getAll().toList(); verify(repository, times(1)).findAll(); verifyNoMoreInteractions(repository); assertThat(actual).isEqualTo(expected); @@ -197,7 +196,7 @@ void getList() { when(repository.findAll(query)).thenReturn(expected.stream()); - List actual = service.getAll(query).collect(Collectors.toList()); + List actual = service.getAll(query).toList(); verify(repository, times(1)).findAll(eq(query)); verifyNoMoreInteractions(repository); assertThat(actual).isEqualTo(expected); diff --git a/src/integration/openapi/java-client/src/main/java/org/geoserver/acl/api/client/integration/AuthorizationServiceClientAdaptor.java b/src/integration/openapi/java-client/src/main/java/org/geoserver/acl/api/client/integration/AuthorizationServiceClientAdaptor.java index 3c91c72..92e884a 100644 --- a/src/integration/openapi/java-client/src/main/java/org/geoserver/acl/api/client/integration/AuthorizationServiceClientAdaptor.java +++ b/src/integration/openapi/java-client/src/main/java/org/geoserver/acl/api/client/integration/AuthorizationServiceClientAdaptor.java @@ -17,7 +17,6 @@ import org.geoserver.acl.domain.rules.Rule; import java.util.List; -import java.util.stream.Collectors; @RequiredArgsConstructor @Slf4j @@ -67,7 +66,7 @@ public List getMatchingRules(org.geoserver.acl.authorization.AccessRequest try { apiRequest = mapper.toApi(request); apiResponse = apiClient.getMatchingRules(apiRequest); - return apiResponse.stream().map(ruleMapper::toModel).collect(Collectors.toList()); + return apiResponse.stream().map(ruleMapper::toModel).toList(); } catch (RuntimeException e) { log.error("Error getting matching rules for {}", request, e); throw e; diff --git a/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/authorization/AuthorizationApiImpl.java b/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/authorization/AuthorizationApiImpl.java index 982ee00..e110dbf 100644 --- a/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/authorization/AuthorizationApiImpl.java +++ b/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/authorization/AuthorizationApiImpl.java @@ -19,7 +19,6 @@ import org.springframework.http.ResponseEntity; import java.util.List; -import java.util.stream.Collectors; @RequiredArgsConstructor @IsAuthenticated @@ -63,8 +62,7 @@ public ResponseEntity> getMatchingRules(AccessRequest accessRequest) modelResponse = service.getMatchingRules(modelRequest); support.setPreferredGeometryEncoding(); - List apiResponse = - modelResponse.stream().map(support::toApi).collect(Collectors.toList()); + List apiResponse = modelResponse.stream().map(support::toApi).toList(); return ResponseEntity.ok(apiResponse); } } diff --git a/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/rules/DataRulesApiImpl.java b/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/rules/DataRulesApiImpl.java index 3b50dc5..cad8cf6 100644 --- a/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/rules/DataRulesApiImpl.java +++ b/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/rules/DataRulesApiImpl.java @@ -32,7 +32,6 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; @RequiredArgsConstructor @IsAuthenticated @@ -94,14 +93,14 @@ private ResponseEntity> query( query.setLimit(query.getLimit() + 1); } try { - list = service.getAll(query).collect(Collectors.toList()); + list = service.getAll(query).toList(); query.setLimit(requestedLimit); // avoid side effect once the method returns } catch (IllegalArgumentException e) { return support.error(BAD_REQUEST, e.getMessage()); } support.setPreferredGeometryEncoding(); - List body = list.stream().map(support::toApi).collect(Collectors.toList()); + List body = list.stream().map(support::toApi).toList(); String nextCursor; if (requestedLimit != null && body.size() > requestedLimit) { nextCursor = body.get(requestedLimit).getId(); diff --git a/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/rules/WorkspaceAdminRulesApiImpl.java b/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/rules/WorkspaceAdminRulesApiImpl.java index 2607d4c..3b9f9ef 100644 --- a/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/rules/WorkspaceAdminRulesApiImpl.java +++ b/src/integration/openapi/spring-server/src/main/java/org/geoserver/acl/api/server/rules/WorkspaceAdminRulesApiImpl.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; @RequiredArgsConstructor @IsAuthenticated @@ -114,13 +113,13 @@ private ResponseEntity> query( query.setLimit(query.getLimit() + 1); } try { - list = service.getAll(query).collect(Collectors.toList()); + list = service.getAll(query).toList(); query.setLimit(requestedLimit); // avoid side effect once the method returns } catch (IllegalArgumentException e) { return support.error(BAD_REQUEST, e.getMessage()); } - List body = list.stream().map(support::toApi).collect(Collectors.toList()); + List body = list.stream().map(support::toApi).toList(); String nextCursor; if (requestedLimit != null && body.size() > requestedLimit) { nextCursor = body.get(requestedLimit).getId(); diff --git a/src/integration/openapi/spring-server/src/test/java/org/geoserver/acl/api/server/rules/RulesApiImpTest.java b/src/integration/openapi/spring-server/src/test/java/org/geoserver/acl/api/server/rules/RulesApiImpTest.java index 9b4ff8b..dfa4bf4 100644 --- a/src/integration/openapi/spring-server/src/test/java/org/geoserver/acl/api/server/rules/RulesApiImpTest.java +++ b/src/integration/openapi/spring-server/src/test/java/org/geoserver/acl/api/server/rules/RulesApiImpTest.java @@ -41,7 +41,6 @@ import java.util.Optional; import java.util.Set; import java.util.function.Supplier; -import java.util.stream.Collectors; @SpringBootTest(classes = RulesApiConfiguration.class, properties = "spring.main.banner-mode=off") class RulesApiImpTest { @@ -119,7 +118,7 @@ private List assertList( ResponseEntity> response = call.get(); assertThat(response.getStatusCode()).isEqualTo(status); assertThat(response.getBody()).isNotNull(); - return response.getBody().stream().map(support::toModel).collect(Collectors.toList()); + return response.getBody().stream().map(support::toModel).toList(); } @Disabled("Filter mapping not yet implemented") diff --git a/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/AdminRuleRepositoryJpaAdaptor.java b/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/AdminRuleRepositoryJpaAdaptor.java index c788651..874e5f5 100644 --- a/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/AdminRuleRepositoryJpaAdaptor.java +++ b/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/AdminRuleRepositoryJpaAdaptor.java @@ -214,7 +214,7 @@ public Stream findAll(@NonNull RuleQuery query) { if (null != query.getLimit()) { rules = rules.limit(query.getLimit()); } - return rules.collect(Collectors.toList()).stream(); + return rules.toList().stream(); } } diff --git a/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/PredicateMapper.java b/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/PredicateMapper.java index f923d72..f1f86a4 100644 --- a/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/PredicateMapper.java +++ b/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/PredicateMapper.java @@ -28,7 +28,6 @@ import java.util.Optional; import java.util.OptionalLong; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.Stream; @Slf4j @@ -177,8 +176,7 @@ Predicate map(InSetPredicate filter, StringPath propertyPath) { if (includeDefault) { return propertyPath.in( - Stream.concat(Stream.of("*"), values.stream()) - .collect(Collectors.toList())); + Stream.concat(Stream.of("*"), values.stream()).toList()); } return propertyPath.in(values); } diff --git a/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/RuleRepositoryJpaAdaptor.java b/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/RuleRepositoryJpaAdaptor.java index 3bd899d..3530225 100644 --- a/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/RuleRepositoryJpaAdaptor.java +++ b/src/integration/persistence-jpa/integration/src/main/java/org/geoserver/acl/integration/jpa/repository/RuleRepositoryJpaAdaptor.java @@ -135,7 +135,7 @@ public Stream findAll(@NonNull RuleQuery query) { if (null != pageSize) { rules = rules.limit(query.getLimit()); } - return rules.collect(Collectors.toList()).stream(); + return rules.toList().stream(); } } diff --git a/src/integration/persistence-jpa/integration/src/test/java/org/geoserver/acl/integration/jpa/it/AdminRuleRepositoryJpaAdaptorTest.java b/src/integration/persistence-jpa/integration/src/test/java/org/geoserver/acl/integration/jpa/it/AdminRuleRepositoryJpaAdaptorTest.java index e6a85c7..c8e7891 100644 --- a/src/integration/persistence-jpa/integration/src/test/java/org/geoserver/acl/integration/jpa/it/AdminRuleRepositoryJpaAdaptorTest.java +++ b/src/integration/persistence-jpa/integration/src/test/java/org/geoserver/acl/integration/jpa/it/AdminRuleRepositoryJpaAdaptorTest.java @@ -21,7 +21,6 @@ import org.springframework.test.context.ActiveProfiles; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.IntStream; @SpringBootTest( @@ -112,15 +111,14 @@ void count() { repo.findById(r1.getId()); repo.findById(r2.getId()); - List collect = repo.findAll().collect(Collectors.toList()); + List collect = repo.findAll().toList(); assertEquals(2, collect.size()); } @Test void streamAll() { - List all = - IntStream.rangeClosed(1, 100).mapToObj(this::addFull).collect(Collectors.toList()); - List result = repo.findAll(RuleQuery.of()).collect(Collectors.toList()); + List all = IntStream.rangeClosed(1, 100).mapToObj(this::addFull).toList(); + List result = repo.findAll(RuleQuery.of()).toList(); assertThat(result).isEqualTo(all); } diff --git a/src/integration/persistence-jpa/integration/src/test/java/org/geoserver/acl/integration/jpa/it/RuleRepositoryJpaAdaptorTest.java b/src/integration/persistence-jpa/integration/src/test/java/org/geoserver/acl/integration/jpa/it/RuleRepositoryJpaAdaptorTest.java index ab6d6dd..2027b91 100644 --- a/src/integration/persistence-jpa/integration/src/test/java/org/geoserver/acl/integration/jpa/it/RuleRepositoryJpaAdaptorTest.java +++ b/src/integration/persistence-jpa/integration/src/test/java/org/geoserver/acl/integration/jpa/it/RuleRepositoryJpaAdaptorTest.java @@ -127,25 +127,22 @@ void count() { repo.findById(r1.getId()); repo.findById(r2.getId()); - List collect = repo.findAll().collect(Collectors.toList()); + List collect = repo.findAll().toList(); assertEquals(2, collect.size()); } @Test void streamAll() { - List limits = - IntStream.rangeClosed(1, 100) - .mapToObj(this::addLimitsRule) - .collect(Collectors.toList()); + List limits = IntStream.rangeClosed(1, 100).mapToObj(this::addLimitsRule).toList(); List allows = IntStream.rangeClosed(101, 200) .mapToObj(this::addAllowRuleWithLayerDetails) - .collect(Collectors.toList()); + .toList(); List expected = new ArrayList<>(limits); expected.addAll(allows); - List result = repo.findAll(RuleQuery.of()).collect(Collectors.toList()); + List result = repo.findAll(RuleQuery.of()).toList(); assertThat(result).isEqualTo(expected); } diff --git a/src/integration/persistence-jpa/model/src/test/java/org/geoserver/acl/jpa/repository/JpaAdminRuleRepositoryTest.java b/src/integration/persistence-jpa/model/src/test/java/org/geoserver/acl/jpa/repository/JpaAdminRuleRepositoryTest.java index 833801b..27b0097 100644 --- a/src/integration/persistence-jpa/model/src/test/java/org/geoserver/acl/jpa/repository/JpaAdminRuleRepositoryTest.java +++ b/src/integration/persistence-jpa/model/src/test/java/org/geoserver/acl/jpa/repository/JpaAdminRuleRepositoryTest.java @@ -27,7 +27,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.IntStream; import javax.persistence.EntityManager; @@ -144,7 +143,7 @@ void findAllNaturalOrderFiltered() { r -> r.getPriority() > 2L && "*".equals(r.getIdentifier().getWorkspace())) - .collect(Collectors.toList()); + .toList(); Iterable res = repo.findAll(predicate, Sort.by("priority")); List actual = new ArrayList<>(); diff --git a/src/integration/persistence-jpa/model/src/test/java/org/geoserver/acl/jpa/repository/JpaRuleRepositoryTest.java b/src/integration/persistence-jpa/model/src/test/java/org/geoserver/acl/jpa/repository/JpaRuleRepositoryTest.java index 594b189..e961bce 100644 --- a/src/integration/persistence-jpa/model/src/test/java/org/geoserver/acl/jpa/repository/JpaRuleRepositoryTest.java +++ b/src/integration/persistence-jpa/model/src/test/java/org/geoserver/acl/jpa/repository/JpaRuleRepositoryTest.java @@ -253,7 +253,7 @@ void findAllNaturalOrderFiltered() { r -> r.getPriority() > 2L && "*".equals(r.getIdentifier().getLayer())) - .collect(Collectors.toList()); + .toList(); Iterable res = repo.findAll(predicate, Sort.by("priority")); List actual = new ArrayList<>(); diff --git a/src/integration/spring/domain/src/main/java/org/geoserver/acl/authorization/cache/CachingAuthorizationService.java b/src/integration/spring/domain/src/main/java/org/geoserver/acl/authorization/cache/CachingAuthorizationService.java index 9a04079..ed4057a 100644 --- a/src/integration/spring/domain/src/main/java/org/geoserver/acl/authorization/cache/CachingAuthorizationService.java +++ b/src/integration/spring/domain/src/main/java/org/geoserver/acl/authorization/cache/CachingAuthorizationService.java @@ -26,7 +26,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.function.Predicate; -import java.util.stream.Collectors; public class CachingAuthorizationService implements AuthorizationService { @@ -103,7 +102,7 @@ private void evictRuleAccessCache(Set affectedRuleIds) { e.getValue().getMatchingRules().stream() .anyMatch(affectedRuleIds::contains)) .map(Map.Entry::getKey) - .collect(Collectors.toList()); + .toList(); ruleAccessCache.invalidateAll(matchingRequests); } @@ -121,7 +120,7 @@ private void evictAdminAccessCache(Set affectedRuleIds) { .parallel() .filter(adminRulePredicate) .map(Map.Entry::getKey) - .collect(Collectors.toList()); + .toList(); adminRuleAccessCache.invalidateAll(matchingRequests); } diff --git a/src/plugin/accessmanager/src/main/java/org/geoserver/acl/plugin/accessmanager/ACLDispatcherCallback.java b/src/plugin/accessmanager/src/main/java/org/geoserver/acl/plugin/accessmanager/ACLDispatcherCallback.java index ae1fa03..5939ba9 100644 --- a/src/plugin/accessmanager/src/main/java/org/geoserver/acl/plugin/accessmanager/ACLDispatcherCallback.java +++ b/src/plugin/accessmanager/src/main/java/org/geoserver/acl/plugin/accessmanager/ACLDispatcherCallback.java @@ -42,7 +42,6 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; /** * {@link ResourceAccessManager} to make GeoServer use the ACL service to assess data access rules @@ -303,9 +302,7 @@ private void addGroupStyles( else groupStyles = groupInfo.styles(); requestedStyles.addAll( - groupStyles.stream() - .map(s -> s != null ? s.prefixedName() : null) - .collect(Collectors.toList())); + groupStyles.stream().map(s -> s != null ? s.prefixedName() : null).toList()); } private List parseLayersParameter(Request gsRequest, GetMapRequest getMap) { diff --git a/src/plugin/accessmanager/src/main/java/org/geoserver/acl/plugin/accessmanager/AccessManagerConfig.java b/src/plugin/accessmanager/src/main/java/org/geoserver/acl/plugin/accessmanager/AccessManagerConfig.java index 1224f8d..7e47ff6 100644 --- a/src/plugin/accessmanager/src/main/java/org/geoserver/acl/plugin/accessmanager/AccessManagerConfig.java +++ b/src/plugin/accessmanager/src/main/java/org/geoserver/acl/plugin/accessmanager/AccessManagerConfig.java @@ -15,7 +15,6 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * Configuration object for {@link ACLResourceAccessManager}. @@ -129,10 +128,7 @@ public void setAcceptedRoles(List acceptedRoles) { if (acceptedRoles == null || acceptedRoles.isEmpty()) { this.roles = new ArrayList<>(List.of("*")); } else { - this.roles = - acceptedRoles.stream() - .filter(StringUtils::hasText) - .collect(Collectors.toList()); + this.roles = acceptedRoles.stream().filter(StringUtils::hasText).toList(); } } diff --git a/src/plugin/accessmanager/src/test/java/org/geoserver/acl/plugin/accessmanager/AclBaseTest.java b/src/plugin/accessmanager/src/test/java/org/geoserver/acl/plugin/accessmanager/AclBaseTest.java index a5456e1..aec9148 100644 --- a/src/plugin/accessmanager/src/test/java/org/geoserver/acl/plugin/accessmanager/AclBaseTest.java +++ b/src/plugin/accessmanager/src/test/java/org/geoserver/acl/plugin/accessmanager/AclBaseTest.java @@ -31,7 +31,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * Creates the following rules, which the test cases expect as precondition: @@ -153,7 +152,7 @@ protected void onTearDown(SystemTestData testData) throws Exception { * */ private void createDefaultRules(RuleAdminService ruleAdminService) { - List rules = ruleAdminService.getAll().collect(Collectors.toList()); + List rules = ruleAdminService.getAll().toList(); rules.stream().map(Rule::getId).forEach(ruleAdminService::delete); ruleAdminService.insert(Rule.allow().withUsername("admin")); ruleAdminService.insert(Rule.allow().withService("WMS")); diff --git a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/DataAccessRuleEditModel.java b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/DataAccessRuleEditModel.java index 5919f27..464ea21 100644 --- a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/DataAccessRuleEditModel.java +++ b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/DataAccessRuleEditModel.java @@ -32,7 +32,6 @@ import java.util.Objects; import java.util.Optional; import java.util.regex.Pattern; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; @@ -230,7 +229,7 @@ private void updateLayerAttributes(PublishedInfo info) { } } List mapped = - attributes.stream().map(MutableLayerAttribute::new).collect(Collectors.toList()); + attributes.stream().map(MutableLayerAttribute::new).toList(); ld.getAttributes().clear(); ld.getAttributes().addAll(mapped); } diff --git a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/DataAccessRulesDataProvider.java b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/DataAccessRulesDataProvider.java index 7cc1dc1..ac7b420 100644 --- a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/DataAccessRulesDataProvider.java +++ b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/DataAccessRulesDataProvider.java @@ -16,7 +16,6 @@ import org.springframework.dao.DuplicateKeyException; import java.util.List; -import java.util.stream.Collectors; /** * @author Niels Charlier - Originally as part of GeoFence's GeoServer extension @@ -67,7 +66,7 @@ protected void delete(MutableRule rule) { @Override protected List doReload() { - return adminService().getAll().map(MutableRule::new).collect(Collectors.toList()); + return adminService().getAll().map(MutableRule::new).toList(); } @Override diff --git a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/MutableLayerDetails.java b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/MutableLayerDetails.java index 237df6b..83bbedc 100644 --- a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/MutableLayerDetails.java +++ b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/accessrules/model/MutableLayerDetails.java @@ -51,10 +51,7 @@ public MutableLayerDetails(@NonNull LayerDetails ld) { setCatalogMode(ld.getCatalogMode()); setSpatialFilterType(ld.getSpatialFilterType()); setAllowedStyles(new TreeSet<>(ld.getAllowedStyles())); - setAttributes( - ld.getAttributes().stream() - .map(MutableLayerAttribute::new) - .collect(Collectors.toList())); + setAttributes(ld.getAttributes().stream().map(MutableLayerAttribute::new).toList()); } public LayerDetails toLayerDetails() { diff --git a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/adminrules/model/AdminRulesTableDataProvider.java b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/adminrules/model/AdminRulesTableDataProvider.java index bb8f522..5998e10 100644 --- a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/adminrules/model/AdminRulesTableDataProvider.java +++ b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/adminrules/model/AdminRulesTableDataProvider.java @@ -16,7 +16,6 @@ import org.springframework.dao.DuplicateKeyException; import java.util.List; -import java.util.stream.Collectors; @SuppressWarnings("serial") public class AdminRulesTableDataProvider extends RulesDataProvider { @@ -43,7 +42,7 @@ public List> getProperties() { @Override protected List doReload() { - return adminService().getAll().map(MutableAdminRule::new).collect(Collectors.toList()); + return adminService().getAll().map(MutableAdminRule::new).toList(); } protected @Override void delete(MutableAdminRule rule) { diff --git a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/components/AbstractRulesModel.java b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/components/AbstractRulesModel.java index 414647c..832272b 100644 --- a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/components/AbstractRulesModel.java +++ b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/components/AbstractRulesModel.java @@ -38,7 +38,6 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.regex.Pattern; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; @@ -64,7 +63,7 @@ public List findServiceNames() { .sorted() .distinct() .filter(service -> !"GWC".equalsIgnoreCase(service)) - .collect(Collectors.toList()); + .toList(); } /** @@ -86,7 +85,7 @@ public List findOperationNames(String serviceName) { .orElseGet(Stream::empty)) .sorted() .distinct() - .collect(Collectors.toList()); + .toList(); } public Iterator getSubfieldChoices(@Nullable String input) { @@ -149,7 +148,7 @@ public Iterator getLayerChoices(@Nullable String input) { .filter(PublishedInfo::isAdvertised) .filter(PublishedInfo::isEnabled) .limit(MAX_SUGGESTIONS) - .collect(Collectors.toList()) + .toList() .stream(); } } else { diff --git a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/components/RulesDataProvider.java b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/components/RulesDataProvider.java index ad29209..0cc7057 100644 --- a/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/components/RulesDataProvider.java +++ b/src/plugin/web/src/main/java/org/geoserver/acl/plugin/web/components/RulesDataProvider.java @@ -19,7 +19,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.stream.Collectors; @SuppressWarnings("serial") public abstract class RulesDataProvider extends GeoServerDataProvider { @@ -55,7 +54,7 @@ public List getItems() { if (_rules.isEmpty()) reload(); SerializablePredicate predicate = filter; if (predicate == null) return _rules; - return _rules.stream().filter(predicate).collect(Collectors.toList()); + return _rules.stream().filter(predicate).toList(); } private final void reload() { diff --git a/src/plugin/web/src/test/java/org/geoserver/acl/plugin/web/components/RulesTablePanelTest.java b/src/plugin/web/src/test/java/org/geoserver/acl/plugin/web/components/RulesTablePanelTest.java index bef476c..8cef8aa 100644 --- a/src/plugin/web/src/test/java/org/geoserver/acl/plugin/web/components/RulesTablePanelTest.java +++ b/src/plugin/web/src/test/java/org/geoserver/acl/plugin/web/components/RulesTablePanelTest.java @@ -21,7 +21,6 @@ import org.junit.Test; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.IntStream; @SuppressWarnings("unused") @@ -31,7 +30,7 @@ List createTestRules(final int count) { AdminRuleAdminService adminService = adminService(); assertEquals(0, adminService.count()); IntStream.rangeClosed(1, count).mapToObj(this::testRule).forEach(adminService::insert); - return adminService.getAll().collect(Collectors.toList()); + return adminService.getAll().toList(); } private AdminRule testRule(int i) { @@ -86,8 +85,7 @@ public void testRows() { @Test public void testUpDown() { List rules = createTestRules(3); - List mutableRules = - rules.stream().map(MutableAdminRule::new).collect(Collectors.toList()); + List mutableRules = rules.stream().map(MutableAdminRule::new).toList(); AdminRulesTableDataProvider data = spy(new AdminRulesTableDataProvider());