From 551efdbcffbbfba76944f6e200ac881527f30510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Thu, 21 Nov 2024 15:22:04 +0100 Subject: [PATCH] code clean, package cleanup --- .../{ => crud}/AbstractSearchFilter.java | 2 +- .../common/{ => crud}/EntityNotFound.java | 2 +- .../ph87/home/common/{ => crud}/ISearch.java | 2 +- .../json/ClassSimpleNameSerializer.java} | 4 ++-- ...chSecondsToZonedDateTimeDeserializer.java} | 4 ++-- .../SecondsToDurationDeserializer.java} | 4 ++-- .../de/ph87/home/device/DeviceFilter.java | 2 +- .../de/ph87/home/device/DeviceService.java | 2 +- .../java/de/ph87/home/knx/group/Group.java | 2 +- .../de/ph87/home/knx/group/GroupFilter.java | 2 +- .../ph87/home/knx/group/GroupRepository.java | 4 ++-- .../de/ph87/home/knx/group/GroupService.java | 2 +- .../de/ph87/home/knx/{ => group/dpt}/DPT.java | 2 +- .../knx/{ => group/dpt}/DPTException.java | 2 +- .../home/knx/property/KnxPropertyService.java | 3 +++ .../java/de/ph87/home/property/State.java | 3 ++- .../api/dto/DvrEntryGridUpcoming.java | 22 +++++++++---------- .../tvheadend/api/dto/StatusConnections.java | 4 ++-- .../api/dto/StatusSubscriptions.java | 4 ++-- 19 files changed, 38 insertions(+), 34 deletions(-) rename src/main/java/de/ph87/home/common/{ => crud}/AbstractSearchFilter.java (89%) rename src/main/java/de/ph87/home/common/{ => crud}/EntityNotFound.java (91%) rename src/main/java/de/ph87/home/common/{ => crud}/ISearch.java (96%) rename src/main/java/de/ph87/home/{property/ClassSerializer.java => common/json/ClassSimpleNameSerializer.java} (82%) rename src/main/java/de/ph87/home/common/{EpochSecondsToZonedDateTime.java => json/EpochSecondsToZonedDateTimeDeserializer.java} (84%) rename src/main/java/de/ph87/home/common/{SecondsToDuration.java => json/SecondsToDurationDeserializer.java} (79%) rename src/main/java/de/ph87/home/knx/{ => group/dpt}/DPT.java (96%) rename src/main/java/de/ph87/home/knx/{ => group/dpt}/DPTException.java (89%) diff --git a/src/main/java/de/ph87/home/common/AbstractSearchFilter.java b/src/main/java/de/ph87/home/common/crud/AbstractSearchFilter.java similarity index 89% rename from src/main/java/de/ph87/home/common/AbstractSearchFilter.java rename to src/main/java/de/ph87/home/common/crud/AbstractSearchFilter.java index 416edd5..ca14e91 100644 --- a/src/main/java/de/ph87/home/common/AbstractSearchFilter.java +++ b/src/main/java/de/ph87/home/common/crud/AbstractSearchFilter.java @@ -1,4 +1,4 @@ -package de.ph87.home.common; +package de.ph87.home.common.crud; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.annotation.Nullable; diff --git a/src/main/java/de/ph87/home/common/EntityNotFound.java b/src/main/java/de/ph87/home/common/crud/EntityNotFound.java similarity index 91% rename from src/main/java/de/ph87/home/common/EntityNotFound.java rename to src/main/java/de/ph87/home/common/crud/EntityNotFound.java index 1f94ab8..2af268c 100644 --- a/src/main/java/de/ph87/home/common/EntityNotFound.java +++ b/src/main/java/de/ph87/home/common/crud/EntityNotFound.java @@ -1,4 +1,4 @@ -package de.ph87.home.common; +package de.ph87.home.common.crud; import lombok.NonNull; import org.springframework.http.HttpStatus; diff --git a/src/main/java/de/ph87/home/common/ISearch.java b/src/main/java/de/ph87/home/common/crud/ISearch.java similarity index 96% rename from src/main/java/de/ph87/home/common/ISearch.java rename to src/main/java/de/ph87/home/common/crud/ISearch.java index 0b683d9..5ff4a4c 100644 --- a/src/main/java/de/ph87/home/common/ISearch.java +++ b/src/main/java/de/ph87/home/common/crud/ISearch.java @@ -1,4 +1,4 @@ -package de.ph87.home.common; +package de.ph87.home.common.crud; import jakarta.annotation.Nullable; import lombok.NonNull; diff --git a/src/main/java/de/ph87/home/property/ClassSerializer.java b/src/main/java/de/ph87/home/common/json/ClassSimpleNameSerializer.java similarity index 82% rename from src/main/java/de/ph87/home/property/ClassSerializer.java rename to src/main/java/de/ph87/home/common/json/ClassSimpleNameSerializer.java index 41b198e..7a64b15 100644 --- a/src/main/java/de/ph87/home/property/ClassSerializer.java +++ b/src/main/java/de/ph87/home/common/json/ClassSimpleNameSerializer.java @@ -1,4 +1,4 @@ -package de.ph87.home.property; +package de.ph87.home.common.json; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.SerializerProvider; import java.io.IOException; -public class ClassSerializer extends JsonSerializer> { +public class ClassSimpleNameSerializer extends JsonSerializer> { @Override public void serialize(final Class aClass, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException { diff --git a/src/main/java/de/ph87/home/common/EpochSecondsToZonedDateTime.java b/src/main/java/de/ph87/home/common/json/EpochSecondsToZonedDateTimeDeserializer.java similarity index 84% rename from src/main/java/de/ph87/home/common/EpochSecondsToZonedDateTime.java rename to src/main/java/de/ph87/home/common/json/EpochSecondsToZonedDateTimeDeserializer.java index 35f3935..65f5ae1 100644 --- a/src/main/java/de/ph87/home/common/EpochSecondsToZonedDateTime.java +++ b/src/main/java/de/ph87/home/common/json/EpochSecondsToZonedDateTimeDeserializer.java @@ -1,4 +1,4 @@ -package de.ph87.home.common; +package de.ph87.home.common.json; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -9,7 +9,7 @@ import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; -public class EpochSecondsToZonedDateTime extends JsonDeserializer { +public class EpochSecondsToZonedDateTimeDeserializer extends JsonDeserializer { @Override public ZonedDateTime deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException { diff --git a/src/main/java/de/ph87/home/common/SecondsToDuration.java b/src/main/java/de/ph87/home/common/json/SecondsToDurationDeserializer.java similarity index 79% rename from src/main/java/de/ph87/home/common/SecondsToDuration.java rename to src/main/java/de/ph87/home/common/json/SecondsToDurationDeserializer.java index c68e64c..9ef6077 100644 --- a/src/main/java/de/ph87/home/common/SecondsToDuration.java +++ b/src/main/java/de/ph87/home/common/json/SecondsToDurationDeserializer.java @@ -1,4 +1,4 @@ -package de.ph87.home.common; +package de.ph87.home.common.json; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import java.io.IOException; import java.time.Duration; -public class SecondsToDuration extends JsonDeserializer { +public class SecondsToDurationDeserializer extends JsonDeserializer { @Override public Duration deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException { diff --git a/src/main/java/de/ph87/home/device/DeviceFilter.java b/src/main/java/de/ph87/home/device/DeviceFilter.java index 03596ca..9018568 100644 --- a/src/main/java/de/ph87/home/device/DeviceFilter.java +++ b/src/main/java/de/ph87/home/device/DeviceFilter.java @@ -1,7 +1,7 @@ package de.ph87.home.device; import com.fasterxml.jackson.annotation.JsonProperty; -import de.ph87.home.common.AbstractSearchFilter; +import de.ph87.home.common.crud.AbstractSearchFilter; import de.ph87.home.property.PropertyTypeMismatch; import jakarta.annotation.Nullable; import lombok.Getter; diff --git a/src/main/java/de/ph87/home/device/DeviceService.java b/src/main/java/de/ph87/home/device/DeviceService.java index acbb183..75d895b 100644 --- a/src/main/java/de/ph87/home/device/DeviceService.java +++ b/src/main/java/de/ph87/home/device/DeviceService.java @@ -1,6 +1,6 @@ package de.ph87.home.device; -import de.ph87.home.common.EntityNotFound; +import de.ph87.home.common.crud.EntityNotFound; import de.ph87.home.property.*; import jakarta.annotation.Nullable; import lombok.NonNull; diff --git a/src/main/java/de/ph87/home/knx/group/Group.java b/src/main/java/de/ph87/home/knx/group/Group.java index 19d49f4..ca04f48 100644 --- a/src/main/java/de/ph87/home/knx/group/Group.java +++ b/src/main/java/de/ph87/home/knx/group/Group.java @@ -1,6 +1,6 @@ package de.ph87.home.knx.group; -import de.ph87.home.knx.DPT; +import de.ph87.home.knx.group.dpt.DPT; import de.ph87.home.property.State; import jakarta.annotation.Nullable; import lombok.Getter; diff --git a/src/main/java/de/ph87/home/knx/group/GroupFilter.java b/src/main/java/de/ph87/home/knx/group/GroupFilter.java index 9a612f4..e6a0d66 100644 --- a/src/main/java/de/ph87/home/knx/group/GroupFilter.java +++ b/src/main/java/de/ph87/home/knx/group/GroupFilter.java @@ -1,6 +1,6 @@ package de.ph87.home.knx.group; -import de.ph87.home.common.AbstractSearchFilter; +import de.ph87.home.common.crud.AbstractSearchFilter; import lombok.Getter; import lombok.NonNull; import lombok.ToString; diff --git a/src/main/java/de/ph87/home/knx/group/GroupRepository.java b/src/main/java/de/ph87/home/knx/group/GroupRepository.java index 6ef533b..2b5a0af 100644 --- a/src/main/java/de/ph87/home/knx/group/GroupRepository.java +++ b/src/main/java/de/ph87/home/knx/group/GroupRepository.java @@ -1,7 +1,7 @@ package de.ph87.home.knx.group; -import de.ph87.home.knx.DPT; -import de.ph87.home.knx.DPTException; +import de.ph87.home.knx.group.dpt.DPT; +import de.ph87.home.knx.group.dpt.DPTException; import jakarta.annotation.Nullable; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/de/ph87/home/knx/group/GroupService.java b/src/main/java/de/ph87/home/knx/group/GroupService.java index e274fdf..b372a49 100644 --- a/src/main/java/de/ph87/home/knx/group/GroupService.java +++ b/src/main/java/de/ph87/home/knx/group/GroupService.java @@ -1,6 +1,6 @@ package de.ph87.home.knx.group; -import de.ph87.home.common.EntityNotFound; +import de.ph87.home.common.crud.EntityNotFound; import jakarta.annotation.Nullable; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/de/ph87/home/knx/DPT.java b/src/main/java/de/ph87/home/knx/group/dpt/DPT.java similarity index 96% rename from src/main/java/de/ph87/home/knx/DPT.java rename to src/main/java/de/ph87/home/knx/group/dpt/DPT.java index f56a89f..fc42e8c 100644 --- a/src/main/java/de/ph87/home/knx/DPT.java +++ b/src/main/java/de/ph87/home/knx/group/dpt/DPT.java @@ -1,4 +1,4 @@ -package de.ph87.home.knx; +package de.ph87.home.knx.group.dpt; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/de/ph87/home/knx/DPTException.java b/src/main/java/de/ph87/home/knx/group/dpt/DPTException.java similarity index 89% rename from src/main/java/de/ph87/home/knx/DPTException.java rename to src/main/java/de/ph87/home/knx/group/dpt/DPTException.java index 0f9ee10..d35746c 100644 --- a/src/main/java/de/ph87/home/knx/DPTException.java +++ b/src/main/java/de/ph87/home/knx/group/dpt/DPTException.java @@ -1,4 +1,4 @@ -package de.ph87.home.knx; +package de.ph87.home.knx.group.dpt; import lombok.NonNull; diff --git a/src/main/java/de/ph87/home/knx/property/KnxPropertyService.java b/src/main/java/de/ph87/home/knx/property/KnxPropertyService.java index 6b404c7..8441929 100644 --- a/src/main/java/de/ph87/home/knx/property/KnxPropertyService.java +++ b/src/main/java/de/ph87/home/knx/property/KnxPropertyService.java @@ -96,6 +96,9 @@ public class KnxPropertyService { } case DOUBLE -> propertyService.update(this, knxProperty.getId(), Double.class, translator.getNumericValue(), translator.getValue()); }; + if (property.getState() == null) { + throw new RuntimeException(); + } group.setState(property.getState()); groupService.publish(group); } catch (KNXException | PropertyNotFound | PropertyTypeMismatch | PropertyNotOwned e) { diff --git a/src/main/java/de/ph87/home/property/State.java b/src/main/java/de/ph87/home/property/State.java index b5bb5c2..ce337b1 100644 --- a/src/main/java/de/ph87/home/property/State.java +++ b/src/main/java/de/ph87/home/property/State.java @@ -1,6 +1,7 @@ package de.ph87.home.property; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import de.ph87.home.common.json.ClassSimpleNameSerializer; import jakarta.annotation.Nullable; import lombok.Getter; import lombok.NonNull; @@ -14,7 +15,7 @@ import java.util.Objects; public class State { @NonNull - @JsonSerialize(using = ClassSerializer.class) + @JsonSerialize(using = ClassSimpleNameSerializer.class) private final Class type; @NonNull diff --git a/src/main/java/de/ph87/home/tvheadend/api/dto/DvrEntryGridUpcoming.java b/src/main/java/de/ph87/home/tvheadend/api/dto/DvrEntryGridUpcoming.java index 0c1b2f4..3999547 100644 --- a/src/main/java/de/ph87/home/tvheadend/api/dto/DvrEntryGridUpcoming.java +++ b/src/main/java/de/ph87/home/tvheadend/api/dto/DvrEntryGridUpcoming.java @@ -3,8 +3,8 @@ package de.ph87.home.tvheadend.api.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import de.ph87.home.common.EpochSecondsToZonedDateTime; -import de.ph87.home.common.SecondsToDuration; +import de.ph87.home.common.json.EpochSecondsToZonedDateTimeDeserializer; +import de.ph87.home.common.json.SecondsToDurationDeserializer; import lombok.Getter; import lombok.NonNull; import lombok.ToString; @@ -38,38 +38,38 @@ public class DvrEntryGridUpcoming { private boolean enabled; @JsonProperty - @JsonDeserialize(using = EpochSecondsToZonedDateTime.class) + @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class) private ZonedDateTime create; @JsonProperty private long watched; @JsonProperty - @JsonDeserialize(using = EpochSecondsToZonedDateTime.class) + @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class) private ZonedDateTime start; @JsonProperty - @JsonDeserialize(using = SecondsToDuration.class) + @JsonDeserialize(using = SecondsToDurationDeserializer.class) private Duration start_extra; @JsonProperty - @JsonDeserialize(using = EpochSecondsToZonedDateTime.class) + @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class) private ZonedDateTime start_real; @JsonProperty - @JsonDeserialize(using = EpochSecondsToZonedDateTime.class) + @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class) private ZonedDateTime stop; @JsonProperty - @JsonDeserialize(using = SecondsToDuration.class) + @JsonDeserialize(using = SecondsToDurationDeserializer.class) private Duration stop_extra; @JsonProperty - @JsonDeserialize(using = EpochSecondsToZonedDateTime.class) + @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class) private ZonedDateTime stop_real; @JsonProperty - @JsonDeserialize(using = SecondsToDuration.class) + @JsonDeserialize(using = SecondsToDurationDeserializer.class) private Duration duration; @JsonProperty @@ -207,7 +207,7 @@ public class DvrEntryGridUpcoming { private long duplicate; @JsonProperty - @JsonDeserialize(using = EpochSecondsToZonedDateTime.class) + @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class) private ZonedDateTime first_aired; @JsonProperty diff --git a/src/main/java/de/ph87/home/tvheadend/api/dto/StatusConnections.java b/src/main/java/de/ph87/home/tvheadend/api/dto/StatusConnections.java index 52888c0..9384f0f 100644 --- a/src/main/java/de/ph87/home/tvheadend/api/dto/StatusConnections.java +++ b/src/main/java/de/ph87/home/tvheadend/api/dto/StatusConnections.java @@ -2,7 +2,7 @@ package de.ph87.home.tvheadend.api.dto; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import de.ph87.home.common.EpochSecondsToZonedDateTime; +import de.ph87.home.common.json.EpochSecondsToZonedDateTimeDeserializer; import lombok.Getter; import lombok.ToString; @@ -39,7 +39,7 @@ public class StatusConnections { private int peer_port; @JsonProperty - @JsonDeserialize(using = EpochSecondsToZonedDateTime.class) + @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class) private ZonedDateTime started; @JsonProperty diff --git a/src/main/java/de/ph87/home/tvheadend/api/dto/StatusSubscriptions.java b/src/main/java/de/ph87/home/tvheadend/api/dto/StatusSubscriptions.java index bcd62eb..f2be3a1 100644 --- a/src/main/java/de/ph87/home/tvheadend/api/dto/StatusSubscriptions.java +++ b/src/main/java/de/ph87/home/tvheadend/api/dto/StatusSubscriptions.java @@ -2,7 +2,7 @@ package de.ph87.home.tvheadend.api.dto; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import de.ph87.home.common.EpochSecondsToZonedDateTime; +import de.ph87.home.common.json.EpochSecondsToZonedDateTimeDeserializer; import lombok.Getter; import lombok.ToString; @@ -27,7 +27,7 @@ public class StatusSubscriptions { private long id; @JsonProperty - @JsonDeserialize(using = EpochSecondsToZonedDateTime.class) + @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class) private ZonedDateTime start; @JsonProperty