Skip to content

Fix: correct JSON parsing in AdminEReportingHeaderController to handle ArrayNode properly #1596

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

Open
Manas-Dikshit wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix: correct JSON parsing in AdminEReportingHeaderController to handle ArrayNode properly #1596

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
55 changes: 41 additions & 14 deletions ...ions/aqd-v10/src/main/java/org/n52/sos/aqd/web/admin/AdminEReportingHeaderController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,13 @@
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

/**
* TODO JavaDoc
* Controller for AQD e-Reporting administration.
*
* @author Christian Autermann
* Handles retrieval and saving of reporting obligations and authorities.
*
* @author
* Christian Autermann (original)
* Updated by ChatGPT – 2026 fix for JSON handling
*/
@Controller
@RequestMapping(value = "/admin/ereporting")
Expand All @@ -76,9 +80,7 @@ public class AdminEReportingHeaderController extends AbstractController {
private static final Logger LOG = LoggerFactory.getLogger(AdminEReportingHeaderController.class);

private EReportObligationRepository reportObligationRepository;

private EncoderRepository encoderRepository;

private DecoderRepository decoderRepository;

@Inject
Expand All @@ -105,44 +107,69 @@ public String get() {
@RequestMapping(method = RequestMethod.GET, produces = "application/json")
public String getJSON() throws OwsExceptionReport, EncodingException {
ObjectNode node = Json.nodeFactory().objectNode();

Encoder<JsonNode, ReportObligation> reportObligationEncoder =
encoderRepository.getEncoder(new JSONEncoderKey(ReportObligation.class));
Encoder<JsonNode, RelatedParty> relatedPartyEncoder =
encoderRepository.getEncoder(new JSONEncoderKey(RelatedParty.class));

node.set(AQDJSONConstants.REPORTING_AUTHORITY,
relatedPartyEncoder.encode(reportObligationRepository.getReportingAuthority()));

ArrayNode ros = node.putArray(AQDJSONConstants.REPORT_OBLIGATIONS);
for (ReportObligationType reportObligationType : ReportObligationType.values()) {
ReportObligation reportObligation = reportObligationRepository.getReportObligation(reportObligationType);
ros.addObject().put(AQDJSONConstants.ID, reportObligationType.name())
ReportObligation reportObligation =
reportObligationRepository.getReportObligation(reportObligationType);
ros.addObject()
.put(AQDJSONConstants.ID, reportObligationType.name())
.put(AQDJSONConstants.NAME, reportObligationType.getTitle())
.put(AQDJSONConstants.DESCRIPTION, reportObligationType.getDescription())
.set(AQDJSONConstants.VALUE, reportObligationEncoder.encode(reportObligation));
}

return Json.print(node);
}

@RequestMapping(method = RequestMethod.POST, consumes = "application/json")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void save(@RequestBody String json) throws OwsExceptionReport, DecodingException {
LOG.info("Saving {}", json);

Decoder<ReportObligation, JsonNode> reportObligationDecoder =
decoderRepository.getDecoder(new JsonDecoderKey(ReportObligation.class));
Decoder<RelatedParty, JsonNode> relatedPartyDecoder =
decoderRepository.getDecoder(new JsonDecoderKey(RelatedParty.class));

JsonNode node = Json.loadString(json);

RelatedParty relatedParty = relatedPartyDecoder.decode(node.path(AQDJSONConstants.REPORTING_AUTHORITY));
// Decode and save reporting authority
RelatedParty relatedParty =
relatedPartyDecoder.decode(node.path(AQDJSONConstants.REPORTING_AUTHORITY));
reportObligationRepository.saveReportingAuthority(relatedParty);

JsonNode obligations = node.path(AQDJSONConstants.REPORT_OBLIGATIONS);
Iterator<String> it = obligations.fieldNames();
while (it.hasNext()) {
String id = it.next();
ReportObligation reportObligation = reportObligationDecoder.decode(obligations.path(id));
reportObligationRepository.saveReportObligation(ReportObligationType.valueOf(id), reportObligation);
// Decode and save report obligations (fixed: correct array handling)
JsonNode obligationsNode = node.path(AQDJSONConstants.REPORT_OBLIGATIONS);
if (obligationsNode.isArray()) {
for (JsonNode obligationNode : obligationsNode) {
String id = obligationNode.path(AQDJSONConstants.ID).asText(null);
if (id == null) {
LOG.warn("Skipping obligation without ID: {}", obligationNode);
continue;
}

ReportObligation reportObligation =
reportObligationDecoder.decode(obligationNode.path(AQDJSONConstants.VALUE));

try {
ReportObligationType type = ReportObligationType.valueOf(id);
reportObligationRepository.saveReportObligation(type, reportObligation);
} catch (IllegalArgumentException e) {
LOG.warn("Unknown ReportObligationType '{}'", id, e);
}
}
} else {
LOG.warn("Expected an array for '{}', but got: {}", AQDJSONConstants.REPORT_OBLIGATIONS,
obligationsNode.getNodeType());
}
}

}