code clean, package cleanup

This commit is contained in:
Patrick Haßel 2024-11-21 15:22:04 +01:00
parent 8e3e763e59
commit 551efdbcff
19 changed files with 38 additions and 34 deletions

View File

@ -1,4 +1,4 @@
package de.ph87.home.common; package de.ph87.home.common.crud;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.annotation.Nullable; import jakarta.annotation.Nullable;

View File

@ -1,4 +1,4 @@
package de.ph87.home.common; package de.ph87.home.common.crud;
import lombok.NonNull; import lombok.NonNull;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;

View File

@ -1,4 +1,4 @@
package de.ph87.home.common; package de.ph87.home.common.crud;
import jakarta.annotation.Nullable; import jakarta.annotation.Nullable;
import lombok.NonNull; import lombok.NonNull;

View File

@ -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.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.JsonSerializer;
@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException; import java.io.IOException;
public class ClassSerializer extends JsonSerializer<Class<?>> { public class ClassSimpleNameSerializer extends JsonSerializer<Class<?>> {
@Override @Override
public void serialize(final Class<?> aClass, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException { public void serialize(final Class<?> aClass, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {

View File

@ -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.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
@ -9,7 +9,7 @@ import java.time.Instant;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
public class EpochSecondsToZonedDateTime extends JsonDeserializer<ZonedDateTime> { public class EpochSecondsToZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {
@Override @Override
public ZonedDateTime deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException { public ZonedDateTime deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {

View File

@ -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.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationContext;
@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException; import java.io.IOException;
import java.time.Duration; import java.time.Duration;
public class SecondsToDuration extends JsonDeserializer<Duration> { public class SecondsToDurationDeserializer extends JsonDeserializer<Duration> {
@Override @Override
public Duration deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException { public Duration deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {

View File

@ -1,7 +1,7 @@
package de.ph87.home.device; package de.ph87.home.device;
import com.fasterxml.jackson.annotation.JsonProperty; 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 de.ph87.home.property.PropertyTypeMismatch;
import jakarta.annotation.Nullable; import jakarta.annotation.Nullable;
import lombok.Getter; import lombok.Getter;

View File

@ -1,6 +1,6 @@
package de.ph87.home.device; package de.ph87.home.device;
import de.ph87.home.common.EntityNotFound; import de.ph87.home.common.crud.EntityNotFound;
import de.ph87.home.property.*; import de.ph87.home.property.*;
import jakarta.annotation.Nullable; import jakarta.annotation.Nullable;
import lombok.NonNull; import lombok.NonNull;

View File

@ -1,6 +1,6 @@
package de.ph87.home.knx.group; 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 de.ph87.home.property.State;
import jakarta.annotation.Nullable; import jakarta.annotation.Nullable;
import lombok.Getter; import lombok.Getter;

View File

@ -1,6 +1,6 @@
package de.ph87.home.knx.group; package de.ph87.home.knx.group;
import de.ph87.home.common.AbstractSearchFilter; import de.ph87.home.common.crud.AbstractSearchFilter;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull; import lombok.NonNull;
import lombok.ToString; import lombok.ToString;

View File

@ -1,7 +1,7 @@
package de.ph87.home.knx.group; package de.ph87.home.knx.group;
import de.ph87.home.knx.DPT; import de.ph87.home.knx.group.dpt.DPT;
import de.ph87.home.knx.DPTException; import de.ph87.home.knx.group.dpt.DPTException;
import jakarta.annotation.Nullable; import jakarta.annotation.Nullable;
import lombok.NonNull; import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@ -1,6 +1,6 @@
package de.ph87.home.knx.group; package de.ph87.home.knx.group;
import de.ph87.home.common.EntityNotFound; import de.ph87.home.common.crud.EntityNotFound;
import jakarta.annotation.Nullable; import jakarta.annotation.Nullable;
import lombok.NonNull; import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@ -1,4 +1,4 @@
package de.ph87.home.knx; package de.ph87.home.knx.group.dpt;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull; import lombok.NonNull;

View File

@ -1,4 +1,4 @@
package de.ph87.home.knx; package de.ph87.home.knx.group.dpt;
import lombok.NonNull; import lombok.NonNull;

View File

@ -96,6 +96,9 @@ public class KnxPropertyService {
} }
case DOUBLE -> propertyService.update(this, knxProperty.getId(), Double.class, translator.getNumericValue(), translator.getValue()); case DOUBLE -> propertyService.update(this, knxProperty.getId(), Double.class, translator.getNumericValue(), translator.getValue());
}; };
if (property.getState() == null) {
throw new RuntimeException();
}
group.setState(property.getState()); group.setState(property.getState());
groupService.publish(group); groupService.publish(group);
} catch (KNXException | PropertyNotFound | PropertyTypeMismatch | PropertyNotOwned e) { } catch (KNXException | PropertyNotFound | PropertyTypeMismatch | PropertyNotOwned e) {

View File

@ -1,6 +1,7 @@
package de.ph87.home.property; package de.ph87.home.property;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import de.ph87.home.common.json.ClassSimpleNameSerializer;
import jakarta.annotation.Nullable; import jakarta.annotation.Nullable;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull; import lombok.NonNull;
@ -14,7 +15,7 @@ import java.util.Objects;
public class State<T> { public class State<T> {
@NonNull @NonNull
@JsonSerialize(using = ClassSerializer.class) @JsonSerialize(using = ClassSimpleNameSerializer.class)
private final Class<T> type; private final Class<T> type;
@NonNull @NonNull

View File

@ -3,8 +3,8 @@ package de.ph87.home.tvheadend.api.dto;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import de.ph87.home.common.EpochSecondsToZonedDateTime; import de.ph87.home.common.json.EpochSecondsToZonedDateTimeDeserializer;
import de.ph87.home.common.SecondsToDuration; import de.ph87.home.common.json.SecondsToDurationDeserializer;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull; import lombok.NonNull;
import lombok.ToString; import lombok.ToString;
@ -38,38 +38,38 @@ public class DvrEntryGridUpcoming {
private boolean enabled; private boolean enabled;
@JsonProperty @JsonProperty
@JsonDeserialize(using = EpochSecondsToZonedDateTime.class) @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class)
private ZonedDateTime create; private ZonedDateTime create;
@JsonProperty @JsonProperty
private long watched; private long watched;
@JsonProperty @JsonProperty
@JsonDeserialize(using = EpochSecondsToZonedDateTime.class) @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class)
private ZonedDateTime start; private ZonedDateTime start;
@JsonProperty @JsonProperty
@JsonDeserialize(using = SecondsToDuration.class) @JsonDeserialize(using = SecondsToDurationDeserializer.class)
private Duration start_extra; private Duration start_extra;
@JsonProperty @JsonProperty
@JsonDeserialize(using = EpochSecondsToZonedDateTime.class) @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class)
private ZonedDateTime start_real; private ZonedDateTime start_real;
@JsonProperty @JsonProperty
@JsonDeserialize(using = EpochSecondsToZonedDateTime.class) @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class)
private ZonedDateTime stop; private ZonedDateTime stop;
@JsonProperty @JsonProperty
@JsonDeserialize(using = SecondsToDuration.class) @JsonDeserialize(using = SecondsToDurationDeserializer.class)
private Duration stop_extra; private Duration stop_extra;
@JsonProperty @JsonProperty
@JsonDeserialize(using = EpochSecondsToZonedDateTime.class) @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class)
private ZonedDateTime stop_real; private ZonedDateTime stop_real;
@JsonProperty @JsonProperty
@JsonDeserialize(using = SecondsToDuration.class) @JsonDeserialize(using = SecondsToDurationDeserializer.class)
private Duration duration; private Duration duration;
@JsonProperty @JsonProperty
@ -207,7 +207,7 @@ public class DvrEntryGridUpcoming {
private long duplicate; private long duplicate;
@JsonProperty @JsonProperty
@JsonDeserialize(using = EpochSecondsToZonedDateTime.class) @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class)
private ZonedDateTime first_aired; private ZonedDateTime first_aired;
@JsonProperty @JsonProperty

View File

@ -2,7 +2,7 @@ package de.ph87.home.tvheadend.api.dto;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; 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.Getter;
import lombok.ToString; import lombok.ToString;
@ -39,7 +39,7 @@ public class StatusConnections {
private int peer_port; private int peer_port;
@JsonProperty @JsonProperty
@JsonDeserialize(using = EpochSecondsToZonedDateTime.class) @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class)
private ZonedDateTime started; private ZonedDateTime started;
@JsonProperty @JsonProperty

View File

@ -2,7 +2,7 @@ package de.ph87.home.tvheadend.api.dto;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; 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.Getter;
import lombok.ToString; import lombok.ToString;
@ -27,7 +27,7 @@ public class StatusSubscriptions {
private long id; private long id;
@JsonProperty @JsonProperty
@JsonDeserialize(using = EpochSecondsToZonedDateTime.class) @JsonDeserialize(using = EpochSecondsToZonedDateTimeDeserializer.class)
private ZonedDateTime start; private ZonedDateTime start;
@JsonProperty @JsonProperty