Commit e081fd5c authored by Gabriel Commeau's avatar Gabriel Commeau Committed by Mark Canterbury
Browse files

Fix confusion between the AssociatedL.?Subtypes attributes and dictionary names

parent 29c96f9c

103120/examples/json/response_config.json

+4 −4
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ 
                        }

                      ]

                    },

                    "config:AssociatedLDRequestSubtypes": {},

                    "config:AssociatedLPRequestSubtypes": {}

                    "config:AssociatedLDSubtypes": {},

                    "config:AssociatedLPSubtypes": {}

                  },

                  {

                    "config:FormatName": "PropietaryIdentifier",
@@ -98,8 +98,8 @@ 
                        }

                      ]

                    },

                    "config:AssociatedLDRequestSubtypes": {},

                    "config:AssociatedLPRequestSubtypes": {}

                    "config:AssociatedLDSubtypes": {},

                    "config:AssociatedLPSubtypes": {}

                  }

                ]

              },

103120/examples/xml/response_config.xml

+4 −4
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ 
                                        <common:Value>ServiceA</common:Value>

                                    </common:DictionaryEntry>

                                </config:AssociatedLIServiceTypes>

                                <config:AssociatedLDRequestSubtypes/> <!-- In this example, no LD types are supported -->

                                <config:AssociatedLPRequestSubtypes/> <!-- In this example, no LP types are supported -->

                                <config:AssociatedLDSubtypes/> <!-- In this example, no LD types are supported -->

                                <config:AssociatedLPSubtypes/> <!-- In this example, no LP types are supported -->

                            </config:TargetingConfiguration>

                            <config:TargetingConfiguration>

                                <config:FormatName>PropietaryIdentifier</config:FormatName>
@@ -81,8 +81,8 @@ 
                                        <common:Value>ServiceB</common:Value>

                                    </common:DictionaryEntry>

                                </config:AssociatedLIServiceTypes>

                                <config:AssociatedLDRequestSubtypes/> <!-- In this example, no LD types are supported -->

                                <config:AssociatedLPRequestSubtypes/> <!-- In this example, no LP types are supported -->

                                <config:AssociatedLDSubtypes/> <!-- In this example, no LD types are supported -->

                                <config:AssociatedLPSubtypes/> <!-- In this example, no LP types are supported -->

                            </config:TargetingConfiguration>

                        </TargetingConfigurations>

                        <SupportedLIWorkflowEndpoints>

103120/examples/xml/response_ee_config.xml

+6 −6
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
                            </dictionaries:Dictionary>

                            <dictionaries:Dictionary>

                                <dictionaries:Owner>ACTOR2</dictionaries:Owner>

                                <dictionaries:Name>LPServiceTypes</dictionaries:Name>

                                <dictionaries:Name>LPRequestSubtype</dictionaries:Name>

                                <dictionaries:DictionaryEntries>

                                    <dictionaries:DictionaryEntry>

                                        <dictionaries:Value>ServiceA</dictionaries:Value>
@@ -97,13 +97,13 @@ 
                                        <common:Value>SubscriberData</common:Value>

                                    </common:DictionaryEntry>

                                </config:AssociatedLPTypes>

                                <config:AssociatedLPRequestSubtypes>

                                <config:AssociatedLPSubtypes>

                                    <common:DictionaryEntry>

                                        <common:Owner>ACTOR02</common:Owner>

                                        <common:Name>LPServiceTypes</common:Name>

                                        <common:Name>LPRequestSubtype</common:Name>

                                        <common:Value>ServiceA</common:Value>

                                    </common:DictionaryEntry>

                                </config:AssociatedLPRequestSubtypes>

                                </config:AssociatedLPSubtypes>

                            </config:TargetingConfiguration>

                            <!-- Second Targeting Configuration -->

                            <config:TargetingConfiguration>
@@ -150,12 +150,12 @@ 
                                <config:AssociatedLPSubtypes>

                                    <common:DictionaryEntry>

                                        <common:Owner>ACTOR02</common:Owner>

                                        <common:Name>LPServiceTypes</common:Name>

                                        <common:Name>LPRequestSubtype</common:Name>

                                        <common:Value>ServiceA</common:Value>

                                    </common:DictionaryEntry>

                                    <common:DictionaryEntry>

                                        <common:Owner>ACTOR02</common:Owner>

                                        <common:Name>LPServiceTypes</common:Name>

                                        <common:Name>LPRequestSubtype</common:Name>

                                        <common:Value>ServiceB</common:Value>

                                    </common:DictionaryEntry>

                                </config:AssociatedLPSubtypes>

utils/xml_to_json.py

+5 −5
Original line number Diff line number Diff line
@@ -94,11 +94,11 @@ coerce_to_empty = [ 
coerce_null_to_empty = [

    'SupportedLIWorkflowEndpoints',

    'SupportedLPWorkflowEndpoints',

    'config:AssociatedLDType',

    'config:AssociatedLDRequestSubtypes',

    'config:AssociatedLPType',

    'config:AssociatedLPRequestSubtypes',

    'config:AssociatedLIRequestSubtypes',

    'config:AssociatedLDTypes',

    'config:AssociatedLDSubtypes',

    'config:AssociatedLPTypes',

    'config:AssociatedLPSubtypes',

    'config:AssociatedLIServiceTypes',

]



def postprocessor (path, key, value):