From d4ca3a12a521f4f32353421c34a5d12f71fe946b Mon Sep 17 00:00:00 2001 From: Mathieu LEFEBVRE Date: Mon, 6 Jul 2026 10:10:20 +0200 Subject: [PATCH] java/iot3mobility: fix DENM v2.2.0 and v2.3.0 management container field naming "management_container" has been replaced by "management" to align with JSON schemas. It had mistakenly been kept in this long form from the v1+ version. Signed-off-by: Mathieu LEFEBVRE --- .../iot3mobility/messages/denm/v220/codec/DenmReader220.java | 4 ++-- .../iot3mobility/messages/denm/v220/codec/DenmWriter220.java | 2 +- .../iot3mobility/messages/denm/v220/model/DenmMessage220.java | 2 +- .../messages/denm/v220/validation/DenmValidator220.java | 2 +- .../iot3mobility/messages/denm/v230/codec/DenmReader230.java | 4 ++-- .../iot3mobility/messages/denm/v230/codec/DenmWriter230.java | 2 +- .../iot3mobility/messages/denm/v230/model/DenmMessage230.java | 2 +- .../messages/denm/v230/validation/DenmValidator230.java | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/codec/DenmReader220.java b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/codec/DenmReader220.java index 16d48748..7e6e4daa 100644 --- a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/codec/DenmReader220.java +++ b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/codec/DenmReader220.java @@ -151,7 +151,7 @@ private DenmMessage220 readMessage(JsonParser parser) throws IOException { switch (field) { case "protocol_version" -> protocolVersion = parser.getIntValue(); case "station_id" -> stationId = parser.getLongValue(); - case "management_container" -> management = readManagement(parser); + case "management" -> management = readManagement(parser); case "situation_container" -> situation = readSituation(parser); case "location_container" -> location = readLocation(parser); case "alacarte_container" -> alacarte = readAlacarte(parser); @@ -162,7 +162,7 @@ private DenmMessage220 readMessage(JsonParser parser) throws IOException { return new DenmMessage220( requireField(protocolVersion, "protocol_version"), requireField(stationId, "station_id"), - requireField(management, "management_container"), + requireField(management, "management"), situation, location, alacarte); diff --git a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/codec/DenmWriter220.java b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/codec/DenmWriter220.java index d58b270c..b36445a6 100644 --- a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/codec/DenmWriter220.java +++ b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/codec/DenmWriter220.java @@ -64,7 +64,7 @@ private void writeMessage(JsonGenerator gen, DenmMessage220 message) throws IOEx gen.writeStartObject(); gen.writeNumberField("protocol_version", message.protocolVersion()); gen.writeNumberField("station_id", message.stationId()); - gen.writeFieldName("management_container"); + gen.writeFieldName("management"); writeManagement(gen, message.managementContainer()); if (message.situationContainer() != null) { gen.writeFieldName("situation_container"); diff --git a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/model/DenmMessage220.java b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/model/DenmMessage220.java index cbbde399..d241e9c7 100644 --- a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/model/DenmMessage220.java +++ b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/model/DenmMessage220.java @@ -76,7 +76,7 @@ public DenmMessage220 build() { return new DenmMessage220( requireNonNull(protocolVersion, "protocol_version"), requireNonNull(stationId, "station_id"), - requireNonNull(managementContainer, "management_container"), + requireNonNull(managementContainer, "management"), situationContainer, locationContainer, alacarteContainer); diff --git a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/validation/DenmValidator220.java b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/validation/DenmValidator220.java index 8b5ed607..f30392b5 100644 --- a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/validation/DenmValidator220.java +++ b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v220/validation/DenmValidator220.java @@ -63,7 +63,7 @@ public static void validateMessage(DenmMessage220 msg) { } private static void validateManagement(ManagementContainer container) { - requireNonNull("management_container", container); + requireNonNull("management", container); validateActionId(container.actionId()); checkRange("detection_time", container.detectionTime(), 0L, 4398046511103L); checkRange("reference_time", container.referenceTime(), 0L, 4398046511103L); diff --git a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/codec/DenmReader230.java b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/codec/DenmReader230.java index 9cb818b9..9570ac0b 100644 --- a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/codec/DenmReader230.java +++ b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/codec/DenmReader230.java @@ -156,7 +156,7 @@ private DenmMessage230 readMessage(JsonParser parser) throws IOException { switch (field) { case "protocol_version" -> protocolVersion = parser.getIntValue(); case "station_id" -> stationId = parser.getLongValue(); - case "management_container" -> management = readManagement(parser); + case "management" -> management = readManagement(parser); case "situation_container" -> situation = readSituation(parser); case "location_container" -> location = readLocation(parser); case "alacarte_container" -> alacarte = readAlacarte(parser); @@ -167,7 +167,7 @@ private DenmMessage230 readMessage(JsonParser parser) throws IOException { return new DenmMessage230( requireField(protocolVersion, "protocol_version"), requireField(stationId, "station_id"), - requireField(management, "management_container"), + requireField(management, "management"), situation, location, alacarte); diff --git a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/codec/DenmWriter230.java b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/codec/DenmWriter230.java index eb7c5b43..0ad8607b 100644 --- a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/codec/DenmWriter230.java +++ b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/codec/DenmWriter230.java @@ -69,7 +69,7 @@ private void writeMessage(JsonGenerator gen, DenmMessage230 message) throws IOEx gen.writeStartObject(); gen.writeNumberField("protocol_version", message.protocolVersion()); gen.writeNumberField("station_id", message.stationId()); - gen.writeFieldName("management_container"); + gen.writeFieldName("management"); writeManagement(gen, message.managementContainer()); if (message.situationContainer() != null) { gen.writeFieldName("situation_container"); diff --git a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/model/DenmMessage230.java b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/model/DenmMessage230.java index 886a28d7..77fa96cf 100644 --- a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/model/DenmMessage230.java +++ b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/model/DenmMessage230.java @@ -76,7 +76,7 @@ public DenmMessage230 build() { return new DenmMessage230( requireNonNull(protocolVersion, "protocol_version"), requireNonNull(stationId, "station_id"), - requireNonNull(managementContainer, "management_container"), + requireNonNull(managementContainer, "management"), situationContainer, locationContainer, alacarteContainer); diff --git a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/validation/DenmValidator230.java b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/validation/DenmValidator230.java index e3b0e99e..bf8e2938 100644 --- a/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/validation/DenmValidator230.java +++ b/java/iot3/mobility/src/main/java/com/orange/iot3mobility/messages/denm/v230/validation/DenmValidator230.java @@ -68,7 +68,7 @@ public static void validateMessage(DenmMessage230 msg) { } private static void validateManagement(ManagementContainer container) { - requireNonNull("management_container", container); + requireNonNull("management", container); validateActionId(container.actionId()); checkRange("detection_time", container.detectionTime(), 0L, 4398046511103L); checkRange("reference_time", container.referenceTime(), 0L, 4398046511103L);