Java 17

deploy.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+cd "$(dirname "$0")" || exit 1
+
+mvn clean package spring-boot:repackage && \
+scp target/Homeautomation.jar media@10.0.0.50:/home/media/java/Homeautomation/Homeautomation.jar.update && \
+curl -m 2 -s http://10.0.0.50:8082/server/shutdown && echo "Server restarting..." || echo "Failed to restart server!"

pom.xml

@@ -7,17 +7,16 @@
     <groupId>de.ph87</groupId>
     <artifactId>Homeautomation</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <packaging>war</packaging>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.4</version>
+        <version>2.7.5</version>
     </parent>
 
     <dependencies>

src/main/java/de/ph87/homeautomation/bulk/BulkController.java

@@ -8,7 +8,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("bulk")
@@ -62,7 +61,7 @@ public class BulkController implements ISearchController {
   @PostMapping("searchLike")
   @Deprecated(since = "Use 'filter' instead", forRemoval = true)
   public List<SearchResult> searchLike(@RequestBody final String term) {
-    return bulkReader.findAllDtoLike("%" + term + "%").stream().map(this::toSearchResult).collect(Collectors.toList());
+    return bulkReader.findAllDtoLike("%" + term + "%").stream().map(this::toSearchResult).toList();
   }
 
   @GetMapping("findAll")

src/main/java/de/ph87/homeautomation/bulk/BulkReader.java

@@ -9,7 +9,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -35,12 +34,12 @@ public class BulkReader {
 
   @Deprecated(since = "Use 'filter' instead", forRemoval = true)
   public List<BulkDto> findAllDtoLike(final String term) {
-    return bulkRepository.findAllByNameLikeIgnoreCase(term).stream().map(bulkMapper::toDto).collect(Collectors.toList());
+    return bulkRepository.findAllByNameLikeIgnoreCase(term).stream().map(bulkMapper::toDto).toList();
   }
 
   @Deprecated(since = "Use 'filter' instead", forRemoval = true)
   public List<BulkDto> findAllDto() {
-    return bulkRepository.findAll().stream().map(bulkMapper::toDto).collect(Collectors.toList());
+    return bulkRepository.findAll().stream().map(bulkMapper::toDto).toList();
   }
 
   public Bulk getBulkByEntryId(final long id) {

src/main/java/de/ph87/homeautomation/channel/ChannelController.java

@@ -7,7 +7,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("channel")
@@ -30,7 +29,7 @@ public class ChannelController implements ISearchController {
   @Override
   @PostMapping("searchLike")
   public List<SearchResult> searchLike(@RequestBody final String term) {
-    return channelService.findAllDtoLike(term).stream().map(this::toSearchResult).collect(Collectors.toList());
+    return channelService.findAllDtoLike(term).stream().map(this::toSearchResult).toList();
   }
 
   private SearchResult toSearchResult(final ChannelDto dto) {

src/main/java/de/ph87/homeautomation/device/DeviceReadService.java

@@ -9,7 +9,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static de.ph87.homeautomation.shared.Helpers.mapOrNull;
 
@@ -24,7 +23,7 @@ public class DeviceReadService {
   private final PropertyMapper propertyMapper;
 
   public List<DeviceDto> findAll() {
-    return deviceRepository.findAll().stream().map(this::toDto).collect(Collectors.toList());
+    return deviceRepository.findAll().stream().map(this::toDto).toList();
   }
 
   public DeviceDto toDto(final Device device) {

src/main/java/de/ph87/homeautomation/device/DeviceWriteService.java

@@ -13,7 +13,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -60,7 +59,7 @@ public class DeviceWriteService {
     deviceStateScene.setTitle(getTitle(title, stateProperty));
     deviceStateScene.setStateProperty(stateProperty);
     deviceStateScene.setSceneProperty(sceneProperty);
-    deviceStateScene.setSceneNumbers(Arrays.stream(scenes).map(SceneDto::getNumber).collect(Collectors.toList()));
+    deviceStateScene.setSceneNumbers(Arrays.stream(scenes).map(SceneDto::getNumber).toList());
     deviceRepository.save(deviceStateScene);
     return publish(deviceStateScene, true);
   }

src/main/java/de/ph87/homeautomation/knx/group/KnxGroupChannelOwnerService.java

@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -37,12 +36,12 @@ public class KnxGroupChannelOwnerService implements IChannelOwner {
 
   @Override
   public List<KnxGroupDto> findAllDto() {
-    return knxGroupReadService.findAll().stream().map(this::toDto).collect(Collectors.toList());
+    return knxGroupReadService.findAll().stream().map(this::toDto).toList();
   }
 
   @Override
   public List<KnxGroupDto> findAllDtoLikeIgnoreCase(final String like) {
-    return knxGroupReadService.findAllLike(like).stream().map(this::toDto).collect(Collectors.toList());
+    return knxGroupReadService.findAllLike(like).stream().map(this::toDto).toList();
   }
 
 }

src/main/java/de/ph87/homeautomation/logic/LogicReader.java

@@ -6,7 +6,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -17,7 +16,7 @@ public class LogicReader {
   private final LogicRepository logicRepository;
 
   public List<LogicDto> findAllDto() {
-    return logicRepository.findAll().stream().map(this::toDto).collect(Collectors.toList());
+    return logicRepository.findAll().stream().map(this::toDto).toList();
   }
 
   public LogicDto toDto(final Logic logic) {
@@ -25,7 +24,7 @@ public class LogicReader {
   }
 
   public List<LogicDto> findAllDtoLike(final String like) {
-    return logicRepository.findAllByNameContainsIgnoreCase(like).stream().map(this::toDto).collect(Collectors.toList());
+    return logicRepository.findAllByNameContainsIgnoreCase(like).stream().map(this::toDto).toList();
   }
 
   public List<Logic> findAllByPropertyId(final long id) {

src/main/java/de/ph87/homeautomation/property/PropertyController.java

@@ -7,7 +7,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("property")
@@ -83,7 +82,7 @@ public class PropertyController implements ISearchController {
   @Override
   @PostMapping("searchLike")
   public List<SearchResult> searchLike(@RequestBody final String term) {
-    return propertyReader.findAllDtoLike("%" + term + "%").stream().map(this::toSearchResult).collect(Collectors.toList());
+    return propertyReader.findAllDtoLike("%" + term + "%").stream().map(this::toSearchResult).toList();
   }
 
   private SearchResult toSearchResult(final PropertyDto propertyDto) {

src/main/java/de/ph87/homeautomation/property/PropertyMapper.java

@@ -13,7 +13,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -39,8 +38,8 @@ public class PropertyMapper {
 
   private List<SearchResult> findUsages(final Property property) {
     final List<SearchResult> searchResults = new ArrayList<>();
-    searchResults.addAll(scheduleRepository.findDistinctByEntries_Property(property).stream().map(this::toSearchResult).collect(Collectors.toList()));
-    searchResults.addAll(bulkRepository.findDistinctByEntries_Property(property).stream().map(this::toSearchResult).collect(Collectors.toList()));
+    searchResults.addAll(scheduleRepository.findDistinctByEntries_Property(property).stream().map(this::toSearchResult).toList());
+    searchResults.addAll(bulkRepository.findDistinctByEntries_Property(property).stream().map(this::toSearchResult).toList());
     return searchResults;
   }
 

src/main/java/de/ph87/homeautomation/property/PropertyReader.java

@@ -6,7 +6,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -23,7 +22,7 @@ public class PropertyReader {
   }
 
   public List<PropertyDto> findAllDtoLike(final String like) {
-    return propertyRepository.findAllByTitleLikeIgnoreCase(like).stream().map(propertyMapper::toDto).collect(Collectors.toList());
+    return propertyRepository.findAllByTitleLikeIgnoreCase(like).stream().map(propertyMapper::toDto).toList();
   }
 
   public PropertyDto getDtoById(final long id) {
@@ -35,7 +34,7 @@ public class PropertyReader {
   }
 
   public List<PropertyDto> findAllDto() {
-    return propertyRepository.findAll().stream().map(propertyMapper::toDto).collect(Collectors.toList());
+    return propertyRepository.findAll().stream().map(propertyMapper::toDto).toList();
   }
 
   public List<Property> findAllByReadChannelNotNull() {

src/main/java/de/ph87/homeautomation/scene/SceneReadService.java

@@ -7,7 +7,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -20,7 +19,7 @@ public class SceneReadService {
   private final SceneMapper sceneMapper;
 
   public List<SceneDto> findAll() {
-    return sceneRepository.findAll().stream().map(sceneMapper::toDto).collect(Collectors.toList());
+    return sceneRepository.findAll().stream().map(sceneMapper::toDto).toList();
   }
 
   public Scene getById(final long id) {

src/main/java/de/ph87/homeautomation/schedule/ScheduleReader.java

@@ -9,7 +9,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -30,7 +29,7 @@ public class ScheduleReader {
   }
 
   public List<ScheduleDto> findAllDtos() {
-    return findAll().stream().map(scheduleMapper::toDto).collect(Collectors.toList());
+    return findAll().stream().map(scheduleMapper::toDto).toList();
   }
 
   public Schedule getByEntry(final ScheduleEntry entry) {

src/main/java/de/ph87/network/router/Router.java

@@ -7,7 +7,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 public class Router {
 
@@ -35,7 +34,7 @@ public class Router {
 
   private static <T> List<T> execute(final Function<String, Optional<T>> parser, final String... commands) throws IOException {
     final String output = new String(new ProcessBuilder(commands).start().getInputStream().readAllBytes());
-    return Arrays.stream(output.split("\\n")).map(parser).filter(Optional::isPresent).map(Optional::get).collect(Collectors.toList());
+    return Arrays.stream(output.split("\\n")).map(parser).filter(Optional::isPresent).map(Optional::get).toList();
   }
 
 }