patrick/Home4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code clean, package cleanup

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/ph87/home/common/AbstractSearchFilter.java → src/main/java/de/ph87/home/common/crud/AbstractSearchFilter.java
View File

@ -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;

2
src/main/java/de/ph87/home/common/EntityNotFound.java → src/main/java/de/ph87/home/common/crud/EntityNotFound.java
View File

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

2
src/main/java/de/ph87/home/common/ISearch.java → src/main/java/de/ph87/home/common/crud/ISearch.java
View File

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

4
src/main/java/de/ph87/home/property/ClassSerializer.java → src/main/java/de/ph87/home/common/json/ClassSimpleNameSerializer.java
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.databind.JsonSerializer;
@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
public class ClassSerializer extends JsonSerializer<Class<?>> {
public class ClassSimpleNameSerializer extends JsonSerializer<Class<?>> {
@Override
public void serialize(final Class<?> aClass, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {

4
src/main/java/de/ph87/home/common/EpochSecondsToZonedDateTime.java → src/main/java/de/ph87/home/common/json/EpochSecondsToZonedDateTimeDeserializer.java
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.databind.DeserializationContext;
@ -9,7 +9,7 @@ import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;
public class EpochSecondsToZonedDateTime extends JsonDeserializer<ZonedDateTime> {
public class EpochSecondsToZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {
@Override
public ZonedDateTime deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {

4
src/main/java/de/ph87/home/common/SecondsToDuration.java → src/main/java/de/ph87/home/common/json/SecondsToDurationDeserializer.java
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.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<Duration> {
public class SecondsToDurationDeserializer extends JsonDeserializer<Duration> {
@Override
public Duration deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {

2
src/main/java/de/ph87/home/device/DeviceFilter.java
View File

@ -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;

2
src/main/java/de/ph87/home/device/DeviceService.java
View File

@ -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;

2
src/main/java/de/ph87/home/knx/group/Group.java
View File

@ -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;

2
src/main/java/de/ph87/home/knx/group/GroupFilter.java
View File

@ -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;

4
src/main/java/de/ph87/home/knx/group/GroupRepository.java
View File

@ -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;

2
src/main/java/de/ph87/home/knx/group/GroupService.java
View File

@ -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;

2
src/main/java/de/ph87/home/knx/DPT.java → src/main/java/de/ph87/home/knx/group/dpt/DPT.java
View File

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

2
src/main/java/de/ph87/home/knx/DPTException.java → src/main/java/de/ph87/home/knx/group/dpt/DPTException.java
View File

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

3
src/main/java/de/ph87/home/knx/property/KnxPropertyService.java
View File

@ -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) {

3
src/main/java/de/ph87/home/property/State.java
View File

@ -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<T> {
@NonNull
@JsonSerialize(using = ClassSerializer.class)
@JsonSerialize(using = ClassSimpleNameSerializer.class)
private final Class<T> type;
@NonNull

22
src/main/java/de/ph87/home/tvheadend/api/dto/DvrEntryGridUpcoming.java
View File

@ -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

4
src/main/java/de/ph87/home/tvheadend/api/dto/StatusConnections.java
View File

@ -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

4
src/main/java/de/ph87/home/tvheadend/api/dto/StatusSubscriptions.java
View File

@ -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