From f39f40a3a35d3b5a5b32202c47838bab83e41944 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 22 Mar 2024 00:15:31 -0300 Subject: [PATCH] drop commons-collections4 dependency --- .../_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs | 4 ++-- generators/spring-data-elasticsearch/generator.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs index 469458617d4..3bc33cc1876 100644 --- a/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +++ b/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs @@ -111,7 +111,7 @@ import <%= entityAbsolutePackage %>.service.criteria.<%= entityClass %>Criteria; import com.fasterxml.jackson.databind.ObjectMapper; <%_ if (searchEngineElasticsearch) { _%> import org.assertj.core.util.IterableUtil; -import org.apache.commons.collections4.IterableUtils; +import org.springframework.data.util.Streamable; import java.util.concurrent.TimeUnit; <%_ } _%> <%_ if ((databaseTypeSql && reactive) || searchEngineElasticsearch) { _%> @@ -1474,7 +1474,7 @@ _%> await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> { int searchDatabaseSizeAfter = IterableUtil.sizeOf(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>); assertThat(searchDatabaseSizeAfter).isEqualTo(searchDatabaseSizeBefore); - List<<%= persistClass %>> <%= entityInstance %>SearchList = IterableUtils.toList(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>); + List<<%= persistClass %>> <%= entityInstance %>SearchList = Streamable.of(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>).toList(); <%= persistClass %> test<%= entityClass %>Search = <%= entityInstance %>SearchList.get(searchDatabaseSizeAfter - 1); <%_ if (reactive && databaseTypeSql) { _%> diff --git a/generators/spring-data-elasticsearch/generator.js b/generators/spring-data-elasticsearch/generator.js index 9135338280e..173d7daa5a1 100644 --- a/generators/spring-data-elasticsearch/generator.js +++ b/generators/spring-data-elasticsearch/generator.js @@ -83,7 +83,6 @@ export default class ElasticsearchGenerator extends BaseApplicationGenerator { source.addJavaDependencies?.([ { groupId: 'org.springframework.boot', artifactId: 'spring-boot-starter-data-elasticsearch' }, { scope: 'test', groupId: 'org.awaitility', artifactId: 'awaitility' }, - { scope: 'test', groupId: 'org.apache.commons', artifactId: 'commons-collections4' }, { scope: 'test', groupId: 'org.testcontainers', artifactId: 'elasticsearch' }, { scope: 'test', groupId: 'org.testcontainers', artifactId: 'junit-jupiter' }, { scope: 'test', groupId: 'org.testcontainers', artifactId: 'testcontainers' },