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

spring-boot 4.0.0-RC1

Browse Source
This commit is contained in:
Patrick Haßel 2025-10-28 10:00:55 +01:00
parent 4a47c890f7
commit 37beb05ca7
11 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -18,7 +18,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.5</version> <version>4.0.0-RC1</version>
</parent> </parent>
<dependencies> <dependencies>

2
src/main/java/de/ph87/data/series/OneSeriesPointsResponse.java
View File

@ -1,6 +1,6 @@
package de.ph87.data.series; package de.ph87.data.series;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import tools.jackson.databind.annotation.JsonSerialize;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;

25
src/main/java/de/ph87/data/series/OneSeriesPointsResponseSerializer.java
View File

@ -1,22 +1,21 @@
package de.ph87.data.series; package de.ph87.data.series;
import com.fasterxml.jackson.core.JsonGenerator; import tools.jackson.core.JacksonException;
import com.fasterxml.jackson.databind.JsonSerializer; import tools.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider; import tools.jackson.databind.SerializationContext;
import tools.jackson.databind.ValueSerializer;
import java.io.IOException; public class OneSeriesPointsResponseSerializer extends ValueSerializer<OneSeriesPointsResponse> {
public class OneSeriesPointsResponseSerializer extends JsonSerializer<OneSeriesPointsResponse> {
@Override @Override
public void serialize(final OneSeriesPointsResponse result, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException { public void serialize(final OneSeriesPointsResponse value, final JsonGenerator gen, final SerializationContext ctxt) throws JacksonException {
jsonGenerator.writeStartArray(); gen.writeStartArray();
for (final SeriesPoint point : result.points) { for (final SeriesPoint<?> point : value.points) {
jsonGenerator.writeStartArray(); gen.writeStartArray();
point.toJson(jsonGenerator); point.toJson(gen);
jsonGenerator.writeEndArray(); gen.writeEndArray();
} }
jsonGenerator.writeEndArray(); gen.writeEndArray();
} }
} }

5
src/main/java/de/ph87/data/series/SeriesPoint.java
View File

@ -1,11 +1,10 @@
package de.ph87.data.series; package de.ph87.data.series;
import com.fasterxml.jackson.core.JsonGenerator;
import de.ph87.data.plot.axis.graph.GraphDivisionByZero; import de.ph87.data.plot.axis.graph.GraphDivisionByZero;
import de.ph87.data.plot.axis.graph.GraphOperation; import de.ph87.data.plot.axis.graph.GraphOperation;
import lombok.NonNull; import lombok.NonNull;
import tools.jackson.core.JsonGenerator;
import java.io.IOException;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -17,7 +16,7 @@ public interface SeriesPoint<T extends SeriesPoint<T>> {
double getValue(); double getValue();
void toJson(final JsonGenerator jsonGenerator) throws IOException; void toJson(final JsonGenerator jsonGenerator);
T times(final double factor); T times(final double factor);

5
src/main/java/de/ph87/data/series/data/bool/BoolPoint.java
View File

@ -1,13 +1,12 @@
package de.ph87.data.series.data.bool; package de.ph87.data.series.data.bool;
import com.fasterxml.jackson.core.JsonGenerator;
import de.ph87.data.plot.axis.graph.GraphDivisionByZero; import de.ph87.data.plot.axis.graph.GraphDivisionByZero;
import de.ph87.data.plot.axis.graph.GraphOperation; import de.ph87.data.plot.axis.graph.GraphOperation;
import de.ph87.data.series.SeriesPoint; import de.ph87.data.series.SeriesPoint;
import lombok.Data; import lombok.Data;
import lombok.NonNull; import lombok.NonNull;
import tools.jackson.core.JsonGenerator;
import java.io.IOException;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
@Data @Data
@ -36,7 +35,7 @@ public class BoolPoint implements SeriesPoint<BoolPoint> {
} }
@Override @Override
public void toJson(final JsonGenerator jsonGenerator) throws IOException { public void toJson(final JsonGenerator jsonGenerator) {
jsonGenerator.writeNumber(begin.toEpochSecond()); jsonGenerator.writeNumber(begin.toEpochSecond());
jsonGenerator.writeNumber(end.toEpochSecond()); jsonGenerator.writeNumber(end.toEpochSecond());
jsonGenerator.writeNumber(state ? 1 : 0); jsonGenerator.writeNumber(state ? 1 : 0);

13
src/main/java/de/ph87/data/series/data/delta/Delta.java
View File

@ -26,7 +26,6 @@ public abstract class Delta {
@Column(nullable = false) @Column(nullable = false)
private double first; private double first;
@NonNull
@Column(nullable = false) @Column(nullable = false)
private double last; private double last;
@ -46,7 +45,7 @@ public abstract class Delta {
@Entity(name = "DeltaFive") @Entity(name = "DeltaFive")
public static class Five extends Delta { public static class Five extends Delta {
public Five(@NonNull final DeltaId id, @NonNull final double value) { public Five(@NonNull final DeltaId id, final double value) {
super(id, value); super(id, value);
} }
@ -58,7 +57,7 @@ public abstract class Delta {
@Entity(name = "DeltaHour") @Entity(name = "DeltaHour")
public static class Hour extends Delta { public static class Hour extends Delta {
public Hour(@NonNull final DeltaId id, @NonNull final double value) { public Hour(@NonNull final DeltaId id, final double value) {
super(id, value); super(id, value);
} }
@ -70,7 +69,7 @@ public abstract class Delta {
@Entity(name = "DeltaDay") @Entity(name = "DeltaDay")
public static class Day extends Delta { public static class Day extends Delta {
public Day(@NonNull final DeltaId id, @NonNull final double value) { public Day(@NonNull final DeltaId id, final double value) {
super(id, value); super(id, value);
} }
@ -82,7 +81,7 @@ public abstract class Delta {
@Entity(name = "DeltaWeek") @Entity(name = "DeltaWeek")
public static class Week extends Delta { public static class Week extends Delta {
public Week(@NonNull final DeltaId id, @NonNull final double value) { public Week(@NonNull final DeltaId id, final double value) {
super(id, value); super(id, value);
} }
@ -94,7 +93,7 @@ public abstract class Delta {
@Entity(name = "DeltaMonth") @Entity(name = "DeltaMonth")
public static class Month extends Delta { public static class Month extends Delta {
public Month(@NonNull final DeltaId id, @NonNull final double value) { public Month(@NonNull final DeltaId id, final double value) {
super(id, value); super(id, value);
} }
@ -106,7 +105,7 @@ public abstract class Delta {
@Entity(name = "DeltaYear") @Entity(name = "DeltaYear")
public static class Year extends Delta { public static class Year extends Delta {
public Year(@NonNull final DeltaId id, @NonNull final double value) { public Year(@NonNull final DeltaId id, final double value) {
super(id, value); super(id, value);
} }

5
src/main/java/de/ph87/data/series/data/delta/DeltaPoint.java
View File

@ -1,13 +1,12 @@
package de.ph87.data.series.data.delta; package de.ph87.data.series.data.delta;
import com.fasterxml.jackson.core.JsonGenerator;
import de.ph87.data.plot.axis.graph.GraphDivisionByZero; import de.ph87.data.plot.axis.graph.GraphDivisionByZero;
import de.ph87.data.plot.axis.graph.GraphOperation; import de.ph87.data.plot.axis.graph.GraphOperation;
import de.ph87.data.series.SeriesPoint; import de.ph87.data.series.SeriesPoint;
import lombok.Data; import lombok.Data;
import lombok.NonNull; import lombok.NonNull;
import tools.jackson.core.JsonGenerator;
import java.io.IOException;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
@Data @Data
@ -24,7 +23,7 @@ public class DeltaPoint implements SeriesPoint<DeltaPoint> {
} }
@Override @Override
public void toJson(final JsonGenerator jsonGenerator) throws IOException { public void toJson(final JsonGenerator jsonGenerator) {
jsonGenerator.writeNumber(date.toEpochSecond()); jsonGenerator.writeNumber(date.toEpochSecond());
jsonGenerator.writeNumber(delta); jsonGenerator.writeNumber(delta);
} }

12
src/main/java/de/ph87/data/series/data/varying/Varying.java
View File

@ -57,7 +57,7 @@ public abstract class Varying {
@Entity(name = "VaryingFive") @Entity(name = "VaryingFive")
public static class Five extends Varying { public static class Five extends Varying {
public Five(@NonNull final DataId id, @NonNull final double value) { public Five(@NonNull final DataId id, final double value) {
super(id, value); super(id, value);
} }
@ -69,7 +69,7 @@ public abstract class Varying {
@Entity(name = "VaryingHour") @Entity(name = "VaryingHour")
public static class Hour extends Varying { public static class Hour extends Varying {
public Hour(@NonNull final DataId id, @NonNull final double value) { public Hour(@NonNull final DataId id, final double value) {
super(id, value); super(id, value);
} }
@ -81,7 +81,7 @@ public abstract class Varying {
@Entity(name = "VaryingDay") @Entity(name = "VaryingDay")
public static class Day extends Varying { public static class Day extends Varying {
public Day(@NonNull final DataId id, @NonNull final double value) { public Day(@NonNull final DataId id, final double value) {
super(id, value); super(id, value);
} }
@ -93,7 +93,7 @@ public abstract class Varying {
@Entity(name = "VaryingWeek") @Entity(name = "VaryingWeek")
public static class Week extends Varying { public static class Week extends Varying {
public Week(@NonNull final DataId id, @NonNull final double value) { public Week(@NonNull final DataId id, final double value) {
super(id, value); super(id, value);
} }
@ -105,7 +105,7 @@ public abstract class Varying {
@Entity(name = "VaryingMonth") @Entity(name = "VaryingMonth")
public static class Month extends Varying { public static class Month extends Varying {
public Month(@NonNull final DataId id, @NonNull final double value) { public Month(@NonNull final DataId id, final double value) {
super(id, value); super(id, value);
} }
@ -117,7 +117,7 @@ public abstract class Varying {
@Entity(name = "VaryingYear") @Entity(name = "VaryingYear")
public static class Year extends Varying { public static class Year extends Varying {
public Year(@NonNull final DataId id, @NonNull final double value) { public Year(@NonNull final DataId id, final double value) {
super(id, value); super(id, value);
} }

5
src/main/java/de/ph87/data/series/data/varying/VaryingPoint.java
View File

@ -1,13 +1,12 @@
package de.ph87.data.series.data.varying; package de.ph87.data.series.data.varying;
import com.fasterxml.jackson.core.JsonGenerator;
import de.ph87.data.plot.axis.graph.GraphDivisionByZero; import de.ph87.data.plot.axis.graph.GraphDivisionByZero;
import de.ph87.data.plot.axis.graph.GraphOperation; import de.ph87.data.plot.axis.graph.GraphOperation;
import de.ph87.data.series.SeriesPoint; import de.ph87.data.series.SeriesPoint;
import lombok.Data; import lombok.Data;
import lombok.NonNull; import lombok.NonNull;
import tools.jackson.core.JsonGenerator;
import java.io.IOException;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
@Data @Data
@ -36,7 +35,7 @@ public class VaryingPoint implements SeriesPoint<VaryingPoint> {
} }
@Override @Override
public void toJson(final JsonGenerator jsonGenerator) throws IOException { public void toJson(final JsonGenerator jsonGenerator) {
jsonGenerator.writeNumber(date.toEpochSecond()); jsonGenerator.writeNumber(date.toEpochSecond());
jsonGenerator.writeNumber(min); jsonGenerator.writeNumber(min);
jsonGenerator.writeNumber(max); jsonGenerator.writeNumber(max);

4
src/main/java/de/ph87/data/weather/WeatherHour.java
View File

@ -13,16 +13,12 @@ public class WeatherHour {
@NonNull @NonNull
public final ZonedDateTime date; public final ZonedDateTime date;
@NonNull
public final double clouds; public final double clouds;
@NonNull
public final double irradiation; public final double irradiation;
@NonNull
public final double precipitation; public final double precipitation;
@NonNull
public final double temperature; public final double temperature;
public WeatherHour(@NonNull final BrightSkyDto.Hour dto) { public WeatherHour(@NonNull final BrightSkyDto.Hour dto) {

2
src/main/java/de/ph87/data/weather/WeatherService.java
View File

@ -1,6 +1,6 @@
package de.ph87.data.weather; package de.ph87.data.weather;
import com.fasterxml.jackson.databind.ObjectMapper; import tools.jackson.databind.ObjectMapper;
import lombok.NonNull; import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;