Skip to content

Commit 2cb9080

Browse files
committed
new versions
1 parent eac32fe commit 2cb9080

File tree

3 files changed

+20
-29
lines changed

3 files changed

+20
-29
lines changed

main-app/main-webapp/src/main/java/gt/app/modules/article/CommentService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.springframework.stereotype.Service;
88

99
import java.util.List;
10-
import java.util.stream.Collectors;
1110

1211
@Service
1312
@RequiredArgsConstructor
@@ -35,7 +34,7 @@ public void save(NewCommentDto c) {
3534

3635

3736
public List<ArticleReadDto.CommentDto> readComments(Long articleId) {
38-
return commentRepository.findAllByArticleId(articleId).stream().map(ArticleMapper.INSTANCE::map).collect(Collectors.toList());
37+
return commentRepository.findAllByArticleId(articleId).stream().map(ArticleMapper.INSTANCE::map).toList();
3938
}
4039

4140
}

main-app/main-webapp/src/test/java/gt/app/e2e/pageobj/UserArticleListingPage.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package gt.app.e2e.pageobj;
22

3+
import com.codeborne.selenide.SelenideElement;
4+
35
import java.io.File;
4-
import java.io.FileNotFoundException;
56
import java.util.List;
6-
import java.util.stream.Collectors;
77

88
import static com.codeborne.selenide.Selenide.$$x;
99
import static com.codeborne.selenide.Selenide.$x;
@@ -16,16 +16,10 @@ public UserArticleListingPage open() {
1616
}
1717

1818
public List<File> downloadFiles(int row) {
19-
return $$x(".//table/tbody/tr[" + row + "]/td[4]/a").asFixedIterable().stream().map(
20-
a -> {
21-
try {
22-
return a.download();
23-
} catch (FileNotFoundException e) {
24-
throw new RuntimeException();
25-
}
26-
}
27-
).collect(Collectors.toList());
28-
19+
return $$x(".//table/tbody/tr[" + row + "]/td[4]/a").asFixedIterable()
20+
.stream()
21+
.map(SelenideElement::download)
22+
.toList();
2923
}
3024

3125

pom.xml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>org.springframework.boot</groupId>
2121
<artifactId>spring-boot-starter-parent</artifactId>
22-
<version>3.2.0-M3</version>
22+
<version>3.2.0</version>
2323
<relativePath/> <!-- lookup parent from repository -->
2424
</parent>
2525

@@ -30,25 +30,23 @@
3030
<maven.compiler.source>${java.version}</maven.compiler.source>
3131
<maven.compiler.target>${java.version}</maven.compiler.target>
3232

33-
<spring-boot.version>3.2.0-M3</spring-boot.version>
34-
<spring-cloud.version>2023.0.0-M2</spring-cloud.version>
33+
<spring-boot.version>3.2.0</spring-boot.version>
34+
<spring-cloud.version>2023.0.0-RC1</spring-cloud.version>
3535
<hibernate-types60.version>2.21.1</hibernate-types60.version>
36-
<hibernate-hypersistence-utils.version>3.5.3</hibernate-hypersistence-utils.version>
37-
<datasource-proxy-sb-starter.version>1.9.0</datasource-proxy-sb-starter.version>
38-
<springdoc-openapi-ui.version>2.2.0</springdoc-openapi-ui.version>
39-
<mapstruct.version>1.5.5.Final</mapstruct.version>
36+
<hibernate-hypersistence-utils.version>3.6.1</hibernate-hypersistence-utils.version>
37+
<datasource-proxy-sb-starter.version>1.9.1</datasource-proxy-sb-starter.version>
38+
<springdoc-openapi-ui.version>2.3.0</springdoc-openapi-ui.version>
39+
<mapstruct.version>1.6.0.Beta1</mapstruct.version>
4040

41-
<selenide.version>6.19.0</selenide.version>
41+
<selenide.version>7.0.1</selenide.version>
4242
<!-- selenide generally uses new selenium. Spring Boot Dep Mgmt still provides older version -->
43-
<selenium.version>4.12.0</selenium.version>
44-
<!-- selenide + webdriver manager uses httpclient 5.2 -->
45-
<httpclient5.version>5.2.1</httpclient5.version>
43+
<selenium.version>4.13.0</selenium.version>
4644

47-
<google-guava.version>32.1.2-jre</google-guava.version>
45+
<google-guava.version>32.1.3-jre</google-guava.version>
4846
<wro4j.version>1.9.0</wro4j.version>
49-
<archunit.version>1.1.0</archunit.version>
50-
<testcontainers.version>1.19.1</testcontainers.version>
51-
<commons-io.version>2.14.0</commons-io.version>
47+
<archunit.version>1.2.1</archunit.version>
48+
<testcontainers.version>1.19.3</testcontainers.version>
49+
<commons-io.version>2.15.1</commons-io.version>
5250
<webjar-jquery.version>3.6.1</webjar-jquery.version>
5351
<webjar-bootstrap.version>5.0.1</webjar-bootstrap.version>
5452
<webjar-jquery-toast-plugin.version>1.3.2</webjar-jquery-toast-plugin.version>

0 commit comments

Comments
 (0)