Skip to content

fix: JSON de/serialization issues #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 17, 2024
Merged

fix: JSON de/serialization issues #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45fe69d
fix: add missing property names on creator methods
metacosm Dec 17, 2024
a7472f3
fix: serialize unit as symbol
metacosm Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions metadata/src/main/java/net/laprun/sustainability/power/SensorMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ public SensorMetadata(List<ComponentMetadata> components, String documentation)
}

@JsonCreator
SensorMetadata(Map<String, ComponentMetadata> components, String documentation) {
SensorMetadata(@JsonProperty("metadata") Map<String, ComponentMetadata> components,
@JsonProperty("documentation") String documentation) {
this.components = components;
this.documentation = documentation;
}
Expand Down Expand Up @@ -228,8 +229,16 @@ public record ComponentMetadata(String name, int index, String description, bool
}
}

public ComponentMetadata(String name, int index, String description, boolean isAttributed, String unitSymbol) {
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
public ComponentMetadata(@JsonProperty("name") String name, @JsonProperty("index") int index,
@JsonProperty("description") String description,
@JsonProperty("isAttributed") boolean isAttributed, @JsonProperty("unit") String unitSymbol) {
this(name, index, description, isAttributed, SensorUnit.of(unitSymbol));
}

@JsonProperty("unit")
public String unitAsSymbol() {
return unit.symbol();
}
}
}
12 changes: 6 additions & 6 deletions metadata/src/main/java/net/laprun/sustainability/power/SensorUnit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,13 @@ public SensorUnit(String symbol, SensorUnit base, double factor) {
this.factor = factor < 0 ? 1 : factor;
}

@JsonCreator
@JsonCreator(mode = JsonCreator.Mode.DELEGATING)
public static SensorUnit of(String symbol) {
symbol = Objects.requireNonNull(symbol, "Unit symbol cannot be null").trim();
if (symbol.isBlank()) {
throw new IllegalArgumentException("Unit symbol cannot be blank");
}

var unit = baseUnits.get(symbol);
if (unit != null) {
return unit;
Expand All @@ -45,11 +50,6 @@ public static SensorUnit of(String symbol) {
return unit;
}

symbol = Objects.requireNonNull(symbol, "Unit symbol cannot be null").trim();
if (symbol.isBlank()) {
throw new IllegalArgumentException("Unit symbol cannot be blank");
}

if (symbol.length() == 1) {
// assume base unit
return baseUnitFor(symbol);
Expand Down
Loading