From 4f1283493a2f2418bf65c952d5679f0dcd6d153f Mon Sep 17 00:00:00 2001 From: ptorres-prowide Date: Thu, 11 Jul 2024 17:22:04 -0300 Subject: [PATCH] CU-86b14j4e0_check-code-security-reports-at-GitHub-for-all-repos --- build.gradle | 1 + .../swift/model/field/Field101.java | 7 +- .../swift/model/field/Field102.java | 7 +- .../swift/model/field/Field103.java | 7 +- .../swift/model/field/Field104.java | 7 +- .../swift/model/field/Field105.java | 7 +- .../swift/model/field/Field106.java | 7 +- .../swift/model/field/Field107.java | 7 +- .../swift/model/field/Field108.java | 7 +- .../swift/model/field/Field109.java | 1 + .../swift/model/field/Field110.java | 7 +- .../swift/model/field/Field111.java | 7 +- .../swift/model/field/Field113.java | 7 +- .../swift/model/field/Field114.java | 7 +- .../swift/model/field/Field115.java | 7 +- .../swift/model/field/Field116.java | 7 +- .../swift/model/field/Field117.java | 7 +- .../swift/model/field/Field118.java | 7 +- .../swift/model/field/Field119.java | 7 +- .../swift/model/field/Field11A.java | 5 + .../swift/model/field/Field11R.java | 1 + .../swift/model/field/Field11S.java | 1 + .../swift/model/field/Field12.java | 7 +- .../swift/model/field/Field120.java | 7 +- .../swift/model/field/Field121.java | 7 +- .../swift/model/field/Field122.java | 7 +- .../swift/model/field/Field123.java | 7 +- .../swift/model/field/Field124.java | 7 +- .../swift/model/field/Field125.java | 7 +- .../swift/model/field/Field126.java | 7 +- .../swift/model/field/Field127.java | 7 +- .../swift/model/field/Field12A.java | 3 + .../swift/model/field/Field12B.java | 3 + .../swift/model/field/Field12C.java | 3 + .../swift/model/field/Field12D.java | 7 +- .../swift/model/field/Field12E.java | 7 +- .../swift/model/field/Field12F.java | 7 +- .../swift/model/field/Field12G.java | 7 +- .../swift/model/field/Field135.java | 7 +- .../swift/model/field/Field13A.java | 3 + .../swift/model/field/Field13B.java | 3 + .../swift/model/field/Field13D.java | 1 + .../swift/model/field/Field13J.java | 3 + .../swift/model/field/Field13K.java | 3 + .../swift/model/field/Field140.java | 7 +- .../swift/model/field/Field141.java | 7 +- .../swift/model/field/Field142.java | 15 +- .../swift/model/field/Field143.java | 15 +- .../swift/model/field/Field144.java | 7 +- .../swift/model/field/Field14A.java | 7 +- .../swift/model/field/Field14B.java | 7 +- .../swift/model/field/Field14C.java | 7 +- .../swift/model/field/Field14D.java | 7 +- .../swift/model/field/Field14E.java | 7 +- .../swift/model/field/Field14F.java | 7 +- .../swift/model/field/Field14H.java | 7 +- .../swift/model/field/Field14J.java | 7 +- .../swift/model/field/Field14K.java | 7 +- .../swift/model/field/Field14L.java | 7 +- .../swift/model/field/Field14M.java | 7 +- .../swift/model/field/Field14N.java | 7 +- .../swift/model/field/Field14O.java | 7 +- .../swift/model/field/Field151.java | 7 +- .../swift/model/field/Field152.java | 7 +- .../swift/model/field/Field153.java | 7 +- .../swift/model/field/Field15A.java | 7 +- .../swift/model/field/Field15B.java | 7 +- .../swift/model/field/Field15C.java | 7 +- .../swift/model/field/Field15D.java | 7 +- .../swift/model/field/Field15E.java | 7 +- .../swift/model/field/Field15F.java | 7 +- .../swift/model/field/Field15G.java | 7 +- .../swift/model/field/Field15H.java | 7 +- .../swift/model/field/Field15I.java | 7 +- .../swift/model/field/Field15J.java | 7 +- .../swift/model/field/Field15K.java | 7 +- .../swift/model/field/Field15L.java | 7 +- .../swift/model/field/Field15M.java | 7 +- .../swift/model/field/Field15N.java | 7 +- .../swift/model/field/Field15O.java | 7 +- .../swift/model/field/Field15P.java | 7 +- .../swift/model/field/Field16A.java | 7 +- .../swift/model/field/Field16C.java | 7 +- .../swift/model/field/Field16R.java | 7 +- .../swift/model/field/Field16S.java | 7 +- .../swift/model/field/Field171.java | 13 +- .../swift/model/field/Field172.java | 1 + .../swift/model/field/Field173.java | 15 +- .../swift/model/field/Field174.java | 7 +- .../swift/model/field/Field175.java | 12 +- .../swift/model/field/Field177.java | 15 +- .../swift/model/field/Field179.java | 12 +- .../swift/model/field/Field17A.java | 7 +- .../swift/model/field/Field17B.java | 3 + .../swift/model/field/Field17C.java | 7 +- .../swift/model/field/Field17E.java | 7 +- .../swift/model/field/Field17F.java | 7 +- .../swift/model/field/Field17G.java | 7 +- .../swift/model/field/Field17H.java | 7 +- .../swift/model/field/Field17I.java | 7 +- .../swift/model/field/Field17L.java | 7 +- .../swift/model/field/Field17M.java | 7 +- .../swift/model/field/Field17N.java | 7 +- .../swift/model/field/Field17O.java | 7 +- .../swift/model/field/Field17P.java | 7 +- .../swift/model/field/Field17Q.java | 7 +- .../swift/model/field/Field17R.java | 7 +- .../swift/model/field/Field17S.java | 7 +- .../swift/model/field/Field17T.java | 7 +- .../swift/model/field/Field17U.java | 7 +- .../swift/model/field/Field17V.java | 7 +- .../swift/model/field/Field17W.java | 7 +- .../swift/model/field/Field17X.java | 7 +- .../swift/model/field/Field17Y.java | 7 +- .../swift/model/field/Field17Z.java | 7 +- .../swift/model/field/Field18A.java | 7 +- .../swift/model/field/Field18B.java | 7 +- .../swift/model/field/Field18C.java | 7 +- .../swift/model/field/Field18D.java | 7 +- .../swift/model/field/Field19.java | 14 +- .../swift/model/field/Field199.java | 7 +- .../swift/model/field/Field19A.java | 5 + .../swift/model/field/Field19B.java | 5 + .../swift/model/field/Field19Y.java | 14 +- .../swift/model/field/Field19Z.java | 14 +- .../swift/model/field/Field20.java | 7 +- .../swift/model/field/Field202.java | 7 +- .../swift/model/field/Field203.java | 7 +- .../swift/model/field/Field204.java | 7 +- .../swift/model/field/Field206.java | 7 +- .../swift/model/field/Field208.java | 7 +- .../swift/model/field/Field209.java | 7 +- .../swift/model/field/Field20C.java | 3 + .../swift/model/field/Field20D.java | 3 + .../swift/model/field/Field20U.java | 3 + .../swift/model/field/Field21.java | 7 +- .../swift/model/field/Field21A.java | 7 +- .../swift/model/field/Field21B.java | 7 +- .../swift/model/field/Field21C.java | 7 +- .../swift/model/field/Field21D.java | 7 +- .../swift/model/field/Field21E.java | 7 +- .../swift/model/field/Field21F.java | 7 +- .../swift/model/field/Field21G.java | 7 +- .../swift/model/field/Field21N.java | 7 +- .../swift/model/field/Field21P.java | 7 +- .../swift/model/field/Field21R.java | 7 +- .../swift/model/field/Field22A.java | 7 +- .../swift/model/field/Field22B.java | 7 +- .../swift/model/field/Field22D.java | 7 +- .../swift/model/field/Field22E.java | 7 +- .../swift/model/field/Field22F.java | 3 + .../swift/model/field/Field22G.java | 7 +- .../swift/model/field/Field22H.java | 3 + .../swift/model/field/Field22J.java | 7 +- .../swift/model/field/Field22L.java | 7 +- .../swift/model/field/Field22M.java | 7 +- .../swift/model/field/Field22N.java | 7 +- .../swift/model/field/Field22P.java | 7 +- .../swift/model/field/Field22Q.java | 7 +- .../swift/model/field/Field22R.java | 7 +- .../swift/model/field/Field22T.java | 7 +- .../swift/model/field/Field22U.java | 7 +- .../swift/model/field/Field22V.java | 7 +- .../swift/model/field/Field22W.java | 7 +- .../swift/model/field/Field22X.java | 7 +- .../swift/model/field/Field22Y.java | 7 +- .../swift/model/field/Field22Z.java | 7 +- .../swift/model/field/Field23.java | 2 + .../swift/model/field/Field23B.java | 7 +- .../swift/model/field/Field23C.java | 7 +- .../swift/model/field/Field23D.java | 7 +- .../swift/model/field/Field23H.java | 7 +- .../swift/model/field/Field23S.java | 7 +- .../swift/model/field/Field242.java | 7 +- .../swift/model/field/Field243.java | 7 +- .../swift/model/field/Field24B.java | 3 + .../swift/model/field/Field25.java | 7 +- .../swift/model/field/Field251.java | 7 +- .../swift/model/field/Field253.java | 7 +- .../swift/model/field/Field255.java | 1 + .../swift/model/field/Field256.java | 1 + .../swift/model/field/Field257.java | 1 + .../swift/model/field/Field258.java | 1 + .../swift/model/field/Field259.java | 1 + .../swift/model/field/Field25A.java | 7 +- .../swift/model/field/Field25D.java | 3 + .../swift/model/field/Field260.java | 1 + .../swift/model/field/Field263.java | 1 + .../swift/model/field/Field264.java | 1 + .../swift/model/field/Field26B.java | 7 +- .../swift/model/field/Field26E.java | 7 +- .../swift/model/field/Field26F.java | 7 +- .../swift/model/field/Field26H.java | 7 +- .../swift/model/field/Field26K.java | 7 +- .../swift/model/field/Field26T.java | 7 +- .../swift/model/field/Field270.java | 1 + .../swift/model/field/Field271.java | 1 + .../swift/model/field/Field272.java | 1 + .../swift/model/field/Field29H.java | 7 +- .../swift/model/field/Field29I.java | 7 +- .../swift/model/field/Field29L.java | 1 + .../swift/model/field/Field29N.java | 1 + .../swift/model/field/Field30.java | 13 +- .../swift/model/field/Field301.java | 7 +- .../swift/model/field/Field302.java | 7 +- .../swift/model/field/Field303.java | 7 +- .../swift/model/field/Field305.java | 7 +- .../swift/model/field/Field307.java | 7 +- .../swift/model/field/Field30F.java | 13 +- .../swift/model/field/Field30G.java | 1 + .../swift/model/field/Field30H.java | 13 +- .../swift/model/field/Field30I.java | 1 + .../swift/model/field/Field30M.java | 13 +- .../swift/model/field/Field30N.java | 13 +- .../swift/model/field/Field30P.java | 13 +- .../swift/model/field/Field30Q.java | 13 +- .../swift/model/field/Field30S.java | 13 +- .../swift/model/field/Field30T.java | 13 +- .../swift/model/field/Field30U.java | 13 +- .../swift/model/field/Field30V.java | 13 +- .../swift/model/field/Field30X.java | 13 +- .../swift/model/field/Field30Y.java | 13 +- .../swift/model/field/Field30Z.java | 13 +- .../swift/model/field/Field311.java | 7 +- .../swift/model/field/Field312.java | 7 +- .../swift/model/field/Field313.java | 7 +- .../swift/model/field/Field31C.java | 13 +- .../swift/model/field/Field31D.java | 1 + .../swift/model/field/Field31E.java | 13 +- .../swift/model/field/Field31F.java | 1 + .../swift/model/field/Field31G.java | 1 + .../swift/model/field/Field31L.java | 13 +- .../swift/model/field/Field31P.java | 1 + .../swift/model/field/Field31R.java | 1 + .../swift/model/field/Field31S.java | 13 +- .../swift/model/field/Field31X.java | 1 + .../swift/model/field/Field329.java | 7 +- .../swift/model/field/Field32A.java | 3 + .../swift/model/field/Field32B.java | 2 + .../swift/model/field/Field32C.java | 3 + .../swift/model/field/Field32D.java | 3 + .../swift/model/field/Field32E.java | 9 +- .../swift/model/field/Field32G.java | 2 + .../swift/model/field/Field32H.java | 2 + .../swift/model/field/Field32K.java | 2 + .../swift/model/field/Field32M.java | 2 + .../swift/model/field/Field32Q.java | 2 + .../swift/model/field/Field32U.java | 2 + .../swift/model/field/Field331.java | 1 + .../swift/model/field/Field333.java | 1 + .../swift/model/field/Field337.java | 7 +- .../swift/model/field/Field338.java | 7 +- .../swift/model/field/Field339.java | 7 +- .../swift/model/field/Field33A.java | 3 + .../swift/model/field/Field33C.java | 3 + .../swift/model/field/Field33D.java | 3 + .../swift/model/field/Field33E.java | 2 + .../swift/model/field/Field33F.java | 2 + .../swift/model/field/Field33G.java | 2 + .../swift/model/field/Field33H.java | 2 + .../swift/model/field/Field33K.java | 2 + .../swift/model/field/Field33Z.java | 14 +- .../swift/model/field/Field341.java | 7 +- .../swift/model/field/Field348.java | 7 +- .../swift/model/field/Field349.java | 7 +- .../swift/model/field/Field34A.java | 3 + .../swift/model/field/Field34B.java | 2 + .../swift/model/field/Field34C.java | 2 + .../swift/model/field/Field34E.java | 2 + .../swift/model/field/Field34F.java | 2 + .../swift/model/field/Field34P.java | 3 + .../swift/model/field/Field34R.java | 3 + .../swift/model/field/Field35D.java | 13 +- .../swift/model/field/Field36.java | 14 +- .../swift/model/field/Field36B.java | 3 + .../swift/model/field/Field36C.java | 3 + .../swift/model/field/Field36D.java | 3 + .../swift/model/field/Field36E.java | 3 + .../swift/model/field/Field37A.java | 1 + .../swift/model/field/Field37B.java | 1 + .../swift/model/field/Field37C.java | 1 + .../swift/model/field/Field37D.java | 1 + .../swift/model/field/Field37E.java | 1 + .../swift/model/field/Field37F.java | 1 + .../swift/model/field/Field37J.java | 14 +- .../swift/model/field/Field37L.java | 14 +- .../swift/model/field/Field37P.java | 14 +- .../swift/model/field/Field37U.java | 14 +- .../swift/model/field/Field38A.java | 7 +- .../swift/model/field/Field38D.java | 7 +- .../swift/model/field/Field39B.java | 7 +- .../swift/model/field/Field39M.java | 7 +- .../swift/model/field/Field401.java | 7 +- .../swift/model/field/Field40A.java | 7 +- .../swift/model/field/Field40D.java | 7 +- .../swift/model/field/Field40F.java | 7 +- .../swift/model/field/Field41F.java | 7 +- .../swift/model/field/Field421.java | 7 +- .../swift/model/field/Field423.java | 7 +- .../swift/model/field/Field424.java | 7 +- .../swift/model/field/Field431.java | 7 +- .../swift/model/field/Field432.java | 7 +- .../swift/model/field/Field43P.java | 7 +- .../swift/model/field/Field43T.java | 7 +- .../swift/model/field/Field443.java | 7 +- .../swift/model/field/Field44A.java | 7 +- .../swift/model/field/Field44B.java | 7 +- .../swift/model/field/Field44C.java | 13 +- .../swift/model/field/Field44E.java | 7 +- .../swift/model/field/Field44F.java | 7 +- .../swift/model/field/Field451.java | 7 +- .../swift/model/field/Field45A.java | 7 +- .../swift/model/field/Field45C.java | 7 +- .../swift/model/field/Field45D.java | 7 +- .../swift/model/field/Field45L.java | 7 +- .../swift/model/field/Field461.java | 7 +- .../swift/model/field/Field46A.java | 7 +- .../swift/model/field/Field47A.java | 7 +- .../swift/model/field/Field48B.java | 7 +- .../swift/model/field/Field48D.java | 7 +- .../swift/model/field/Field49.java | 7 +- .../swift/model/field/Field49G.java | 7 +- .../swift/model/field/Field49H.java | 7 +- .../swift/model/field/Field503.java | 7 +- .../swift/model/field/Field50C.java | 7 +- .../swift/model/field/Field533.java | 7 +- .../swift/model/field/Field60F.java | 3 + .../swift/model/field/Field60M.java | 3 + .../swift/model/field/Field61.java | 1 + .../swift/model/field/Field619.java | 7 +- .../swift/model/field/Field62F.java | 1 + .../swift/model/field/Field62M.java | 1 + .../swift/model/field/Field64.java | 1 + .../swift/model/field/Field65.java | 1 + .../swift/model/field/Field68A.java | 2 + .../swift/model/field/Field69A.java | 4 + .../swift/model/field/Field69B.java | 4 + .../swift/model/field/Field69C.java | 4 + .../swift/model/field/Field69D.java | 4 + .../swift/model/field/Field69E.java | 4 + .../swift/model/field/Field69F.java | 4 + .../swift/model/field/Field69J.java | 3 + .../swift/model/field/Field70C.java | 3 + .../swift/model/field/Field70D.java | 3 + .../swift/model/field/Field70E.java | 3 + .../swift/model/field/Field70F.java | 3 + .../swift/model/field/Field70G.java | 3 + .../swift/model/field/Field70H.java | 3 + .../swift/model/field/Field71A.java | 7 +- .../swift/model/field/Field71F.java | 2 + .../swift/model/field/Field71G.java | 2 + .../swift/model/field/Field77C.java | 7 +- .../swift/model/field/Field77E.java | 7 +- .../swift/model/field/Field77F.java | 7 +- .../swift/model/field/Field77H.java | 1 + .../swift/model/field/Field77L.java | 7 +- .../swift/model/field/Field77T.java | 7 +- .../swift/model/field/Field77U.java | 7 +- .../swift/model/field/Field90A.java | 3 + .../swift/model/field/Field90B.java | 5 + .../swift/model/field/Field90C.java | 2 + .../swift/model/field/Field90D.java | 2 + .../swift/model/field/Field90E.java | 3 + .../swift/model/field/Field90F.java | 5 + .../swift/model/field/Field90J.java | 5 + .../swift/model/field/Field90K.java | 3 + .../swift/model/field/Field90L.java | 3 + .../swift/model/field/Field92A.java | 3 + .../swift/model/field/Field92B.java | 5 + .../swift/model/field/Field92C.java | 3 + .../swift/model/field/Field92D.java | 3 + .../swift/model/field/Field92F.java | 5 + .../swift/model/field/Field92H.java | 5 + .../swift/model/field/Field92J.java | 5 + .../swift/model/field/Field92K.java | 3 + .../swift/model/field/Field92L.java | 5 + .../swift/model/field/Field92M.java | 5 + .../swift/model/field/Field92N.java | 5 + .../swift/model/field/Field92P.java | 3 + .../swift/model/field/Field92R.java | 3 + .../swift/model/field/Field93A.java | 3 + .../swift/model/field/Field93B.java | 3 + .../swift/model/field/Field93C.java | 3 + .../swift/model/field/Field93D.java | 3 + .../swift/model/field/Field93E.java | 3 + .../swift/model/field/Field93F.java | 3 + .../swift/model/field/Field94A.java | 7 +- .../swift/model/field/Field94B.java | 3 + .../swift/model/field/Field94C.java | 3 + .../swift/model/field/Field94D.java | 3 + .../swift/model/field/Field94E.java | 3 + .../swift/model/field/Field94F.java | 3 + .../swift/model/field/Field94G.java | 3 + .../swift/model/field/Field94H.java | 3 + .../swift/model/field/Field94L.java | 3 + .../swift/model/field/Field95C.java | 3 + .../swift/model/field/Field95L.java | 3 + .../swift/model/field/Field95P.java | 3 + .../swift/model/field/Field95Q.java | 3 + .../swift/model/field/Field95R.java | 3 + .../swift/model/field/Field95S.java | 3 + .../swift/model/field/Field95U.java | 3 + .../swift/model/field/Field95V.java | 3 + .../swift/model/field/Field97A.java | 3 + .../swift/model/field/Field97B.java | 3 + .../swift/model/field/Field97C.java | 3 + .../swift/model/field/Field97D.java | 3 + .../swift/model/field/Field97E.java | 3 + .../swift/model/field/Field98A.java | 4 + .../swift/model/field/Field98B.java | 3 + .../swift/model/field/Field98C.java | 4 + .../swift/model/field/Field98D.java | 1 + .../swift/model/field/Field98E.java | 4 + .../swift/model/field/Field98F.java | 3 + .../swift/model/field/Field98G.java | 1 + .../swift/model/field/Field98J.java | 4 + .../swift/model/field/Field98K.java | 4 + .../swift/model/field/Field999.java | 7 +- .../swift/model/field/Field99A.java | 3 + .../swift/model/field/Field99B.java | 3 + .../swift/model/field/Field99C.java | 3 + .../swift/constraints/IbanValidator.java | 3 +- .../swift/model/BicValidationResult.java | 3 +- .../com/prowidesoftware/swift/model/IBAN.java | 29 +- .../swift/model/IbanValidationResult.java | 4 +- .../swift/model/ValidationResultUtils.java | 186 ++++++++++++ .../swift/constraints/IbanValidatorTest.java | 266 ++++++++++++++++++ .../swift/model/IBANValidateTest.java | 224 +++++++++++++++ .../model/ValidationResultUtilsTest.java | 19 ++ .../swift/model/mt/AbstractMTTest.java | 4 +- 430 files changed, 1816 insertions(+), 1359 deletions(-) create mode 100644 src/main/java/com/prowidesoftware/swift/model/ValidationResultUtils.java create mode 100644 src/test/java/com/prowidesoftware/swift/constraints/IbanValidatorTest.java create mode 100644 src/test/java/com/prowidesoftware/swift/model/IBANValidateTest.java create mode 100644 src/test/java/com/prowidesoftware/swift/model/ValidationResultUtilsTest.java diff --git a/build.gradle b/build.gradle index 79dc56ecb..c94374e0b 100644 --- a/build.gradle +++ b/build.gradle @@ -59,6 +59,7 @@ dependencies { compileOnly 'javax.xml.bind:jaxb-api:2.3.1' compileOnly 'javax.validation:validation-api:2.0.1.Final' + testImplementation 'javax.validation:validation-api:2.0.1.Final' testImplementation 'javax.persistence:javax.persistence-api:2.2' testImplementation('org.junit.jupiter:junit-jupiter:5.8.2') testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.22.0' diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field101.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field101.java index d57c46a98..55d5bf051 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field101.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field101.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 101"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field102.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field102.java index 3bbe53977..ff1505582 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field102.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field102.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 102"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field103.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field103.java index 59cc859bc..06d112bdc 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field103.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field103.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 103"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field104.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field104.java index 2958e5d3e..2c48d71a9 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field104.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field104.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 104"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field105.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field105.java index 4a0933a96..80a4afa4e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field105.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field105.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 105"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field106.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field106.java index b6109fd6e..abba3152d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field106.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field106.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 106"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field107.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field107.java index ce085fc63..711026d9e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field107.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field107.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 107"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field108.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field108.java index 7a8fbda13..65713731a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field108.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field108.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 108"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field109.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field109.java index cd5b2b1e7..2b889d127 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field109.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field109.java @@ -571,6 +571,7 @@ public Field109 setMIR(String component3) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field110.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field110.java index e84db9d2b..9ac49c0b9 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field110.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field110.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 110"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field111.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field111.java index 7da76c56c..04058e379 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field111.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field111.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 111"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field113.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field113.java index a03bcf530..40046345f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field113.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field113.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 113"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field114.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field114.java index f17e8a29f..1e727660a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field114.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field114.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 114"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field115.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field115.java index 07396899d..09f30e0d8 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field115.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field115.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 115"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field116.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field116.java index c757e1c6f..932734009 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field116.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field116.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 116"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field117.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field117.java index 20cf9796d..be22ece6c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field117.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field117.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 117"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field118.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field118.java index 527aac845..d4bc0b9d3 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field118.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field118.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 118"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field119.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field119.java index 17d471264..2d223ee94 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field119.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field119.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 119"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field11A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field11A.java index 3bdb1348f..169f5b249 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field11A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field11A.java @@ -526,10 +526,12 @@ public String currencyString() { return CurrencyResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { CurrencyResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { CurrencyResolver.resolveSetCurrency(this, cur); } @@ -541,6 +543,7 @@ public void initializeCurrencies(Currency cur) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -551,6 +554,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -565,6 +569,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field11R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field11R.java index 2cc498cf7..0a2bbadb9 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field11R.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field11R.java @@ -849,6 +849,7 @@ public Field11R setISN(java.lang.Number component4) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field11S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field11S.java index 5877397bd..678f5203f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field11S.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field11S.java @@ -849,6 +849,7 @@ public Field11S setISN(java.lang.Number component4) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field12.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field12.java index 7cdf9b1dc..202c5121e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field12.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field12.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 12"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field120.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field120.java index 87ea6d68a..93527c132 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field120.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field120.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 120"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field121.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field121.java index 52a5f6355..20ca8e13a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field121.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field121.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 121"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field122.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field122.java index 2debe8c65..ce7620e7f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field122.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field122.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 122"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field123.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field123.java index 0a7c5fc3c..8a5cdf9ae 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field123.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field123.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 123"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field124.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field124.java index 6c3c61278..615b1f4df 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field124.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field124.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 124"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field125.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field125.java index 363093e25..336debe2e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field125.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field125.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 125"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field126.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field126.java index bf7ef458b..53e6b078e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field126.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field126.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 126"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field127.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field127.java index 254361ea1..3a1e4137a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field127.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field127.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 127"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field12A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field12A.java index 030748293..631e9fe29 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field12A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field12A.java @@ -512,6 +512,7 @@ public Field12A setInstrumentCode(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -522,6 +523,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -536,6 +538,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field12B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field12B.java index d4286ba8d..0d742a5d5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field12B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field12B.java @@ -507,6 +507,7 @@ public Field12B setType(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -517,6 +518,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -531,6 +533,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field12C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field12C.java index df7992918..70ff6f121 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field12C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field12C.java @@ -427,6 +427,7 @@ public Field12C setCFICode(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -437,6 +438,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -451,6 +453,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field12D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field12D.java index 343b895d6..75f659675 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field12D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field12D.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 12D"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field12E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field12E.java index 5797b406c..e70e3211d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field12E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field12E.java @@ -220,11 +220,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 12E"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field12F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field12F.java index 4fdcdcb80..27964e0e7 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field12F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field12F.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 12F"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field12G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field12G.java index 948087f34..ce76faf70 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field12G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field12G.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 12G"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field135.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field135.java index 618d9118b..d212e5199 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field135.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field135.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 135"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field13A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field13A.java index d4b42f975..c5a26a409 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field13A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field13A.java @@ -451,6 +451,7 @@ public Field13A setNumberIdentification(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -461,6 +462,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -475,6 +477,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field13B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field13B.java index ba91c7b57..9c5dd3874 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field13B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field13B.java @@ -483,6 +483,7 @@ public Field13B setNumber(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -493,6 +494,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -507,6 +509,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field13D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field13D.java index ac9f4a9ce..75a59a375 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field13D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field13D.java @@ -664,6 +664,7 @@ public Field13D setOffset(java.util.Calendar component4) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field13J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field13J.java index 74e268389..612044663 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field13J.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field13J.java @@ -456,6 +456,7 @@ public Field13J setCode(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -466,6 +467,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -480,6 +482,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field13K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field13K.java index 00262ceec..f99d16f91 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field13K.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field13K.java @@ -686,6 +686,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -696,6 +697,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -710,6 +712,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field140.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field140.java index de411e41d..3e694e2a9 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field140.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field140.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 140"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field141.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field141.java index 4d428b048..4669c1520 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field141.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field141.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 141"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field142.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field142.java index 8353a7f3f..02fd90cdb 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field142.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field142.java @@ -210,14 +210,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 142"); } - if (component == 1) { - //datetime: [YY]YYMMDDHHMM - java.text.DateFormat df = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.text.DateFormat tf = new java.text.SimpleDateFormat("HH:mm", notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return df.format(cal.getTime()) + " " + tf.format(cal.getTime()); - } + //datetime: [YY]YYMMDDHHMM + java.text.DateFormat df = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.text.DateFormat tf = new java.text.SimpleDateFormat("HH:mm", notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return df.format(cal.getTime()) + " " + tf.format(cal.getTime()); } return null; } @@ -419,6 +417,7 @@ public Field142 setStartDateTime(java.util.Calendar component1) { * @return the list of converted components (a Calendar object or null) * @since 9.2.7 */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field143.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field143.java index 22c1e7e5c..2350c5d3b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field143.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field143.java @@ -210,14 +210,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 143"); } - if (component == 1) { - //datetime: [YY]YYMMDDHHMM - java.text.DateFormat df = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.text.DateFormat tf = new java.text.SimpleDateFormat("HH:mm", notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return df.format(cal.getTime()) + " " + tf.format(cal.getTime()); - } + //datetime: [YY]YYMMDDHHMM + java.text.DateFormat df = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.text.DateFormat tf = new java.text.SimpleDateFormat("HH:mm", notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return df.format(cal.getTime()) + " " + tf.format(cal.getTime()); } return null; } @@ -419,6 +417,7 @@ public Field143 setEndDateTime(java.util.Calendar component1) { * @return the list of converted components (a Calendar object or null) * @since 9.2.7 */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field144.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field144.java index 923e02d66..be23dba02 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field144.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field144.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 144"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14A.java index 5824585e2..f433eb6bd 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14A.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14B.java index 5b6130ac5..bfe652745 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14B.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14B"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14C.java index 638aed8b3..3d25a88c1 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14C.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14C"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14D.java index d140cd364..bea6329ba 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14D.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14D"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14E.java index edd6fda1e..75fc3d2d8 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14E.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14E"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14F.java index d18b5af7d..9ca71265f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14F.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14F"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14H.java index 4389da7a3..562fb2337 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14H.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14H"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14J.java index c1f9898cd..59e786eda 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14J.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14J.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14J"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14K.java index 78e81ca64..2928353b7 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14K.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14K.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14K"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14L.java index e63deb482..859fa0a1c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14L.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14L"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14M.java index 745c3d43c..f493f059b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14M.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14M.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14M"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14N.java index 1c05f05d7..907976e13 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14N.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14N.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14N"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field14O.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field14O.java index 2df65e579..68ebfd45b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field14O.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field14O.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 14O"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field151.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field151.java index 5e867942a..440d135d2 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field151.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field151.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 151"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field152.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field152.java index 233c4e491..2a08eb54d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field152.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field152.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 152"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field153.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field153.java index 396952f7c..0bae45368 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field153.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field153.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 153"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15A.java index 3cb2254f1..a75eed2c0 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15A.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15B.java index 43afdd9ae..3e76a9c85 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15B.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15B"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15C.java index 48827bf76..98d27b520 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15C.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15C"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15D.java index c58922698..6b05ea81f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15D.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15D"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15E.java index 667bceaf6..8350efb64 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15E.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15E"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15F.java index 0711f6158..6fc443b72 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15F.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15F"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15G.java index 416a21cf3..1daac9063 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15G.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15G"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15H.java index 28b0e7e03..cbb69845f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15H.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15H"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15I.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15I.java index 7b899fc6a..9c156adff 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15I.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15I.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15I"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15J.java index 4b432d205..be120ff69 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15J.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15J.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15J"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15K.java index a158eabe0..e5aa04534 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15K.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15K.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15K"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15L.java index dfa8f785c..0313e6646 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15L.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15L"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15M.java index 7942e4abd..8de64e749 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15M.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15M.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15M"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15N.java index 7c9068912..29eb18415 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15N.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15N.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15N"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15O.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15O.java index 3b1247928..33fe4b988 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15O.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15O.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15O"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field15P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field15P.java index 43e72fff7..b6dc0b4ec 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field15P.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field15P.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 15P"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field16A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field16A.java index fe186f556..6ec318ac3 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field16A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field16A.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 16A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field16C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field16C.java index ac786a9a8..8f324c741 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field16C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field16C.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 16C"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field16R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field16R.java index 111a0e36c..196a4826c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field16R.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field16R.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 16R"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field16S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field16S.java index e14f208f6..29f895006 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field16S.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field16S.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 16S"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field171.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field171.java index b7bb4c110..8a877fbc8 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field171.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field171.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 171"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field171 setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field172.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field172.java index ce1a22779..29a0512d8 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field172.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field172.java @@ -519,6 +519,7 @@ public Field172 setEndDate(java.util.Calendar component2) { * @return the list of converted components (a Calendar object or null) * @since 9.2.7 */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field173.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field173.java index 8a7305478..b935519c2 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field173.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field173.java @@ -210,14 +210,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 173"); } - if (component == 1) { - //day + time: DDHHMM - java.text.DateFormat df = new java.text.SimpleDateFormat("dd", notNull(locale)); - java.text.DateFormat tf = new java.text.SimpleDateFormat("HH:mm", notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return df.format(cal.getTime()) + " " + tf.format(cal.getTime()); - } + //day + time: DDHHMM + java.text.DateFormat df = new java.text.SimpleDateFormat("dd", notNull(locale)); + java.text.DateFormat tf = new java.text.SimpleDateFormat("HH:mm", notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return df.format(cal.getTime()) + " " + tf.format(cal.getTime()); } return null; } @@ -419,6 +417,7 @@ public Field173 setDayTime(java.util.Calendar component1) { * @return the list of converted components (a Calendar object or null) * @since 9.2.7 */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field174.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field174.java index 36c491888..f54c1d015 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field174.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field174.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 174"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field175.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field175.java index 4a2287910..8828f7ea0 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field175.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field175.java @@ -208,13 +208,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 175"); } - if (component == 1) { - //time: HH[mm] - java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //time: HH[mm] + java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field177.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field177.java index 729219d29..185dcac83 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field177.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field177.java @@ -210,14 +210,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 177"); } - if (component == 1) { - //datetime: [YY]YYMMDDHHMM - java.text.DateFormat df = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.text.DateFormat tf = new java.text.SimpleDateFormat("HH:mm", notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return df.format(cal.getTime()) + " " + tf.format(cal.getTime()); - } + //datetime: [YY]YYMMDDHHMM + java.text.DateFormat df = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.text.DateFormat tf = new java.text.SimpleDateFormat("HH:mm", notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return df.format(cal.getTime()) + " " + tf.format(cal.getTime()); } return null; } @@ -419,6 +417,7 @@ public Field177 setDateTime(java.util.Calendar component1) { * @return the list of converted components (a Calendar object or null) * @since 9.2.7 */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field179.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field179.java index 17a8ca4dc..4a481aab4 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field179.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field179.java @@ -203,13 +203,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 179"); } - if (component == 1) { - //time with seconds: HHmmss - java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm:ss", notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //time with seconds: HHmmss + java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm:ss", notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17A.java index a63a7687e..f56831408 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17A.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17B.java index 5e70b8c94..12eaf4a59 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17B.java @@ -427,6 +427,7 @@ public Field17B setFlag(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -437,6 +438,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -451,6 +453,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17C.java index cee35dc6c..d17fbe1f0 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17C.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17C"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17E.java index 5484bdc60..ed2c3bd7b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17E.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17E"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17F.java index a3263e18a..880cf4344 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17F.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17F"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17G.java index 4d4a3e839..958f0164f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17G.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17G"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17H.java index 726c5a4ca..95bd008a5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17H.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17H"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17I.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17I.java index ff1524fcb..9f44e57c0 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17I.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17I.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17I"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17L.java index 0bb11d33a..ea4db73ce 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17L.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17L"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17M.java index 3a96aba8f..fc9618e1d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17M.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17M.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17M"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17N.java index 9d9abb33e..29e13289f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17N.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17N.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17N"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17O.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17O.java index c412b5092..a090f5e34 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17O.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17O.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17O"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17P.java index 8b1d44096..a209fe6ba 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17P.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17P.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17P"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17Q.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17Q.java index f34ea3a17..436424e6f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17Q.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17Q.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17Q"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17R.java index d0264bf29..1989aa511 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17R.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17R.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17R"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17S.java index d74579f42..705eeedb4 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17S.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17S.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17S"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17T.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17T.java index 8c66a1f1f..d8299d141 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17T.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17T.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17T"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17U.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17U.java index 6ea0abcab..c1e56356c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17U.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17U.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17U"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17V.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17V.java index 03a06e7b1..e04a555d3 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17V.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17V.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17V"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17W.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17W.java index 84abe4fd2..7042f497e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17W.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17W.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17W"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17X.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17X.java index 7de5dd9fe..c764c2857 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17X.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17X.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17X"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17Y.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17Y.java index 01b72d439..fa0bcc051 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17Y.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17Y.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17Y"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field17Z.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field17Z.java index 8cc4a7040..5173268d2 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field17Z.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field17Z.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 17Z"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field18A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field18A.java index 38ca6fb98..46ebe33ae 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field18A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field18A.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 18A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field18B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field18B.java index d48812fb0..16a9778cd 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field18B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field18B.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 18B"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field18C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field18C.java index ebd869fa2..f5ab5161b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field18C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field18C.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 18C"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field18D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field18D.java index 3acf6689f..da7fc9259 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field18D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field18D.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 18D"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field19.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field19.java index ead0f42d3..ebe01c228 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field19.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field19.java @@ -211,14 +211,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 19"); } - if (component == 1) { - //amount, rate - java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); - f.setMaximumFractionDigits(13); - BigDecimal n = getComponent1AsBigDecimal(); - if (n != null) { - return f.format(n); - } + //amount, rate + java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); + f.setMaximumFractionDigits(13); + BigDecimal n = getComponent1AsBigDecimal(); + if (n != null) { + return f.format(n); } return null; } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field199.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field199.java index d688f2f60..f0eccae23 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field199.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field199.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 199"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field19A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field19A.java index d35961f90..72d8eb456 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field19A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field19A.java @@ -759,10 +759,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -794,6 +796,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -804,6 +807,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -818,6 +822,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field19B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field19B.java index 24db87ad4..66dea0111 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field19B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field19B.java @@ -696,10 +696,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -731,6 +733,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -741,6 +744,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -755,6 +759,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field19Y.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field19Y.java index 5c5bb9a1b..d71c19323 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field19Y.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field19Y.java @@ -218,14 +218,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 19Y"); } - if (component == 1) { - //amount, rate - java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); - f.setMaximumFractionDigits(13); - BigDecimal n = getComponent1AsBigDecimal(); - if (n != null) { - return f.format(n); - } + //amount, rate + java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); + f.setMaximumFractionDigits(13); + BigDecimal n = getComponent1AsBigDecimal(); + if (n != null) { + return f.format(n); } return null; } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field19Z.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field19Z.java index ec6624b7c..1f87d37f2 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field19Z.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field19Z.java @@ -218,14 +218,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 19Z"); } - if (component == 1) { - //amount, rate - java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); - f.setMaximumFractionDigits(13); - BigDecimal n = getComponent1AsBigDecimal(); - if (n != null) { - return f.format(n); - } + //amount, rate + java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); + f.setMaximumFractionDigits(13); + BigDecimal n = getComponent1AsBigDecimal(); + if (n != null) { + return f.format(n); } return null; } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field20.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field20.java index fc57fd941..c9e5a3c09 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field20.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field20.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 20"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field202.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field202.java index 351ac7bc3..802c12f9f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field202.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field202.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 202"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field203.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field203.java index 28afaf1ab..c6e725dd5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field203.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field203.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 203"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field204.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field204.java index a9e45c628..f692a464e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field204.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field204.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 204"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field206.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field206.java index 36237d297..c6b649280 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field206.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field206.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 206"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field208.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field208.java index d3f2cd81b..3f2a4ef50 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field208.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field208.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 208"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field209.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field209.java index a5680bb22..ebf6d6b22 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field209.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field209.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 209"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field20C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field20C.java index f6eb41ca9..35b635b30 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field20C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field20C.java @@ -427,6 +427,7 @@ public Field20C setReference(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -437,6 +438,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -451,6 +453,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field20D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field20D.java index cb7c9d60d..80f10d481 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field20D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field20D.java @@ -427,6 +427,7 @@ public Field20D setReference(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -437,6 +438,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -451,6 +453,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field20U.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field20U.java index c9c816658..118b4034c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field20U.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field20U.java @@ -427,6 +427,7 @@ public Field20U setReference(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -437,6 +438,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -451,6 +453,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21.java index 6312f84ab..3218891c2 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 21"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21A.java index eaaf6bfd7..fecf98619 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21A.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 21A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21B.java index d4a0fc5ad..0f5864ed9 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21B.java @@ -219,11 +219,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 21B"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21C.java index 537f495f7..21bc3e91b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21C.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 21C"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21D.java index 96f1ecafb..869885496 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21D.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 21D"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21E.java index b7726ae2d..265ef0277 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21E.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 21E"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21F.java index f5a098d48..48e2d0abe 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21F.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 21F"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21G.java index c9d5c1342..c233ae4e8 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21G.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 21G"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21N.java index 9332bf084..741def943 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21N.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21N.java @@ -219,11 +219,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 21N"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21P.java index b59bb9092..af09371de 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21P.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21P.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 21P"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field21R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field21R.java index bd2e9c0d7..cd91a0249 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field21R.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field21R.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 21R"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22A.java index 7268ec99a..0fc0afea6 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22A.java @@ -219,11 +219,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22B.java index feb723af9..5922e5fdb 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22B.java @@ -219,11 +219,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22B"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22D.java index cfd3e0717..7376aab01 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22D.java @@ -219,11 +219,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22D"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22E.java index 48ddd757a..0ffc7eb7a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22E.java @@ -213,11 +213,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22E"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22F.java index bcfa3fe33..67b9bb65a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22F.java @@ -483,6 +483,7 @@ public Field22F setIndicator(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -493,6 +494,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -507,6 +509,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22G.java index eee71a303..452665999 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22G.java @@ -219,11 +219,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22G"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22H.java index 7674c3790..33961ce41 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22H.java @@ -456,6 +456,7 @@ public Field22H setCode(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -466,6 +467,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -480,6 +482,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22J.java index 6f92e8168..f047305f1 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22J.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22J.java @@ -214,11 +214,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22J"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22L.java index 7ac2d901c..c95fab79a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22L.java @@ -214,11 +214,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22L"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22M.java index 5f805cd38..8cdc25157 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22M.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22M.java @@ -226,11 +226,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22M"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22N.java index ec2c22c4c..ea68cb195 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22N.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22N.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22N"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22P.java index 40f2a20ba..09be66d4e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22P.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22P.java @@ -226,11 +226,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22P"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22Q.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22Q.java index 9d0b32c84..9f931a344 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22Q.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22Q.java @@ -214,11 +214,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22Q"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22R.java index 852c8011c..70a3ec211 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22R.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22R.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22R"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22T.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22T.java index 7e193ffe2..bfef26b68 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22T.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22T.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22T"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22U.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22U.java index 23a0ac510..c5098e881 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22U.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22U.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22U"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22V.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22V.java index 4e2e8f8eb..0d0b0fa9d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22V.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22V.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22V"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22W.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22W.java index 09ce255a7..51321d28a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22W.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22W.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22W"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22X.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22X.java index 989dc494b..c0b6a6afc 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22X.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22X.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22X"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22Y.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22Y.java index e16b1c7ee..10016f341 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22Y.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22Y.java @@ -220,11 +220,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22Y"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field22Z.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field22Z.java index 5cded64e8..0819e60a9 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field22Z.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field22Z.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 22Z"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23.java index d2998a428..393ea7d75 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23.java @@ -716,10 +716,12 @@ public String currencyString() { return CurrencyResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { CurrencyResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { CurrencyResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23B.java index 916a79d56..37f912682 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23B.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 23B"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23C.java index a772d718b..6f606931f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23C.java @@ -214,11 +214,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 23C"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23D.java index db07575cb..41dee8d50 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23D.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 23D"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23H.java index 4c54b496c..c85315962 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23H.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 23H"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field23S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field23S.java index 77a580d2d..28a27ec1e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field23S.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field23S.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 23S"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field242.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field242.java index b305ad454..a52bd3015 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field242.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field242.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 242"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field243.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field243.java index 85e1e501c..88d32a0f5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field243.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field243.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 243"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field24B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field24B.java index 1585bd2c8..61ed2e7a6 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field24B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field24B.java @@ -483,6 +483,7 @@ public Field24B setReasonCode(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -493,6 +494,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -507,6 +509,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field25.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field25.java index 2a09c4694..53bb953b0 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field25.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field25.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 25"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field251.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field251.java index 2321b9c86..73e2c5933 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field251.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field251.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 251"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field253.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field253.java index 59d8c849e..8d9c47db5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field253.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field253.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 253"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field255.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field255.java index 48d3f4aa0..0e8f83675 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field255.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field255.java @@ -931,6 +931,7 @@ public Field255 setEndTime(java.util.Calendar component6) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field256.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field256.java index 4d8056bb9..9541c40d8 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field256.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field256.java @@ -1040,6 +1040,7 @@ public Field256 setEndTime(java.util.Calendar component6) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field257.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field257.java index 1f5e01a55..329ef3ffd 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field257.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field257.java @@ -877,6 +877,7 @@ public Field257 setSessionNumber(java.lang.Number component5) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field258.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field258.java index d52f818e9..6d3821ca5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field258.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field258.java @@ -931,6 +931,7 @@ public Field258 setEndTime(java.util.Calendar component6) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field259.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field259.java index 459f61244..38c63a0d0 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field259.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field259.java @@ -1035,6 +1035,7 @@ public Field259 setEndTime(java.util.Calendar component6) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field25A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field25A.java index e89f971e3..8bf9b7db6 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field25A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field25A.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 25A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field25D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field25D.java index 9d30f1025..5579845ec 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field25D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field25D.java @@ -512,6 +512,7 @@ public Field25D setCode(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -522,6 +523,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -536,6 +538,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field260.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field260.java index 718ac8b32..f8e94122b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field260.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field260.java @@ -877,6 +877,7 @@ public Field260 setSessionNumber(java.lang.Number component5) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field263.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field263.java index e69c8b6cf..07d91d5b0 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field263.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field263.java @@ -877,6 +877,7 @@ public Field263 setSessionNumber(java.lang.Number component5) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field264.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field264.java index 860d0a3f8..295afee6b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field264.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field264.java @@ -877,6 +877,7 @@ public Field264 setSessionNumber(java.lang.Number component5) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field26B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field26B.java index 7facd7c15..e1d173b44 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field26B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field26B.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 26B"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field26E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field26E.java index 8b6b355c8..485ed9e3f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field26E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field26E.java @@ -222,11 +222,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 26E"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field26F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field26F.java index c48be97e0..3c01a31ea 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field26F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field26F.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 26F"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field26H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field26H.java index 8a11e2e97..4958b02e9 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field26H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field26H.java @@ -220,11 +220,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 26H"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field26K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field26K.java index 3102576a1..1708dea17 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field26K.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field26K.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 26K"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field26T.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field26T.java index ba51687d2..6c3d4fb67 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field26T.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field26T.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 26T"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field270.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field270.java index 6187a8129..1fae9a803 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field270.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field270.java @@ -476,6 +476,7 @@ public Field270 setLoginBlock(String component2) { * @return the list of converted components (a Calendar object or null) * @since 9.2.7 */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field271.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field271.java index b12f7a610..1f5e8c0b5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field271.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field271.java @@ -476,6 +476,7 @@ public Field271 setLogoutBlock(String component2) { * @return the list of converted components (a Calendar object or null) * @since 9.2.7 */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field272.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field272.java index e4f76c7a4..d3c87c3fd 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field272.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field272.java @@ -476,6 +476,7 @@ public Field272 setAbort(String component2) { * @return the list of converted components (a Calendar object or null) * @since 9.2.7 */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29H.java index 5ab8f8c27..8a27b2fb7 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29H.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 29H"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29I.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29I.java index 294eb8c0b..41257dcf6 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29I.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29I.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 29I"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29L.java index ddeeb3dae..2881fb189 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29L.java @@ -568,6 +568,7 @@ public Field29L setTime(java.util.Calendar component3) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field29N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field29N.java index 5227cbacb..cf99e9d90 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field29N.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field29N.java @@ -568,6 +568,7 @@ public Field29N setTime(java.util.Calendar component3) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30.java index 3a8733798..6d24b96da 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30 setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field301.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field301.java index 4ce5fb508..7158473c4 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field301.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field301.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 301"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field302.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field302.java index 7740ab39a..0865132af 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field302.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field302.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 302"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field303.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field303.java index 9e87f7af7..d5bcd0895 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field303.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field303.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 303"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field305.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field305.java index 2a1be2cc2..6f4f16d00 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field305.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field305.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 305"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field307.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field307.java index e902e8b74..00e7d5b50 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field307.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field307.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 307"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30F.java index c11c8f67d..126f594f3 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30F.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30F"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30F setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30G.java index 6856317c7..8d987b83c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30G.java @@ -592,6 +592,7 @@ public Field30G setPeriodEndDate(java.util.Calendar component2) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30H.java index b66f926de..0324bca9e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30H.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30H"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30H setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30I.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30I.java index 38dde6aaf..db49c6591 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30I.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30I.java @@ -562,6 +562,7 @@ public Field30I setEndDate(java.util.Calendar component2) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30M.java index 3ffc3aa75..dda0c31b6 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30M.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30M.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30M"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30M setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30N.java index 3e226461d..7873c796f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30N.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30N.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30N"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30N setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30P.java index 729a97711..3887779d7 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30P.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30P.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30P"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30P setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30Q.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30Q.java index 8d5c98e93..7daaeaad6 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30Q.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30Q.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30Q"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30Q setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30S.java index a1437ce19..6c74e650d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30S.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30S.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30S"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30S setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30T.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30T.java index 87df0d0f2..386c0e420 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30T.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30T.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30T"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30T setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30U.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30U.java index 814b3d7d2..56856cf74 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30U.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30U.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30U"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30U setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30V.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30V.java index 62dbbb99a..9ab4b656a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30V.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30V.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30V"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30V setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30X.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30X.java index d4340b3c1..2d31b29f1 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30X.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30X.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30X"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30X setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30Y.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30Y.java index d7e78020c..ed7bb4922 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30Y.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30Y.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30Y"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30Y setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field30Z.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field30Z.java index 7c105f831..9addda9d7 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field30Z.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field30Z.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 30Z"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field30Z setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field311.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field311.java index 80e03c2f8..fcb74ab0e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field311.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field311.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 311"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field312.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field312.java index 767b109ae..77d3b2428 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field312.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field312.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 312"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field313.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field313.java index dfebf97d9..40a602ab2 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field313.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field313.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 313"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31C.java index f76c5869a..4fb3d476b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31C.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 31C"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field31C setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31D.java index 82a8e764f..d2afe56ba 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31D.java @@ -474,6 +474,7 @@ public Field31D setPlace(String component2) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31E.java index a0b9e4c70..d0710e259 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31E.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 31E"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field31E setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31F.java index c6f5637fc..13f329f93 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31F.java @@ -576,6 +576,7 @@ public Field31F setPeriodDetails(String component3) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31G.java index e932c3dc3..0c64151c3 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31G.java @@ -567,6 +567,7 @@ public Field31G setLocation(String component3) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31L.java index 8e4401a46..da81d0d84 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31L.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 31L"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field31L setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31P.java index 17ef2a6f1..49b6d9794 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31P.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31P.java @@ -477,6 +477,7 @@ public Field31P setPlace(String component2) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31R.java index 1de7b0d25..51d2aa616 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31R.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31R.java @@ -518,6 +518,7 @@ public Field31R setDate2(java.util.Calendar component2) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31S.java index 12781bbc3..67ec26db2 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31S.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31S.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 31S"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field31S setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field31X.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field31X.java index 1681f0a52..8a86c0532 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field31X.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field31X.java @@ -586,6 +586,7 @@ public Field31X setCode(String component3) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field329.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field329.java index a6ebf8b8f..6827d9e0b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field329.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field329.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 329"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32A.java index b112b43f5..621f6a39c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32A.java @@ -695,10 +695,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -728,6 +730,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32B.java index bb6e42848..8c96b6cdd 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32B.java @@ -648,10 +648,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32C.java index 41f9e9c0d..3427b54f4 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32C.java @@ -695,10 +695,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -728,6 +730,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32D.java index 67205053f..8ceade167 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32D.java @@ -695,10 +695,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -728,6 +730,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32E.java index 3eb560e46..5dbd4ec77 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32E.java @@ -210,11 +210,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 32E"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** @@ -424,10 +421,12 @@ public String currencyString() { return CurrencyResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { CurrencyResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { CurrencyResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32G.java index d14965f7a..b609584bb 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32G.java @@ -592,10 +592,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32H.java index 0108e0495..71fcebc80 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32H.java @@ -653,10 +653,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32K.java index 96184d26a..3cd62e099 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32K.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32K.java @@ -963,10 +963,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32M.java index f37891dd6..435fd12d2 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32M.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32M.java @@ -592,10 +592,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32Q.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32Q.java index ddec44865..221b403d3 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32Q.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32Q.java @@ -517,10 +517,12 @@ public String currencyString() { return CurrencyResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { CurrencyResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { CurrencyResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field32U.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field32U.java index 1235ac823..a696cdf92 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field32U.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field32U.java @@ -592,10 +592,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field331.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field331.java index 9360f7aac..077acac32 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field331.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field331.java @@ -1994,6 +1994,7 @@ public Field331 setLastOutputSequenceNumber(java.lang.Number component12) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field333.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field333.java index ead196766..f107b3b61 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field333.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field333.java @@ -1362,6 +1362,7 @@ public Field333 setLastOutputSequenceNumberSent(java.lang.Number component8) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field337.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field337.java index 917b3bc3e..727d8a432 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field337.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field337.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 337"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field338.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field338.java index 2f65cb2cf..bf5b83840 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field338.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field338.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 338"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field339.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field339.java index 4e164290e..bfdb44848 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field339.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field339.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 339"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33A.java index 1640bfe76..f4b25b229 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33A.java @@ -695,10 +695,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -728,6 +730,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33C.java index 052a78c21..26801603c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33C.java @@ -695,10 +695,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -728,6 +730,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33D.java index 11ec7a363..245cde3e8 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33D.java @@ -695,10 +695,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -728,6 +730,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33E.java index 2f50e356b..e5a294ca4 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33E.java @@ -592,10 +592,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33F.java index e73f602b1..4c7f4e680 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33F.java @@ -592,10 +592,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33G.java index 5ccc784e8..7d3c8b663 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33G.java @@ -713,10 +713,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33H.java index c2d72cdfe..de450b188 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33H.java @@ -592,10 +592,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33K.java index 1739b39c1..9543489c0 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33K.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33K.java @@ -963,10 +963,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field33Z.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field33Z.java index 1cb7191e4..8fbd06894 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field33Z.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field33Z.java @@ -211,14 +211,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 33Z"); } - if (component == 1) { - //amount, rate - java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); - f.setMaximumFractionDigits(13); - BigDecimal n = getComponent1AsBigDecimal(); - if (n != null) { - return f.format(n); - } + //amount, rate + java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); + f.setMaximumFractionDigits(13); + BigDecimal n = getComponent1AsBigDecimal(); + if (n != null) { + return f.format(n); } return null; } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field341.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field341.java index fd47577e6..96a7f568f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field341.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field341.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 341"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field348.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field348.java index d3a83bfc9..21f6b7f82 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field348.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field348.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 348"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field349.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field349.java index 5761c29f8..a6f5e657f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field349.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field349.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 349"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34A.java index 474a4be31..6a377e823 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34A.java @@ -695,10 +695,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -728,6 +730,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34B.java index db255a591..b0c023c69 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34B.java @@ -592,10 +592,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34C.java index 8539ccff2..cbfbe63af 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34C.java @@ -822,10 +822,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34E.java index fe0067032..bf2feabad 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34E.java @@ -653,10 +653,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34F.java index 0c5cdfd77..80c7c72ef 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34F.java @@ -653,10 +653,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34P.java index 66a1d1134..4e7527df5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34P.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34P.java @@ -695,10 +695,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -728,6 +730,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field34R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field34R.java index f57be2cb4..0d0474080 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field34R.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field34R.java @@ -695,10 +695,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -728,6 +730,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field35D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field35D.java index f80084d34..ee5e7c39c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field35D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field35D.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 35D"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field35D setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field36.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field36.java index 9402cae90..cdea98d55 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field36.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field36.java @@ -211,14 +211,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 36"); } - if (component == 1) { - //amount, rate - java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); - f.setMaximumFractionDigits(13); - BigDecimal n = getComponent1AsBigDecimal(); - if (n != null) { - return f.format(n); - } + //amount, rate + java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); + f.setMaximumFractionDigits(13); + BigDecimal n = getComponent1AsBigDecimal(); + if (n != null) { + return f.format(n); } return null; } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field36B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field36B.java index 0ed2661d6..e6d16579c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field36B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field36B.java @@ -620,6 +620,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -630,6 +631,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -644,6 +646,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field36C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field36C.java index a972386da..266b17ffb 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field36C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field36C.java @@ -456,6 +456,7 @@ public Field36C setCode(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -466,6 +467,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -480,6 +482,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field36D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field36D.java index bf67bcc50..575304b1d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field36D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field36D.java @@ -592,6 +592,7 @@ public Field36D setQuantityOfDigitalTokens(java.lang.Number component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -602,6 +603,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -616,6 +618,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field36E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field36E.java index 5a88c4c86..2b7522972 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field36E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field36E.java @@ -742,6 +742,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -752,6 +753,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -766,6 +768,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37A.java index 0e35ebc55..e085198e7 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37A.java @@ -1042,6 +1042,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37B.java index 1b35137a6..7427a8d69 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37B.java @@ -1042,6 +1042,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37C.java index eed0ce5c6..479bfd740 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37C.java @@ -1042,6 +1042,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37D.java index df6c87535..b668e8346 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37D.java @@ -1042,6 +1042,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37E.java index 421966208..21a7fc072 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37E.java @@ -1042,6 +1042,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37F.java index 2296a90a7..26f91d77a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37F.java @@ -1042,6 +1042,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37J.java index 7feb13a77..ff837fd4e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37J.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37J.java @@ -211,14 +211,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 37J"); } - if (component == 1) { - //amount, rate - java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); - f.setMaximumFractionDigits(13); - BigDecimal n = getComponent1AsBigDecimal(); - if (n != null) { - return f.format(n); - } + //amount, rate + java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); + f.setMaximumFractionDigits(13); + BigDecimal n = getComponent1AsBigDecimal(); + if (n != null) { + return f.format(n); } return null; } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37L.java index ecb77fe00..f94a96e90 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37L.java @@ -211,14 +211,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 37L"); } - if (component == 1) { - //amount, rate - java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); - f.setMaximumFractionDigits(13); - BigDecimal n = getComponent1AsBigDecimal(); - if (n != null) { - return f.format(n); - } + //amount, rate + java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); + f.setMaximumFractionDigits(13); + BigDecimal n = getComponent1AsBigDecimal(); + if (n != null) { + return f.format(n); } return null; } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37P.java index d919c78dd..b9a70136c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37P.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37P.java @@ -211,14 +211,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 37P"); } - if (component == 1) { - //amount, rate - java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); - f.setMaximumFractionDigits(13); - BigDecimal n = getComponent1AsBigDecimal(); - if (n != null) { - return f.format(n); - } + //amount, rate + java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); + f.setMaximumFractionDigits(13); + BigDecimal n = getComponent1AsBigDecimal(); + if (n != null) { + return f.format(n); } return null; } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field37U.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field37U.java index bba256fde..69f2e4bf5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field37U.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field37U.java @@ -211,14 +211,12 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 37U"); } - if (component == 1) { - //amount, rate - java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); - f.setMaximumFractionDigits(13); - BigDecimal n = getComponent1AsBigDecimal(); - if (n != null) { - return f.format(n); - } + //amount, rate + java.text.NumberFormat f = java.text.NumberFormat.getNumberInstance(notNull(locale)); + f.setMaximumFractionDigits(13); + BigDecimal n = getComponent1AsBigDecimal(); + if (n != null) { + return f.format(n); } return null; } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field38A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field38A.java index 4b7f52689..8e759d35f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field38A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field38A.java @@ -216,11 +216,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 38A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field38D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field38D.java index efbc5d01c..52f177cae 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field38D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field38D.java @@ -216,11 +216,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 38D"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field39B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field39B.java index d56a1268b..ab6ed07ee 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field39B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field39B.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 39B"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field39M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field39M.java index 3a73372bf..f8968db56 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field39M.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field39M.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 39M"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field401.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field401.java index 1379fea9f..8f33387d4 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field401.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field401.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 401"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field40A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field40A.java index b15f65db4..2684615df 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field40A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field40A.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 40A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field40D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field40D.java index 7f30c6e00..851228a06 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field40D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field40D.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 40D"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field40F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field40F.java index 8bd350507..458283634 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field40F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field40F.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 40F"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field41F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field41F.java index f1ec3a679..f64c3fa16 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field41F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field41F.java @@ -217,11 +217,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 41F"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field421.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field421.java index c51e79ebe..7a63656e5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field421.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field421.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 421"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field423.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field423.java index 0986f40f7..8b26fd7cc 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field423.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field423.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 423"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field424.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field424.java index 740baa586..c2f248cc1 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field424.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field424.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 424"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field431.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field431.java index e88655051..fbdba4187 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field431.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field431.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 431"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field432.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field432.java index c071f5e53..d3bb4528f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field432.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field432.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 432"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field43P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field43P.java index 0e079d530..8f9cb0bdc 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field43P.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field43P.java @@ -214,11 +214,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 43P"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field43T.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field43T.java index 0e8c879f1..078e53acd 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field43T.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field43T.java @@ -214,11 +214,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 43T"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field443.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field443.java index 424a54ce7..7b7169667 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field443.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field443.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 443"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field44A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field44A.java index 38cdf3209..532e3e800 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field44A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field44A.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 44A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field44B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field44B.java index 2153afa9d..4752256bb 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field44B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field44B.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 44B"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field44C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field44C.java index 55c985511..4dbbec3a3 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field44C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field44C.java @@ -210,13 +210,11 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 44C"); } - if (component == 1) { - //date: [YY]YYMMDD - java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); - java.util.Calendar cal = getComponent1AsCalendar(); - if (cal != null) { - return f.format(cal.getTime()); - } + //date: [YY]YYMMDD + java.text.DateFormat f = java.text.DateFormat.getDateInstance(java.text.DateFormat.DEFAULT, notNull(locale)); + java.util.Calendar cal = getComponent1AsCalendar(); + if (cal != null) { + return f.format(cal.getTime()); } return null; } @@ -417,6 +415,7 @@ public Field44C setDate(java.util.Calendar component1) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field44E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field44E.java index 956823863..cc3f2308a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field44E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field44E.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 44E"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field44F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field44F.java index 26de2e6a2..f8ea91bc9 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field44F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field44F.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 44F"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field451.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field451.java index 01eaad9aa..21806cbde 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field451.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field451.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 451"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field45A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field45A.java index 47b3af0c7..1094af0ba 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field45A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field45A.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 45A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field45C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field45C.java index 228a146e8..2fbc17e63 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field45C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field45C.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 45C"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field45D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field45D.java index 9d5ea971a..82db2ad71 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field45D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field45D.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 45D"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field45L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field45L.java index 0ef232305..b81eec655 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field45L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field45L.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 45L"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field461.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field461.java index 89740b168..9b36de5fc 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field461.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field461.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 461"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field46A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field46A.java index 79792e46c..736b78f1a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field46A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field46A.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 46A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field47A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field47A.java index 88c5ba6d2..30f635465 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field47A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field47A.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 47A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field48B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field48B.java index c0ca779ce..a003d0551 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field48B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field48B.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 48B"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field48D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field48D.java index 651430cc9..52b8dd8cb 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field48D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field48D.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 48D"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field49.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field49.java index 910a7583f..bea8e701f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field49.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field49.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 49"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field49G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field49G.java index c3d814326..bf7e705bb 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field49G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field49G.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 49G"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field49H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field49H.java index 4257791ff..9bc475570 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field49H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field49H.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 49H"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field503.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field503.java index fc0c4da5a..39ce71a22 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field503.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field503.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 503"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field50C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field50C.java index 45b3aa7b5..2409400a3 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field50C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field50C.java @@ -217,11 +217,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 50C"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field533.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field533.java index 641346683..01c18da4e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field533.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field533.java @@ -209,11 +209,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 533"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field60F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field60F.java index 7e567cc90..cb54f0443 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field60F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field60F.java @@ -782,10 +782,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -815,6 +817,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field60M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field60M.java index dfba3322b..c036b85dd 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field60M.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field60M.java @@ -782,10 +782,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -815,6 +817,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field61.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field61.java index 36abfe6ad..698a2a4b1 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field61.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field61.java @@ -1149,6 +1149,7 @@ public BigDecimal amount() { * @return the list of converted components (a Calendar object or null) * @since 9.2.7 */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field619.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field619.java index 4832286ff..bebaa19d0 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field619.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field619.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 619"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field62F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field62F.java index bb39b8db4..fb16c6e05 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field62F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field62F.java @@ -735,6 +735,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field62M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field62M.java index 695e100a2..8e3af3c89 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field62M.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field62M.java @@ -735,6 +735,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field64.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field64.java index 1dbed86fc..2a625a07d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field64.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field64.java @@ -735,6 +735,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field65.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field65.java index 7d547734f..869ae3a8e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field65.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field65.java @@ -735,6 +735,7 @@ public BigDecimal amount() { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field68A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field68A.java index 04c645864..7e1bf2626 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field68A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field68A.java @@ -1142,10 +1142,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69A.java index 0e34413a5..ad6bcfa15 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69A.java @@ -570,6 +570,7 @@ public Field69A setDate2(java.util.Calendar component3) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } @@ -590,6 +591,7 @@ public Calendar date() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -600,6 +602,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -614,6 +617,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69B.java index bd15b1f32..2479f5b75 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69B.java @@ -964,6 +964,7 @@ public Field69B setEndTime(java.util.Calendar component5) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } @@ -984,6 +985,7 @@ public Calendar date() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -994,6 +996,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -1008,6 +1011,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69C.java index 001fd38cb..5d3c19d0b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69C.java @@ -526,6 +526,7 @@ public Field69C setDateCode(String component3) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } @@ -546,6 +547,7 @@ public Calendar date() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -556,6 +558,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -570,6 +573,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69D.java index bbd1ca642..af54495c6 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69D.java @@ -629,6 +629,7 @@ public Field69D setDateCode(String component4) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } @@ -649,6 +650,7 @@ public Calendar date() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -659,6 +661,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -673,6 +676,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69E.java index 94dbfc9fb..a766c4dac 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69E.java @@ -555,6 +555,7 @@ public Field69E setDate(java.util.Calendar component3) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } @@ -575,6 +576,7 @@ public Calendar date() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -585,6 +587,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -599,6 +602,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69F.java index aeb4ce6e9..c0bda987b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69F.java @@ -658,6 +658,7 @@ public Field69F setTime(java.util.Calendar component4) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } @@ -678,6 +679,7 @@ public Calendar date() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -688,6 +690,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -702,6 +705,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field69J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field69J.java index 426cc2283..53823186e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field69J.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field69J.java @@ -456,6 +456,7 @@ public Field69J setCode(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -466,6 +467,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -480,6 +482,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70C.java index 65e0b9563..e4d10d9ef 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70C.java @@ -617,6 +617,7 @@ public Field70C setNarrativeLine4(String component5) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -627,6 +628,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -641,6 +643,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70D.java index 10b85a72c..b5e2b71ed 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70D.java @@ -713,6 +713,7 @@ public Field70D setNarrativeLine6(String component7) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -723,6 +724,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -737,6 +739,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70E.java index 5cfe0f7e4..a52ca132c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70E.java @@ -905,6 +905,7 @@ public Field70E setNarrativeLine10(String component11) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -915,6 +916,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -929,6 +931,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70F.java index 0f5065ec3..098256304 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70F.java @@ -428,6 +428,7 @@ public Field70F setNarrative(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -438,6 +439,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -452,6 +454,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70G.java index f2e83c301..86b9e24e5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70G.java @@ -905,6 +905,7 @@ public Field70G setNarrativeLine10(String component11) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -915,6 +916,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -929,6 +931,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field70H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field70H.java index ab30145f1..d38c2ca7b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field70H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field70H.java @@ -427,6 +427,7 @@ public Field70H setNarrative(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -437,6 +438,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -451,6 +453,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field71A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field71A.java index 24ccf8f87..8e1e90add 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field71A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field71A.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 71A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field71F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field71F.java index be91790d3..1ca45a682 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field71F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field71F.java @@ -592,10 +592,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field71G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field71G.java index dd43678a2..be543af73 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field71G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field71G.java @@ -592,10 +592,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field77C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field77C.java index 09b89264a..2623d1781 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field77C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field77C.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 77C"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field77E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field77E.java index 4d13fe3b6..fc7867981 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field77E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field77E.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 77E"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field77F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field77F.java index dfb3958bc..e796e9328 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field77F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field77F.java @@ -215,11 +215,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 77F"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field77H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field77H.java index b4598a097..8d00cd9ea 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field77H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field77H.java @@ -597,6 +597,7 @@ public Field77H setVersion(java.util.Calendar component3) { * @return the list of converted components (a Calendar object or null) * @since 9.2.7 */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field77L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field77L.java index f463ae2a8..8a911747a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field77L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field77L.java @@ -215,11 +215,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 77L"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field77T.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field77T.java index 784c98739..2e059e21c 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field77T.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field77T.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 77T"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field77U.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field77U.java index 68271de53..8851c35db 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field77U.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field77U.java @@ -208,11 +208,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 77U"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90A.java index e72d48d77..f0075a3bc 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90A.java @@ -676,6 +676,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -686,6 +687,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -700,6 +702,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90B.java index 56e778806..6ef83ad31 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90B.java @@ -749,10 +749,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -784,6 +786,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -794,6 +797,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -808,6 +812,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90C.java index 862eb1740..878b419f8 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90C.java @@ -753,10 +753,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90D.java index ba47c06d4..1f5c9c9a2 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90D.java @@ -753,10 +753,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90E.java index 170b5df6c..0500bc32e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90E.java @@ -456,6 +456,7 @@ public Field90E setCode(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -466,6 +467,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -480,6 +482,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90F.java index d6366153d..048194c5b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90F.java @@ -973,10 +973,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -1008,6 +1010,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -1018,6 +1021,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -1032,6 +1036,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90J.java index 870b79dbe..588b09df8 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90J.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90J.java @@ -1088,10 +1088,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -1123,6 +1125,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -1133,6 +1136,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -1147,6 +1151,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90K.java index ef90d5063..bfb7e7326 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90K.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90K.java @@ -632,6 +632,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -642,6 +643,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -656,6 +658,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field90L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field90L.java index 1bea2df74..2edcef374 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field90L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field90L.java @@ -688,6 +688,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -698,6 +699,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -712,6 +714,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92A.java index 664e5a9e3..d1d76e70d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92A.java @@ -688,6 +688,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -698,6 +699,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -712,6 +714,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92B.java index 8f0b6e8b5..ae749479f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92B.java @@ -743,10 +743,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -778,6 +780,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -788,6 +791,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -802,6 +806,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92C.java index 36cd1443a..7306378c1 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92C.java @@ -512,6 +512,7 @@ public Field92C setCode(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -522,6 +523,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -536,6 +538,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92D.java index 24036a597..7f8534ddb 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92D.java @@ -735,6 +735,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -745,6 +746,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -759,6 +761,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92F.java index b59240bc2..22557918a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92F.java @@ -696,10 +696,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -731,6 +733,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -741,6 +744,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -755,6 +759,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92H.java index d0532238a..f06f9883f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92H.java @@ -750,10 +750,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -785,6 +787,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -795,6 +798,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -809,6 +813,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92J.java index 0c1ce015f..dff4bf488 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92J.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92J.java @@ -892,10 +892,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -927,6 +929,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -937,6 +940,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -951,6 +955,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92K.java index a91d51391..ab1a390a0 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92K.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92K.java @@ -427,6 +427,7 @@ public Field92K setRateTypeCode(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -437,6 +438,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -451,6 +453,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92L.java index dda5dd6dc..9248756d5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92L.java @@ -1005,10 +1005,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -1040,6 +1042,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -1050,6 +1053,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -1064,6 +1068,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92M.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92M.java index 0396235ff..94388120d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92M.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92M.java @@ -865,10 +865,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -900,6 +902,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -910,6 +913,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -924,6 +928,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92N.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92N.java index 69a41ae98..a6306b517 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92N.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92N.java @@ -864,10 +864,12 @@ public String currencyString() { return MonetaryAmountResolver.resolveCurrencyString(this); } + @Override public void initializeCurrencies(String cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } + @Override public void initializeCurrencies(Currency cur) { MonetaryAmountResolver.resolveSetCurrency(this, cur); } @@ -899,6 +901,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -909,6 +912,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -923,6 +927,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92P.java index ae6f6e9f6..1e648d22a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92P.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92P.java @@ -632,6 +632,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -642,6 +643,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -656,6 +658,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field92R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field92R.java index fa0e742c2..4d2cfb8a3 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field92R.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field92R.java @@ -770,6 +770,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -780,6 +781,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -794,6 +796,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93A.java index 2bd8d40df..7d934403d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93A.java @@ -512,6 +512,7 @@ public Field93A setCode(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -522,6 +523,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -536,6 +538,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93B.java index b625c8678..07f2012d1 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93B.java @@ -798,6 +798,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -808,6 +809,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -822,6 +824,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93C.java index 2a7da1c44..7aa059319 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93C.java @@ -795,6 +795,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -805,6 +806,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -819,6 +821,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93D.java index 017758731..6ac51dafd 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93D.java @@ -688,6 +688,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -698,6 +699,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -712,6 +714,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93E.java index 2ab8039df..262d1f888 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93E.java @@ -729,6 +729,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -739,6 +740,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -753,6 +755,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field93F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field93F.java index 29cb02972..0a12046ee 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field93F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field93F.java @@ -732,6 +732,7 @@ public BigDecimal amount() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -742,6 +743,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -756,6 +758,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94A.java index eeef975ba..f96ef3e76 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94A.java @@ -207,11 +207,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 94A"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94B.java index 3f09b3682..9d5cbb326 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94B.java @@ -540,6 +540,7 @@ public Field94B setNarrative(String component4) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -550,6 +551,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -564,6 +566,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94C.java index 08af595d2..091447861 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94C.java @@ -427,6 +427,7 @@ public Field94C setCountryCode(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -437,6 +438,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -451,6 +453,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94D.java index 4c25b64d3..5d7899f67 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94D.java @@ -484,6 +484,7 @@ public Field94D setPlace(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -494,6 +495,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -508,6 +510,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94E.java index e61a54003..cc01969e5 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94E.java @@ -905,6 +905,7 @@ public Field94E setAddressLine10(String component11) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -915,6 +916,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -929,6 +931,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94F.java index beeb1f728..3ca2c3aa9 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94F.java @@ -608,6 +608,7 @@ public List bicStrings () { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -618,6 +619,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -632,6 +634,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94G.java index b2bee3662..93dcd70da 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94G.java @@ -524,6 +524,7 @@ public Field94G setAddressLine2(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -534,6 +535,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -548,6 +550,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94H.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94H.java index 24a001b47..60133454a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94H.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94H.java @@ -525,6 +525,7 @@ public List bicStrings () { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -535,6 +536,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -549,6 +551,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field94L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field94L.java index ca729d693..77ef61915 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field94L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field94L.java @@ -595,6 +595,7 @@ public Field94L setLegalEntityIdentifierNumber(java.lang.Number component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -605,6 +606,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -619,6 +621,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field95C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field95C.java index 20f002e6b..e9fcb5da4 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field95C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field95C.java @@ -427,6 +427,7 @@ public Field95C setCountryCode(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -437,6 +438,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -451,6 +453,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field95L.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field95L.java index b76490d1b..d5332c1b8 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field95L.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field95L.java @@ -595,6 +595,7 @@ public Field95L setLegalEntityIdentifierNumber(java.lang.Number component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -605,6 +606,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -619,6 +621,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field95P.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field95P.java index 8e75f27fb..0ce2d2d92 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field95P.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field95P.java @@ -253,6 +253,7 @@ public List bicStrings () { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -263,6 +264,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -277,6 +279,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field95Q.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field95Q.java index 41b5114fd..b6fd71559 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field95Q.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field95Q.java @@ -280,6 +280,7 @@ public Field95Q setNameAndAddressLine4(String component5) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -290,6 +291,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -304,6 +306,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field95R.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field95R.java index df7d6828e..de20d009f 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field95R.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field95R.java @@ -223,6 +223,7 @@ public Field95R setProprietaryCode(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -233,6 +234,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -247,6 +249,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field95S.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field95S.java index 5015596ba..aab87d674 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field95S.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field95S.java @@ -267,6 +267,7 @@ public Field95S setAlternateID(String component5) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -277,6 +278,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -291,6 +293,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field95U.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field95U.java index 94563aa51..1c245999e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field95U.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field95U.java @@ -258,6 +258,7 @@ public Field95U setPartyNameLine3(String component4) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -268,6 +269,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -282,6 +284,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field95V.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field95V.java index e5d5f4596..d74c3cce7 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field95V.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field95V.java @@ -905,6 +905,7 @@ public Field95V setNameAndAddressLine10(String component11) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -915,6 +916,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -929,6 +931,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field97A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field97A.java index 2dca990ff..a06f50d82 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field97A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field97A.java @@ -465,6 +465,7 @@ public Field97A setAccount(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -475,6 +476,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -489,6 +491,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field97B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field97B.java index bca6bafd7..13b2b8a74 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field97B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field97B.java @@ -538,6 +538,7 @@ public Field97B setAccountNumber(String component4) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -548,6 +549,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -562,6 +564,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field97C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field97C.java index 7897377a0..9c6572e62 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field97C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field97C.java @@ -456,6 +456,7 @@ public Field97C setCode(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -466,6 +467,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -480,6 +482,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field97D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field97D.java index 4ab730462..ce99e2861 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field97D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field97D.java @@ -483,6 +483,7 @@ public Field97D setIdentificationOfBlockchainOrWallet(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -493,6 +494,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -507,6 +509,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field97E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field97E.java index 1c9feb3ba..3d1298487 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field97E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field97E.java @@ -465,6 +465,7 @@ public Field97E setAccount(String component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -475,6 +476,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -489,6 +491,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98A.java index aa4470176..a4e97e60b 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98A.java @@ -472,6 +472,7 @@ public Field98A setDate(java.util.Calendar component2) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } @@ -492,6 +493,7 @@ public Calendar date() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -502,6 +504,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -516,6 +519,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98B.java index d4da7ede7..bc3d9a680 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98B.java @@ -512,6 +512,7 @@ public Field98B setCode(String component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -522,6 +523,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -536,6 +538,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98C.java index 743f17b26..1b8e49c46 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98C.java @@ -571,6 +571,7 @@ public Field98C setTime(java.util.Calendar component3) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } @@ -591,6 +592,7 @@ public Calendar date() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -601,6 +603,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -615,6 +618,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98D.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98D.java index 72d6de1be..b21b1d771 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98D.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98D.java @@ -861,6 +861,7 @@ public Field98D setOffset(java.util.Calendar component5) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98E.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98E.java index f3aa0ae6b..d9cfbe6bd 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98E.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98E.java @@ -917,6 +917,7 @@ public Field98E setOffset(java.util.Calendar component6) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } @@ -937,6 +938,7 @@ public Calendar date() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -947,6 +949,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -961,6 +964,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98F.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98F.java index 7161aca6c..2ca4a8391 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98F.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98F.java @@ -617,6 +617,7 @@ public Field98F setTime(java.util.Calendar component4) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return getComponent2(); } @@ -627,6 +628,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return getComponent2() != null; } @@ -641,6 +643,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98G.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98G.java index 42c2117d0..c437b3641 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98G.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98G.java @@ -927,6 +927,7 @@ public Field98G setOffset(java.util.Calendar component5) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98J.java index f1706e0f8..d98624b76 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98J.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98J.java @@ -719,6 +719,7 @@ public Field98J setBIC(com.prowidesoftware.swift.model.BIC component4) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } @@ -747,6 +748,7 @@ public List bicStrings () { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -757,6 +759,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -771,6 +774,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field98K.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field98K.java index 41bd090fb..d99c965a7 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field98K.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field98K.java @@ -682,6 +682,7 @@ public Field98K setProprietaryCode(String component5) { * * @return the list of converted components (a Calendar object or null) */ + @Override public List dates() { return DateResolver.dates(this); } @@ -702,6 +703,7 @@ public Calendar date() { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -712,6 +714,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -726,6 +729,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field999.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field999.java index fa325ec74..32dae527e 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field999.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field999.java @@ -202,11 +202,8 @@ public String getValueDisplay(int component, Locale locale) { if (component < 1 || component > 1) { throw new IllegalArgumentException("invalid component number " + component + " for field 999"); } - if (component == 1) { - //default format (as is) - return getComponent(1); - } - return null; + //default format (as is) + return getComponent(1); } /** diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field99A.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field99A.java index 15fa7ccde..c7aa075f2 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field99A.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field99A.java @@ -660,6 +660,7 @@ public Field99A setAmount(java.lang.Number component3) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -670,6 +671,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -684,6 +686,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field99B.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field99B.java index dfa27b2cc..e6729dd7a 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field99B.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field99B.java @@ -538,6 +538,7 @@ public Field99B setNumber(java.lang.Number component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -548,6 +549,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -562,6 +564,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field99C.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field99C.java index f4f5e8cfc..3b36a078d 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field99C.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field99C.java @@ -538,6 +538,7 @@ public Field99C setNumber(java.lang.Number component2) { * * @return DSS component value or null if the DSS is not set or not available for this field. */ + @Override public String getDSS() { return null; } @@ -548,6 +549,7 @@ public String getDSS() { * @see #getDSS() * @return true if DSS is present, false otherwise. */ + @Override public boolean isDSSPresent() { return false; } @@ -562,6 +564,7 @@ public boolean isDSSPresent() { * * @return for generic fields returns the value of the conditional qualifier or null if not set or not applicable for this field. */ + @Override public String getConditionalQualifier() { return getComponent(CONDITIONAL_QUALIFIER); } diff --git a/src/main/java/com/prowidesoftware/swift/constraints/IbanValidator.java b/src/main/java/com/prowidesoftware/swift/constraints/IbanValidator.java index 552e92766..2eaf443aa 100644 --- a/src/main/java/com/prowidesoftware/swift/constraints/IbanValidator.java +++ b/src/main/java/com/prowidesoftware/swift/constraints/IbanValidator.java @@ -37,12 +37,13 @@ public boolean isValid(String iban, ConstraintValidatorContext context) { if (StringUtils.isBlank(iban)) { return true; } - IbanValidationResult result = new IBAN(iban).validate(); + IbanValidationResult result = IBAN.validate(iban); if (result == IbanValidationResult.OK) { return true; } else { context.disableDefaultConstraintViolation(); context.buildConstraintViolationWithTemplate(result.message()).addConstraintViolation(); + return false; } } diff --git a/src/main/java/com/prowidesoftware/swift/model/BicValidationResult.java b/src/main/java/com/prowidesoftware/swift/model/BicValidationResult.java index 18c2f7cc4..395c09548 100644 --- a/src/main/java/com/prowidesoftware/swift/model/BicValidationResult.java +++ b/src/main/java/com/prowidesoftware/swift/model/BicValidationResult.java @@ -51,8 +51,9 @@ public enum BicValidationResult { * @return message with variables replaced */ public String message() { + String sanitizerFound = ValidationResultUtils.escapeEcmaScript(found); return this.message - .replace("${found}", Objects.toString(found)) + .replace("${found}", Objects.toString(sanitizerFound)) .replace("${length}", found == null ? "-1" : String.valueOf(found.length())); } diff --git a/src/main/java/com/prowidesoftware/swift/model/IBAN.java b/src/main/java/com/prowidesoftware/swift/model/IBAN.java index ea913b30f..7da17d63c 100644 --- a/src/main/java/com/prowidesoftware/swift/model/IBAN.java +++ b/src/main/java/com/prowidesoftware/swift/model/IBAN.java @@ -139,16 +139,37 @@ public boolean isValid() { * @return IbanFormatStatus with detailed information of the validation problem found */ public IbanValidationResult validate() { - if (iban == null) { + if (this.iban == null) { return IbanValidationResult.IBAN_IS_NULL; } - if (iban.length() == 0) { + final String code = removeNonAlpha(this.iban); + + return validate(code); + } + + /** + * Check an IBAN code throwing an exception with validation details if it is not valid. + * + *

Validates that the length is at least 5 chars: composed by a valid 2 letters ISO country code, + * 2 verifying digits, and 1 BBAN. The verification digits are also computed and verified. + * For the BBAN validation the specific per country structure must be defined either in the + * BbanStructureValidations.json file or by API in the {@link BbanStructureValidations} instance. + * + *

Non alpha-numeric characters are removed from the code prior to validation. Meaning an IBAN + * such as "ES64 0049 6170 68 2810279951" will be considered valid. + * + * @return IbanFormatStatus with detailed information of the validation problem found + */ + public static IbanValidationResult validate(String code) { + if (code == null) { + return IbanValidationResult.IBAN_IS_NULL; + } + if (code.isEmpty()) { return IbanValidationResult.IBAN_IS_EMPTY; } - IbanValidationResult result = null; + IbanValidationResult result; try { - final String code = removeNonAlpha(this.iban); result = IbanValidationUtils.validateCountryCode(code); diff --git a/src/main/java/com/prowidesoftware/swift/model/IbanValidationResult.java b/src/main/java/com/prowidesoftware/swift/model/IbanValidationResult.java index 19bfc0e09..33af76292 100644 --- a/src/main/java/com/prowidesoftware/swift/model/IbanValidationResult.java +++ b/src/main/java/com/prowidesoftware/swift/model/IbanValidationResult.java @@ -68,7 +68,9 @@ public enum IbanValidationResult { public String message() { String msg = this.message; for (Entry e : vars.entrySet()) { - msg = msg.replace("${" + e.getKey() + "}", e.getValue()); + String value = e.getValue(); + String escapedEcmaScript = ValidationResultUtils.escapeEcmaScript(value); + msg = msg.replace("${" + e.getKey() + "}", escapedEcmaScript); } return msg; } diff --git a/src/main/java/com/prowidesoftware/swift/model/ValidationResultUtils.java b/src/main/java/com/prowidesoftware/swift/model/ValidationResultUtils.java new file mode 100644 index 000000000..73a6712bd --- /dev/null +++ b/src/main/java/com/prowidesoftware/swift/model/ValidationResultUtils.java @@ -0,0 +1,186 @@ +package com.prowidesoftware.swift.model; + +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * Utility class for escaping EcmaScript and Java control characters. + * This class provides methods for translating characters into their + * escaped equivalents, specifically for EcmaScript. + */ +public class ValidationResultUtils { + + // Map for Java control characters that need to be escaped + private static final Map JAVA_CTRL_CHARS_ESCAPE; + + static { + Map initialMap = new HashMap<>(); + initialMap.put("\b", "\\b"); + initialMap.put("\n", "\\n"); + initialMap.put("\t", "\\t"); + initialMap.put("\f", "\\f"); + initialMap.put("\r", "\\r"); + JAVA_CTRL_CHARS_ESCAPE = Collections.unmodifiableMap(initialMap); + } + + /** + * Escapes the given input string using EcmaScript rules. + * The method escapes control characters and symbols such as single quotes, double quotes, + * backslashes, and forward slashes, making the string safe for use in EcmaScript contexts. + * + * @param input the string to escape, may be null + * @return the escaped string or null if the input is null + */ + static String escapeEcmaScript(final String input) { + if (input == null) { + return null; + } + + Map escapeEcmaScriptMap = new HashMap<>(); + escapeEcmaScriptMap.put("'", "\\'"); + escapeEcmaScriptMap.put("\"", "\\\""); + escapeEcmaScriptMap.put("\\", "\\\\"); + escapeEcmaScriptMap.put("/", "\\/"); + + CharSequenceTranslator translator = new AggregateTranslator( + new LookupTranslator(escapeEcmaScriptMap), + new LookupTranslator(JAVA_CTRL_CHARS_ESCAPE), + new JavaUnicodeEscaper()); + + return translator.translate(input); + } + + /** + * Translator that aggregates multiple translators and applies them sequentially. + */ + static class AggregateTranslator extends CharSequenceTranslator { + + private final CharSequenceTranslator[] translators; + + /** + * Constructs an AggregateTranslator with multiple translators. + * Each translator will be applied in sequence until one consumes a character. + * + * @param translators an array of translators to aggregate + */ + AggregateTranslator(CharSequenceTranslator... translators) { + this.translators = translators; + } + + @Override + int translate(final CharSequence input, final int index, final Writer writer) throws IOException { + for (CharSequenceTranslator translator : translators) { + int consumed = translator.translate(input, index, writer); + if (consumed != 0) { + return consumed; + } + } + return 0; + } + } + + /** + * Abstract base class for translating character sequences. + * It provides methods for translating a sequence of characters using custom rules. + */ + abstract static class CharSequenceTranslator { + + /** + * Translates the input string and returns the translated result. + * If the input is null, null will be returned. + * + * @param input the string to translate + * @return the translated string + */ + final String translate(final CharSequence input) { + if (input == null) return null; + + try (StringWriter writer = new StringWriter(input.length() * 2)) { + translate(input, writer); + return writer.toString(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * Abstract method to translate a sequence of characters. + * + * @param input the input character sequence + * @param index the index to start translating from + * @param writer the writer to write the translated result to + * @return the number of characters consumed from the input + * @throws IOException if an I/O error occurs + */ + abstract int translate(CharSequence input, int index, Writer writer) throws IOException; + + /** + * Helper method to translate the entire input and write the result to a writer. + * + * @param input the input character sequence + * @param writer the writer to write the translated result to + * @throws IOException if an I/O error occurs + */ + final void translate(final CharSequence input, final Writer writer) throws IOException { + for (int i = 0; i < input.length(); i++) { + int consumed = translate(input, i, writer); + if (consumed == 0) { + writer.write(input.charAt(i)); + } else { + i += consumed - 1; + } + } + } + } + + /** + * Translator that looks up characters in a predefined map and replaces them with their corresponding values. + */ + static class LookupTranslator extends CharSequenceTranslator { + + private final Map lookupMap; + + /** + * Creates a new LookupTranslator with the given map of character translations. + * + * @param lookupMap a map containing character sequences to be translated + */ + LookupTranslator(final Map lookupMap) { + this.lookupMap = new HashMap<>(); + for (Map.Entry entry : lookupMap.entrySet()) { + this.lookupMap.put(entry.getKey().toString(), entry.getValue().toString()); + } + } + + @Override + int translate(final CharSequence input, final int index, final Writer writer) throws IOException { + String result = lookupMap.get(input.subSequence(index, index + 1).toString()); + if (result != null) { + writer.write(result); + return 1; + } + return 0; + } + } + + /** + * A translator that escapes Unicode characters outside of a specified range. + * Characters outside the given range will be converted to their Unicode escape form. + */ + static class JavaUnicodeEscaper extends CharSequenceTranslator { + + @Override + int translate(final CharSequence input, final int index, final Writer writer) throws IOException { + int codePoint = Character.codePointAt(input, index); + if (codePoint < 32 || codePoint > 0x7f) { + writer.write("\\u" + Integer.toHexString(codePoint).toUpperCase()); + return 1; + } + return 0; + } + } +} diff --git a/src/test/java/com/prowidesoftware/swift/constraints/IbanValidatorTest.java b/src/test/java/com/prowidesoftware/swift/constraints/IbanValidatorTest.java new file mode 100644 index 000000000..861e51b31 --- /dev/null +++ b/src/test/java/com/prowidesoftware/swift/constraints/IbanValidatorTest.java @@ -0,0 +1,266 @@ +package com.prowidesoftware.swift.constraints; + +import static org.junit.jupiter.api.Assertions.*; + +import com.prowidesoftware.swift.model.IBAN; +import com.prowidesoftware.swift.model.IbanValidationResult; +import javax.validation.ClockProvider; +import javax.validation.ConstraintValidatorContext; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +public class IbanValidatorTest { + + private IbanValidator validator; + private TestConstraintValidatorContext context; + + @BeforeEach + public void setUp() { + validator = new IbanValidator(); + context = new TestConstraintValidatorContext(); + } + + @Test + public void testValidIban() { + String validIban = "ES9121000418450200051332"; // A valid IBAN + assertEquals(IbanValidationResult.OK, new IBAN(validIban).validate()); + assertTrue(validator.isValid(validIban, context)); + assertFalse(context.isViolationOccurred()); + } + + @Test + public void testIbanIsNull() { + String nullIban = null; + assertEquals(IbanValidationResult.IBAN_IS_NULL, new IBAN(nullIban).validate()); + assertTrue(validator.isValid(nullIban, context)); + assertFalse(context.isViolationOccurred()); + assertNull(context.getViolationMessage()); + } + + @Test + public void testIbanIsEmpty() { + String emptyIban = ""; + assertEquals(IbanValidationResult.IBAN_IS_EMPTY, new IBAN(emptyIban).validate()); + assertTrue(validator.isValid(emptyIban, context)); + assertFalse(context.isViolationOccurred()); + assertNull(context.getViolationMessage()); + } + + @Test + public void testMissingCountryCode() { + String missingCountryCodeIban = "1"; + assertEquals(IbanValidationResult.MISSING_COUNTRY_CODE, new IBAN(missingCountryCodeIban).validate()); + assertFalse(validator.isValid(missingCountryCodeIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals("The IBAN must start with the two letters ISO country code", context.getViolationMessage()); + } + + @Test + public void testInvalidCountryCodeCharset() { + String invalidCountryCodeIban = "es123456789"; // Lowercase 'es' instead of uppercase + assertEquals(IbanValidationResult.INVALID_COUNTRY_CODE_CHARSET, new IBAN(invalidCountryCodeIban).validate()); + assertFalse(validator.isValid(invalidCountryCodeIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals( + "The country code must contain upper case letters and es was found", context.getViolationMessage()); + } + + @Test + public void testInvalidCountry() { + String invalidCountryCodeIban = "ZZ123456789"; + assertEquals(IbanValidationResult.INVALID_COUNTRY_CODE, new IBAN(invalidCountryCodeIban).validate()); + assertFalse(validator.isValid(invalidCountryCodeIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals( + "The country code ZZ is not a valid ISO country code or the country code is not configured for IBAN validations", + context.getViolationMessage()); + } + + @Test + public void testMissingCheckDigits() { + String missingCheckDigitsIban = "ESX"; + assertEquals(IbanValidationResult.MISSING_CHECK_DIGITS, new IBAN(missingCheckDigitsIban).validate()); + assertFalse(validator.isValid(missingCheckDigitsIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals("Missing check digits", context.getViolationMessage()); + } + + @Test + public void testInvalidCheckDigitsFormat() { + String invalidCheckDigitsFormatIban = "ESAB123456789"; // Non-numeric check digits + assertEquals( + IbanValidationResult.INVALID_CHECK_DIGITS_FORMAT, new IBAN(invalidCheckDigitsFormatIban).validate()); + assertFalse(validator.isValid(invalidCheckDigitsFormatIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals("Expected 2 check digits and found AB", context.getViolationMessage()); + } + + @Test + public void testMissingBban() { + String missingBbanIban = "ES64"; // Country code + check digits, but no BBAN + assertEquals(IbanValidationResult.MISSING_BBAN, new IBAN(missingBbanIban).validate()); + assertFalse(validator.isValid(missingBbanIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals("Missing custom account number (BBAN)", context.getViolationMessage()); + } + + @Test + public void testBbanMaxLengthExceeded() { + String bbanMaxLengthExceededIban = "ES640123456789012345678901234567890"; // Exceeding max BBAN length + assertEquals(IbanValidationResult.BBAN_MAX_LENGTH, new IBAN(bbanMaxLengthExceededIban).validate()); + assertFalse(validator.isValid(bbanMaxLengthExceededIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals( + "The max length for the custom account number (BBAN) is 30 and found 31", + context.getViolationMessage()); + } + + @Test + public void testMissingBbanConfiguration() { + String missingBbanConfigIban = "FK64123456789"; + assertEquals(IbanValidationResult.MISSING_BBAN_CONFIGURATION, new IBAN(missingBbanConfigIban).validate()); + assertFalse(validator.isValid(missingBbanConfigIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals( + "Missing custom account number (BBAN) configuration for country FK", context.getViolationMessage()); + } + + @Test + public void testInvalidBbanLength() { + String invalidBbanLengthIban = "ES6401234"; // Invalid BBAN length + assertEquals(IbanValidationResult.BBAN_INVALID_LENGTH, new IBAN(invalidBbanLengthIban).validate()); + assertFalse(validator.isValid(invalidBbanLengthIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals( + "Expected a 20 characters length for the custom account number (BBAN) and found 5 in 01234", + context.getViolationMessage()); + } + + @Test + public void testBbanInvalidUpperCaseLetters() { + String invalidUpperCaseIban = "GI75nWBK000000007099453"; // BBAN with lowercase letters + assertEquals(IbanValidationResult.BBAN_INVALID_UPPER_CASE_LETTERS, new IBAN(invalidUpperCaseIban).validate()); + assertFalse(validator.isValid(invalidUpperCaseIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals("The BANK_CODE nWBK must contain only upper case letters", context.getViolationMessage()); + } + + @Test + public void testBbanInvalidDigitsOrLetters() { + String invalidDigitsOrLettersIban = "GI75NWBK00000000709t453"; // BBAN with invalid characters + assertEquals( + IbanValidationResult.BBAN_INVALID_DIGITS_OR_LETTERS, new IBAN(invalidDigitsOrLettersIban).validate()); + assertFalse(validator.isValid(invalidDigitsOrLettersIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals( + "The ACCOUNT_NUMBER 00000000709t453 must contain only digits or upper case letters", + context.getViolationMessage()); + } + + @Test + public void testBbanInvalidDigits() { + String invalidDigitsIban = "ES640abcd100041845024502"; // BBAN with letters where digits expected + assertEquals(IbanValidationResult.BBAN_INVALID_DIGITS, new IBAN(invalidDigitsIban).validate()); + assertFalse(validator.isValid(invalidDigitsIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals("The BANK_CODE 0abc must contain only digits", context.getViolationMessage()); + } + + @Disabled + @Test + public void testInvalidCharacters() { + // TODO: find a input that can produce this result + String invalidCharactersIban = "ES0X1234000000007094532"; + assertEquals(IbanValidationResult.INVALID_CHARACTERS, new IBAN(invalidCharactersIban).validate()); + assertFalse(validator.isValid(invalidCharactersIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals("Invalid character '@' found", context.getViolationMessage()); + } + + @Test + public void testInvalidCheckDigits() { + String invalidCheckDigitsIban = "ES0012345678901234567890"; // Invalid computed check digits + assertEquals(IbanValidationResult.IVALID_CHECK_DIGITS, new IBAN(invalidCheckDigitsIban).validate()); + assertFalse(validator.isValid(invalidCheckDigitsIban, context)); + assertTrue(context.isViolationOccurred()); + assertEquals("The expected computed check digit is 98 and 00 was found", context.getViolationMessage()); + } + + /** + * Simulated implementation of ConstraintValidatorContext for testing + */ + static class TestConstraintValidatorContext implements ConstraintValidatorContext { + + private boolean violationOccurred = false; + private String violationMessage = null; + + @Override + public void disableDefaultConstraintViolation() { + violationOccurred = true; + } + + @Override + public String getDefaultConstraintMessageTemplate() { + return null; + } + + @Override + public ClockProvider getClockProvider() { + return null; + } + + @Override + public ConstraintViolationBuilder buildConstraintViolationWithTemplate(String messageTemplate) { + this.violationMessage = messageTemplate; + return new TestConstraintViolationBuilder(); + } + + public boolean isViolationOccurred() { + return violationOccurred; + } + + public String getViolationMessage() { + return violationMessage; + } + + @Override + public T unwrap(Class type) { + return null; + } + + // Simulated ConstraintViolationBuilder implementation + class TestConstraintViolationBuilder implements ConstraintViolationBuilder { + @Override + public NodeBuilderDefinedContext addNode(String name) { + return null; + } + + @Override + public NodeBuilderCustomizableContext addPropertyNode(String name) { + return null; + } + + @Override + public LeafNodeBuilderCustomizableContext addBeanNode() { + return null; + } + + @Override + public ContainerElementNodeBuilderCustomizableContext addContainerElementNode( + String name, Class containerType, Integer index) { + return null; + } + + @Override + public NodeBuilderDefinedContext addParameterNode(int index) { + return null; + } + + @Override + public ConstraintValidatorContext addConstraintViolation() { + return TestConstraintValidatorContext.this; + } + } + } +} diff --git a/src/test/java/com/prowidesoftware/swift/model/IBANValidateTest.java b/src/test/java/com/prowidesoftware/swift/model/IBANValidateTest.java new file mode 100644 index 000000000..9d85778e9 --- /dev/null +++ b/src/test/java/com/prowidesoftware/swift/model/IBANValidateTest.java @@ -0,0 +1,224 @@ +/* + * Copyright 2006-2023 Prowide + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.prowidesoftware.swift.model; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; + +public class IBANValidateTest { + + @Test + public void testIsValidFoooo() { + assertFalse(IbanValidationResult.OK == IBAN.validate("fooo")); + } + + @Test + public void testIsValidFo00() { + assertFalse(IbanValidationResult.OK == IBAN.validate("fo00")); + } + + @Test + public void testReportedBad() { + assertTrue(IbanValidationResult.OK == IBAN.validate("CH10002300A1023502601")); + } + + @Test + public void testOkAustrian() { + assertEquals(IbanValidationResult.OK, IBAN.validate("AT611904300234573201")); + } + + @Test + public void testInvalidBbanAustrian() { + assertFalse(IbanValidationResult.OK == IBAN.validate("AT32010000000173363")); + } + + @Test + public void testOKSeychelles() { + assertEquals(IbanValidationResult.OK, IBAN.validate("SC52BAHL01031234567890123456USD")); + } + + @Test + public void testOKItaly() { + assertEquals(IbanValidationResult.OK, IBAN.validate("IT40S0542811101000000123456")); + } + + @Test + public void testOKBelgiumOK() { + assertEquals(IbanValidationResult.OK, IBAN.validate("BE62510007547061")); + } + + @Test + public void testOKLuxembourg() { + assertEquals(IbanValidationResult.OK, IBAN.validate("LU280019400644750000")); + } + + @Test + public void testOKDenmark() { + assertEquals(IbanValidationResult.OK, IBAN.validate("DK5000400440116243")); + } + + @Test + public void testOKNetherlands() { + assertEquals(IbanValidationResult.OK, IBAN.validate("NL39RABO0300065264")); + } + + @Test + public void testOKFinland() { + assertEquals(IbanValidationResult.OK, IBAN.validate("FI2112345600000785")); + } + + @Test + public void testOKNorway() { + assertEquals(IbanValidationResult.OK, IBAN.validate("NO9386011117947")); + } + + @Test + public void testOKFrance() { + assertEquals(IbanValidationResult.OK, IBAN.validate("FR1420041010050500013M02606")); + } + + @Test + public void testOKPoland() { + assertEquals(IbanValidationResult.OK, IBAN.validate("PL60102010260000042270201111")); + } + + @Test + public void testOKGermany() { + assertEquals(IbanValidationResult.OK, IBAN.validate("DE89370400440532013000")); + } + + @Test + public void testOKPortugal() { + assertEquals(IbanValidationResult.OK, IBAN.validate("PT50000201231234567890154")); + } + + @Test + public void testOKGibraltar() { + assertEquals(IbanValidationResult.OK, IBAN.validate("GI75NWBK000000007099453")); + } + + @Test + public void testOKSpain() { + assertEquals(IbanValidationResult.OK, IBAN.validate("ES0700120345030000067890")); + } + + @Test + public void testOKGreece() { + assertEquals(IbanValidationResult.OK, IBAN.validate("GR1601101250000000012300695")); + } + + @Test + public void testOKSweden() { + assertEquals(IbanValidationResult.OK, IBAN.validate("SE3550000000054910000003")); + } + + @Test + public void testOKIceland() { + assertEquals(IbanValidationResult.OK, IBAN.validate("IS140159260076545510730339")); + } + + @Test + public void testOKSwitzerland() { + assertEquals(IbanValidationResult.OK, IBAN.validate("CH9300762011623852957")); + } + + @Test + public void testOKIreland() { + assertEquals(IbanValidationResult.OK, IBAN.validate("IE29AIBK93115212345678")); + } + + @Test + public void testSpaceGreatBritain() { + assertTrue(IBAN.validate(" GB51 LOYD 3092 0700 7195 88.") == IbanValidationResult.INVALID_COUNTRY_CODE_CHARSET); + } + + @Test + public void testErrorEmpty() { + assertTrue(IBAN.validate("") == IbanValidationResult.IBAN_IS_EMPTY); + } + + @Test + public void testErrorNull() { + assertTrue(IBAN.validate(null) == IbanValidationResult.IBAN_IS_NULL); + } + + @Test + public void testErrorMissingBban() { + assertTrue(IBAN.validate("IE99") == IbanValidationResult.MISSING_BBAN); + } + + @Test + public void testErrorBbanMaxLength() { + assertTrue(IBAN.validate("IE991234567890123456789012345678901") == IbanValidationResult.BBAN_MAX_LENGTH); + } + + @Test + public void testErrorBbanLength() { + IbanValidationResult result = IBAN.validate("AT32010000000173363"); + assertTrue(result == IbanValidationResult.BBAN_INVALID_LENGTH); + // System.out.println(result.message()); + } + + @Test + public void testErrorCountry() { + IbanValidationResult result = IBAN.validate("aa17002001280000001200527600"); + assertTrue(result == IbanValidationResult.INVALID_COUNTRY_CODE_CHARSET); + // System.out.println(result.message()); + result = IBAN.validate("ZZ17002001280000001200527600"); + assertTrue(result == IbanValidationResult.INVALID_COUNTRY_CODE); + // System.out.println(result.message()); + } + + @Test + public void testValidateCheckDigitPresence() { + IbanValidationResult result = IBAN.validate("AT1"); + assertTrue(result == IbanValidationResult.MISSING_CHECK_DIGITS); + } + + @Test + public void testValidateBbanInvalidDigits() { + IbanValidationResult result = IBAN.validate("DK5000400T40116243"); + assertTrue(result == IbanValidationResult.BBAN_INVALID_DIGITS); + } + + @Test + public void testValidateBbanInvalidDigitsOrLetters() { + IbanValidationResult result = IBAN.validate("GI75NWBK00000000709t453"); + assertTrue(result == IbanValidationResult.BBAN_INVALID_DIGITS_OR_LETTERS); + // System.out.println(result.message()); + } + + @Test + public void testValidateBbanInvalidUpperCaseLetters() { + IbanValidationResult result = IBAN.validate("GI75nWBK000000007099453"); + assertTrue(result == IbanValidationResult.BBAN_INVALID_UPPER_CASE_LETTERS); + // System.out.println(result.message()); + } + + @Test + public void testCodes() { + assertEquals(IbanValidationResult.OK, IBAN.validate("CY17002001280000001200527600")); + assertEquals(IbanValidationResult.OK, IBAN.validate("IE62BOFI90381614262992")); + assertEquals(IbanValidationResult.OK, IBAN.validate("GB61CHAS60924232466601")); + assertEquals(IbanValidationResult.OK, IBAN.validate("EG389004000100300074201200001")); + assertEquals(IbanValidationResult.BBAN_INVALID_LENGTH, IBAN.validate("GB45-LOYD-3092-0711-1072-32")); + assertEquals(IbanValidationResult.BBAN_INVALID_LENGTH, IBAN.validate("SE76 8000.08105903-7676/5343")); + assertEquals(IbanValidationResult.BBAN_INVALID_LENGTH, IBAN.validate("GB97CHAS60924232684106*&^%()!@")); + assertEquals(IbanValidationResult.INVALID_COUNTRY_CODE_CHARSET, IBAN.validate(" NL76 FTSB 084.47.26.494")); + assertEquals(IbanValidationResult.INVALID_COUNTRY_CODE_CHARSET, IBAN.validate(" FI8916603000104953")); + } +} diff --git a/src/test/java/com/prowidesoftware/swift/model/ValidationResultUtilsTest.java b/src/test/java/com/prowidesoftware/swift/model/ValidationResultUtilsTest.java new file mode 100644 index 000000000..111480d86 --- /dev/null +++ b/src/test/java/com/prowidesoftware/swift/model/ValidationResultUtilsTest.java @@ -0,0 +1,19 @@ +package com.prowidesoftware.swift.model; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; + +class ValidationResultUtilsTest { + + @Test + public void testEscapeEcmaScript() { + assertNull(ValidationResultUtils.escapeEcmaScript(null)); + assertEquals( + "He didn\\'t say, \\\"stop!\\\"", ValidationResultUtils.escapeEcmaScript("He didn't say, \"stop!\"")); + assertEquals( + "document.getElementById(\\\"test\\\").value = \\'';")); + } +} diff --git a/src/test/java/com/prowidesoftware/swift/model/mt/AbstractMTTest.java b/src/test/java/com/prowidesoftware/swift/model/mt/AbstractMTTest.java index 88726c765..49011cbe8 100644 --- a/src/test/java/com/prowidesoftware/swift/model/mt/AbstractMTTest.java +++ b/src/test/java/com/prowidesoftware/swift/model/mt/AbstractMTTest.java @@ -303,8 +303,8 @@ public void testMTClassParse() { } @Test - public void testAbstractMt() throws IOException { - Integer type = 9; + public void testAbstractMt() { + int type = 9; try { AbstractMT aMt = AbstractMT.create(type);