Skip to content

java/iot3mobility: fix DENM v2+ management container field name #556

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
mathieu1fb merged 1 commit into from
Jul 8, 2026
Merged

java/iot3mobility: fix DENM v2+ management container field name #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...obility/src/main/java/com/orange/iot3mobility/messages/denm/v220/codec/DenmReader220.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...obility/src/main/java/com/orange/iot3mobility/messages/denm/v220/codec/DenmWriter220.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion ...bility/src/main/java/com/orange/iot3mobility/messages/denm/v220/model/DenmMessage220.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/orange/iot3mobility/messages/denm/v220/validation/DenmValidator220.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...obility/src/main/java/com/orange/iot3mobility/messages/denm/v230/codec/DenmReader230.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...obility/src/main/java/com/orange/iot3mobility/messages/denm/v230/codec/DenmWriter230.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion ...bility/src/main/java/com/orange/iot3mobility/messages/denm/v230/model/DenmMessage230.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/orange/iot3mobility/messages/denm/v230/validation/DenmValidator230.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading