From cd9644e9d33c6e60f96bc602a246f026c6eadb6b Mon Sep 17 00:00:00 2001 From: JayasriR <124573358+JayasriR@users.noreply.github.com> Date: Fri, 1 Nov 2024 14:33:08 +0000 Subject: [PATCH] Lionel Smith-Gordon Refactor ETD qualification (P3+) - Release (#3200) * Refactor ETD qualification (P3+) Refactor product qualification for ETDs (ART P3+) * correct typo correct typo * typo typo * release note * update expectations * update expectations * update expectations * update expectations * update expectations * update expectations * update tests and expectations * Reinstated ETD enum and added mappings To address ETD product qualification exceptions * update expectations * update RN * Fix instrumentType mappings for loans and listed derivatives * Update expectations * Reduce logging * update expectations --------- Co-authored-by: Lionel Smith-Gordon Co-authored-by: Lionel SG <146734978+Oblongs@users.noreply.github.com> Co-authored-by: PayalKhanna Co-authored-by: hugohills-regnosys --- RELEASE.md | 28 ++- docs/product-model.md | 33 ++- ...teralSpecificationFromInstructionTest.java | 2 +- .../processor/FISMapperMappingProcessor.java | 6 +- ...mation-credit-default-swap-func-input.json | 2 +- ...ation-credit-default-swap-func-output.json | 4 +- ...cution-credit-default-swap-func-input.json | 2 +- ...ution-credit-default-swap-func-output.json | 4 +- ...ll-termination-equity-swap-func-input.json | 2 +- ...l-termination-equity-swap-func-output.json | 4 +- ...ty-swap-existing-trade-lot-func-input.json | 4 +- ...y-swap-existing-trade-lot-func-output.json | 8 +- .../increase-equity-swap-func-input.json | 4 +- .../increase-equity-swap-func-output.json | 8 +- ...al-termination-equity-swap-func-input.json | 4 +- ...l-termination-equity-swap-func-output.json | 8 +- .../stock-split-equity-swap-func-input.json | 2 +- .../stock-split-equity-swap-func-output.json | 4 +- .../dtcc-11-0/DDL_NewTrade1-func-output.json | 16 +- .../dtcc-11-0/DDL_NewTrade4-func-output.json | 16 +- .../dtcc-11-0/DDL_NewTrade5-func-output.json | 4 +- .../dtcc-11-0/DDL_NewTrade6-func-output.json | 16 +- ...trade-CFTC-SEC-and-canada-func-output.json | 16 +- ...e-trade-initiation-C01-00-func-output.json | 4 +- ...e-partial-novation-C02-00-func-output.json | 6 +- ...ovation-correction-C02-10-func-output.json | 6 +- ...trade-CFTC-SEC-and-canada-func-output.json | 16 +- ...trade-CFTC-SEC-and-canada-func-output.json | 16 +- ...trade-CFTC-SEC-and-canada-func-output.json | 16 +- ...g-new-trade-CFTC-clearing-func-output.json | 16 +- .../bond-execution-func-input.json | 5 +- .../bond-execution-func-output.json | 24 +- .../repo-and-bond/cancellation-input.json | 42 ++-- .../repo-and-bond/cancellation-output.json | 98 ++++----- .../on-demand-interest-payment-input.json | 37 ++-- .../on-demand-interest-payment-output.json | 86 +++----- .../on-demand-rate-change-input.json | 37 ++-- .../on-demand-rate-change-output.json | 93 ++++---- .../repo-and-bond/pair-off-input.json | 84 +++---- .../repo-and-bond/pair-off-output.json | 144 ++++++------ ...ial-delivery-delivered-price-quantity.json | 5 +- .../repo-and-bond/partial-delivery-input.json | 28 +-- .../partial-delivery-output.json | 57 +++-- .../repo-and-bond/repo-adjustment-input.json | 37 ++-- .../repo-and-bond/repo-adjustment-output.json | 93 ++++---- .../repo-execution-func-input.json | 19 +- .../repo-execution-func-output.json | 48 ++-- .../repo-and-bond/repo-reprice-input.json | 37 ++-- .../repo-and-bond/repo-reprice-output.json | 93 ++++---- .../repo-substitution-collateral.json | 11 +- .../repo-substitution-input.json | 23 +- .../repo-substitution-output.json | 36 ++- .../repo-substitution-price-quantity.json | 10 +- .../functions/repo-and-bond/roll-input.json | 42 ++-- .../functions/repo-and-bond/roll-output.json | 98 ++++----- .../repo-and-bond/shaping-input.json | 95 ++++---- .../repo-and-bond/shaping-output.json | 205 ++++++++---------- ...ping-primitive-instruction-trade-lots.json | 15 +- .../allocation-sec-lending-func-input.json | 4 +- .../allocation-sec-lending-func-output.json | 16 +- .../block-execution-instruction.json | 4 +- .../block-execution-trade-state.json | 4 +- ...e-security-lending-invoice-func-input.json | 12 +- ...-security-lending-invoice-func-output.json | 12 +- ...return-settlement-workflow-func-input.json | 4 +- ...eturn-settlement-workflow-func-output.json | 16 +- .../new-settlement-workflow-func-input.json | 4 +- .../new-settlement-workflow-func-output.json | 20 +- ...return-settlement-workflow-func-input.json | 4 +- ...eturn-settlement-workflow-func-output.json | 16 +- .../reallocation-pre-settled-func-input.json | 4 +- .../reallocation-pre-settled-func-output.json | 12 +- .../dtcc-11-0/DDL_NewTrade1.json | 2 +- .../dtcc-11-0/DDL_NewTrade4.json | 2 +- .../dtcc-11-0/DDL_NewTrade5.json | 2 +- .../dtcc-11-0/DDL_NewTrade6.json | 2 +- .../result-json-files/fis/isla1.json | 20 +- .../msg-ex19-cds-execution-allocations.json | 2 +- .../bond-options/bond-option.json | 2 +- .../bond-options/cb-option-2.json | 2 +- .../bond-options/cb-option.json | 2 +- .../cd-ex01-long-asia-corp-fixreg.json | 2 +- .../cd-ex02-2003-short-asia-corp-fixreg.json | 2 +- .../cd-ex02-short-asia-corp-fixreg.json | 2 +- .../cd-ex03-long-aussie-corp-fixreg.json | 2 +- .../cd-ex04-short-aussie-corp-fixreg.json | 2 +- .../cd-ex05-long-emasia-corp-fixreg.json | 2 +- .../cd-ex06-long-emeur-sov-fixreg.json | 2 +- .../cd-ex07-2003-long-euro-corp-fixreg.json | 2 +- .../cd-ex07-long-euro-corp-fixreg.json | 2 +- .../cd-ex08-2003-short-euro-corp-fixreg.json | 2 +- .../cd-ex08-short-euro-corp-fixreg.json | 2 +- .../cd-ex09-long-euro-sov-fixreg.json | 2 +- .../cd-ex10-2003-long-us-corp-fixreg.json | 2 +- .../cd-ex10-long-us-corp-fixreg.json | 2 +- .../cd-ex11-2003-short-us-corp-fixreg.json | 2 +- .../cd-ex11-short-us-corp-fixreg.json | 2 +- .../cd-ex12-long-emasia-sov-fixreg.json | 2 +- .../cd-ex13-long-asia-sov-fixreg.json | 2 +- .../cd-ex14-long-emlatin-corp-fixreg.json | 2 +- .../cd-ex15-long-emlatin-sov-fixreg.json | 2 +- ...-short-us-corp-fixreg-recovery-factor.json | 2 +- ...7-short-us-corp-portfolio-compression.json | 2 +- .../cd-ex18-standard-north-american-corp.json | 2 +- .../cd-indamt-ex01-short-us-corp-fixreg.json | 2 +- .../credit-derivatives/cd-swaption-1.json | 2 +- .../credit-derivatives/cd-swaption-2.json | 2 +- .../cds-ELCDS-ReferenceObligation.json | 9 +- .../cds-basket-tranche.json | 4 +- .../credit-derivatives/cds-basket.json | 4 +- .../credit-derivatives/cds-custom-basket.json | 6 +- .../cds-loan-ReferenceObligation.json | 9 +- .../credit-derivatives/cds-mortgage-CMBS.json | 2 +- .../credit-derivatives/cds-mortgage-RMBS.json | 2 +- ...qd-ex01-american-call-stock-long-form.json | 2 +- .../eqd-ex02-calendar-spread-short-form.json | 2 +- ...qd-ex03-call-or-put-spread-short-form.json | 2 +- .../eqd-ex08-basket-long-form.json | 4 +- .../eqd-ex09-bermuda-long-form.json | 2 +- .../eqd-ex11-quanto-long-form.json | 2 +- .../eqd-ex12-vanilla-short-form.json | 2 +- .../eqd-ex13-1996-american-call-stock.json | 2 +- ...ican-call-stock-passthrough-long-form.json | 2 +- ...eqd-ex15-basket-passthrough-long-form.json | 4 +- ...x16-equityOptionTransactionSupplement.json | 2 +- ...ctionSupplement-non-deliverable-share.json | 2 +- .../eqd-ex19-dividend-adjustment.json | 2 +- .../eqd-ex21-flat-weight-basket.json | 4 +- .../eqs-ex04-zero-strike-long-form.json | 2 +- ...-ex05-single-stock-plus-fee-long-form.json | 2 +- .../eqs-ex07-long-form-with-stub.json | 12 +- ...ite-basket-long-form-separate-spreads.json | 12 +- ...ean-interdealer-share-swap-short-form.json | 2 +- ...ean-interdealer-share-swap-short-form.json | 2 +- .../equity-swaps/eqs-ex17-cfd.json | 2 +- ...sia-interdealer-index-swap-short-form.json | 2 +- ...aler-fair-value-share-swap-short-form.json | 2 +- .../equity-swaps/trs-ex01-equity-basket.json | 4 +- .../equity-swaps/trs-ex02-single-equity.json | 2 +- ...ith-fixing-and-dividend-payment-dates.json | 2 +- .../AdditionalFixedPayments_mortgages.json | 2 +- .../BasketReferenceInformation_nameOrId.json | 4 +- ...Information_nthToDefault_mthToDefault.json | 4 +- .../FloatingAmountEvents_mortgages.json | 2 +- .../invalid-products/FpML_cd_12.json | 2 +- .../invalid-products/FpML_cd_19.json | 2 +- .../invalid-products/FpML_cd_26_28.json | 2 +- .../invalid-products/FpML_cd_27-1.json | 2 +- .../invalid-products/FpML_cd_27-2.json | 2 +- .../invalid-products/FpML_cd_27-3.json | 2 +- .../invalid-products/FpML_cd_30-1.json | 2 +- .../invalid-products/FpML_cd_30-2.json | 2 +- .../invalid-products/FpML_cd_37.json | 4 +- .../invalid-products/FpML_cd_41.json | 2 +- .../invalid-products/FpML_cd_42.json | 2 +- .../invalid-products/FpML_cd_44.json | 6 +- .../invalid-products/FpML_ird_14.json | 2 +- ...pML_ird_21_economicTermsEffectiveDate.json | 2 +- .../invalid-products/FpML_ird_35_cd_31-1.json | 2 +- .../invalid-products/FpML_ird_35_cd_31-2.json | 2 +- .../invalid-products/FpML_ird_8.json | 2 +- .../invalid-products/Tranche_dataRules.json | 4 +- ...eared-alpha-trade-CFTC-SEC-and-canada.json | 2 +- ...cution-advice-trade-initiation-C01-00.json | 2 +- ...-advice-trade-partial-novation-C02-00.json | 2 +- ...de-partial-novation-correction-C02-10.json | 2 +- ...g-new-alpha-trade-CFTC-SEC-and-canada.json | 2 +- ...sg-new-beta-trade-CFTC-SEC-and-canada.json | 2 +- .../msg-new-trade-CFTC-SEC-and-canada.json | 2 +- .../msg-new-trade-CFTC-clearing.json | 2 +- .../eqcs-ex01-correlation-swap.json | 6 +- ...cs-ex02-correlation-swap-confirmation.json | 6 +- ...cs-ex03-correlation-swap-confirmation.json | 6 +- ...cs-ex04-correlation-swap-confirmation.json | 6 +- ...-ex01-long-asia-corp-fixreg-versioned.json | 2 +- ...2003-short-asia-corp-fixreg-versioned.json | 2 +- ...corp-fixreg-recovery-factor-versioned.json | 2 +- ...t-ex01-short-us-corp-fixreg-versioned.json | 2 +- .../products/credit/cd-swaption-usi.json | 2 +- .../products/credit/cd-swaption-uti.json | 2 +- ...ortgage-CMBS-single-payment-versioned.json | 2 +- .../credit/cdm-cds-ref-ob-versioned.json | 2 +- ...erenceObligation-collateral-versioned.json | 9 +- .../credit/cds-basket-tranche-versioned.json | 4 +- .../products/credit/cds-basket-uti.json | 4 +- .../cds-loan-ReferenceObligation-uti.json | 9 +- .../credit/cds-mortgage-RMBS-versioned.json | 2 +- ...qd-ex01-american-call-stock-long-form.json | 2 +- ...rlyer-execution-long-form-other-party.json | 2 +- ...-single-underlyer-execution-long-form.json | 2 +- ...rm-interestLeg-driving-schedule-dates.json | 2 +- ...ean-single-stock-underlyer-short-form.json | 2 +- ...sia-interdealer-share-swap-short-form.json | 2 +- ...ean-interdealer-share-swap-short-form.json | 2 +- ...nflation-swap-ex02-yoy-bond-reference.json | 2 +- .../products/rates/bond-fwd-generic-ex01.json | 2 +- .../products/rates/bond-fwd-generic-ex02.json | 2 +- .../products/rates/bond-option-uti.json | 2 +- .../products/rates/cb-option-usi.json | 2 +- .../eqvs-ex01-variance-swap-index.json | 11 +- .../eqvs-ex02-variance-swap-single-stock.json | 13 +- .../eqvs-ex03-conditional-variance-swap.json | 13 +- .../eqvs-ex04-dispersion-variance-swap.json | 4 +- ...-variance-swap-transaction-supplement.json | 4 +- .../eqs-ex04-zero-strike-long-form.json | 2 +- .../custom-basket-linkId-ptrr-comp.json | 6 +- .../processes/custom-basket-linkId-rtn.json | 6 +- .../credit/cd-ex01-long-asia-corp-fixreg.json | 2 +- .../cd-ex02-2003-short-asia-corp-fixreg.json | 2 +- ...-short-us-corp-fixreg-recovery-factor.json | 2 +- .../cd-indamt-ex01-short-us-corp-fixreg.json | 2 +- .../products/credit/cd-swaption-1.json | 2 +- .../products/credit/cd-swaption-2.json | 2 +- .../credit/cds-ELCDS-ReferenceObligation.json | 9 +- .../products/credit/cds-basket-tranche.json | 4 +- .../fpml-5-12/products/credit/cds-basket.json | 4 +- .../credit/cds-loan-ReferenceObligation.json | 9 +- .../products/credit/cds-mortgage-CMBS.json | 2 +- .../products/credit/cds-mortgage-RMBS.json | 2 +- ...qd-ex01-american-call-stock-long-form.json | 2 +- ...-single-underlyer-execution-long-form.json | 2 +- ...-ex05-single-stock-plus-fee-long-form.json | 2 +- ...rm-interestLeg-driving-schedule-dates.json | 2 +- ...ean-single-stock-underlyer-short-form.json | 2 +- ...sia-interdealer-share-swap-short-form.json | 2 +- ...ean-interdealer-share-swap-short-form.json | 2 +- ...ean-interdealer-share-swap-short-form.json | 2 +- ...ean-interdealer-share-swap-short-form.json | 2 +- .../products/equity/eqs-ex17-cfd.json | 2 +- ...sia-interdealer-index-swap-short-form.json | 2 +- ...aler-fair-value-share-swap-short-form.json | 2 +- .../equity/trs-ex02-single-equity.json | 2 +- ...ith-fixing-and-dividend-payment-dates.json | 2 +- .../fpml-5-12/products/rates/bond-option.json | 2 +- .../fpml-5-12/products/rates/cb-option-2.json | 2 +- ...cs-ex03-correlation-swap-confirmation.json | 6 +- ...qd-ex01-american-call-stock-long-form.json | 2 +- .../eqd-ex08-basket-long-form.json | 4 +- .../eqd-ex09-bermuda-long-form.json | 2 +- .../eqd-ex11-quanto-long-form.json | 2 +- ...ican-call-stock-passthrough-long-form.json | 2 +- ...eqd-ex15-basket-passthrough-long-form.json | 4 +- ...x16-equityOptionTransactionSupplement.json | 2 +- ...ctionSupplement-non-deliverable-share.json | 2 +- .../eqd-ex19-dividend-adjustment.json | 2 +- .../eqd-ex21-flat-weight-basket.json | 4 +- .../eqs-ex04-zero-strike-long-form.json | 2 +- ...-ex05-single-stock-plus-fee-long-form.json | 2 +- .../equity-swaps/trs-ex01-equity-basket.json | 4 +- .../eqvs-ex01-variance-swap-index.json | 11 +- .../eqvs-ex03-conditional-variance-swap.json | 13 +- ...cution-advice-trade-initiation-C01-00.json | 2 +- ...-advice-trade-partial-novation-C02-00.json | 2 +- ...de-partial-novation-correction-C02-10.json | 2 +- .../products/bond-options/bond-option.json | 2 +- .../products/bond-options/cb-option-2.json | 2 +- .../products/bond-options/cb-option-ois.json | 2 +- .../products/bond-options/cb-option.json | 2 +- .../eqcs-ex01-correlation-swap.json | 6 +- ...cs-ex02-correlation-swap-confirmation.json | 6 +- ...cs-ex04-correlation-swap-confirmation.json | 6 +- .../cd-ex01-long-asia-corp-fixreg.json | 2 +- .../cd-ex02-2003-short-asia-corp-fixreg.json | 2 +- .../cd-ex02-short-asia-corp-fixreg.json | 2 +- .../cd-ex03-long-aussie-corp-fixreg.json | 2 +- .../cd-ex04-short-aussie-corp-fixreg.json | 2 +- .../cd-ex05-long-emasia-corp-fixreg.json | 2 +- .../cd-ex06-long-emeur-sov-fixreg.json | 2 +- .../cd-ex07-2003-long-euro-corp-fixreg.json | 2 +- .../cd-ex07-long-euro-corp-fixreg.json | 2 +- .../cd-ex08-2003-short-euro-corp-fixreg.json | 2 +- .../cd-ex08-short-euro-corp-fixreg.json | 2 +- .../cd-ex09-long-euro-sov-fixreg.json | 2 +- .../cd-ex10-2003-long-us-corp-fixreg.json | 2 +- .../cd-ex10-long-us-corp-fixreg.json | 2 +- .../cd-ex11-2003-short-us-corp-fixreg.json | 2 +- .../cd-ex11-short-us-corp-fixreg.json | 2 +- .../cd-ex12-long-emasia-sov-fixreg.json | 2 +- .../cd-ex13-long-asia-sov-fixreg.json | 2 +- .../cd-ex14-long-emlatin-corp-fixreg.json | 2 +- .../cd-ex15-long-emlatin-sov-fixreg.json | 2 +- ...-short-us-corp-fixreg-recovery-factor.json | 2 +- ...7-short-us-corp-portfolio-compression.json | 2 +- .../cd-ex18-standard-north-american-corp.json | 2 +- .../cd-indamt-ex01-short-us-corp-fixreg.json | 2 +- .../credit-derivatives/cd-swaption-1.json | 2 +- .../credit-derivatives/cd-swaption-2.json | 2 +- .../cds-ELCDS-ReferenceObligation.json | 9 +- .../cds-basket-tranche.json | 4 +- .../credit-derivatives/cds-basket.json | 4 +- .../credit-derivatives/cds-custom-basket.json | 6 +- .../cds-loan-ReferenceObligation.json | 9 +- .../credit-derivatives/cds-mortgage-CMBS.json | 2 +- .../credit-derivatives/cds-mortgage-RMBS.json | 2 +- .../eqd-ex02-calendar-spread-short-form.json | 2 +- ...qd-ex03-call-or-put-spread-short-form.json | 2 +- .../eqd-ex12-vanilla-short-form.json | 2 +- .../eqd-ex13-1996-american-call-stock.json | 2 +- ...-single-underlyer-execution-long-form.json | 2 +- .../eqs-ex02-composite-basket-long-form.json | 12 +- .../eqs-ex07-long-form-with-stub.json | 12 +- ...ite-basket-long-form-separate-spreads.json | 12 +- ...rm-interestLeg-driving-schedule-dates.json | 2 +- ...ean-single-stock-underlyer-short-form.json | 2 +- ...sia-interdealer-share-swap-short-form.json | 2 +- ...ean-interdealer-share-swap-short-form.json | 2 +- ...ean-interdealer-share-swap-short-form.json | 2 +- ...ean-interdealer-share-swap-short-form.json | 2 +- .../products/equity-swaps/eqs-ex17-cfd.json | 2 +- ...sia-interdealer-index-swap-short-form.json | 2 +- ...aler-fair-value-share-swap-short-form.json | 2 +- ...gle-underlyer-execution-long-form-ois.json | 2 +- .../equity-swaps/trs-ex02-single-equity.json | 2 +- ...ith-fixing-and-dividend-payment-dates.json | 2 +- ...le-equity-with-calculation-parameters.json | 2 +- ...tion-asset-swap-ex01-ratio-zc-floored.json | 2 +- ...tion-asset-swap-ex02-ratio-zc-floored.json | 2 +- .../inflation-asset-swap-ex03-par-par.json | 2 +- .../inflation-asset-swap-ex04-proceeds.json | 2 +- ...nflation-swap-ex02-yoy-bond-reference.json | 2 +- .../eqvs-ex02-variance-swap-single-stock.json | 13 +- .../eqvs-ex04-dispersion-variance-swap.json | 4 +- ...-variance-swap-transaction-supplement.json | 4 +- .../base-staticdata-asset-common-enum.rosetta | 16 +- .../base-staticdata-asset-common-type.rosetta | 16 +- .../main/rosetta/event-common-func.rosetta | 4 +- .../main/rosetta/event-common-type.rosetta | 6 +- ...ml-confirmation-tradestate-synonym.rosetta | 16 +- .../main/rosetta/product-asset-type.rosetta | 4 +- .../rosetta/product-collateral-type.rosetta | 12 +- .../product-qualification-func.rosetta | 38 ++-- .../functions/FunctionInputCreationTest.java | 4 +- tests/src/test/resources/logback-test.xml | 1 + 333 files changed, 1315 insertions(+), 1601 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index ea3ae0f3be..2bdc98eb5b 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -25,4 +25,30 @@ _Backward-incompatible changes_ This release contains changes that are not backward-compatible: - All references to a payout need to be updated as references to a payout are now treated as capitalised Data Types rather than lower case Attributes. For example, a previous reference might have read: `payout -> interestRatePayout -> floatingAmount` must now be written as: `payout -> InterestRatePayout -> floatingAmount`. -- Logic or mapping that expects certain cardinality may need to be reviewed; see the explanation above. \ No newline at end of file +- Logic or mapping that expects certain cardinality may need to be reviewed; see the explanation above. + +# *CDM Product Model* - Refactor ETD Product Qualification + +_Background_ + +In an earlier Asset Refactoring release, the modelling of Exchange Traded Derivatives was enhanced +by introducing a new item `ListedDerivative` as an option of one of the values in the `Asset` choice +data type. However, the product qualification functions were still expecting these products to be +modelled using the `Security` choice within `Asset`. This has been corrected. +The enumerator type `SecurityTypeEnum` has been renamed to `InstrumentTypeEnum` and the value of +`ListedDerivative` has been removed from the list. This broadens the potential use of this +enumeration for additional assets. + +The attribute `instrumentType`, using the `InstrumentTypeEnum` data type, has been added to `InstrumentBase` +so that this basic type determination is on all types of instrument. The corresponding attribute, +`securityType` has been removed from `Security` to avoid duplication. + +The attribute `securityType` on the data type `AssetType` has been changed to use the renamed data +type, ie `InstrumentTypeEnum`. + +Occurrences of logic to test the type of a security or instrument +have also been updated to use this new name `InstrumentTypeEnum`, including a number of references +to this enumerator in the product qualification logic. Where product qualification was only +looking for the type of a `security`, it has also been broadened to `instrument`. + +Changes can be reviewed in PR [#3200](https://github.com/finos/common-domain-model/pull/3200) \ No newline at end of file diff --git a/docs/product-model.md b/docs/product-model.md index 80fa5a9634..b1d26f8bc5 100644 --- a/docs/product-model.md +++ b/docs/product-model.md @@ -1105,23 +1105,22 @@ ISDA definitions for reference benchmarks. Security has a set of additional attributes, as shown below: ``` Haskell -type Security extends InstrumentBase: - securityType SecurityTypeEnum (1..1) - debtType DebtType (0..1) - equityType EquityTypeEnum (0..1) - fundType FundProductTypeEnum (0..1) - - condition DebtSubType: - if securityType <> SecurityTypeEnum -> Debt - then debtType is absent - - condition EquitySubType: - if securityType <> SecurityTypeEnum -> Equity - then equityType is absent - - condition FundSubType: - if securityType <> SecurityTypeEnum -> Fund - then fundType is absent +type Security extends InstrumentBase: + debtType DebtType (0..1) + equityType EquityTypeEnum (0..1) + fundType FundProductTypeEnum (0..1) + + condition DebtSubType: + if instrumentType <> InstrumentTypeEnum -> Debt + then debtType is absent + + condition EquitySubType: + if instrumentType <> InstrumentTypeEnum -> Equity + then equityType is absent + + condition FundSubType: + if instrumentType <> InstrumentTypeEnum -> Fund + then fundType is absent ``` The product identifier will uniquely identify the security. The diff --git a/examples/src/test/java/org/finos/cdm/example/functions/CreateEligibleCollateralSpecificationFromInstructionTest.java b/examples/src/test/java/org/finos/cdm/example/functions/CreateEligibleCollateralSpecificationFromInstructionTest.java index c3e58763be..9f3eee1a51 100644 --- a/examples/src/test/java/org/finos/cdm/example/functions/CreateEligibleCollateralSpecificationFromInstructionTest.java +++ b/examples/src/test/java/org/finos/cdm/example/functions/CreateEligibleCollateralSpecificationFromInstructionTest.java @@ -58,7 +58,7 @@ private static EligibleCollateralCriteria getCommonCriteria() { .addAsset(AssetCriteria.builder() .addCollateralAssetType(AssetType.builder() .setAssetType(AssetTypeEnum.SECURITY) - .setSecurityType(SecurityTypeEnum.DEBT))) + .setSecurityType(InstrumentTypeEnum.DEBT))) .addIssuer(IssuerCriteria.builder() .addIssuerType(CollateralIssuerType.builder() .setIssuerType(IssuerTypeEnum.SOVEREIGN_CENTRAL_BANK)) diff --git a/rosetta-source/src/main/java/cdm/event/workflow/processor/FISMapperMappingProcessor.java b/rosetta-source/src/main/java/cdm/event/workflow/processor/FISMapperMappingProcessor.java index c79b440f9a..cff2af746c 100644 --- a/rosetta-source/src/main/java/cdm/event/workflow/processor/FISMapperMappingProcessor.java +++ b/rosetta-source/src/main/java/cdm/event/workflow/processor/FISMapperMappingProcessor.java @@ -8,8 +8,8 @@ import cdm.base.math.UnitType; import cdm.base.staticdata.asset.common.AssetIdTypeEnum; import cdm.base.staticdata.asset.common.AssetIdentifier; +import cdm.base.staticdata.asset.common.InstrumentTypeEnum; import cdm.base.staticdata.asset.common.Security; -import cdm.base.staticdata.asset.common.SecurityTypeEnum; import cdm.base.staticdata.party.CounterpartyRoleEnum; import cdm.base.staticdata.party.PartyIdentifier; import cdm.event.common.ExecutionTypeEnum; @@ -94,7 +94,7 @@ private void staticMappings(PathValue tradeState) { getIRP(tradeState).getValue().getOrCreatePaymentDates().getOrCreatePaymentFrequency().setPeriodMultiplier(1); //sec lending payout - getSecPO(tradeState).getValue().getOrCreateUnderlier().getOrCreateInstrument().getOrCreateSecurity().setSecurityType(SecurityTypeEnum.EQUITY); + getSecPO(tradeState).getValue().getOrCreateUnderlier().getOrCreateInstrument().getOrCreateSecurity().setInstrumentType(InstrumentTypeEnum.EQUITY); getSecPO(tradeState).getValue().getOrCreatePayerReceiver().setPayer(CounterpartyRoleEnum.PARTY_1); getSecPO(tradeState).getValue().getOrCreatePayerReceiver().setReceiver(CounterpartyRoleEnum.PARTY_2); @@ -338,7 +338,7 @@ private Multimap> buildCommonMappings // key PathValue pq = getPriceQuantityForSecurityFinancePayout(tradeState); Security security = Security.builder() - .setSecurityType(SecurityTypeEnum.EQUITY) + .setInstrumentType(InstrumentTypeEnum.EQUITY) .addIdentifier(AssetIdentifier.builder() .setIdentifierValue(value) .setIdentifierType(AssetIdTypeEnum.SEDOL)); diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-input.json index c3c319921c..31fe63a10f 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-input.json @@ -160,7 +160,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-output.json index 4fa75e978d..684d6ad517 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/contract-formation/contract-formation-credit-default-swap-func-output.json @@ -162,7 +162,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", @@ -704,7 +704,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-input.json index 54fc0885b9..4349127170 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-input.json @@ -159,7 +159,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-output.json index bbde02ca1f..2ebd5952c6 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/execution/execution-credit-default-swap-func-output.json @@ -160,7 +160,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", @@ -634,7 +634,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-input.json index 7e5b4d5cd0..08cf6018a2 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-input.json @@ -510,7 +510,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-output.json index 2fd3322e8a..675247bd54 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/full-termination-equity-swap-func-output.json @@ -526,7 +526,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1231,7 +1231,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-existing-trade-lot-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-existing-trade-lot-func-input.json index 837b4ff5e6..150eb0fd51 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-existing-trade-lot-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-existing-trade-lot-func-input.json @@ -574,7 +574,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -750,7 +750,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-existing-trade-lot-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-existing-trade-lot-func-output.json index c478304025..11524308de 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-existing-trade-lot-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-existing-trade-lot-func-output.json @@ -576,7 +576,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -752,7 +752,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1466,7 +1466,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1642,7 +1642,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-input.json index f845ee6f2b..dbecb35f55 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-input.json @@ -51,7 +51,7 @@ }, "identifierType" : "Other" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -657,7 +657,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-output.json index 1fa7298c29..3977eac0e7 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/increase-equity-swap-func-output.json @@ -52,7 +52,7 @@ }, "identifierType" : "Other" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -654,7 +654,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1369,7 +1369,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1513,7 +1513,7 @@ }, "identifierType" : "Other" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-input.json index ba9c11b91e..39442e4095 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-input.json @@ -533,7 +533,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -709,7 +709,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-output.json index ca88b78d06..559afb0ad6 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/quantity-change/partial-termination-equity-swap-func-output.json @@ -546,7 +546,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -722,7 +722,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1436,7 +1436,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1612,7 +1612,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-input.json index 2bbb7aa8f4..093208ae25 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-input.json @@ -460,7 +460,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-output.json index c275d4a965..a4454bbc6b 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/business-event/stock-split/stock-split-equity-swap-func-output.json @@ -468,7 +468,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1173,7 +1173,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade1-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade1-func-output.json index 1aabd11ccb..549a4cf0dc 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade1-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade1-func-output.json @@ -158,13 +158,10 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } - }, - "meta" : { - "globalKey" : "e7dc2716" } }, "meta" : { @@ -239,9 +236,6 @@ "meta" : { "globalKey" : "3f1e2a" } - }, - "meta" : { - "globalKey" : "c1d79704" } }, "meta" : { @@ -581,13 +575,10 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } - }, - "meta" : { - "globalKey" : "e7dc2716" } }, "meta" : { @@ -662,9 +653,6 @@ "meta" : { "globalKey" : "3f1e2a" } - }, - "meta" : { - "globalKey" : "c1d79704" } }, "meta" : { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade4-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade4-func-output.json index 16cbcae598..133e342e06 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade4-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade4-func-output.json @@ -158,13 +158,10 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } - }, - "meta" : { - "globalKey" : "209b2f4d" } }, "meta" : { @@ -239,9 +236,6 @@ "meta" : { "globalKey" : "3f27aa" } - }, - "meta" : { - "globalKey" : "7b8a4704" } }, "meta" : { @@ -618,13 +612,10 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } - }, - "meta" : { - "globalKey" : "209b2f4d" } }, "meta" : { @@ -699,9 +690,6 @@ "meta" : { "globalKey" : "3f27aa" } - }, - "meta" : { - "globalKey" : "7b8a4704" } }, "meta" : { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade5-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade5-func-output.json index 186710166a..911e859eb2 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade5-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade5-func-output.json @@ -163,7 +163,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } @@ -482,7 +482,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade6-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade6-func-output.json index eae4260f0b..4ec7e1433f 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade6-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/dtcc-11-0/DDL_NewTrade6-func-output.json @@ -158,13 +158,10 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } - }, - "meta" : { - "globalKey" : "209b2f4d" } }, "meta" : { @@ -239,9 +236,6 @@ "meta" : { "globalKey" : "3f1faa" } - }, - "meta" : { - "globalKey" : "30014704" } }, "meta" : { @@ -567,13 +561,10 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } - }, - "meta" : { - "globalKey" : "209b2f4d" } }, "meta" : { @@ -648,9 +639,6 @@ "meta" : { "globalKey" : "3f1faa" } - }, - "meta" : { - "globalKey" : "30014704" } }, "meta" : { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada-func-output.json index 0e221ab17e..629c6de92c 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada-func-output.json @@ -227,16 +227,13 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } }, "transactedPrice" : { "marketFixedRate" : 0.02 - }, - "meta" : { - "globalKey" : "c847dc2a" } }, "meta" : { @@ -310,9 +307,6 @@ "meta" : { "globalKey" : "3ede2a" } - }, - "meta" : { - "globalKey" : "658f9704" } }, "meta" : { @@ -908,16 +902,13 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } }, "transactedPrice" : { "marketFixedRate" : 0.02 - }, - "meta" : { - "globalKey" : "c847dc2a" } }, "meta" : { @@ -991,9 +982,6 @@ "meta" : { "globalKey" : "3ede2a" } - }, - "meta" : { - "globalKey" : "658f9704" } }, "meta" : { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00-func-output.json index cce1397a0c..15b00bfe3c 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00-func-output.json @@ -110,7 +110,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { @@ -541,7 +541,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00-func-output.json index 54f3915833..b55069e2d9 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00-func-output.json @@ -202,7 +202,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { @@ -679,7 +679,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { @@ -1137,7 +1137,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10-func-output.json index 72ac4eb68e..99370c67f5 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10-func-output.json @@ -202,7 +202,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { @@ -679,7 +679,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { @@ -1137,7 +1137,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada-func-output.json index 24c32a9f5e..3c28e64a67 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada-func-output.json @@ -227,16 +227,13 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } }, "transactedPrice" : { "marketFixedRate" : 0.02 - }, - "meta" : { - "globalKey" : "c847dc2a" } }, "meta" : { @@ -310,9 +307,6 @@ "meta" : { "globalKey" : "3ede2a" } - }, - "meta" : { - "globalKey" : "658f9704" } }, "meta" : { @@ -908,16 +902,13 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } }, "transactedPrice" : { "marketFixedRate" : 0.02 - }, - "meta" : { - "globalKey" : "c847dc2a" } }, "meta" : { @@ -991,9 +982,6 @@ "meta" : { "globalKey" : "3ede2a" } - }, - "meta" : { - "globalKey" : "658f9704" } }, "meta" : { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada-func-output.json index 052090e9a3..9aa208ecbc 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada-func-output.json @@ -227,16 +227,13 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } }, "transactedPrice" : { "marketFixedRate" : 0.02 - }, - "meta" : { - "globalKey" : "c847dc2a" } }, "meta" : { @@ -310,9 +307,6 @@ "meta" : { "globalKey" : "3ede2a" } - }, - "meta" : { - "globalKey" : "658f9704" } }, "meta" : { @@ -851,16 +845,13 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } }, "transactedPrice" : { "marketFixedRate" : 0.02 - }, - "meta" : { - "globalKey" : "c847dc2a" } }, "meta" : { @@ -934,9 +925,6 @@ "meta" : { "globalKey" : "3ede2a" } - }, - "meta" : { - "globalKey" : "658f9704" } }, "meta" : { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada-func-output.json index adab4bb12b..f5a7d9eb6d 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada-func-output.json @@ -227,16 +227,13 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } }, "transactedPrice" : { "marketFixedRate" : 0.02 - }, - "meta" : { - "globalKey" : "c847dc2a" } }, "meta" : { @@ -310,9 +307,6 @@ "meta" : { "globalKey" : "3ede2a" } - }, - "meta" : { - "globalKey" : "658f9704" } }, "meta" : { @@ -908,16 +902,13 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } }, "transactedPrice" : { "marketFixedRate" : 0.02 - }, - "meta" : { - "globalKey" : "c847dc2a" } }, "meta" : { @@ -991,9 +982,6 @@ "meta" : { "globalKey" : "3ede2a" } - }, - "meta" : { - "globalKey" : "658f9704" } }, "meta" : { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-clearing-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-clearing-func-output.json index b364dc0583..059e94cece 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-clearing-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/fpml-5-10/processes/msg-new-trade-CFTC-clearing-func-output.json @@ -177,16 +177,13 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } }, "transactedPrice" : { "marketFixedRate" : 0.02 - }, - "meta" : { - "globalKey" : "c847dc2a" } }, "meta" : { @@ -260,9 +257,6 @@ "meta" : { "globalKey" : "3ede2a" } - }, - "meta" : { - "globalKey" : "658f9704" } }, "meta" : { @@ -758,16 +752,13 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } }, "transactedPrice" : { "marketFixedRate" : 0.02 - }, - "meta" : { - "globalKey" : "c847dc2a" } }, "meta" : { @@ -841,9 +832,6 @@ "meta" : { "globalKey" : "3ede2a" } - }, - "meta" : { - "globalKey" : "658f9704" } }, "meta" : { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-input.json index 90f2eadcb0..9a403feadc 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-input.json @@ -119,8 +119,7 @@ "value" : "TR30 4 3/4% TREASURY GILT 30" }, "identifierType" : "Name" - } ], - "securityType" : "Debt" + } ] } } } @@ -133,7 +132,7 @@ } }, "meta" : { - "globalKey" : "4062b7ba" + "globalKey" : "5cca7473" } } ], "counterparty" : [ { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-output.json index 55b2dfce58..10b0def02f 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/bond-execution-func-output.json @@ -4,10 +4,6 @@ "primitiveInstruction" : { "execution" : { "product" : { - "taxonomy" : [ { - "source" : "ISDA", - "productQualifier" : "InterestRate_Forward_Debt" - } ], "economicTerms" : { "payout" : [ { "SettlementPayout" : { @@ -127,8 +123,7 @@ "value" : "TR30 4 3/4% TREASURY GILT 30" }, "identifierType" : "Name" - } ], - "securityType" : "Debt" + } ] } } } @@ -141,7 +136,7 @@ } }, "meta" : { - "globalKey" : "4062b7ba" + "globalKey" : "5cca7473" } } ], "counterparty" : [ { @@ -222,10 +217,6 @@ "after" : [ { "trade" : { "product" : { - "taxonomy" : [ { - "source" : "ISDA", - "productQualifier" : "InterestRate_Forward_Debt" - } ], "economicTerms" : { "payout" : [ { "SettlementPayout" : { @@ -346,8 +337,7 @@ "value" : "TR30 4 3/4% TREASURY GILT 30" }, "identifierType" : "Name" - } ], - "securityType" : "Debt" + } ] } } } @@ -360,7 +350,7 @@ } }, "meta" : { - "globalKey" : "4062b7ba" + "globalKey" : "5cca7473" } } ] } ], @@ -436,17 +426,17 @@ } } ], "meta" : { - "globalKey" : "33ca4620" + "globalKey" : "f3683251" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "12bd25af" + "globalKey" : "6290c9a0" } } ], "meta" : { - "globalKey" : "c7015e9d" + "globalKey" : "fc9e59fd" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-input.json index d492060a51..5cb26f97aa 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-input.json @@ -115,8 +115,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -129,7 +128,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "direction" : "Replace" @@ -229,8 +228,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -306,14 +304,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -321,7 +318,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -336,12 +333,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "d25531df" + "globalKey" : "293fbe45" } } } @@ -446,8 +443,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -523,14 +519,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -538,7 +533,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -553,12 +548,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -654,8 +649,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -668,7 +662,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -752,14 +746,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-output.json index e9764e9bfe..f2bbeea471 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/cancellation-output.json @@ -117,8 +117,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -131,7 +130,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "direction" : "Replace" @@ -237,8 +236,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -314,17 +312,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -332,7 +329,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -347,12 +344,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "d25531df" + "globalKey" : "293fbe45" } } } @@ -463,8 +460,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -540,17 +536,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -558,7 +553,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -573,12 +568,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -674,8 +669,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -688,7 +682,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -772,14 +766,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -888,8 +882,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -965,17 +958,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -983,7 +975,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -998,12 +990,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -1099,8 +1091,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1113,7 +1104,7 @@ } }, "meta" : { - "globalKey" : "b7c2e18" + "globalKey" : "6b99ba55" } } ] } ], @@ -1197,7 +1188,7 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "451766" + "globalKey" : "c9872511" } }, "state" : { @@ -1207,7 +1198,7 @@ "positionState" : "Closed" }, "meta" : { - "globalKey" : "2420140f" + "globalKey" : "3cfd543a" } }, { "trade" : { @@ -1311,8 +1302,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1388,17 +1378,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1406,7 +1395,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1421,12 +1410,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "d25531df" + "globalKey" : "293fbe45" } }, "tradeLot" : [ { @@ -1522,8 +1511,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1536,7 +1524,7 @@ } }, "meta" : { - "globalKey" : "6f5b6f18" + "globalKey" : "5e4e5955" } } ] } ], @@ -1620,14 +1608,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "edb4cb65" + "globalKey" : "41610972" } }, "meta" : { - "globalKey" : "edb4cb65" + "globalKey" : "41610972" } } ], "meta" : { - "globalKey" : "65623d19" + "globalKey" : "70ede49d" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-input.json index 0301c2b87f..3616d30b6b 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-input.json @@ -134,8 +134,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -211,14 +210,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -226,7 +224,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -241,12 +239,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "3641fc21" + "globalKey" : "2fe3107" } } } @@ -349,8 +347,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -426,14 +423,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -441,7 +437,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -456,12 +452,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -557,8 +553,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -571,7 +566,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -655,14 +650,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-output.json index b8c8dfa09e..b6a6ed2eda 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-interest-payment-output.json @@ -77,9 +77,6 @@ }, "cashflowType" : { "cashflowType" : "NetInterest" - }, - "meta" : { - "globalKey" : "11ce29f7" } }, "InterestRatePayout" : { @@ -123,9 +120,6 @@ }, "dayCountFraction" : { "value" : "ACT/360" - }, - "meta" : { - "globalKey" : "69ca64cc" } }, "meta" : { @@ -145,8 +139,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -222,17 +215,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } - }, - "meta" : { - "globalKey" : "ac013980" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -240,7 +229,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -255,12 +244,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "3641fc21" + "globalKey" : "2fe3107" } } } @@ -347,9 +336,6 @@ }, "dayCountFraction" : { "value" : "ACT/360" - }, - "meta" : { - "globalKey" : "69ca64cc" } }, "meta" : { @@ -369,8 +355,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -446,17 +431,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } - }, - "meta" : { - "globalKey" : "ac013980" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -464,7 +445,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -479,12 +460,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -580,8 +561,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -594,7 +574,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -678,14 +658,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -765,9 +745,6 @@ }, "cashflowType" : { "cashflowType" : "NetInterest" - }, - "meta" : { - "globalKey" : "11ce29f7" } }, "InterestRatePayout" : { @@ -811,9 +788,6 @@ }, "dayCountFraction" : { "value" : "ACT/360" - }, - "meta" : { - "globalKey" : "69ca64cc" } }, "meta" : { @@ -833,8 +807,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -910,17 +883,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } - }, - "meta" : { - "globalKey" : "ac013980" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -928,7 +897,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -943,12 +912,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "3641fc21" + "globalKey" : "2fe3107" } }, "tradeLot" : [ { @@ -1044,8 +1013,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1058,7 +1026,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -1142,17 +1110,17 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "6670914" + "globalKey" : "19a50263" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "b134fba3" + "globalKey" : "ecd9dd32" } } ], "meta" : { - "globalKey" : "199f78ea" + "globalKey" : "a92fb58a" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-input.json index a71b2516b5..bf7e6fd345 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-input.json @@ -141,8 +141,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -218,14 +217,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -233,7 +231,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -248,12 +246,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "884e117f" + "globalKey" : "292c05e5" } } } @@ -358,8 +356,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -435,14 +432,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -450,7 +446,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -465,12 +461,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -566,8 +562,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -580,7 +575,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -664,14 +659,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-output.json index bbfecea7de..4dad0a1875 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/on-demand-rate-change-output.json @@ -149,8 +149,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -226,17 +225,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -244,7 +242,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -259,12 +257,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "884e117f" + "globalKey" : "292c05e5" } } } @@ -375,8 +373,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -452,17 +449,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -470,7 +466,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -485,12 +481,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -586,8 +582,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -600,7 +595,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -684,14 +679,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -800,8 +795,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -877,17 +871,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -895,7 +888,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -910,12 +903,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -1011,8 +1004,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1025,7 +1017,7 @@ } }, "meta" : { - "globalKey" : "b7c2e18" + "globalKey" : "6b99ba55" } } ] } ], @@ -1109,7 +1101,7 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "451766" + "globalKey" : "c9872511" } }, "state" : { @@ -1119,7 +1111,7 @@ "positionState" : "Closed" }, "meta" : { - "globalKey" : "2420140f" + "globalKey" : "3cfd543a" } }, { "trade" : { @@ -1223,8 +1215,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1300,17 +1291,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1318,7 +1308,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1333,12 +1323,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "884e117f" + "globalKey" : "292c05e5" } }, "tradeLot" : [ { @@ -1434,8 +1424,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1448,7 +1437,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -1532,14 +1521,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "ce4467d5" + "globalKey" : "c2f8702" } }, "meta" : { - "globalKey" : "ce4467d5" + "globalKey" : "c2f8702" } } ], "meta" : { - "globalKey" : "580c56e2" + "globalKey" : "659c5199" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-input.json index 2d56d53505..7144f160a2 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-input.json @@ -97,8 +97,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -174,14 +173,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -189,7 +187,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -204,12 +202,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -304,8 +302,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -318,7 +315,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { @@ -551,8 +548,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -628,14 +624,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -643,7 +638,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -658,12 +653,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -759,8 +754,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -773,7 +767,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -857,14 +851,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -966,8 +960,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1043,14 +1036,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1058,7 +1050,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1073,12 +1065,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -1173,8 +1165,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1187,7 +1178,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { @@ -1420,8 +1411,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1497,14 +1487,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1512,7 +1501,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1527,12 +1516,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -1628,8 +1617,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1642,7 +1630,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -1726,14 +1714,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-output.json index 904056b338..a547a8d886 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/pair-off-output.json @@ -105,8 +105,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -182,17 +181,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -200,7 +198,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -215,12 +213,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -315,8 +313,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -329,7 +326,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { @@ -568,8 +565,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -645,17 +641,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -663,7 +658,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -678,12 +673,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -779,8 +774,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -793,7 +787,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -877,14 +871,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -992,8 +986,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1069,17 +1062,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1087,7 +1079,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1102,12 +1094,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -1202,8 +1194,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1216,7 +1207,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { @@ -1455,8 +1446,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1532,17 +1522,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1550,7 +1539,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1565,12 +1554,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -1666,8 +1655,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1680,7 +1668,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -1764,14 +1752,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -1879,8 +1867,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1956,17 +1943,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1974,7 +1960,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1989,12 +1975,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -2090,8 +2076,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -2104,7 +2089,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -2239,14 +2224,14 @@ } }, "meta" : { - "globalKey" : "44bb33bd" + "globalKey" : "26271ba6" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "ab29200c" + "globalKey" : "e13ab1b5" } }, { "trade" : { @@ -2351,8 +2336,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -2428,17 +2412,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -2446,7 +2429,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -2461,12 +2444,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -2562,8 +2545,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -2576,7 +2558,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -2711,17 +2693,17 @@ } }, "meta" : { - "globalKey" : "44bb33bd" + "globalKey" : "26271ba6" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "ab29200c" + "globalKey" : "e13ab1b5" } } ], "meta" : { - "globalKey" : "c70169d6" + "globalKey" : "b068c902" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-delivered-price-quantity.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-delivered-price-quantity.json index fcbd096d70..d495431287 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-delivered-price-quantity.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-delivered-price-quantity.json @@ -71,8 +71,7 @@ } }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -85,6 +84,6 @@ } }, "meta" : { - "globalKey" : "d5a30690" + "globalKey" : "dd79f2dd" } } ] \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-input.json index 1644d41b11..d782a48584 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-input.json @@ -75,8 +75,7 @@ } }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -89,7 +88,7 @@ } }, "meta" : { - "globalKey" : "d5a30690" + "globalKey" : "dd79f2dd" } } ], "direction" : "Replace" @@ -195,8 +194,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -272,14 +270,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -287,7 +284,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -302,12 +299,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -403,8 +400,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -417,7 +413,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -501,14 +497,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-output.json index 6239c1a1ac..5258a7f23f 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/partial-delivery-output.json @@ -77,8 +77,7 @@ } }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -91,7 +90,7 @@ } }, "meta" : { - "globalKey" : "d5a30690" + "globalKey" : "dd79f2dd" } } ], "direction" : "Replace" @@ -203,8 +202,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -280,17 +278,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -298,7 +295,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -313,12 +310,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -414,8 +411,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -428,7 +424,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -512,14 +508,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -627,8 +623,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -704,17 +699,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -722,7 +716,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -737,12 +731,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -838,8 +832,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -852,7 +845,7 @@ } }, "meta" : { - "globalKey" : "6f344a1" + "globalKey" : "df112eac" } } ] } ], @@ -936,14 +929,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "408708c6" + "globalKey" : "aa9187b1" } }, "meta" : { - "globalKey" : "408708c6" + "globalKey" : "aa9187b1" } } ], "meta" : { - "globalKey" : "91500649" + "globalKey" : "ecaba3c" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-adjustment-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-adjustment-input.json index 54aef8462c..50cf4ecad9 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-adjustment-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-adjustment-input.json @@ -152,8 +152,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -229,14 +228,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -244,7 +242,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -259,12 +257,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "884e117f" + "globalKey" : "292c05e5" } } } @@ -369,8 +367,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -446,14 +443,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -461,7 +457,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -476,12 +472,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -577,8 +573,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -591,7 +586,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -675,14 +670,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-adjustment-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-adjustment-output.json index 3603936ec5..c86206695f 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-adjustment-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-adjustment-output.json @@ -160,8 +160,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -237,17 +236,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -255,7 +253,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -270,12 +268,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "884e117f" + "globalKey" : "292c05e5" } } } @@ -386,8 +384,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -463,17 +460,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -481,7 +477,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -496,12 +492,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -597,8 +593,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -611,7 +606,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -695,14 +690,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -810,8 +805,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -887,17 +881,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -905,7 +898,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -920,12 +913,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -1021,8 +1014,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1035,7 +1027,7 @@ } }, "meta" : { - "globalKey" : "b7c2e18" + "globalKey" : "6b99ba55" } } ] } ], @@ -1119,7 +1111,7 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "451766" + "globalKey" : "c9872511" } }, "state" : { @@ -1129,7 +1121,7 @@ "positionState" : "Closed" }, "meta" : { - "globalKey" : "2420140f" + "globalKey" : "3cfd543a" } }, { "trade" : { @@ -1233,8 +1225,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1310,17 +1301,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1328,7 +1318,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1343,12 +1333,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "884e117f" + "globalKey" : "292c05e5" } }, "tradeLot" : [ { @@ -1444,8 +1434,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1458,7 +1447,7 @@ } }, "meta" : { - "globalKey" : "1b8b8f2e" + "globalKey" : "ae2ede7f" } } ] } ], @@ -1542,14 +1531,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b02c17af" + "globalKey" : "450573e8" } }, "meta" : { - "globalKey" : "b02c17af" + "globalKey" : "450573e8" } } ], "meta" : { - "globalKey" : "c3bb9d2b" + "globalKey" : "1ca85770" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-input.json index 97a354f58c..9f9f16069e 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-input.json @@ -97,8 +97,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -174,14 +173,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -189,7 +187,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -204,12 +202,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -304,8 +302,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -318,7 +315,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-output.json index 3b873a5ab1..2501dec1cc 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-execution-func-output.json @@ -104,8 +104,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -181,17 +180,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -199,7 +197,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -214,12 +212,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -314,8 +312,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -328,7 +325,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { @@ -517,8 +514,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -594,17 +590,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -612,7 +607,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -627,12 +622,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -728,8 +723,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -742,7 +736,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -826,17 +820,17 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } ], "meta" : { - "globalKey" : "a5f5df05" + "globalKey" : "5a7eee59" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-reprice-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-reprice-input.json index 8c3e5ae1b1..a510b1288f 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-reprice-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-reprice-input.json @@ -152,8 +152,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -229,14 +228,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -244,7 +242,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -259,12 +257,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "884e117f" + "globalKey" : "292c05e5" } } } @@ -369,8 +367,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -446,14 +443,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -461,7 +457,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -476,12 +472,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -577,8 +573,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -591,7 +586,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -675,14 +670,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-reprice-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-reprice-output.json index 280c91caa3..39a9877372 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-reprice-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-reprice-output.json @@ -160,8 +160,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -237,17 +236,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -255,7 +253,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -270,12 +268,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "884e117f" + "globalKey" : "292c05e5" } } } @@ -386,8 +384,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -463,17 +460,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -481,7 +477,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -496,12 +492,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -597,8 +593,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -611,7 +606,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -695,14 +690,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -810,8 +805,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -887,17 +881,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -905,7 +898,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -920,12 +913,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -1021,8 +1014,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1035,7 +1027,7 @@ } }, "meta" : { - "globalKey" : "b7c2e18" + "globalKey" : "6b99ba55" } } ] } ], @@ -1119,7 +1111,7 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "451766" + "globalKey" : "c9872511" } }, "state" : { @@ -1129,7 +1121,7 @@ "positionState" : "Closed" }, "meta" : { - "globalKey" : "2420140f" + "globalKey" : "3cfd543a" } }, { "trade" : { @@ -1233,8 +1225,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1310,17 +1301,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1328,7 +1318,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1343,12 +1333,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "884e117f" + "globalKey" : "292c05e5" } }, "tradeLot" : [ { @@ -1444,8 +1434,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1458,7 +1447,7 @@ } }, "meta" : { - "globalKey" : "5da2464f" + "globalKey" : "7ec43f3e" } } ] } ], @@ -1542,14 +1531,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "7b674521" + "globalKey" : "53d5d036" } }, "meta" : { - "globalKey" : "7b674521" + "globalKey" : "53d5d036" } } ], "meta" : { - "globalKey" : "da50681a" + "globalKey" : "675aa261" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-collateral.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-collateral.json index a5f5ddbbb6..1dfee72de1 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-collateral.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-collateral.json @@ -77,29 +77,28 @@ "value" : "GB00BMGR2916" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "686cce76" + "globalKey" : "c98eddbd" } } ] }, "meta" : { - "globalKey" : "686cce76" + "globalKey" : "c98eddbd" } } } } ], "meta" : { - "globalKey" : "686cce76" + "globalKey" : "c98eddbd" } } } ], "meta" : { - "globalKey" : "686cce76" + "globalKey" : "c98eddbd" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-input.json index 2b68d135a0..a1d74ea442 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-input.json @@ -206,8 +206,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -283,14 +282,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -298,7 +296,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -313,12 +311,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -414,8 +412,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -428,7 +425,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -512,14 +509,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-output.json index 442e00b605..4763615c2b 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-output.json @@ -217,8 +217,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -294,17 +293,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -312,7 +310,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -327,12 +325,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -428,8 +426,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -442,7 +439,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -526,14 +523,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -738,8 +735,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -752,7 +748,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -836,14 +832,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "20a89ebb" + "globalKey" : "13db68f6" } }, "meta" : { - "globalKey" : "20a89ebb" + "globalKey" : "13db68f6" } } ], "meta" : { - "globalKey" : "d7bc02cf" + "globalKey" : "71e39535" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-price-quantity.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-price-quantity.json index adf7578930..f2c2837ee9 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-price-quantity.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/repo-substitution-price-quantity.json @@ -69,8 +69,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -83,7 +82,7 @@ } }, "meta" : { - "globalKey" : "3de38cd2" + "globalKey" : "bfce9c5b" } } ] }, { @@ -157,8 +156,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -171,7 +169,7 @@ } }, "meta" : { - "globalKey" : "3de38cd2" + "globalKey" : "bfce9c5b" } } ] } ] \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-input.json index f5e61ca93d..ded83f8f84 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-input.json @@ -115,8 +115,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -129,7 +128,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "direction" : "Replace" @@ -229,8 +228,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -306,14 +304,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -321,7 +318,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -336,12 +333,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "768a859e" + "globalKey" : "61e4f5c4" } } } @@ -446,8 +443,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -523,14 +519,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -538,7 +533,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -553,12 +548,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -654,8 +649,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -668,7 +662,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -752,14 +746,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-output.json index f868d68be5..90476a08a5 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/roll-output.json @@ -117,8 +117,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -131,7 +130,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "direction" : "Replace" @@ -237,8 +236,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -314,17 +312,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -332,7 +329,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -347,12 +344,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "768a859e" + "globalKey" : "61e4f5c4" } } } @@ -463,8 +460,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -540,17 +536,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -558,7 +553,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -573,12 +568,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -674,8 +669,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -688,7 +682,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -772,14 +766,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -887,8 +881,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -964,17 +957,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -982,7 +974,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -997,12 +989,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -1098,8 +1090,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1112,7 +1103,7 @@ } }, "meta" : { - "globalKey" : "b7c2e18" + "globalKey" : "6b99ba55" } } ] } ], @@ -1196,7 +1187,7 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "451766" + "globalKey" : "c9872511" } }, "state" : { @@ -1206,7 +1197,7 @@ "positionState" : "Closed" }, "meta" : { - "globalKey" : "2420140f" + "globalKey" : "3cfd543a" } }, { "trade" : { @@ -1310,8 +1301,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1387,17 +1377,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1405,7 +1394,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1420,12 +1409,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "768a859e" + "globalKey" : "61e4f5c4" } }, "tradeLot" : [ { @@ -1521,8 +1510,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1535,7 +1523,7 @@ } }, "meta" : { - "globalKey" : "6f5b6f18" + "globalKey" : "5e4e5955" } } ] } ], @@ -1619,14 +1607,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "fade5486" + "globalKey" : "b933fbf1" } }, "meta" : { - "globalKey" : "fade5486" + "globalKey" : "b933fbf1" } } ], "meta" : { - "globalKey" : "66e43059" + "globalKey" : "924a061d" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-input.json index 39bbfcf89c..91bf384a27 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-input.json @@ -118,8 +118,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -195,14 +194,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -210,7 +208,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -225,12 +223,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -325,8 +323,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -339,7 +336,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { @@ -511,15 +508,14 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } } }, "meta" : { - "globalKey" : "22607b8e" + "globalKey" : "2a652da5" } } ], "direction" : "Replace" @@ -621,8 +617,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -698,14 +693,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -713,7 +707,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -728,12 +722,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -828,8 +822,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -842,7 +835,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { @@ -1014,15 +1007,14 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } } }, "meta" : { - "globalKey" : "22607b8e" + "globalKey" : "2a652da5" } } ], "direction" : "Replace" @@ -1124,8 +1116,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1201,14 +1192,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1216,7 +1206,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1231,12 +1221,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -1331,8 +1321,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1345,7 +1334,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { @@ -1517,15 +1506,14 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } } }, "meta" : { - "globalKey" : "531cced0" + "globalKey" : "8f106a23" } } ], "direction" : "Replace" @@ -1631,8 +1619,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1708,14 +1695,13 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1723,7 +1709,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1738,12 +1724,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -1839,8 +1825,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1853,7 +1838,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -1937,14 +1922,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-output.json index e3abe74e3e..3851d3142a 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-output.json @@ -126,8 +126,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -203,17 +202,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -221,7 +219,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -236,12 +234,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -336,8 +334,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -350,7 +347,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { @@ -522,15 +519,14 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } } }, "meta" : { - "globalKey" : "22607b8e" + "globalKey" : "2a652da5" } } ], "direction" : "Replace" @@ -638,8 +634,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -715,17 +710,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -733,7 +727,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -748,12 +742,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -848,8 +842,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -862,7 +855,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { @@ -1034,15 +1027,14 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } } }, "meta" : { - "globalKey" : "22607b8e" + "globalKey" : "2a652da5" } } ], "direction" : "Replace" @@ -1150,8 +1142,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1227,17 +1218,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1245,7 +1235,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1260,12 +1250,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "priceQuantity" : [ { @@ -1360,8 +1350,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1374,7 +1363,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ], "counterparty" : [ { @@ -1546,15 +1535,14 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } } }, "meta" : { - "globalKey" : "531cced0" + "globalKey" : "8f106a23" } } ], "direction" : "Replace" @@ -1666,8 +1654,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -1743,17 +1730,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -1761,7 +1747,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -1776,12 +1762,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -1877,8 +1863,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -1891,7 +1876,7 @@ } }, "meta" : { - "globalKey" : "ce3a1589" + "globalKey" : "ccb8a0c4" } } ] } ], @@ -1975,14 +1960,14 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "b9aac117" + "globalKey" : "3add0140" } }, "state" : { "positionState" : "Executed" }, "meta" : { - "globalKey" : "a26abee6" + "globalKey" : "a00d98cf" } } } @@ -2091,8 +2076,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -2168,17 +2152,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -2186,7 +2169,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -2201,12 +2184,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -2302,8 +2285,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -2316,7 +2298,7 @@ } }, "meta" : { - "globalKey" : "b7c2e18" + "globalKey" : "6b99ba55" } } ] } ], @@ -2400,7 +2382,7 @@ "role" : "Buyer" } ], "meta" : { - "globalKey" : "451766" + "globalKey" : "c9872511" } }, "state" : { @@ -2410,7 +2392,7 @@ "positionState" : "Closed" }, "meta" : { - "globalKey" : "2420140f" + "globalKey" : "3cfd543a" } }, { "trade" : { @@ -2515,8 +2497,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -2592,17 +2573,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -2610,7 +2590,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -2625,12 +2605,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -2726,8 +2706,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -2740,7 +2719,7 @@ } }, "meta" : { - "globalKey" : "77b6e318" + "globalKey" : "e2b46555" } } ] } ], @@ -2844,11 +2823,11 @@ } }, "meta" : { - "globalKey" : "5b71e9c8" + "globalKey" : "f4400b33" } }, "meta" : { - "globalKey" : "5b71e9c8" + "globalKey" : "f4400b33" } }, { "trade" : { @@ -2953,8 +2932,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -3030,17 +3008,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -3048,7 +3025,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -3063,12 +3040,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -3164,8 +3141,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -3178,7 +3154,7 @@ } }, "meta" : { - "globalKey" : "77b6e318" + "globalKey" : "e2b46555" } } ] } ], @@ -3282,11 +3258,11 @@ } }, "meta" : { - "globalKey" : "5b71e9c8" + "globalKey" : "f4400b33" } }, "meta" : { - "globalKey" : "5b71e9c8" + "globalKey" : "f4400b33" } }, { "trade" : { @@ -3391,8 +3367,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } }, "economicTerms" : { @@ -3468,17 +3443,16 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } }, "meta" : { - "globalKey" : "ac013980" + "globalKey" : "479be973" } } ] } @@ -3486,7 +3460,7 @@ } } ], "meta" : { - "globalKey" : "27d08997" + "globalKey" : "94d568bd" } } } ], @@ -3501,12 +3475,12 @@ } ] }, "meta" : { - "globalKey" : "a565e3a8" + "globalKey" : "a7344e4e" } } }, "meta" : { - "globalKey" : "549fe6be" + "globalKey" : "62201ee4" } }, "tradeLot" : [ { @@ -3602,8 +3576,7 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } @@ -3616,7 +3589,7 @@ } }, "meta" : { - "globalKey" : "a7c73556" + "globalKey" : "2651d357" } } ] } ], @@ -3720,14 +3693,14 @@ } }, "meta" : { - "globalKey" : "616ab508" + "globalKey" : "b260d7f3" } }, "meta" : { - "globalKey" : "616ab508" + "globalKey" : "b260d7f3" } } ], "meta" : { - "globalKey" : "53e4e999" + "globalKey" : "eb85ea88" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-primitive-instruction-trade-lots.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-primitive-instruction-trade-lots.json index fd241ee699..30e8c13776 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-primitive-instruction-trade-lots.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/repo-and-bond/shaping-primitive-instruction-trade-lots.json @@ -69,15 +69,14 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } } }, "meta" : { - "globalKey" : "22607b8e" + "globalKey" : "2a652da5" } } ] }, { @@ -151,15 +150,14 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } } }, "meta" : { - "globalKey" : "22607b8e" + "globalKey" : "2a652da5" } } ] }, { @@ -233,15 +231,14 @@ "value" : "GB00B24FF097" }, "identifierType" : "ISIN" - } ], - "securityType" : "Debt" + } ] } } } } }, "meta" : { - "globalKey" : "531cced0" + "globalKey" : "8f106a23" } } ] } ] \ No newline at end of file diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-input.json index 7ee0171d3a..e4d1cb2210 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-input.json @@ -349,7 +349,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -623,7 +623,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-output.json index f6a7ab6d46..99bedc3785 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/allocation/allocation-sec-lending-func-output.json @@ -321,7 +321,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -601,7 +601,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -856,7 +856,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1136,7 +1136,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1422,7 +1422,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1702,7 +1702,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1988,7 +1988,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -2268,7 +2268,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/block-execution-instruction.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/block-execution-instruction.json index 723d8cf8e4..4f864c5385 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/block-execution-instruction.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/block-execution-instruction.json @@ -65,7 +65,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -261,7 +261,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/block-execution-trade-state.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/block-execution-trade-state.json index 84bf092100..a87c3086e2 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/block-execution-trade-state.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/block-execution-trade-state.json @@ -115,7 +115,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -389,7 +389,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-input.json index 4bf73f0a40..39c67ad092 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-input.json @@ -154,7 +154,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -428,7 +428,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1108,7 +1108,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1382,7 +1382,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1903,7 +1903,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -2177,7 +2177,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-output.json index 613f2cbdc2..a32702fa13 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/create-security-lending-invoice-func-output.json @@ -154,7 +154,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -428,7 +428,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1246,7 +1246,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1520,7 +1520,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -2114,7 +2114,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -2388,7 +2388,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-input.json index 4cf316a31c..b9bd73bdd6 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-input.json @@ -116,7 +116,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -390,7 +390,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-output.json index dbd95684bb..edada5b9ed 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/full-return-settlement-workflow-func-output.json @@ -119,7 +119,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -393,7 +393,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -979,7 +979,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1253,7 +1253,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1840,7 +1840,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -2114,7 +2114,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -2526,7 +2526,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -2800,7 +2800,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-input.json index b4a0b43d9a..b303c006db 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-input.json @@ -68,7 +68,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -267,7 +267,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-output.json index bd36929238..7050cd1f47 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/new-settlement-workflow-func-output.json @@ -120,7 +120,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -393,7 +393,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -653,7 +653,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -927,7 +927,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1372,7 +1372,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1646,7 +1646,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -2092,7 +2092,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -2366,7 +2366,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -2637,7 +2637,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -2911,7 +2911,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-input.json index 4b5af1c063..bf6d87d12b 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-input.json @@ -116,7 +116,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -390,7 +390,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-output.json index 4164751efc..cd41def818 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/part-return-settlement-workflow-func-output.json @@ -119,7 +119,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -393,7 +393,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -976,7 +976,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1250,7 +1250,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1834,7 +1834,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -2108,7 +2108,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -2517,7 +2517,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -2791,7 +2791,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-input.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-input.json index 69e4342789..7f80e8a3f9 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-input.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-input.json @@ -254,7 +254,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -528,7 +528,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-output.json b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-output.json index d9473735b9..8f579665d2 100644 --- a/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-output.json +++ b/rosetta-source/src/main/resources/cdm-sample-files/functions/sec-lending/reallocation/reallocation-pre-settled-func-output.json @@ -236,7 +236,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -516,7 +516,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -806,7 +806,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1086,7 +1086,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1409,7 +1409,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1689,7 +1689,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade1.json b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade1.json index 6a554443d3..8d0b481349 100644 --- a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade1.json +++ b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade1.json @@ -158,7 +158,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade4.json b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade4.json index e8d5eedade..bc3ca181a2 100644 --- a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade4.json +++ b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade4.json @@ -158,7 +158,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade5.json b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade5.json index a52d0b2da3..6f78beccf3 100644 --- a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade5.json +++ b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade5.json @@ -163,7 +163,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade6.json b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade6.json index 5ecbbf84f2..745bc03d6d 100644 --- a/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade6.json +++ b/rosetta-source/src/main/resources/result-json-files/dtcc-11-0/DDL_NewTrade6.json @@ -158,7 +158,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fis/isla1.json b/rosetta-source/src/main/resources/result-json-files/fis/isla1.json index 293b6bb189..9bcb995242 100644 --- a/rosetta-source/src/main/resources/result-json-files/fis/isla1.json +++ b/rosetta-source/src/main/resources/result-json-files/fis/isla1.json @@ -68,7 +68,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -300,7 +300,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -454,7 +454,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -686,7 +686,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -855,7 +855,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1087,7 +1087,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1256,7 +1256,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1488,7 +1488,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -1657,7 +1657,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -1889,7 +1889,7 @@ }, "identifierType" : "SEDOL" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex19-cds-execution-allocations.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex19-cds-execution-allocations.json index c166389dbe..223e666113 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex19-cds-execution-allocations.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-processes/msg-ex19-cds-execution-allocations.json @@ -215,7 +215,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/bond-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/bond-option.json index 3f40758d23..843efd93c1 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/bond-option.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/bond-option.json @@ -205,7 +205,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option-2.json index 0f9fe60d08..8342cde400 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option-2.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option-2.json @@ -232,7 +232,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option.json index 06448b2617..4dcd663675 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/bond-options/cb-option.json @@ -240,7 +240,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json index d91465e4b5..441162dded 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json @@ -157,7 +157,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json index 5c8a1763d3..ef2ce5da9f 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json @@ -70,7 +70,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "7abf9ebb", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json index 55ba3c370a..c5e77ba8d6 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "7abf9ebb", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json index 3328f6e75f..d8e4001495 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json @@ -160,7 +160,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json index 61eb4dac95..90cbf882ff 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json index b49e625e38..0192263508 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "8695044e", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json index 6a5f9455a2..572c8ef3b9 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json @@ -142,7 +142,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "b489e2c8", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json index 284db1dc97..97610e4cea 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json @@ -144,7 +144,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "68c6dc05", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json index 30f8a5c9ec..d9e2484a38 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "68c6dc05", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json index aa554bcf66..295aa10da9 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json index 322ffa4f43..82fe7fa69c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json index 682c2e3b33..192ede6838 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json @@ -143,7 +143,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "546f933e", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json index 1294e90f8b..96686e037c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json @@ -143,7 +143,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json index ed1a86e72b..422a9b101c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json @@ -153,7 +153,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json index f831c54141..d63f23bc38 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json index f8e9b361f4..5ab73a2d2d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json index a49af43f92..2ee133d46d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "5cf1ae36", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json index db8ca100de..51cd8225f9 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json @@ -152,7 +152,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "23b559bc", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json index 1f35f45be7..614f014a22 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json @@ -149,7 +149,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "7b58e286", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json index bf36812b2d..4feff0b8f5 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json @@ -142,7 +142,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "80f8c8cb", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json index e077fd3120..42b959c493 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json @@ -85,7 +85,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json index 12cfb9f1ad..848b95165c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json @@ -73,7 +73,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex18-standard-north-american-corp.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex18-standard-north-american-corp.json index ab9b3296b1..10efec80fa 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex18-standard-north-american-corp.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-ex18-standard-north-american-corp.json @@ -73,7 +73,7 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json index 4434dc23d2..9584adc274 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json @@ -74,7 +74,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-1.json index e4820e09a9..ce670df4c8 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-1.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-1.json @@ -143,7 +143,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-2.json index 7ebac28b57..863c4a873e 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-2.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cd-swaption-2.json @@ -184,7 +184,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-ELCDS-ReferenceObligation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-ELCDS-ReferenceObligation.json index 8343d8da6b..8088475413 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-ELCDS-ReferenceObligation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-ELCDS-ReferenceObligation.json @@ -101,6 +101,7 @@ }, "identifierType" : "BBGID" } ], + "instrumentType" : "Debt", "borrower" : [ { "name" : { "value" : "BorrowerName1" @@ -148,7 +149,7 @@ } ] }, "meta" : { - "globalKey" : "fbf842d9" + "globalKey" : "d49bda7c" } }, { "InterestRatePayout" : { @@ -219,7 +220,7 @@ } }, "meta" : { - "globalKey" : "c422dcc4" + "globalKey" : "d73b7b87" } }, "tradeLot" : [ { @@ -435,10 +436,10 @@ } }, "meta" : { - "globalKey" : "f6a76e64" + "globalKey" : "d26c75a7" } }, "meta" : { - "globalKey" : "f6a76e64" + "globalKey" : "d26c75a7" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket-tranche.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket-tranche.json index 0044f2cb58..71bdbeaab4 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket-tranche.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket-tranche.json @@ -109,7 +109,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -148,7 +148,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket.json index f9d4f0bec2..cd332a1467 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-basket.json @@ -100,7 +100,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -142,7 +142,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-custom-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-custom-basket.json index 407c11c10a..6b206fa8e8 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-custom-basket.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-custom-basket.json @@ -112,7 +112,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -164,7 +164,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", @@ -216,7 +216,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-ReferenceObligation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-ReferenceObligation.json index 9ccf5d209b..0c28a6df2d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-ReferenceObligation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-loan-ReferenceObligation.json @@ -128,6 +128,7 @@ }, "identifierType" : "Other" } ], + "instrumentType" : "Debt", "lien" : { "value" : "FirstLienLoan" }, @@ -220,7 +221,7 @@ } ] }, "meta" : { - "globalKey" : "1a0b8594" + "globalKey" : "1e35e057" } }, { "InterestRatePayout" : { @@ -297,7 +298,7 @@ } }, "meta" : { - "globalKey" : "75e839e3" + "globalKey" : "a2700874" } }, "tradeLot" : [ { @@ -516,10 +517,10 @@ } }, "meta" : { - "globalKey" : "4582a89e" + "globalKey" : "c0d14f6d" } }, "meta" : { - "globalKey" : "4582a89e" + "globalKey" : "c0d14f6d" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-CMBS.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-CMBS.json index 96b4215215..4d1d68922f 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-CMBS.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-CMBS.json @@ -127,7 +127,7 @@ }, "identifierType" : "BBGID" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-RMBS.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-RMBS.json index 6da525d15c..1766f6d4fb 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-RMBS.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/credit-derivatives/cds-mortgage-RMBS.json @@ -137,7 +137,7 @@ }, "identifierType" : "BBGID" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json index 4e0dd45e32..18904e5519 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json @@ -209,7 +209,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex02-calendar-spread-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex02-calendar-spread-short-form.json index 0bc7f0ace4..a6305ab786 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex02-calendar-spread-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex02-calendar-spread-short-form.json @@ -203,7 +203,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex03-call-or-put-spread-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex03-call-or-put-spread-short-form.json index 8376f429db..790eeceb89 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex03-call-or-put-spread-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex03-call-or-put-spread-short-form.json @@ -203,7 +203,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex08-basket-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex08-basket-long-form.json index e813fc7b4f..e55fd04bca 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex08-basket-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex08-basket-long-form.json @@ -167,7 +167,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -217,7 +217,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json index 438c3a79c1..b64b8a2a9c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json @@ -193,7 +193,7 @@ "globalKey" : "292a56" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json index f0c538aca8..7faf9bb061 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json @@ -202,7 +202,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex12-vanilla-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex12-vanilla-short-form.json index fbec1aebb6..e20d9c8c0b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex12-vanilla-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex12-vanilla-short-form.json @@ -203,7 +203,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex13-1996-american-call-stock.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex13-1996-american-call-stock.json index 925c3986be..49b751f544 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex13-1996-american-call-stock.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex13-1996-american-call-stock.json @@ -222,7 +222,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json index 5d45502773..aad11bd4b0 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json @@ -217,7 +217,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json index 4e73a922a3..52b0a51506 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json @@ -181,7 +181,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -231,7 +231,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json index a4130727a1..a4a1e13f03 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json @@ -195,7 +195,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json index 2d49555187..9fb0242488 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json @@ -193,7 +193,7 @@ "globalKey" : "fbea4eb1" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json index 95bde0a858..80bf4a061d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json @@ -202,7 +202,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json index d50f304fed..7f049a3a84 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json @@ -233,7 +233,7 @@ "globalKey" : "29232c" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -280,7 +280,7 @@ "globalKey" : "29232c" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json index b74ca9bb97..f729e77379 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json @@ -285,7 +285,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json index 37a9d00981..d3fbb14ab2 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json @@ -366,7 +366,7 @@ "globalKey" : "294424" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex07-long-form-with-stub.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex07-long-form-with-stub.json index fec6b249b4..5edc24da57 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex07-long-form-with-stub.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex07-long-form-with-stub.json @@ -439,7 +439,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, @@ -484,7 +484,7 @@ "globalKey" : "291797" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, @@ -529,7 +529,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, @@ -574,7 +574,7 @@ "globalKey" : "2929d8" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, @@ -619,7 +619,7 @@ "globalKey" : "2906e2" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, @@ -664,7 +664,7 @@ "globalKey" : "2927d3" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json index 9b4b762acb..2c7f1ffef0 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json @@ -508,7 +508,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -558,7 +558,7 @@ "globalKey" : "291797" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -608,7 +608,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -658,7 +658,7 @@ "globalKey" : "2929d8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -708,7 +708,7 @@ "globalKey" : "2906e2" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -758,7 +758,7 @@ "globalKey" : "2927d3" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json index 8abe38e871..f68c43dbd7 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json @@ -583,7 +583,7 @@ "globalKey" : "290e2b" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json index 290c41866e..46344c67c3 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json @@ -634,7 +634,7 @@ "globalKey" : "290e2b" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex17-cfd.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex17-cfd.json index edec23239e..089fc0c000 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex17-cfd.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex17-cfd.json @@ -388,7 +388,7 @@ "globalKey" : "24cd5d" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json index 4e0c809797..10414d11e5 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json @@ -449,7 +449,7 @@ "globalKey" : "fd81" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json index 5e467ba311..39241ca732 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json @@ -455,7 +455,7 @@ "globalKey" : "fd81" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex01-equity-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex01-equity-basket.json index 37e51b5b7d..8403ce088d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex01-equity-basket.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex01-equity-basket.json @@ -486,7 +486,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -536,7 +536,7 @@ "globalKey" : "291797" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex02-single-equity.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex02-single-equity.json index ffd016d8ae..7988858f49 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex02-single-equity.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex02-single-equity.json @@ -461,7 +461,7 @@ "globalKey" : "292da8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json index 1e5029e0f8..35d86177e9 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/incomplete-products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json @@ -446,7 +446,7 @@ "globalKey" : "292da8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/AdditionalFixedPayments_mortgages.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/AdditionalFixedPayments_mortgages.json index d361618945..7f1888a456 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/AdditionalFixedPayments_mortgages.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/AdditionalFixedPayments_mortgages.json @@ -143,7 +143,7 @@ }, "identifierType" : "BBGID" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ], "allGuarantees" : true, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nameOrId.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nameOrId.json index 26e07e1cef..24be96976c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nameOrId.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nameOrId.json @@ -97,7 +97,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -136,7 +136,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nthToDefault_mthToDefault.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nthToDefault_mthToDefault.json index 88543fd981..e1d5da1702 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nthToDefault_mthToDefault.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/BasketReferenceInformation_nthToDefault_mthToDefault.json @@ -109,7 +109,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -148,7 +148,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FloatingAmountEvents_mortgages.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FloatingAmountEvents_mortgages.json index 9e2c12e14e..f15c45a882 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FloatingAmountEvents_mortgages.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FloatingAmountEvents_mortgages.json @@ -143,7 +143,7 @@ }, "identifierType" : "BBGID" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ], "allGuarantees" : true, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_12.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_12.json index 9ea7bbd5ab..505dcc38d8 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_12.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_12.json @@ -143,7 +143,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "546f933e", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_19.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_19.json index 43b265e9d3..1647cbde09 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_19.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_19.json @@ -157,7 +157,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_26_28.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_26_28.json index 0a1284669e..8c4165d6b5 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_26_28.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_26_28.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "5cf1ae36", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-1.json index 3dc4e6d9bd..5317d36147 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-1.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-1.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "5cf1ae36", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-2.json index 33aa025336..c28dd2bf2e 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-2.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-2.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "5cf1ae36", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-3.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-3.json index d2da0b2b0c..b862f31221 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-3.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_27-3.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "5cf1ae36", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-1.json index 7434b62780..1d4566ad76 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-1.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-1.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "5cf1ae36", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-2.json index f43c8b84aa..38a95a3cea 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-2.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_30-2.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "5cf1ae36", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_37.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_37.json index 72baf65c5b..b11d16c471 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_37.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_37.json @@ -138,7 +138,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -177,7 +177,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_41.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_41.json index b501899dd3..1c88745fb3 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_41.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_41.json @@ -157,7 +157,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_42.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_42.json index e6c88fdc1c..926110ba9d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_42.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_42.json @@ -157,7 +157,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_44.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_44.json index 46a71ad6ad..df3acc72af 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_44.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_cd_44.json @@ -112,7 +112,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -164,7 +164,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", @@ -216,7 +216,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_14.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_14.json index 192c8ff03d..8a0a3be4e3 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_14.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_14.json @@ -73,7 +73,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_economicTermsEffectiveDate.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_economicTermsEffectiveDate.json index 775e21fcd3..7b64b69fe9 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_economicTermsEffectiveDate.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_21_economicTermsEffectiveDate.json @@ -143,7 +143,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "546f933e", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-1.json index 875eadb733..77c1749451 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-1.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-1.json @@ -129,7 +129,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "23b559bc", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-2.json index d73bbf5383..ca3197d3f1 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-2.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_35_cd_31-2.json @@ -129,7 +129,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "23b559bc", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_8.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_8.json index 0e37137126..9565ca3719 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_8.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/FpML_ird_8.json @@ -73,7 +73,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Tranche_dataRules.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Tranche_dataRules.json index 52656b24fa..51b0714e65 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Tranche_dataRules.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/invalid-products/Tranche_dataRules.json @@ -109,7 +109,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -148,7 +148,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada.json index e7609f9655..9dd44d7ff7 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-cleared-alpha-trade-CFTC-SEC-and-canada.json @@ -227,7 +227,7 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00.json index 8054e9c4c8..5ef84733ea 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex51-execution-advice-trade-initiation-C01-00.json @@ -110,7 +110,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00.json index 33e9c0c724..6aaf30060f 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex52-execution-advice-trade-partial-novation-C02-00.json @@ -202,7 +202,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json index d30d8150b1..829c39c4f7 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json @@ -202,7 +202,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada.json index a2dddb9a4a..cc1ffd7617 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-alpha-trade-CFTC-SEC-and-canada.json @@ -227,7 +227,7 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada.json index f2a3f44d33..e1c7e80587 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-beta-trade-CFTC-SEC-and-canada.json @@ -227,7 +227,7 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada.json index 9e03e132c9..0a1df0aeef 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-SEC-and-canada.json @@ -227,7 +227,7 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-clearing.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-clearing.json index 4da020c631..6d881d885a 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-clearing.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/processes/msg-new-trade-CFTC-clearing.json @@ -177,7 +177,7 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex01-correlation-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex01-correlation-swap.json index d75b300338..43d44bf4e9 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex01-correlation-swap.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex01-correlation-swap.json @@ -196,7 +196,7 @@ "globalKey" : "293090" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -235,7 +235,7 @@ "globalKey" : "292da8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -274,7 +274,7 @@ "globalKey" : "293090" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json index 2d246b9c34..3a7903a766 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json @@ -217,7 +217,7 @@ "globalKey" : "292da8" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -259,7 +259,7 @@ "globalKey" : "293090" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -301,7 +301,7 @@ "globalKey" : "292da8" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json index 76b1d7254b..ea619a7fb7 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json @@ -219,7 +219,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -266,7 +266,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -313,7 +313,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json index 27edcc2b6c..7ed51ea11c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json @@ -219,7 +219,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -266,7 +266,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -313,7 +313,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex01-long-asia-corp-fixreg-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex01-long-asia-corp-fixreg-versioned.json index 9ec1c9fc25..7f491a8c07 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex01-long-asia-corp-fixreg-versioned.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex01-long-asia-corp-fixreg-versioned.json @@ -157,7 +157,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex02-2003-short-asia-corp-fixreg-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex02-2003-short-asia-corp-fixreg-versioned.json index 55b137f784..74d4962883 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex02-2003-short-asia-corp-fixreg-versioned.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex02-2003-short-asia-corp-fixreg-versioned.json @@ -70,7 +70,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "7abf9ebb", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor-versioned.json index 2b5e58b9ab..e9b18d62c3 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor-versioned.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor-versioned.json @@ -85,7 +85,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-indamt-ex01-short-us-corp-fixreg-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-indamt-ex01-short-us-corp-fixreg-versioned.json index 9e47b2bf5a..d5b3e596bc 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-indamt-ex01-short-us-corp-fixreg-versioned.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-indamt-ex01-short-us-corp-fixreg-versioned.json @@ -74,7 +74,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-usi.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-usi.json index 07b7a6081f..1c7f1b920c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-usi.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-usi.json @@ -187,7 +187,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-uti.json index 5c59ee3f2a..f70794cc2b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-uti.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cd-swaption-uti.json @@ -143,7 +143,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-mortgage-CMBS-single-payment-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-mortgage-CMBS-single-payment-versioned.json index ffc9c25bac..068dfc5875 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-mortgage-CMBS-single-payment-versioned.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-mortgage-CMBS-single-payment-versioned.json @@ -127,7 +127,7 @@ }, "identifierType" : "BBGID" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-ref-ob-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-ref-ob-versioned.json index 17d7318d6e..6d93dd69f1 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-ref-ob-versioned.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cdm-cds-ref-ob-versioned.json @@ -212,7 +212,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ], "referencePrice" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-ELCDS-ReferenceObligation-collateral-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-ELCDS-ReferenceObligation-collateral-versioned.json index 8e81b7c051..ee2723cf76 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-ELCDS-ReferenceObligation-collateral-versioned.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-ELCDS-ReferenceObligation-collateral-versioned.json @@ -110,6 +110,7 @@ }, "identifierType" : "BBGID" } ], + "instrumentType" : "Debt", "borrower" : [ { "name" : { "value" : "BorrowerName1" @@ -157,7 +158,7 @@ } ] }, "meta" : { - "globalKey" : "25404a32" + "globalKey" : "d454be43" } }, { "InterestRatePayout" : { @@ -228,7 +229,7 @@ } }, "meta" : { - "globalKey" : "377659d" + "globalKey" : "82780dce" } }, "tradeLot" : [ { @@ -450,10 +451,10 @@ } }, "meta" : { - "globalKey" : "f538285b" + "globalKey" : "27fd858c" } }, "meta" : { - "globalKey" : "f538285b" + "globalKey" : "27fd858c" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-tranche-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-tranche-versioned.json index fa553a5cfc..babfc635e5 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-tranche-versioned.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-tranche-versioned.json @@ -109,7 +109,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -148,7 +148,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-uti.json index e09e7dcf4c..396152cecd 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-uti.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-basket-uti.json @@ -112,7 +112,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -154,7 +154,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-ReferenceObligation-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-ReferenceObligation-uti.json index 5e3acf52f0..b113f157cc 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-ReferenceObligation-uti.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-loan-ReferenceObligation-uti.json @@ -128,6 +128,7 @@ }, "identifierType" : "Other" } ], + "instrumentType" : "Debt", "lien" : { "value" : "FirstLienLoan" }, @@ -220,7 +221,7 @@ } ] }, "meta" : { - "globalKey" : "a73e92f6" + "globalKey" : "ab68edb9" } }, { "InterestRatePayout" : { @@ -297,7 +298,7 @@ } }, "meta" : { - "globalKey" : "d67f9ec1" + "globalKey" : "3076d52" } }, "tradeLot" : [ { @@ -508,10 +509,10 @@ } }, "meta" : { - "globalKey" : "e076eb40" + "globalKey" : "418ef9cf" } }, "meta" : { - "globalKey" : "e076eb40" + "globalKey" : "418ef9cf" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-mortgage-RMBS-versioned.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-mortgage-RMBS-versioned.json index 2cdf378151..c100fef99c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-mortgage-RMBS-versioned.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/credit/cds-mortgage-RMBS-versioned.json @@ -137,7 +137,7 @@ }, "identifierType" : "BBGID" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex01-american-call-stock-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex01-american-call-stock-long-form.json index 4e0dd45e32..18904e5519 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex01-american-call-stock-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqd-ex01-american-call-stock-long-form.json @@ -209,7 +209,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form-other-party.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form-other-party.json index 7e58ab9978..3009ff2f28 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form-other-party.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form-other-party.json @@ -451,7 +451,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form.json index 26bf71a648..93f7e080a1 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex01-single-underlyer-execution-long-form.json @@ -451,7 +451,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json index 1e71eef556..ad4ae4b57f 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json @@ -497,7 +497,7 @@ "globalKey" : "28fe4f" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json index a1e1b6c54f..292a14af5e 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json @@ -434,7 +434,7 @@ "globalKey" : "291797" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json index a54fe84ef2..ea9fd7a610 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json @@ -652,7 +652,7 @@ "globalKey" : "292479" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json index 4d5c8af442..1fd1ab3277 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json @@ -630,7 +630,7 @@ "globalKey" : "290e2b" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json index 36e2e772ee..3d1267d581 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json @@ -183,7 +183,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "conditionPrecedentBond" : true } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-fwd-generic-ex01.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-fwd-generic-ex01.json index 663f7a803f..ac9421cf01 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-fwd-generic-ex01.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-fwd-generic-ex01.json @@ -200,7 +200,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-fwd-generic-ex02.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-fwd-generic-ex02.json index 37534f152e..2a5158af14 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-fwd-generic-ex02.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-fwd-generic-ex02.json @@ -200,7 +200,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-option-uti.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-option-uti.json index 139df76fc7..85ffe75636 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-option-uti.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/bond-option-uti.json @@ -217,7 +217,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cb-option-usi.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cb-option-usi.json index f769246973..e27f69c8e6 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cb-option-usi.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/rates/cb-option-usi.json @@ -240,7 +240,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex01-variance-swap-index.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex01-variance-swap-index.json index d9b50fa9f6..34448937f7 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex01-variance-swap-index.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex01-variance-swap-index.json @@ -107,7 +107,8 @@ "meta" : { "globalKey" : "290478" } - } ] + } ], + "instrumentType" : "ListedDerivative" } } } @@ -117,7 +118,7 @@ } }, "meta" : { - "globalKey" : "67d9fa2d" + "globalKey" : "78eb5cbc" } } ], "calculationAgent" : { @@ -125,7 +126,7 @@ } }, "meta" : { - "globalKey" : "25900bd7" + "globalKey" : "37d306a6" } }, "tradeLot" : [ { @@ -345,10 +346,10 @@ } }, "meta" : { - "globalKey" : "1516ea49" + "globalKey" : "5fe957d8" } }, "meta" : { - "globalKey" : "1516ea49" + "globalKey" : "5fe957d8" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json index b9a1113fd5..5729a31ff3 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json @@ -111,7 +111,8 @@ "meta" : { "globalKey" : "290478" } - } ] + } ], + "instrumentType" : "ListedDerivative" } } } @@ -121,7 +122,7 @@ } }, "meta" : { - "globalKey" : "144421bc" + "globalKey" : "59c6270d" } } ], "calculationAgent" : { @@ -129,7 +130,7 @@ } }, "meta" : { - "globalKey" : "600e8ba6" + "globalKey" : "4d2480b7" } }, "tradeLot" : [ { @@ -181,7 +182,7 @@ "globalKey" : "293090" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -342,10 +343,10 @@ } }, "meta" : { - "globalKey" : "ab38652d" + "globalKey" : "dd08bf7e" } }, "meta" : { - "globalKey" : "ab38652d" + "globalKey" : "dd08bf7e" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex03-conditional-variance-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex03-conditional-variance-swap.json index 1b78494314..689f51e324 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex03-conditional-variance-swap.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex03-conditional-variance-swap.json @@ -127,7 +127,8 @@ "meta" : { "globalKey" : "290478" } - } ] + } ], + "instrumentType" : "ListedDerivative" } } } @@ -137,12 +138,12 @@ } }, "meta" : { - "globalKey" : "1071b75d" + "globalKey" : "e34b458c" } } ] }, "meta" : { - "globalKey" : "1071b75d" + "globalKey" : "e34b458c" } }, "tradeLot" : [ { @@ -194,7 +195,7 @@ "globalKey" : "293090" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -298,10 +299,10 @@ } } ], "meta" : { - "globalKey" : "39449a42" + "globalKey" : "b049cf71" } }, "meta" : { - "globalKey" : "39449a42" + "globalKey" : "b049cf71" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json index f2ab6ce780..33568bb70a 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json @@ -382,7 +382,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -442,7 +442,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json index 7771c746ef..51d3e7db9b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-10/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json @@ -316,7 +316,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -376,7 +376,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/incomplete-products/equity/eqs-ex04-zero-strike-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/incomplete-products/equity/eqs-ex04-zero-strike-long-form.json index b74ca9bb97..f729e77379 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/incomplete-products/equity/eqs-ex04-zero-strike-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/incomplete-products/equity/eqs-ex04-zero-strike-long-form.json @@ -285,7 +285,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/processes/custom-basket-linkId-ptrr-comp.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/processes/custom-basket-linkId-ptrr-comp.json index 3b18e830f0..26553f1c86 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/processes/custom-basket-linkId-ptrr-comp.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/processes/custom-basket-linkId-ptrr-comp.json @@ -146,7 +146,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -198,7 +198,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", @@ -250,7 +250,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/processes/custom-basket-linkId-rtn.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/processes/custom-basket-linkId-rtn.json index 4584da501e..ff223df94d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/processes/custom-basket-linkId-rtn.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/processes/custom-basket-linkId-rtn.json @@ -146,7 +146,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -198,7 +198,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", @@ -250,7 +250,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex01-long-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex01-long-asia-corp-fixreg.json index 7f6b8c5d17..c76f05151b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex01-long-asia-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex01-long-asia-corp-fixreg.json @@ -157,7 +157,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex02-2003-short-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex02-2003-short-asia-corp-fixreg.json index cdf421ed68..0e30c3812e 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex02-2003-short-asia-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex02-2003-short-asia-corp-fixreg.json @@ -70,7 +70,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "7abf9ebb", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor.json index b023a48f06..201aec6fdc 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-ex16-short-us-corp-fixreg-recovery-factor.json @@ -85,7 +85,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-indamt-ex01-short-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-indamt-ex01-short-us-corp-fixreg.json index 4bd066f0ae..e3cbb059e6 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-indamt-ex01-short-us-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-indamt-ex01-short-us-corp-fixreg.json @@ -74,7 +74,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-1.json index e4820e09a9..ce670df4c8 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-1.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-1.json @@ -143,7 +143,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-2.json index 7ebac28b57..863c4a873e 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-2.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cd-swaption-2.json @@ -184,7 +184,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-ELCDS-ReferenceObligation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-ELCDS-ReferenceObligation.json index 8343d8da6b..8088475413 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-ELCDS-ReferenceObligation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-ELCDS-ReferenceObligation.json @@ -101,6 +101,7 @@ }, "identifierType" : "BBGID" } ], + "instrumentType" : "Debt", "borrower" : [ { "name" : { "value" : "BorrowerName1" @@ -148,7 +149,7 @@ } ] }, "meta" : { - "globalKey" : "fbf842d9" + "globalKey" : "d49bda7c" } }, { "InterestRatePayout" : { @@ -219,7 +220,7 @@ } }, "meta" : { - "globalKey" : "c422dcc4" + "globalKey" : "d73b7b87" } }, "tradeLot" : [ { @@ -435,10 +436,10 @@ } }, "meta" : { - "globalKey" : "f6a76e64" + "globalKey" : "d26c75a7" } }, "meta" : { - "globalKey" : "f6a76e64" + "globalKey" : "d26c75a7" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket-tranche.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket-tranche.json index 43333a348a..04b917f0a5 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket-tranche.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket-tranche.json @@ -109,7 +109,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -148,7 +148,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket.json index 06ed5748f5..bfda39aab6 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-basket.json @@ -100,7 +100,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -142,7 +142,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-ReferenceObligation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-ReferenceObligation.json index 9ccf5d209b..0c28a6df2d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-ReferenceObligation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-loan-ReferenceObligation.json @@ -128,6 +128,7 @@ }, "identifierType" : "Other" } ], + "instrumentType" : "Debt", "lien" : { "value" : "FirstLienLoan" }, @@ -220,7 +221,7 @@ } ] }, "meta" : { - "globalKey" : "1a0b8594" + "globalKey" : "1e35e057" } }, { "InterestRatePayout" : { @@ -297,7 +298,7 @@ } }, "meta" : { - "globalKey" : "75e839e3" + "globalKey" : "a2700874" } }, "tradeLot" : [ { @@ -516,10 +517,10 @@ } }, "meta" : { - "globalKey" : "4582a89e" + "globalKey" : "c0d14f6d" } }, "meta" : { - "globalKey" : "4582a89e" + "globalKey" : "c0d14f6d" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-CMBS.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-CMBS.json index 877a8b4eaf..dd1f7f4189 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-CMBS.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-CMBS.json @@ -127,7 +127,7 @@ }, "identifierType" : "BBGID" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-RMBS.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-RMBS.json index 3530d7a0e7..9bf12b61ef 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-RMBS.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/credit/cds-mortgage-RMBS.json @@ -137,7 +137,7 @@ }, "identifierType" : "BBGID" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.json index 4e0dd45e32..18904e5519 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqd-ex01-american-call-stock-long-form.json @@ -209,7 +209,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex01-single-underlyer-execution-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex01-single-underlyer-execution-long-form.json index 26bf71a648..93f7e080a1 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex01-single-underlyer-execution-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex01-single-underlyer-execution-long-form.json @@ -451,7 +451,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex05-single-stock-plus-fee-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex05-single-stock-plus-fee-long-form.json index 37a9d00981..d3fbb14ab2 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex05-single-stock-plus-fee-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex05-single-stock-plus-fee-long-form.json @@ -366,7 +366,7 @@ "globalKey" : "294424" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json index c0dfd3bb4d..fe56927be7 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json @@ -497,7 +497,7 @@ "globalKey" : "28fe4f" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json index a1e1b6c54f..292a14af5e 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex11-on-european-single-stock-underlyer-short-form.json @@ -434,7 +434,7 @@ "globalKey" : "291797" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json index 452440f2e6..d6ca767a0a 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json @@ -684,7 +684,7 @@ "globalKey" : "292479" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json index bf519aeb3b..72d78d3eef 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex14-european-interdealer-share-swap-short-form.json @@ -631,7 +631,7 @@ "globalKey" : "290e2b" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json index 330bc24731..8f21df3e33 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json @@ -615,7 +615,7 @@ "globalKey" : "290e2b" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json index 7d52b12b82..d58357cf25 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json @@ -666,7 +666,7 @@ "globalKey" : "290e2b" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex17-cfd.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex17-cfd.json index 1a725d9593..58d231427b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex17-cfd.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex17-cfd.json @@ -404,7 +404,7 @@ "globalKey" : "24cd5d" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json index b72dcdb2a3..dcc4907180 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json @@ -449,7 +449,7 @@ "globalKey" : "fd81" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json index b02716f250..b2c387737c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json @@ -455,7 +455,7 @@ "globalKey" : "fd81" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex02-single-equity.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex02-single-equity.json index 8200db5fca..a3f067c820 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex02-single-equity.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex02-single-equity.json @@ -461,7 +461,7 @@ "globalKey" : "292da8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json index 1e5029e0f8..35d86177e9 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/equity/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json @@ -446,7 +446,7 @@ "globalKey" : "292da8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/bond-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/bond-option.json index 3f40758d23..843efd93c1 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/bond-option.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/bond-option.json @@ -205,7 +205,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/cb-option-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/cb-option-2.json index 0f9fe60d08..8342cde400 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/cb-option-2.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-12/products/rates/cb-option-2.json @@ -232,7 +232,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json index 7257a19d66..6a24fc6902 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/correlation-swaps/eqcs-ex03-correlation-swap-confirmation.json @@ -219,7 +219,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -266,7 +266,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -313,7 +313,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json index 4e0dd45e32..18904e5519 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex01-american-call-stock-long-form.json @@ -209,7 +209,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex08-basket-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex08-basket-long-form.json index e813fc7b4f..e55fd04bca 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex08-basket-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex08-basket-long-form.json @@ -167,7 +167,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -217,7 +217,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json index 438c3a79c1..b64b8a2a9c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex09-bermuda-long-form.json @@ -193,7 +193,7 @@ "globalKey" : "292a56" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json index f0c538aca8..7faf9bb061 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex11-quanto-long-form.json @@ -202,7 +202,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json index 5d45502773..aad11bd4b0 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex14-american-call-stock-passthrough-long-form.json @@ -217,7 +217,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json index 4e73a922a3..52b0a51506 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex15-basket-passthrough-long-form.json @@ -181,7 +181,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -231,7 +231,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json index a4130727a1..a4a1e13f03 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex16-equityOptionTransactionSupplement.json @@ -195,7 +195,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json index 6759f56648..60dbd41c05 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex17-equityOptionTransactionSupplement-non-deliverable-share.json @@ -193,7 +193,7 @@ "globalKey" : "fbea4eb1" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json index 95bde0a858..80bf4a061d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex19-dividend-adjustment.json @@ -202,7 +202,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json index d50f304fed..7f049a3a84 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-options/eqd-ex21-flat-weight-basket.json @@ -233,7 +233,7 @@ "globalKey" : "29232c" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -280,7 +280,7 @@ "globalKey" : "29232c" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json index b74ca9bb97..f729e77379 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/eqs-ex04-zero-strike-long-form.json @@ -285,7 +285,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json index 37a9d00981..d3fbb14ab2 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/eqs-ex05-single-stock-plus-fee-long-form.json @@ -366,7 +366,7 @@ "globalKey" : "294424" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/trs-ex01-equity-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/trs-ex01-equity-basket.json index 9740764e67..f779b7f60c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/trs-ex01-equity-basket.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/equity-swaps/trs-ex01-equity-basket.json @@ -486,7 +486,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -536,7 +536,7 @@ "globalKey" : "291797" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/variance-swaps/eqvs-ex01-variance-swap-index.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/variance-swaps/eqvs-ex01-variance-swap-index.json index d9b50fa9f6..34448937f7 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/variance-swaps/eqvs-ex01-variance-swap-index.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/variance-swaps/eqvs-ex01-variance-swap-index.json @@ -107,7 +107,8 @@ "meta" : { "globalKey" : "290478" } - } ] + } ], + "instrumentType" : "ListedDerivative" } } } @@ -117,7 +118,7 @@ } }, "meta" : { - "globalKey" : "67d9fa2d" + "globalKey" : "78eb5cbc" } } ], "calculationAgent" : { @@ -125,7 +126,7 @@ } }, "meta" : { - "globalKey" : "25900bd7" + "globalKey" : "37d306a6" } }, "tradeLot" : [ { @@ -345,10 +346,10 @@ } }, "meta" : { - "globalKey" : "1516ea49" + "globalKey" : "5fe957d8" } }, "meta" : { - "globalKey" : "1516ea49" + "globalKey" : "5fe957d8" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/variance-swaps/eqvs-ex03-conditional-variance-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/variance-swaps/eqvs-ex03-conditional-variance-swap.json index 1b78494314..689f51e324 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/variance-swaps/eqvs-ex03-conditional-variance-swap.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/incomplete-products/variance-swaps/eqvs-ex03-conditional-variance-swap.json @@ -127,7 +127,8 @@ "meta" : { "globalKey" : "290478" } - } ] + } ], + "instrumentType" : "ListedDerivative" } } } @@ -137,12 +138,12 @@ } }, "meta" : { - "globalKey" : "1071b75d" + "globalKey" : "e34b458c" } } ] }, "meta" : { - "globalKey" : "1071b75d" + "globalKey" : "e34b458c" } }, "tradeLot" : [ { @@ -194,7 +195,7 @@ "globalKey" : "293090" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -298,10 +299,10 @@ } } ], "meta" : { - "globalKey" : "39449a42" + "globalKey" : "b049cf71" } }, "meta" : { - "globalKey" : "39449a42" + "globalKey" : "b049cf71" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex51-execution-advice-trade-initiation-C01-00.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex51-execution-advice-trade-initiation-C01-00.json index 2a54e4d5e0..224e8ebe2f 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex51-execution-advice-trade-initiation-C01-00.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex51-execution-advice-trade-initiation-C01-00.json @@ -110,7 +110,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex52-execution-advice-trade-partial-novation-C02-00.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex52-execution-advice-trade-partial-novation-C02-00.json index b57bc7a233..cfab26df4b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex52-execution-advice-trade-partial-novation-C02-00.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex52-execution-advice-trade-partial-novation-C02-00.json @@ -202,7 +202,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json index dfde60455d..d11b6384bf 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/processes/execution-advice/msg-ex53-execution-advice-trade-partial-novation-correction-C02-10.json @@ -202,7 +202,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/bond-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/bond-option.json index 3f40758d23..843efd93c1 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/bond-option.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/bond-option.json @@ -205,7 +205,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option-2.json index 0f9fe60d08..8342cde400 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option-2.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option-2.json @@ -232,7 +232,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option-ois.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option-ois.json index af8f8a538f..6c8a9273eb 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option-ois.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option-ois.json @@ -240,7 +240,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option.json index 06448b2617..4dcd663675 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/bond-options/cb-option.json @@ -240,7 +240,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex01-correlation-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex01-correlation-swap.json index d75b300338..43d44bf4e9 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex01-correlation-swap.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex01-correlation-swap.json @@ -196,7 +196,7 @@ "globalKey" : "293090" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -235,7 +235,7 @@ "globalKey" : "292da8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -274,7 +274,7 @@ "globalKey" : "293090" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json index a51d730433..38cf8a8d0b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex02-correlation-swap-confirmation.json @@ -217,7 +217,7 @@ "globalKey" : "292da8" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -259,7 +259,7 @@ "globalKey" : "293090" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -301,7 +301,7 @@ "globalKey" : "292da8" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json index f982aa51ef..253519631d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/correlation-swaps/eqcs-ex04-correlation-swap-confirmation.json @@ -219,7 +219,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -266,7 +266,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -313,7 +313,7 @@ "globalKey" : "292711" } } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json index 7f6b8c5d17..c76f05151b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex01-long-asia-corp-fixreg.json @@ -157,7 +157,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "e414546d", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json index cdf421ed68..0e30c3812e 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex02-2003-short-asia-corp-fixreg.json @@ -70,7 +70,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "7abf9ebb", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json index 2329e3a70d..dde4bdbc25 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex02-short-asia-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "7abf9ebb", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json index 2172d0f650..671fabd794 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex03-long-aussie-corp-fixreg.json @@ -160,7 +160,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json index 0c0a5d7337..4e9e0e8de6 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex04-short-aussie-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json index c313a27b8a..b304cc0226 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex05-long-emasia-corp-fixreg.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "8695044e", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json index dfdc701e39..bfead7cf63 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex06-long-emeur-sov-fixreg.json @@ -142,7 +142,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "b489e2c8", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json index dc07297555..32c30655d9 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex07-2003-long-euro-corp-fixreg.json @@ -144,7 +144,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "68c6dc05", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json index d23e8a5789..d4ee87e413 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex07-long-euro-corp-fixreg.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "68c6dc05", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json index 1cbf0790e6..b9e7d7079e 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex08-2003-short-euro-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json index 4c137e90ee..11087c52a5 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex08-short-euro-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "entityId" : [ { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json index 9cae602a11..8b5015049d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex09-long-euro-sov-fixreg.json @@ -143,7 +143,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "546f933e", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json index 324da725c0..e08eb96640 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex10-2003-long-us-corp-fixreg.json @@ -143,7 +143,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json index a73a8df830..abf22ad1c7 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex10-long-us-corp-fixreg.json @@ -153,7 +153,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json index 95d0f4b467..7116b139e6 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex11-2003-short-us-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json index fa6fc5b47e..6f47e686bf 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex11-short-us-corp-fixreg.json @@ -73,7 +73,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json index 06f00a798c..10ebfabb79 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex12-long-emasia-sov-fixreg.json @@ -153,7 +153,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "5cf1ae36", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json index a83ae23276..c7a527bef6 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex13-long-asia-sov-fixreg.json @@ -152,7 +152,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "23b559bc", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json index 211d5bea91..49be5126ae 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex14-long-emlatin-corp-fixreg.json @@ -149,7 +149,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "7b58e286", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json index 1d0837f62c..ed5ba5b030 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex15-long-emlatin-sov-fixreg.json @@ -142,7 +142,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "80f8c8cb", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json index b023a48f06..201aec6fdc 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex16-short-us-corp-fixreg-recovery-factor.json @@ -85,7 +85,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json index 2d0568a670..bb65c2d254 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex17-short-us-corp-portfolio-compression.json @@ -73,7 +73,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex18-standard-north-american-corp.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex18-standard-north-american-corp.json index 8a76e26129..6def1041e0 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex18-standard-north-american-corp.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-ex18-standard-north-american-corp.json @@ -73,7 +73,7 @@ }, "identifierType" : "Other" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json index 4bd066f0ae..e3cbb059e6 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-indamt-ex01-short-us-corp-fixreg.json @@ -74,7 +74,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-swaption-1.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-swaption-1.json index e4820e09a9..ce670df4c8 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-swaption-1.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-swaption-1.json @@ -143,7 +143,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-swaption-2.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-swaption-2.json index 7ebac28b57..863c4a873e 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-swaption-2.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cd-swaption-2.json @@ -184,7 +184,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-ELCDS-ReferenceObligation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-ELCDS-ReferenceObligation.json index 8343d8da6b..8088475413 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-ELCDS-ReferenceObligation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-ELCDS-ReferenceObligation.json @@ -101,6 +101,7 @@ }, "identifierType" : "BBGID" } ], + "instrumentType" : "Debt", "borrower" : [ { "name" : { "value" : "BorrowerName1" @@ -148,7 +149,7 @@ } ] }, "meta" : { - "globalKey" : "fbf842d9" + "globalKey" : "d49bda7c" } }, { "InterestRatePayout" : { @@ -219,7 +220,7 @@ } }, "meta" : { - "globalKey" : "c422dcc4" + "globalKey" : "d73b7b87" } }, "tradeLot" : [ { @@ -435,10 +436,10 @@ } }, "meta" : { - "globalKey" : "f6a76e64" + "globalKey" : "d26c75a7" } }, "meta" : { - "globalKey" : "f6a76e64" + "globalKey" : "d26c75a7" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-basket-tranche.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-basket-tranche.json index 43333a348a..04b917f0a5 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-basket-tranche.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-basket-tranche.json @@ -109,7 +109,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -148,7 +148,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-basket.json index 06ed5748f5..bfda39aab6 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-basket.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-basket.json @@ -100,7 +100,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -142,7 +142,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-custom-basket.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-custom-basket.json index 0224f77e76..5bbad64a49 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-custom-basket.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-custom-basket.json @@ -112,7 +112,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "6b99b4c1", @@ -164,7 +164,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", @@ -216,7 +216,7 @@ }, "identifierType" : "CUSIP" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligorReference" : { "globalReference" : "92cc27", diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-loan-ReferenceObligation.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-loan-ReferenceObligation.json index 9ccf5d209b..0c28a6df2d 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-loan-ReferenceObligation.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-loan-ReferenceObligation.json @@ -128,6 +128,7 @@ }, "identifierType" : "Other" } ], + "instrumentType" : "Debt", "lien" : { "value" : "FirstLienLoan" }, @@ -220,7 +221,7 @@ } ] }, "meta" : { - "globalKey" : "1a0b8594" + "globalKey" : "1e35e057" } }, { "InterestRatePayout" : { @@ -297,7 +298,7 @@ } }, "meta" : { - "globalKey" : "75e839e3" + "globalKey" : "a2700874" } }, "tradeLot" : [ { @@ -516,10 +517,10 @@ } }, "meta" : { - "globalKey" : "4582a89e" + "globalKey" : "c0d14f6d" } }, "meta" : { - "globalKey" : "4582a89e" + "globalKey" : "c0d14f6d" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-mortgage-CMBS.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-mortgage-CMBS.json index 877a8b4eaf..dd1f7f4189 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-mortgage-CMBS.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-mortgage-CMBS.json @@ -127,7 +127,7 @@ }, "identifierType" : "BBGID" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "primaryObligor" : { "name" : { diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-mortgage-RMBS.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-mortgage-RMBS.json index 3530d7a0e7..9bf12b61ef 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-mortgage-RMBS.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/credit-derivatives/cds-mortgage-RMBS.json @@ -137,7 +137,7 @@ }, "identifierType" : "BBGID" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" } } ] } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex02-calendar-spread-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex02-calendar-spread-short-form.json index 0bc7f0ace4..a6305ab786 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex02-calendar-spread-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex02-calendar-spread-short-form.json @@ -203,7 +203,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex03-call-or-put-spread-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex03-call-or-put-spread-short-form.json index 8376f429db..790eeceb89 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex03-call-or-put-spread-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex03-call-or-put-spread-short-form.json @@ -203,7 +203,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex12-vanilla-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex12-vanilla-short-form.json index fbec1aebb6..e20d9c8c0b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex12-vanilla-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex12-vanilla-short-form.json @@ -203,7 +203,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex13-1996-american-call-stock.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex13-1996-american-call-stock.json index 925c3986be..49b751f544 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex13-1996-american-call-stock.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-options/eqd-ex13-1996-american-call-stock.json @@ -222,7 +222,7 @@ "globalKey" : "292fc8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex01-single-underlyer-execution-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex01-single-underlyer-execution-long-form.json index 26bf71a648..93f7e080a1 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex01-single-underlyer-execution-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex01-single-underlyer-execution-long-form.json @@ -451,7 +451,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex02-composite-basket-long-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex02-composite-basket-long-form.json index 8e35d12e87..979cd6407f 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex02-composite-basket-long-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex02-composite-basket-long-form.json @@ -508,7 +508,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -558,7 +558,7 @@ "globalKey" : "291797" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -608,7 +608,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -658,7 +658,7 @@ "globalKey" : "2929d8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -708,7 +708,7 @@ "globalKey" : "2906e2" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -758,7 +758,7 @@ "globalKey" : "2927d3" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex07-long-form-with-stub.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex07-long-form-with-stub.json index fec6b249b4..5edc24da57 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex07-long-form-with-stub.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex07-long-form-with-stub.json @@ -439,7 +439,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, @@ -484,7 +484,7 @@ "globalKey" : "291797" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, @@ -529,7 +529,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, @@ -574,7 +574,7 @@ "globalKey" : "2929d8" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, @@ -619,7 +619,7 @@ "globalKey" : "2906e2" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, @@ -664,7 +664,7 @@ "globalKey" : "2927d3" } }, - "securityType" : "Debt" + "instrumentType" : "Debt" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json index 9b4b762acb..2c7f1ffef0 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex08-composite-basket-long-form-separate-spreads.json @@ -508,7 +508,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -558,7 +558,7 @@ "globalKey" : "291797" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -608,7 +608,7 @@ "globalKey" : "292ad8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -658,7 +658,7 @@ "globalKey" : "2929d8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -708,7 +708,7 @@ "globalKey" : "2906e2" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, @@ -758,7 +758,7 @@ "globalKey" : "2927d3" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } }, diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json index c0dfd3bb4d..fe56927be7 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex10-short-form-interestLeg-driving-schedule-dates.json @@ -497,7 +497,7 @@ "globalKey" : "28fe4f" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex11-on-european-single-stock-underlyer-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex11-on-european-single-stock-underlyer-short-form.json index a1e1b6c54f..292a14af5e 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex11-on-european-single-stock-underlyer-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex11-on-european-single-stock-underlyer-short-form.json @@ -434,7 +434,7 @@ "globalKey" : "291797" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json index 452440f2e6..d6ca767a0a 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex13-pan-asia-interdealer-share-swap-short-form.json @@ -684,7 +684,7 @@ "globalKey" : "292479" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex14-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex14-european-interdealer-share-swap-short-form.json index bf519aeb3b..72d78d3eef 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex14-european-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex14-european-interdealer-share-swap-short-form.json @@ -631,7 +631,7 @@ "globalKey" : "290e2b" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json index 330bc24731..8f21df3e33 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex15-forward-starting-pre-european-interdealer-share-swap-short-form.json @@ -615,7 +615,7 @@ "globalKey" : "290e2b" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json index 7d52b12b82..d58357cf25 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex16-forward-starting-post-european-interdealer-share-swap-short-form.json @@ -666,7 +666,7 @@ "globalKey" : "290e2b" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex17-cfd.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex17-cfd.json index 1a725d9593..58d231427b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex17-cfd.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex17-cfd.json @@ -404,7 +404,7 @@ "globalKey" : "24cd5d" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json index b72dcdb2a3..dcc4907180 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex18-pan-asia-interdealer-index-swap-short-form.json @@ -449,7 +449,7 @@ "globalKey" : "fd81" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json index b02716f250..b2c387737c 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex19-european-interdealer-fair-value-share-swap-short-form.json @@ -455,7 +455,7 @@ "globalKey" : "fd81" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex20-single-underlyer-execution-long-form-ois.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex20-single-underlyer-execution-long-form-ois.json index 4e5a4ef408..b024cf3852 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex20-single-underlyer-execution-long-form-ois.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/eqs-ex20-single-underlyer-execution-long-form-ois.json @@ -451,7 +451,7 @@ "globalKey" : "247344" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex02-single-equity.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex02-single-equity.json index 8200db5fca..a3f067c820 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex02-single-equity.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex02-single-equity.json @@ -461,7 +461,7 @@ "globalKey" : "292da8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json index 1e5029e0f8..35d86177e9 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex03-single-stock-execution-swap-with-fixing-and-dividend-payment-dates.json @@ -446,7 +446,7 @@ "globalKey" : "292da8" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex05-single-equity-with-calculation-parameters.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex05-single-equity-with-calculation-parameters.json index 7f2c10feb4..361d3644a6 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex05-single-equity-with-calculation-parameters.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/equity-swaps/trs-ex05-single-equity-with-calculation-parameters.json @@ -433,7 +433,7 @@ }, "identifierType" : "Name" } ], - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex01-ratio-zc-floored.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex01-ratio-zc-floored.json index 2f9cd1b197..4f643f9dbe 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex01-ratio-zc-floored.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex01-ratio-zc-floored.json @@ -190,7 +190,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "conditionPrecedentBond" : true } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex02-ratio-zc-floored.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex02-ratio-zc-floored.json index a10666feff..bbeceeae06 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex02-ratio-zc-floored.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex02-ratio-zc-floored.json @@ -198,7 +198,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "conditionPrecedentBond" : true } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex03-par-par.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex03-par-par.json index bbdb5096f0..72f619d759 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex03-par-par.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex03-par-par.json @@ -170,7 +170,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "conditionPrecedentBond" : false } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex04-proceeds.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex04-proceeds.json index ff5f57a8e7..d12ba39f5b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex04-proceeds.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-asset-swap-ex04-proceeds.json @@ -170,7 +170,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "conditionPrecedentBond" : false } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json index 6dcc51307f..df04ce5fe7 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/inflation-swaps/inflation-swap-ex02-yoy-bond-reference.json @@ -183,7 +183,7 @@ }, "identifierType" : "ISIN" } ], - "securityType" : "Debt" + "instrumentType" : "Debt" }, "conditionPrecedentBond" : true } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json index b9a1113fd5..5729a31ff3 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex02-variance-swap-single-stock.json @@ -111,7 +111,8 @@ "meta" : { "globalKey" : "290478" } - } ] + } ], + "instrumentType" : "ListedDerivative" } } } @@ -121,7 +122,7 @@ } }, "meta" : { - "globalKey" : "144421bc" + "globalKey" : "59c6270d" } } ], "calculationAgent" : { @@ -129,7 +130,7 @@ } }, "meta" : { - "globalKey" : "600e8ba6" + "globalKey" : "4d2480b7" } }, "tradeLot" : [ { @@ -181,7 +182,7 @@ "globalKey" : "293090" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -342,10 +343,10 @@ } }, "meta" : { - "globalKey" : "ab38652d" + "globalKey" : "dd08bf7e" } }, "meta" : { - "globalKey" : "ab38652d" + "globalKey" : "dd08bf7e" } } \ No newline at end of file diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json index f2ab6ce780..33568bb70a 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex04-dispersion-variance-swap.json @@ -382,7 +382,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -442,7 +442,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json index 7771c746ef..51d3e7db9b 100644 --- a/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json +++ b/rosetta-source/src/main/resources/result-json-files/fpml-5-13/products/variance-swaps/eqvs-ex05-dispersion-variance-swap-transaction-supplement.json @@ -316,7 +316,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } @@ -376,7 +376,7 @@ "globalKey" : "28fefb" } }, - "securityType" : "Equity" + "instrumentType" : "Equity" } } } diff --git a/rosetta-source/src/main/rosetta/base-staticdata-asset-common-enum.rosetta b/rosetta-source/src/main/rosetta/base-staticdata-asset-common-enum.rosetta index c6f4ce629d..6ae6f77a6e 100755 --- a/rosetta-source/src/main/rosetta/base-staticdata-asset-common-enum.rosetta +++ b/rosetta-source/src/main/rosetta/base-staticdata-asset-common-enum.rosetta @@ -252,14 +252,14 @@ enum CreditRiskEnum: <"Represents an enumeration list to identify tranched or un TranchedCreditRisk <"Indicates tranched credit risk, including securitizations."> UntranchedCreditRisk <"Indicates tranched credit risk, including repackagings."> -enum SecurityTypeEnum: <"Represetns an enumeration list to indentify the type of security."> - Debt <"Identifies a security as a fixed income instrument of debt issued and securitized as a tradable asset."> - Equity <"Identifies a security as an Equity value of holding of shares in listed company."> - Fund <"Identifies a security as an Instrument representing holding in an investment fund."> - Warrant <"Identifies a security as a Warrant that give the right, but not the obligation, to buy or sell a security — most commonly an equity — at a certain price before expiration, or to receive the cash equivalent."> - Certificate <"Identifies a security as one that that offers a derivative-based economic return which is not structured as a bond, an equity or a warrant. Note that this security type is not a Certificate of Deposit (aka CD)."> - LetterOfCredit <"Identifies a security as a letter of credit or documentary credit/ bankers commercial credit. A payment mechanism used in international trade to provide economic guarantee of payment by a creditworthy issuer for payment of exported goods."> - ListedDerivative <"Identifies a security as a listed derivative on an exchange."> +enum InstrumentTypeEnum: <"Represents an enumeration list to indentify the type of an instrument."> + Debt <"Identifies an instrument as a fixed income instrument of debt issued and securitized as a tradable asset."> + Equity <"Identifies an instrument as an Equity value of holding of shares in listed company."> + Fund <"Identifies an instrument as representing holding in an investment fund."> + Warrant <"Identifies an instrument as a Warrant that give the right, but not the obligation, to buy or sell a security — most commonly an equity — at a certain price before expiration, or to receive the cash equivalent."> + Certificate <"Identifies an instrument as one that that offers a derivative-based economic return which is not structured as a bond, an equity or a warrant. Note that this security type is not a Certificate of Deposit (aka CD)."> + LetterOfCredit <"Identifies an instrument as a letter of credit or documentary credit/ bankers commercial credit. A payment mechanism used in international trade to provide economic guarantee of payment by a creditworthy issuer for payment of exported goods."> + ListedDerivative <"Identifies an instrument as a listed derivative on an exchange."> enum PutCallEnum: <"The enumerated values to specify the types of listed derivative options."> Put <"A put option gives the holder the right to sell the underlying asset by a certain date for a certain price."> diff --git a/rosetta-source/src/main/rosetta/base-staticdata-asset-common-type.rosetta b/rosetta-source/src/main/rosetta/base-staticdata-asset-common-type.rosetta index 54db7d7c1e..7e2629883f 100755 --- a/rosetta-source/src/main/rosetta/base-staticdata-asset-common-type.rosetta +++ b/rosetta-source/src/main/rosetta/base-staticdata-asset-common-type.rosetta @@ -35,6 +35,7 @@ type AssetIdentifier: <"The unique identifier for an Asset, specified using an A identifierType AssetIdTypeEnum (1..1) <"Defines the symbology source of the Asset Identifier, eg CUSIP, ISIN, etc."> type InstrumentBase extends AssetBase: <"Defines the common attributes for all Instrument data types."> + instrumentType InstrumentTypeEnum (1..1) <"Identifies the type of an instrument using an enumerated list."> choice Instrument: <"A type of Asset that is issued by one party to one or more others."> ListedDerivative <"A securitized derivative on another asset that is created by an exchange."> @@ -204,21 +205,20 @@ type CollateralTaxonomyValue: <"Specifies the collateral taxonomy value, either type Security extends InstrumentBase: <"Identifies a security by referencing an identifier and by specifying the sector."> [docReference ICMA GMRA namingConvention "Purchased Security" provision "As defined in GMRA paragraph 2(oo) The Purchased Securities are the Securities sold or to be sold and any New Purchased Securities transferred by Seller to Buyer under paragraph 8 (Substitution)."] - securityType SecurityTypeEnum (1..1) <"Identifies the type of security using an enumerated list."> debtType DebtType (0..1) <"Identifies the type of debt and selected debt economics."> equityType EquityTypeEnum (0..1) <"Identifies the type of equity."> fundType FundProductTypeEnum (0..1) <"Identifies the type of fund."> condition DebtSubType: - if securityType <> SecurityTypeEnum -> Debt + if instrumentType <> InstrumentTypeEnum -> Debt then debtType is absent condition EquitySubType: - if securityType <> SecurityTypeEnum -> Equity + if instrumentType <> InstrumentTypeEnum -> Equity then equityType is absent condition FundSubType: - if securityType <> SecurityTypeEnum -> Fund + if instrumentType <> InstrumentTypeEnum -> Fund then fundType is absent type DebtType: <"Specifies the type of debt instrument."> @@ -277,7 +277,7 @@ type TaxonomyClassification: type AssetType: <"Represents a class to allow specification of the asset product type."> assetType AssetTypeEnum (1..1) <"Represents a filter based on the type of collateral asset."> - securityType SecurityTypeEnum (0..1) <"Represents a filter based on the type of security."> + securityType InstrumentTypeEnum (0..1) <"Represents a filter based on the type of security."> debtType DebtType (0..1) <"Represents a filter based on the type of bond."> equityType EquityTypeEnum (0..1) <"Represents a filter based on the type of equity."> fundType FundProductTypeEnum (0..1) <"Represents a filter based on the type of fund."> @@ -291,15 +291,15 @@ type AssetType: <"Represents a class to allow specification of the asset product and fundType is absent condition BondSubType: - if securityType <> SecurityTypeEnum -> Debt + if securityType <> InstrumentTypeEnum -> Debt then debtType is absent condition EquitySubType: - if securityType <> SecurityTypeEnum -> Equity + if securityType <> InstrumentTypeEnum -> Equity then equityType is absent condition FundSubType: - if securityType <> SecurityTypeEnum -> Fund + if securityType <> InstrumentTypeEnum -> Fund then fundType is absent condition OtherAssetSubType: diff --git a/rosetta-source/src/main/rosetta/event-common-func.rosetta b/rosetta-source/src/main/rosetta/event-common-func.rosetta index 1c9612644e..7f9ce92892 100644 --- a/rosetta-source/src/main/rosetta/event-common-func.rosetta +++ b/rosetta-source/src/main/rosetta/event-common-func.rosetta @@ -1056,7 +1056,7 @@ func NewEquitySwapProduct: <"Function specification to create an Equity Swap acc product NonTransferableProduct (1..1) condition EquitySecurityType: <"Security must be equity (single name)."> - security -> securityType = SecurityTypeEnum -> Equity + security -> instrumentType = InstrumentTypeEnum -> Equity add product -> economicTerms -> payout: Payout { @@ -1083,7 +1083,7 @@ func NewSingleNameEquityPerformancePayout: <"Function specification to create th performancePayout PerformancePayout (1..1) condition EquitySecurityType: <"Security must be equity (single name)."> - security -> securityType = SecurityTypeEnum -> Equity + security -> instrumentType = InstrumentTypeEnum -> Equity set performancePayout -> returnTerms -> priceReturnTerms -> returnType: <"Equity payout must inherit terms from the Master Confirmation Agreement."> // if masterConfirmation -> typeOfSwapElection -> Price exists diff --git a/rosetta-source/src/main/rosetta/event-common-type.rosetta b/rosetta-source/src/main/rosetta/event-common-type.rosetta index 20fcdecdec..997e92b49b 100644 --- a/rosetta-source/src/main/rosetta/event-common-type.rosetta +++ b/rosetta-source/src/main/rosetta/event-common-type.rosetta @@ -328,7 +328,7 @@ type Trade extends TradableProduct: <"Defines the output of a financial transact then product -> economicTerms -> payout -> CreditDefaultPayout -> protectionTerms -> creditEvents -> restructuring -> multipleHolderObligation exists condition AdditionalFixedPaymentsMortgages: <"The below set of additional fixed payment provisions are specified as optional boolean in FpML and the CDM because they only apply to mortgage credit default swaps. As a result, this data rule specifies that those provisions are required if the contract corresponds to a mortgage credit default swap. The provision related to the existence of the Contractual Term Supplement is meant to address the case where the underlier is a mortgage index."> - if ((product -> economicTerms -> payout -> CreditDefaultPayout -> generalTerms -> referenceInformation -> referenceObligation -> security -> securityType any = SecurityTypeEnum -> Debt + if ((product -> economicTerms -> payout -> CreditDefaultPayout -> generalTerms -> referenceInformation -> referenceObligation -> security -> instrumentType any = InstrumentTypeEnum -> Debt and product -> economicTerms -> payout -> CreditDefaultPayout -> generalTerms -> referenceInformation -> referenceObligation -> security -> debtType -> debtClass any = DebtClassEnum -> AssetBacked) or contractDetails -> documentation -> legalAgreementIdentification -> agreementName -> contractualTermsSupplement -> contractualTermsSupplementType contains ContractualSupplementTypeEnum -> CDSonMBS) and product -> economicTerms -> payout -> CreditDefaultPayout -> protectionTerms -> floatingAmountEvents exists @@ -337,7 +337,7 @@ type Trade extends TradableProduct: <"Defines the output of a financial transact and product -> economicTerms -> payout -> CreditDefaultPayout -> protectionTerms -> floatingAmountEvents -> additionalFixedPayments -> writedownReimbursement exists) condition FloatingAmountEventsMortgages: <"The below set of floating amount events provisions are specified as optional boolean in FpML and the CDM because they only apply to mortgage credit default swaps. As a result, this data rule specifies that those provisions are required if the contract corresponds to a mortgage credit default swap. The provision related to the existence of the Contractual Term Supplement is meant to address the case where the underlier is a mortgage index."> - if ((product -> economicTerms -> payout -> CreditDefaultPayout -> generalTerms -> referenceInformation -> referenceObligation -> security -> securityType any = SecurityTypeEnum -> Debt + if ((product -> economicTerms -> payout -> CreditDefaultPayout -> generalTerms -> referenceInformation -> referenceObligation -> security -> instrumentType any = InstrumentTypeEnum -> Debt and product -> economicTerms -> payout -> CreditDefaultPayout -> generalTerms -> referenceInformation -> referenceObligation -> security -> debtType -> debtClass any = DebtClassEnum -> AssetBacked) or contractDetails -> documentation -> legalAgreementIdentification -> agreementName -> contractualTermsSupplement -> contractualTermsSupplementType contains ContractualSupplementTypeEnum -> CDSonMBS) and product -> economicTerms -> payout -> CreditDefaultPayout -> protectionTerms -> floatingAmountEvents exists @@ -346,7 +346,7 @@ type Trade extends TradableProduct: <"Defines the output of a financial transact and product -> economicTerms -> payout -> CreditDefaultPayout -> protectionTerms -> floatingAmountEvents -> impliedWritedown exists) condition CreditEventsMortgages: <"The below set of credit events provisions are specified as optional boolean in FpML and the CDM because they only apply to mortgage credit default swaps. As a result, this data rule specifies that those provisions are required if the contract corresponds to a mortgage credit default swap. The provision related to the existence of the Contractual Term Supplement is meant to address the case where the underlier is a mortgage index."> - if ((product -> economicTerms -> payout -> CreditDefaultPayout -> generalTerms -> referenceInformation -> referenceObligation -> security -> securityType any = SecurityTypeEnum -> Debt + if ((product -> economicTerms -> payout -> CreditDefaultPayout -> generalTerms -> referenceInformation -> referenceObligation -> security -> instrumentType any = InstrumentTypeEnum -> Debt and product -> economicTerms -> payout -> CreditDefaultPayout -> generalTerms -> referenceInformation -> referenceObligation -> security -> debtType -> debtClass any = DebtClassEnum -> AssetBacked) or contractDetails -> documentation -> legalAgreementIdentification -> agreementName -> contractualTermsSupplement -> contractualTermsSupplementType contains ContractualSupplementTypeEnum -> CDSonMBS) and product -> economicTerms -> payout -> CreditDefaultPayout -> protectionTerms -> creditEvents exists diff --git a/rosetta-source/src/main/rosetta/mapping-fpml-confirmation-tradestate-synonym.rosetta b/rosetta-source/src/main/rosetta/mapping-fpml-confirmation-tradestate-synonym.rosetta index 9973df5ba1..9a8beddb1b 100644 --- a/rosetta-source/src/main/rosetta/mapping-fpml-confirmation-tradestate-synonym.rosetta +++ b/rosetta-source/src/main/rosetta/mapping-fpml-confirmation-tradestate-synonym.rosetta @@ -2676,6 +2676,10 @@ synonym source FpML_5_Confirmation_To_TradeState extends FpML [hint "bond"] [hint "convertibleBond"] + ListedDerivative: + + instrumentType + [set to InstrumentTypeEnum -> ListedDerivative when "exchangeTradedContractNearest" exists] + Loan: + borrower [value "borrower" path "loan"] @@ -2687,6 +2691,8 @@ synonym source FpML_5_Confirmation_To_TradeState extends FpML [value "creditAgreementDate" path "loan"] + tranche [value "tranche" path "loan" meta "loanTrancheScheme"] + + instrumentType + [set to InstrumentTypeEnum -> Debt when "loan" exists] Security: + identifier @@ -2696,11 +2702,11 @@ synonym source FpML_5_Confirmation_To_TradeState extends FpML [hint "convertibleBond"] [hint "mortgage"] [hint "equity"] - + securityType - [set to SecurityTypeEnum -> Debt when "bond" exists] - [set to SecurityTypeEnum -> Debt when "convertibleBond" exists] - [set to SecurityTypeEnum -> Debt when "mortgage" exists] - [set to SecurityTypeEnum -> Equity when "equity" exists] + + instrumentType + [set to InstrumentTypeEnum -> Debt when "bond" exists] + [set to InstrumentTypeEnum -> Debt when "convertibleBond" exists] + [set to InstrumentTypeEnum -> Debt when "mortgage" exists] + [set to InstrumentTypeEnum -> Equity when "equity" exists] IndexBase: + name diff --git a/rosetta-source/src/main/rosetta/product-asset-type.rosetta b/rosetta-source/src/main/rosetta/product-asset-type.rosetta index 62e2c48280..519a144e7f 100644 --- a/rosetta-source/src/main/rosetta/product-asset-type.rosetta +++ b/rosetta-source/src/main/rosetta/product-asset-type.rosetta @@ -322,7 +322,7 @@ type ReferenceObligation: <"A class to specify the reference obligation that is condition MustBeDebtSecurity: <"Only debt securities can be used as the reference obligation for a credit derivative."> if security exists - then security -> securityType = SecurityTypeEnum -> Debt + then security -> instrumentType = InstrumentTypeEnum -> Debt condition LegalEntityChoice: <"Represents the choice in a CDS contract.."> optional choice primaryObligor, primaryObligorReference @@ -611,7 +611,7 @@ type BondReference: <"Reference to a bond underlier to represent an asset swap o couponRate FixedRateSpecification (0..1) <"Specifies the coupon rate (expressed in percentage) of a fixed income security or convertible bond."> condition BondUnderlier: <"The underlier should be a bond."> - bond -> securityType = SecurityTypeEnum -> Debt + bond -> instrumentType = InstrumentTypeEnum -> Debt type CashflowRepresentation: <"A data defining: the cashflow representation of a swap trade."> diff --git a/rosetta-source/src/main/rosetta/product-collateral-type.rosetta b/rosetta-source/src/main/rosetta/product-collateral-type.rosetta index 7e6d06b574..bcc932ca5c 100644 --- a/rosetta-source/src/main/rosetta/product-collateral-type.rosetta +++ b/rosetta-source/src/main/rosetta/product-collateral-type.rosetta @@ -118,18 +118,18 @@ type EligibleCollateralCriteria extends CollateralCriteriaBase: <"Represents a s condition ConcentrationLimitTypeIssueOSAmountDebtOnly: <"Specifies a condition that concentration limit type 'IssueOutstandingAmount' is restricted to be used only if the asset type is described as 'Security' and 'Debt'."> if treatment -> concentrationLimit -> concentrationLimitCriteria -> concentrationLimitType only-element = ConcentrationLimitTypeEnum -> IssueOutstandingAmount - then asset -> collateralAssetType -> securityType all = SecurityTypeEnum -> Debt - or treatment -> concentrationLimit -> concentrationLimitCriteria -> asset -> collateralAssetType -> securityType all = SecurityTypeEnum -> Debt + then asset -> collateralAssetType -> securityType all = InstrumentTypeEnum -> Debt + or treatment -> concentrationLimit -> concentrationLimitCriteria -> asset -> collateralAssetType -> securityType all = InstrumentTypeEnum -> Debt condition ConcentrationLimitTypeMarketCapEquityOnly: <"Specifies a condition that concentration limit type 'MarketCapitalisation' is restricted to be used only if the asset type is described as 'Security' and 'Equity'."> if treatment -> concentrationLimit -> concentrationLimitCriteria -> concentrationLimitType only-element = ConcentrationLimitTypeEnum -> MarketCapitalisation - then asset -> collateralAssetType -> securityType all = SecurityTypeEnum -> Equity - or treatment -> concentrationLimit -> concentrationLimitCriteria -> asset -> collateralAssetType -> securityType all = SecurityTypeEnum -> Equity + then asset -> collateralAssetType -> securityType all = InstrumentTypeEnum -> Equity + or treatment -> concentrationLimit -> concentrationLimitCriteria -> asset -> collateralAssetType -> securityType all = InstrumentTypeEnum -> Equity condition AverageTradingVolumeEquityOnly: <"Specifies a condition that concentration limit 'AverageTradingVolume' is restricted to be used only if the asset type is described as 'Security' and 'Equity'."> if treatment -> concentrationLimit -> concentrationLimitCriteria -> averageTradingVolume exists - then asset -> collateralAssetType -> securityType all = SecurityTypeEnum -> Equity - or treatment -> concentrationLimit -> concentrationLimitCriteria -> asset -> collateralAssetType -> securityType all = SecurityTypeEnum -> Equity + then asset -> collateralAssetType -> securityType all = InstrumentTypeEnum -> Equity + or treatment -> concentrationLimit -> concentrationLimitCriteria -> asset -> collateralAssetType -> securityType all = InstrumentTypeEnum -> Equity type CollateralTreatment: <"Specifies the treatment terms for the eligible collateral criteria specified."> diff --git a/rosetta-source/src/main/rosetta/product-qualification-func.rosetta b/rosetta-source/src/main/rosetta/product-qualification-func.rosetta index b4e3be46ba..124b61b439 100644 --- a/rosetta-source/src/main/rosetta/product-qualification-func.rosetta +++ b/rosetta-source/src/main/rosetta/product-qualification-func.rosetta @@ -14,26 +14,26 @@ isProduct root EconomicTerms; func UnderlierQualification: <"Identifies whether the underlier(s) have either the specified securityType or assetClass."> inputs: underlier Underlier (1..1) <"An Underlier is an Observable (eg Asset, Basket or Index) or a Product."> - securityType SecurityTypeEnum (0..1) + securityType InstrumentTypeEnum (0..1) assetClass AssetClassEnum (0..1) output: qualifies boolean (1..1) set qualifies: ObservableQualification(underlier -> Observable, securityType, assetClass) - or underlier -> Product -> TransferableProduct -> Instrument -> Security -> securityType = securityType + or underlier -> Product -> TransferableProduct -> Instrument -> Security -> instrumentType = securityType // The EconomicTerms of any TransferableProduct or a NonTransferableProduct should be checked outside this function. func ObservableQualification: <"Identifies whether the observable(s) have either the specified securityType or assetClass."> inputs: observable Observable (0..1) <"An Observable is an Asset, Basket or Index."> - securityType SecurityTypeEnum (0..1) + securityType InstrumentTypeEnum (0..1) assetClass AssetClassEnum (0..1) output: qualifies boolean (1..1) set qualifies: - observable -> Asset -> Instrument -> Security -> securityType = securityType + observable -> Asset -> Instrument -> Security -> instrumentType = securityType or observable -> Index ->> assetClass = assetClass or if observable -> Basket exists @@ -65,14 +65,14 @@ func Qualify_AssetClass_InterestRate: <"Qualifies a product as having the Asset set is_product: InterestRatePayoutOnlyExists(economicTerms -> payout) or (economicTerms -> payout only-element -> OptionPayout exists - and (ObservableQualification(optionUnderlier -> Observable, SecurityTypeEnum -> Debt, AssetClassEnum -> InterestRate) - or optionUnderlier -> Product -> TransferableProduct -> Instrument -> Security -> securityType = SecurityTypeEnum -> Debt + and (ObservableQualification(optionUnderlier -> Observable, InstrumentTypeEnum -> Debt, AssetClassEnum -> InterestRate) + or optionUnderlier -> Product -> TransferableProduct -> Instrument ->> instrumentType = InstrumentTypeEnum -> Debt or if optionUnderlier -> Product exists then Qualify_AssetClass_InterestRate(optionUnderlier -> Product ->> economicTerms) = True else False )) or (economicTerms -> payout only-element -> SettlementPayout exists - and (UnderlierQualification(settlementUnderlier, SecurityTypeEnum -> Debt, AssetClassEnum -> InterestRate) + and (UnderlierQualification(settlementUnderlier, InstrumentTypeEnum -> Debt, AssetClassEnum -> InterestRate) or if settlementUnderlier -> Product ->> economicTerms exists then Qualify_AssetClass_InterestRate(settlementUnderlier -> Product ->> economicTerms) = True else False @@ -112,7 +112,7 @@ func Qualify_AssetClass_Credit: <"Qualifies a product as having the Asset Class and economicTerms -> payout -> CreditDefaultPayout exists and economicTerms -> payout -> PerformancePayout exists) and if performanceUnderlier exists - then (performanceUnderlier -> Observable -> Asset -> Instrument -> Loan exists or performanceUnderlier -> Observable -> Asset -> Instrument -> Security -> securityType = SecurityTypeEnum -> Debt)) + then (performanceUnderlier -> Observable -> Asset -> Instrument ->> instrumentType = InstrumentTypeEnum -> Debt)) func Qualify_AssetClass_ForeignExchange: <"Qualifies a product as having the Asset Class classification Foreign Exchange"> inputs: @@ -289,25 +289,27 @@ func Qualify_UnderlierObservable_Equity: <"Qualifies an Observable as having the is_product boolean (1..1) set is_product: - Qualify_SecurityTypeEquity(observable -> Asset -> Instrument -> Security) + Qualify_InstrumentTypeEquity(observable -> Asset -> Instrument) or observable -> Index ->> assetClass = AssetClassEnum -> Equity // Qualifies that the underlier is a basket composed of equity products only or (observable -> Basket exists and observable -> Basket -> basketConstituent extract [ Qualify_UnderlierObservable_Equity ] any = True) -func Qualify_SecurityTypeEquity: <"Qualifies that the security type, for all of the provided securities, is Equity-related."> +func Qualify_InstrumentTypeEquity: <"Qualifies that the security type, for all of the provided securities, is Equity-related."> inputs: - security Security (1..1) + instrument Instrument (1..1) output: is_equity boolean (1..1) + alias instrumentType: instrument ->> instrumentType + set is_equity: - security -> securityType = SecurityTypeEnum -> Equity - or (security -> securityType = SecurityTypeEnum -> Fund - and security -> fundType = FundProductTypeEnum -> ExchangeTradedFund) - or (security -> securityType = SecurityTypeEnum -> Fund - and security -> fundType = FundProductTypeEnum -> MutualFund) - or security -> securityType = SecurityTypeEnum -> Warrant + instrumentType = InstrumentTypeEnum -> Equity + or (instrumentType = InstrumentTypeEnum -> Fund + and instrument -> Security -> fundType = FundProductTypeEnum -> ExchangeTradedFund) + or (instrumentType = InstrumentTypeEnum -> Fund + and instrument -> Security -> fundType = FundProductTypeEnum -> MutualFund) + or instrumentType = InstrumentTypeEnum -> Warrant func Qualify_BaseProduct_EquitySwap: <"Qualifies a product as having the Asset Class classification Equity and Base Product Classification Swap."> inputs: @@ -1401,7 +1403,7 @@ func Qualify_InterestRate_Option_DebtOption: <"Qualifies a product as a Option t // qualifies that only the option payout exists and all other payouts are absent and economicTerms -> payout only-element -> OptionPayout exists // qualifies the underlyer of the option as a debt security - and optionPayout -> underlier -> Observable extract [ ObservableQualification(item, SecurityTypeEnum -> Debt, empty) ] all = True + and optionPayout -> underlier -> Observable extract [ ObservableQualification(item, InstrumentTypeEnum -> Debt, empty) ] all = True func Qualify_InterestRate_Forward_Debt: <"Qualifies a product as Interest Rate Bond Forward based on economic terms, which is defined as a transaction in which one party agrees to pay an agreed price for a specified amount of a bond of an issuer or a basket of bonds of several issuers at a future date and the other party agrees to pay a price for the same amount of the same bond to be set on a specified date in the future."> [qualification Product] diff --git a/rosetta-source/src/test/java/org/isda/cdm/functions/FunctionInputCreationTest.java b/rosetta-source/src/test/java/org/isda/cdm/functions/FunctionInputCreationTest.java index 1f274af578..bf62a6f96c 100644 --- a/rosetta-source/src/test/java/org/isda/cdm/functions/FunctionInputCreationTest.java +++ b/rosetta-source/src/test/java/org/isda/cdm/functions/FunctionInputCreationTest.java @@ -510,7 +510,7 @@ private CreateBusinessEventInput getIncreaseEquitySwapFuncInputJson() throws IOE .setAsset(Asset.builder() .setInstrument(Instrument.builder() .setSecurity(Security.builder() - .setSecurityType(SecurityTypeEnum.EQUITY) + .setInstrumentType(InstrumentTypeEnum.EQUITY) .addIdentifier(AssetIdentifier.builder() .setIdentifierType(AssetIdTypeEnum.OTHER) .setIdentifier(FieldWithMetaString.builder() @@ -2092,7 +2092,7 @@ void validateEligibleCollateralScheduleHelper() { .addAsset(AssetCriteria.builder() .addCollateralAssetType(AssetType.builder() .setAssetType(AssetTypeEnum.SECURITY) - .setSecurityType(SecurityTypeEnum.DEBT))) + .setSecurityType(InstrumentTypeEnum.DEBT))) .addIssuer(IssuerCriteria.builder() .addIssuerType(CollateralIssuerType.builder() .setIssuerType(IssuerTypeEnum.SOVEREIGN_CENTRAL_BANK)) diff --git a/tests/src/test/resources/logback-test.xml b/tests/src/test/resources/logback-test.xml index d9f5e94fc8..bd612a722f 100644 --- a/tests/src/test/resources/logback-test.xml +++ b/tests/src/test/resources/logback-test.xml @@ -13,6 +13,7 @@ +