diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..543e4e9 --- /dev/null +++ b/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!" \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7dd2bff..337c235 100644 --- a/pom.xml +++ b/pom.xml @@ -7,17 +7,16 @@ de.ph87 Homeautomation 1.0-SNAPSHOT - war - 11 - 11 + 17 + 17 org.springframework.boot spring-boot-starter-parent - 2.7.4 + 2.7.5 diff --git a/src/main/java/de/ph87/homeautomation/bulk/BulkController.java b/src/main/java/de/ph87/homeautomation/bulk/BulkController.java index 902b36d..0381742 100644 --- a/src/main/java/de/ph87/homeautomation/bulk/BulkController.java +++ b/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 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") diff --git a/src/main/java/de/ph87/homeautomation/bulk/BulkReader.java b/src/main/java/de/ph87/homeautomation/bulk/BulkReader.java index daabb83..a357451 100644 --- a/src/main/java/de/ph87/homeautomation/bulk/BulkReader.java +++ b/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 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 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) { diff --git a/src/main/java/de/ph87/homeautomation/channel/ChannelController.java b/src/main/java/de/ph87/homeautomation/channel/ChannelController.java index 092afde..09d703e 100644 --- a/src/main/java/de/ph87/homeautomation/channel/ChannelController.java +++ b/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 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) { diff --git a/src/main/java/de/ph87/homeautomation/device/DeviceReadService.java b/src/main/java/de/ph87/homeautomation/device/DeviceReadService.java index d074b1c..d250f53 100644 --- a/src/main/java/de/ph87/homeautomation/device/DeviceReadService.java +++ b/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 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) { diff --git a/src/main/java/de/ph87/homeautomation/device/DeviceWriteService.java b/src/main/java/de/ph87/homeautomation/device/DeviceWriteService.java index fdfe63d..71208ec 100644 --- a/src/main/java/de/ph87/homeautomation/device/DeviceWriteService.java +++ b/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); } diff --git a/src/main/java/de/ph87/homeautomation/knx/group/KnxGroupChannelOwnerService.java b/src/main/java/de/ph87/homeautomation/knx/group/KnxGroupChannelOwnerService.java index a225d84..28b92bb 100644 --- a/src/main/java/de/ph87/homeautomation/knx/group/KnxGroupChannelOwnerService.java +++ b/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 findAllDto() { - return knxGroupReadService.findAll().stream().map(this::toDto).collect(Collectors.toList()); + return knxGroupReadService.findAll().stream().map(this::toDto).toList(); } @Override public List findAllDtoLikeIgnoreCase(final String like) { - return knxGroupReadService.findAllLike(like).stream().map(this::toDto).collect(Collectors.toList()); + return knxGroupReadService.findAllLike(like).stream().map(this::toDto).toList(); } } diff --git a/src/main/java/de/ph87/homeautomation/logic/LogicReader.java b/src/main/java/de/ph87/homeautomation/logic/LogicReader.java index 55f0aab..74b4aa1 100644 --- a/src/main/java/de/ph87/homeautomation/logic/LogicReader.java +++ b/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 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 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 findAllByPropertyId(final long id) { diff --git a/src/main/java/de/ph87/homeautomation/property/PropertyController.java b/src/main/java/de/ph87/homeautomation/property/PropertyController.java index 2c971fb..a8bbc93 100644 --- a/src/main/java/de/ph87/homeautomation/property/PropertyController.java +++ b/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 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) { diff --git a/src/main/java/de/ph87/homeautomation/property/PropertyMapper.java b/src/main/java/de/ph87/homeautomation/property/PropertyMapper.java index 1089a09..7bd271c 100644 --- a/src/main/java/de/ph87/homeautomation/property/PropertyMapper.java +++ b/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 findUsages(final Property property) { final List 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; } diff --git a/src/main/java/de/ph87/homeautomation/property/PropertyReader.java b/src/main/java/de/ph87/homeautomation/property/PropertyReader.java index f01af5b..1216e1d 100644 --- a/src/main/java/de/ph87/homeautomation/property/PropertyReader.java +++ b/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 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 findAllDto() { - return propertyRepository.findAll().stream().map(propertyMapper::toDto).collect(Collectors.toList()); + return propertyRepository.findAll().stream().map(propertyMapper::toDto).toList(); } public List findAllByReadChannelNotNull() { diff --git a/src/main/java/de/ph87/homeautomation/scene/SceneReadService.java b/src/main/java/de/ph87/homeautomation/scene/SceneReadService.java index 28a0783..99c483d 100644 --- a/src/main/java/de/ph87/homeautomation/scene/SceneReadService.java +++ b/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 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) { diff --git a/src/main/java/de/ph87/homeautomation/schedule/ScheduleReader.java b/src/main/java/de/ph87/homeautomation/schedule/ScheduleReader.java index 0a9bdfd..dd40d50 100644 --- a/src/main/java/de/ph87/homeautomation/schedule/ScheduleReader.java +++ b/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 findAllDtos() { - return findAll().stream().map(scheduleMapper::toDto).collect(Collectors.toList()); + return findAll().stream().map(scheduleMapper::toDto).toList(); } public Schedule getByEntry(final ScheduleEntry entry) { diff --git a/src/main/java/de/ph87/network/router/Router.java b/src/main/java/de/ph87/network/router/Router.java index 2e32b28..3e05446 100644 --- a/src/main/java/de/ph87/network/router/Router.java +++ b/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 List execute(final Function> 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(); } }