Summary

Phase 16d completes the separation of concerns between MapStruct mapping (XSD fields only) and Atom protocol handling (IdentifiedObject metadata). This refactor removes all IdentifiedObject field mappings from MapStruct mappers and fixes related DTOs and tests.

Mapper Changes (17 mappers)

• ✅ Removed all IdentifiedObject field mappings (id, uuid, description, published, updated, selfLink, upLink, relatedLinks)
• ✅ Removed updateEntity() methods from all mappers
• ✅ Added @Mapping(target = "id", ignore = true) to prevent UUID→Long type conflicts
• ✅ Mappers now exclusively handle XSD-defined fields

Updated Mappers:

• UsagePointMapper, MeterReadingMapper, ReadingTypeMapper, IntervalBlockMapper
• TimeConfigurationMapper, UsageSummaryMapper, ElectricPowerQualitySummaryMapper
• AuthorizationMapper, ApplicationInformationMapper, ReadingQualityMapper
• IntervalReadingMapper, CustomerAccountMapper, CustomerAgreementMapper, CustomerMapper

DTO Fixes

UsageSummaryDto

• Removed Atom metadata fields (published, updated, selfLink, upLink, relatedLinks, description)
• Now has only: id (Long), uuid (String), + 24 XSD fields
• Updated @XmlType propOrder to remove description
• Fixed convenience constructors (26 parameters)

ElectricPowerQualitySummaryDto

• Removed description field
• Now has only: id (Long), uuid (String), + 14 XSD fields, usagePointId (Long)
• Updated @XmlType propOrder
• Fixed convenience constructors (17 parameters)

Test Enhancements

DtoExportServiceImplTest

• ✅ Fixed reflection setup (removed obsolete dateTimeMapper)
• ✅ Added TimeConfiguration, UsageSummary, and ElectricPowerQualitySummary entries to comprehensive export test
• ✅ Populated all DTOs with meaningful test data instead of nulls:
  • UsageSummary: billing data ($1500-$1750), consumption measurements (425-450 kWh), tariff info, line items
  • ElectricPowerQualitySummary: flicker (0.85/0.72), voltage (120V), frequency (60Hz), interruption metrics
  • TimeConfiguration: EST timezone (-5h), DST offset (+1h)
• ✅ Added 30+ assertions validating XML serialization of all populated fields

Test Results

• 580 tests: 571 pass ✅
• DtoExportServiceImplTest: 6/6 pass with comprehensive field validation ✅
• 9 pre-existing Jackson3XmlMarshallingTest failures (AtomContent deserialization - unrelated to our changes)

Files Changed

• 23 files changed, 550 insertions(+), 607 deletions(-)
• Mappers: 14 files
• DTOs: 3 files
• Tests: 6 files

Impact

This change completes the architectural separation:

• MapStruct mappers: Handle only XSD-defined fields (business data)
• Atom protocol layer: Handle all IdentifiedObject metadata (id, uuid, description, timestamps, links)

The separation prevents type conflicts (UUID vs Long for id), reduces mapper complexity, and properly delegates metadata handling to the AtomFeedDto/AtomEntryDto layer.

🤖 Generated with Claude Code