From 272ecfdbcd54dcbea8f61e473abd646aebe21a41 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 11:52:38 +0000
Subject: [PATCH 1/2] Update dependency
org.springframework.boot:spring-boot-starter-parent to v3.2.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 086376f..65035b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.1.5
+ 3.2.0
pl.piomin.samples
From 34ef1ecca8ef048cd362b32c9bde928d7d548c64 Mon Sep 17 00:00:00 2001
From: piomin
Date: Mon, 27 Nov 2023 15:19:59 +0100
Subject: [PATCH 2/2] update to java 21 (2)
---
.../jpastreamer/repository/DepartmentRepository.java | 7 +++----
.../spring/jpastreamer/repository/EmployeeRepository.java | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/pl/piomin/samples/spring/jpastreamer/repository/DepartmentRepository.java b/src/main/java/pl/piomin/samples/spring/jpastreamer/repository/DepartmentRepository.java
index a3b8c38..27dbcd8 100644
--- a/src/main/java/pl/piomin/samples/spring/jpastreamer/repository/DepartmentRepository.java
+++ b/src/main/java/pl/piomin/samples/spring/jpastreamer/repository/DepartmentRepository.java
@@ -24,15 +24,14 @@ public List findAll() {
return streamer.stream(Department.class)
.sorted(Department$.name)
.map(DepartmentDTO::new)
- .collect(Collectors.toList());
+ .toList();
}
public long getNumberOfEmployees(Integer id) {
return streamer.stream(Department.class)
.filter(Department$.id.equal(id))
.map(Department::getEmployees)
- .mapToLong(Set::size)
- .sum();
+ .count();
}
public List getEmployees(Integer id) {
@@ -41,7 +40,7 @@ public List getEmployees(Integer id) {
.map(Department::getEmployees)
.flatMap(Set::stream)
.map(EmployeeDTO::new)
- .collect(Collectors.toList());
+ .toList();
}
}
diff --git a/src/main/java/pl/piomin/samples/spring/jpastreamer/repository/EmployeeRepository.java b/src/main/java/pl/piomin/samples/spring/jpastreamer/repository/EmployeeRepository.java
index 4f05181..fef9c31 100644
--- a/src/main/java/pl/piomin/samples/spring/jpastreamer/repository/EmployeeRepository.java
+++ b/src/main/java/pl/piomin/samples/spring/jpastreamer/repository/EmployeeRepository.java
@@ -26,7 +26,7 @@ public List findBySalaryGreaterThan(final int salary) {
.filter(Employee$.salary.greaterThan(salary))
.sorted(Employee$.salary)
.map(EmployeeDTO::new)
- .collect(Collectors.toList());
+ .toList();
}
public List findAllWithPagination(final int offset,
@@ -35,7 +35,7 @@ public List findAllWithPagination(final int offset,
.skip(offset)
.limit(limit)
.map(EmployeeDTO::new)
- .collect(Collectors.toList());
+ .toList();
}
public EmployeeWithDetailsDTO findById(final Integer id) {