Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@

package energy.trolie.client.model.monitoringsets;

import java.util.List;

import com.fasterxml.jackson.annotation.JsonProperty;
import energy.trolie.client.model.common.DataProvenance;
import energy.trolie.client.model.common.PowerSystemResource;

import com.fasterxml.jackson.annotation.JsonProperty;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
import lombok.NoArgsConstructor;
import lombok.ToString;

import java.util.List;

/**
* Monitoring set definition and its contents. See
Expand All @@ -41,15 +39,18 @@
@ToString
public class MonitoringSet {

@JsonProperty("source")
private DataProvenance source;

@JsonProperty("id")
private String id;
@JsonProperty("name")
private String name;

@JsonProperty("description")
private String description;

@JsonProperty("power-system-resources")
private List<PowerSystemResource> powerSystemResources;

@JsonProperty("source")
private DataProvenance source;

@JsonProperty("id")
private String id;
}
Original file line number Diff line number Diff line change
Expand Up @@ -1902,7 +1902,7 @@ void testSppApiTokenHeaderProvider_generatesCorrectHeader() throws NoSuchAlgorit
private void writeMonitoringSet(JsonGenerator json, String id) throws IOException {
var source = DataProvenance.builder().provider(id).lastUpdated(
Instant.now()).originId(id).build();
MonitoringSet monitoringSet = new MonitoringSet(source, id, "This is test SDK", List.of());
MonitoringSet monitoringSet = new MonitoringSet("monitoringSetName", "This is test SDK", List.of(), source, id);
json.writeStartObject();
try {
json.writeFieldName(TAG_SOURCE);
Expand Down
Loading