feat!: upgrade to SFERA v3 (#578) #577

mghilardelli · 2025-02-17T08:09:10Z

contactType
G2BError additionalInfo
commercialStop

… sfera-v3 # Conflicts: # sfera_mock/src/main/java/ch/sbb/sferamock/messages/model/HandshakeRejectReason.java # sfera_mock/src/main/resources/SFERA_2.01.xsd # sfera_mock/src/main/resources/SFERA_3.0_custom.xsd # sfera_mock/src/main/resources/SFERA_v3.00.xsd # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_1000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_10000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_100000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_103000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_106000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_109000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_112000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_115000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_118000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_121000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_124000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_127000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_13000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_130000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_133000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_136000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_139000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_142000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_145000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_148000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_151000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_154000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_157000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_16000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_160000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_163000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_166000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_169000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_172000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_175000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_178000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_181000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_184000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_187000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_19000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_190000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_193000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_22000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_25000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_28000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_31000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_34000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_37000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_4000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_40000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_43000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_46000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_48000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_52000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_55000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_58000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_61000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_64000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_67000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_7000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_70000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_73000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_76000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_79000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_82000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_85000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_88000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_91000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_94000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_Event_1513_97000.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_10_Othmarsingen.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_11_Maegenwil.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_12_Mellingen.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_13_Mellingen_Heitersberg.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_14_Killwangen_Spreitenbach.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_15_Dietikon.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_16_Glanzenberg.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_17_Schlieren.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_18_Altstetten.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_19_Hardbruecke.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_1_Olten.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_20_Zuerich_HB.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_2_Dulliken.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_3_Daeniken.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_4_Schoenenwerd.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_5_Woeschnau.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_6_Aarau.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_7_Rupperswil.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_8_Lenzburg.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_9_Gexi.xml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_TC_1513_1.xml # sfera_mock/src/main/resources/static_sfera_resources/T9_automatic_advancement/SFERA_Event_T9_10000.xml # sfera_mock/src/main/resources/static_sfera_resources/T9_automatic_advancement/SFERA_Event_T9_4000.xml # sfera_mock/src/main/resources/static_sfera_resources/T9_automatic_advancement/SFERA_Event_T9_6000.xml # sfera_mock/src/main/resources/static_sfera_resources/T9_automatic_advancement/SFERA_Event_T9_8000.xml

… sfera-v3

phirzel · 2025-02-20T07:33:28Z

sfera_mock/src/main/java/ch/sbb/sferamock/messages/sfera/SferaMessageCreator.java

@@ -157,7 +151,12 @@ public SFERAG2BReplyMessage createSferaReplyErrorMessage(MessageHeader header, S
        var messageResponse = new G2BMessageResponse();
        G2BError g2BError = new G2BError();
        g2BError.setErrorCode(errorCode);
-        additionalInfo.ifPresent(g2BError::setAdditionalInfo);
+        additionalInfo.ifPresent(value -> {
+            var text = new MultilingualTextComplexType();


(perhaps Builder or Factory pattern or does it come 1:1 from XSD generation? Probably more often used elsewhere?)

yes it's generated from XSD

… sfera-v3 # Conflicts: # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_11_Maegenwil.xml # sfera_mock/src/main/resources/static_sfera_resources/T1_track_equipment/SFERA_JP_T1.xml # sfera_mock/src/main/resources/static_sfera_resources/T1_track_equipment/SFERA_SP_T1_1.xml # sfera_mock/src/main/resources/static_sfera_resources/T9999_mixed_journey/SFERA_SP_T9999_4.xml

… sfera-v3 # Conflicts: # das_client/pubspec.yaml # sfera_mock/src/main/resources/static_sfera_resources/1513_OL_ZUE/SFERA_SP_1513_11_Maegenwil.xml # sfera_mock/src/main/resources/static_sfera_resources/T11_ASR_in_etcs_l2_section/SFERA_JP_T11.xml # sfera_mock/src/main/resources/static_sfera_resources/T11_ASR_in_etcs_l2_section/SFERA_SP_T11_1.xml # sfera_mock/src/main/resources/static_sfera_resources/T11_ASR_in_etcs_l2_section/SFERA_TC_T11_1.xml # sfera_mock/src/main/resources/static_sfera_resources/T1_track_equipment/SFERA_JP_T1.xml # sfera_mock/src/main/resources/static_sfera_resources/T1_track_equipment/SFERA_SP_T1_1.xml # sfera_mock/src/main/resources/static_sfera_resources/T1_track_equipment/SFERA_SP_T1_4.xml # sfera_mock/src/main/resources/static_sfera_resources/T1_track_equipment/SFERA_TC_T1_1.xml # sfera_mock/src/main/resources/static_sfera_resources/T9999_mixed_journey/SFERA_SP_T9999_4.xml

…hake reject. (#578)

Grodien

lgtm

feat: upgrade to SFERA v3

d5897c4

mghilardelli changed the title ~~feat: upgrade to SFERA v3~~ feat: upgrade to SFERA v3 (#578) Feb 17, 2025

mghilardelli added 3 commits February 17, 2025 10:19

fix: error additionalInfo list

c38c6d6

fix: jaxb bindings

6a2d651

fix: HandshakeRejectReason

a4fe665

mghilardelli changed the title ~~feat: upgrade to SFERA v3 (#578)~~ feat!: upgrade to SFERA v3 (#578) Feb 17, 2025

mghilardelli added 2 commits February 18, 2025 08:44

Merge branch 'main' of github.com:SchweizerischeBundesbahnen/DAS into…

8bf09fc

… sfera-v3

phirzel approved these changes Feb 20, 2025

View reviewed changes

mghilardelli and others added 9 commits February 20, 2025 09:16

feat: updated client code and test data to SFERA v3.0. (#578)

bffb543

fix: contact and stopping type nsp

5c2b675

chore: xml formatting

560db45

fix contact info

56bd4a9

chore: updated XML formatting, fixed some tests and handling of hands…

7ffdcc2

…hake reject. (#578)

Merge remote-tracking branch 'origin/sfera-v3' into sfera-v3

bf359c7

chore: pump major version for mock data because of SFERA v3.0 update.

fca85d0

mghilardelli marked this pull request as ready for review February 24, 2025 07:54

mghilardelli requested review from Grodien and rawi-coding as code owners February 24, 2025 07:54

mghilardelli requested a review from phirzel February 24, 2025 07:54

fix test

91ec8bc

Grodien approved these changes Feb 24, 2025

View reviewed changes

Grodien merged commit df1d74c into main Feb 24, 2025
13 of 15 checks passed

This was referenced Feb 20, 2025

chore(main): release webapp 0.3.0 #598

Merged

chore(main): release sfera_mock 0.2.0 #599

Merged

chore(main): release das_client 0.10.0 #589

Merged

chore(main): release webapp 0.3.0 #610

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat!: upgrade to SFERA v3 (#578) #577

feat!: upgrade to SFERA v3 (#578) #577

mghilardelli commented Feb 17, 2025 •

edited

Loading

phirzel Feb 20, 2025 •

edited

Loading

mghilardelli Feb 20, 2025

Grodien left a comment

feat!: upgrade to SFERA v3 (#578) #577

feat!: upgrade to SFERA v3 (#578) #577

Conversation

mghilardelli commented Feb 17, 2025 • edited Loading

phirzel Feb 20, 2025 • edited Loading

Choose a reason for hiding this comment

mghilardelli Feb 20, 2025

Choose a reason for hiding this comment

Grodien left a comment

Choose a reason for hiding this comment

mghilardelli commented Feb 17, 2025 •

edited

Loading

phirzel Feb 20, 2025 •

edited

Loading