Merge pull request #67 from IZIVIA/fix/IDEV-3942-fix-phase-enum-parsing

fix: IDEV-3942 fix phase enum mapping missing in ocpp 1.6 soap
IZIVIA · Mar 28, 2024 · ed85bf4 · ed85bf4
2 parents ba3e898 + 2bddc9d
commit ed85bf4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ocpp-1-6-soap/src/main/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapMapper.kt b/ocpp-1-6-soap/src/main/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapMapper.kt
@@ -97,13 +97,15 @@ internal object Ocpp16SoapMapperIn : ObjectMapper(
     OcppSoapMapper()
         .addMixIn(ReadingContext::class.java, EnumMixin::class.java)
         .addMixIn(Measurand::class.java, EnumMixin::class.java)
+        .addMixIn(Phase::class.java, EnumMixin::class.java)
 )
 
 internal object Ocpp16SoapMapper : ObjectMapper(
     OcppSoapMapper()
         .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
         .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
         .addMixIn(Measurand::class.java, EnumMixin::class.java)
+        .addMixIn(Phase::class.java, EnumMixin::class.java)
         .addMixIn(IdTagInfo::class.java, IdTagInfoMixin::class.java)
         .addMixIn(ReadingContext::class.java, EnumMixin::class.java)
         .addMixIn(AuthorizeResp::class.java, AuthorizeRespMixin::class.java)

diff --git a/ocpp-1-6-soap/src/test/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapParserTest.kt b/ocpp-1-6-soap/src/test/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapParserTest.kt
@@ -413,6 +413,7 @@ class Ocpp16SoapParserTest {
                                     <ocpp:measurand>Energy.Active.Import.Register</ocpp:measurand>
                                     <ocpp:unit>Wh</ocpp:unit>
                                     <ocpp:value>15213716</ocpp:value>
+                                    <ocpp:phase>L1-N</ocpp:phase>
                                 </ocpp:sampledValue>
                             </ocpp:meterValue>
                         </ocpp:meterValuesRequest>
@@ -434,7 +435,7 @@ class Ocpp16SoapParserTest {
                     get { format }.isEqualTo(ValueFormat.Raw)
                     get { location }.isEqualTo(Location.Inlet)
                     get { measurand }.isEqualTo(Measurand.EnergyActiveImportRegister)
-                    get { phase }.isNull()
+                    get { phase }.isEqualTo(Phase.L1N)
                     get { unit }.isEqualTo(UnitOfMeasure.Wh)
                 }
             }