From 79d4379f09cfc7f92096e4b80adf9f29ea3c5568 Mon Sep 17 00:00:00 2001
From: "Short, Aidan" <aidan.short@gevernova.com>
Date: Tue, 1 Sep 2026 10:43:59 -0700
Subject: [PATCH] Add "name" field to MonitoringSet

---
 .../model/monitoringsets/MonitoringSet.java   | 23 ++++++++++---------
 .../energy/trolie/client/TrolieClientIT.java  |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/java-client/src/main/java/energy/trolie/client/model/monitoringsets/MonitoringSet.java b/java-client/src/main/java/energy/trolie/client/model/monitoringsets/MonitoringSet.java
index 392198f..06a333d 100644
--- a/java-client/src/main/java/energy/trolie/client/model/monitoringsets/MonitoringSet.java
+++ b/java-client/src/main/java/energy/trolie/client/model/monitoringsets/MonitoringSet.java
@@ -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
@@ -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;
 }
diff --git a/java-client/src/test/java/energy/trolie/client/TrolieClientIT.java b/java-client/src/test/java/energy/trolie/client/TrolieClientIT.java
index 8dbefa2..edf0a83 100644
--- a/java-client/src/test/java/energy/trolie/client/TrolieClientIT.java
+++ b/java-client/src/test/java/energy/trolie/client/TrolieClientIT.java
@@ -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);