From 40e5c9040ed6ef990427090abad93e442aa1a0f1 Mon Sep 17 00:00:00 2001 From: Brooke E Kline Jr Date: Wed, 27 Mar 2019 13:31:13 -0400 Subject: [PATCH] gofmt gofmt --- accountCreditedDrawdown.go | 5 ++--- accountDebitedDrawdown.go | 6 +++--- actualAmountPaid.go | 4 ++-- adjustment.go | 4 ++-- advice.go | 3 +-- amountNegotiatedDiscount.go | 4 ++-- beneficiary.go | 4 ++-- beneficiaryCustomer.go | 4 ++-- beneficiaryFI.go | 6 +++--- beneficiaryReference.go | 5 ++--- charges.go | 6 ++---- const.go | 3 +-- converters.go | 2 +- coverPayment.go | 2 +- currencyInstructedAmount.go | 4 ++-- dateRemittanceDocument.go | 4 ++-- errorWire.go | 6 +++--- exchangeRate.go | 6 +++--- fedWireMessage.go | 8 +++----- fiAdditionalFIToFI.go | 4 ++-- fiBeneficiaryAdvice.go | 1 - fiBeneficiaryFI.go | 6 +++--- fiIntermediaryFI.go | 2 -- fiIntermediaryFIAdvice.go | 3 --- fiReceiverFI.go | 5 ++--- file.go | 2 +- financiaInstitution.go | 2 +- grossAmountRemittanceDocument.go | 4 ++-- institutionAccount.go | 4 ++-- instructedAmount.go | 7 ++----- instructingFI.go | 4 ++-- intermediaryInstitution.go | 4 ++-- localInstrument.go | 5 ++--- messageDisposition.go | 4 ++-- orderingCustomer.go | 4 ++-- orderingInstitution.go | 4 ++-- originator.go | 5 ++--- originatorFI.go | 4 ++-- originatorOptionF.go | 6 ++---- originatorToBeneficiary.go | 4 ++-- outputMessageAccountabilityData.go | 6 +++--- paymentNotification.go | 5 ++--- personal.go | 2 +- previousMessageIdentifier.go | 5 ++--- primaryRemittanceDocument.go | 4 ++-- reader.go | 27 +++++++++++++++++---------- receiptTimeStamp.go | 4 ++-- relatedRemittance.go | 4 ++-- remittanceAmount.go | 2 +- remittanceBeneficiary.go | 10 +++++----- remittanceData.go | 3 +-- remittanceFreeText.go | 4 ++-- remittanceInformation.go | 4 ++-- remittanceOriginator.go | 10 +++++----- secondaryRemittanceDocument.go | 4 ++-- senderReference.go | 4 ++-- senderSupplied.go | 12 ++++++------ senderToReceiver.go | 4 ++-- serviceMessage.go | 4 ++-- unstructuredAddenda.go | 4 ++-- validators.go | 2 +- 61 files changed, 138 insertions(+), 156 deletions(-) diff --git a/accountCreditedDrawdown.go b/accountCreditedDrawdown.go index f7f57fbc..dd4bd9db 100644 --- a/accountCreditedDrawdown.go +++ b/accountCreditedDrawdown.go @@ -20,8 +20,8 @@ type AccountCreditedDrawdown struct { } // NewAccountCreditedDrawdown returns a new AccountCreditedDrawdown -func NewAccountCreditedDrawdown() AccountCreditedDrawdown { - creditDD := AccountCreditedDrawdown { +func NewAccountCreditedDrawdown() AccountCreditedDrawdown { + creditDD := AccountCreditedDrawdown{ tag: TagAccountCreditedDrawdown, } return creditDD @@ -57,4 +57,3 @@ func (creditDD *AccountCreditedDrawdown) Validate() error { func (creditDD *AccountCreditedDrawdown) fieldInclusion() error { return nil } - diff --git a/accountDebitedDrawdown.go b/accountDebitedDrawdown.go index 37725169..d925044d 100644 --- a/accountDebitedDrawdown.go +++ b/accountDebitedDrawdown.go @@ -15,7 +15,7 @@ type AccountDebitedDrawdown struct { // Identifier Identifier string `json:"identifier"` // Name - Name string `json:"name"` + Name string `json:"name"` Address Address `json:"address,omitempty"` // validator is composed for data validation @@ -25,8 +25,8 @@ type AccountDebitedDrawdown struct { } // NewAccountDebitedDrawdown returns a new AccountDebitedDrawdown -func NewAccountDebitedDrawdown() AccountDebitedDrawdown { - debitDD := AccountDebitedDrawdown { +func NewAccountDebitedDrawdown() AccountDebitedDrawdown { + debitDD := AccountDebitedDrawdown{ tag: TagAccountDebitedDrawdown, } return debitDD diff --git a/actualAmountPaid.go b/actualAmountPaid.go index 72af1540..0cd1175c 100644 --- a/actualAmountPaid.go +++ b/actualAmountPaid.go @@ -20,8 +20,8 @@ type ActualAmountPaid struct { } // NewActualAmountPaid returns a new ActualAmountPaid -func NewActualAmountPaid() ActualAmountPaid { - aap := ActualAmountPaid { +func NewActualAmountPaid() ActualAmountPaid { + aap := ActualAmountPaid{ tag: TagActualAmountPaid, } return aap diff --git a/adjustment.go b/adjustment.go index cac58590..95aa7b39 100644 --- a/adjustment.go +++ b/adjustment.go @@ -26,8 +26,8 @@ type Adjustment struct { } // NewAdjustment returns a new Adjustment -func NewAdjustment() Adjustment { - adj := Adjustment { +func NewAdjustment() Adjustment { + adj := Adjustment{ tag: TagAdjustment, } return adj diff --git a/advice.go b/advice.go index 6cbfd899..8508ff47 100644 --- a/advice.go +++ b/advice.go @@ -6,7 +6,7 @@ package wire // Advice is financial institution advice information type Advice struct { - AdviceCode string`json:"adviceCode,omitempty"` + AdviceCode string `json:"adviceCode,omitempty"` // LineOne LineOne string `json:"lineOne,omitempty"` // LineTwo @@ -20,4 +20,3 @@ type Advice struct { // LineSix LineSix string `json:"lineSix,omitempty"` } - diff --git a/amountNegotiatedDiscount.go b/amountNegotiatedDiscount.go index 117e9ac6..d3e76865 100644 --- a/amountNegotiatedDiscount.go +++ b/amountNegotiatedDiscount.go @@ -20,8 +20,8 @@ type AmountNegotiatedDiscount struct { } // NewAmountNegotiatedDiscount returns a new AmountNegotiatedDiscount -func NewAmountNegotiatedDiscount() AmountNegotiatedDiscount { - and := AmountNegotiatedDiscount { +func NewAmountNegotiatedDiscount() AmountNegotiatedDiscount { + and := AmountNegotiatedDiscount{ tag: TagAmountNegotiatedDiscount, } return and diff --git a/beneficiary.go b/beneficiary.go index 3db25120..5f8f3438 100644 --- a/beneficiary.go +++ b/beneficiary.go @@ -20,8 +20,8 @@ type Beneficiary struct { } // NewBeneficiary returns a new Beneficiary -func NewBeneficiary() Beneficiary { - b := Beneficiary { +func NewBeneficiary() Beneficiary { + b := Beneficiary{ tag: TagBeneficiary, } return b diff --git a/beneficiaryCustomer.go b/beneficiaryCustomer.go index 030e2ada..adce9211 100644 --- a/beneficiaryCustomer.go +++ b/beneficiaryCustomer.go @@ -20,8 +20,8 @@ type BeneficiaryCustomer struct { } // NewBeneficiaryCustomer returns a new BeneficiaryCustomer -func NewBeneficiaryCustomer() BeneficiaryCustomer { - bc := BeneficiaryCustomer { +func NewBeneficiaryCustomer() BeneficiaryCustomer { + bc := BeneficiaryCustomer{ tag: TagBeneficiaryCustomer, } return bc diff --git a/beneficiaryFI.go b/beneficiaryFI.go index 08cb8b49..b26d432d 100644 --- a/beneficiaryFI.go +++ b/beneficiaryFI.go @@ -20,8 +20,8 @@ type BeneficiaryFI struct { } // NewBeneficiaryFI returns a new BeneficiaryFI -func NewBeneficiaryFI() BeneficiaryFI { - bfi := BeneficiaryFI { +func NewBeneficiaryFI() BeneficiaryFI { + bfi := BeneficiaryFI{ tag: TagBeneficiaryFI, } return bfi @@ -56,4 +56,4 @@ func (bfi *BeneficiaryFI) Validate() error { // invalid the WIRE will return an error. func (bfi *BeneficiaryFI) fieldInclusion() error { return nil -} \ No newline at end of file +} diff --git a/beneficiaryReference.go b/beneficiaryReference.go index 5985acc6..4f0f6069 100644 --- a/beneficiaryReference.go +++ b/beneficiaryReference.go @@ -20,8 +20,8 @@ type BeneficiaryReference struct { } // NewBeneficiaryReference returns a new BeneficiaryReference -func NewBeneficiaryReference() BeneficiaryReference { - br := BeneficiaryReference { +func NewBeneficiaryReference() BeneficiaryReference { + br := BeneficiaryReference{ tag: TagBeneficiaryReference, } return br @@ -57,4 +57,3 @@ func (br *BeneficiaryReference) Validate() error { func (br *BeneficiaryReference) fieldInclusion() error { return nil } - diff --git a/charges.go b/charges.go index d4e1b6cb..f3a91baa 100644 --- a/charges.go +++ b/charges.go @@ -36,8 +36,8 @@ type Charges struct { } // NewCharges returns a new Charges -func NewCharges() Charges { - c := Charges { +func NewCharges() Charges { + c := Charges{ tag: TagCharges, } return c @@ -73,5 +73,3 @@ func (c *Charges) Validate() error { func (c *Charges) fieldInclusion() error { return nil } - - diff --git a/const.go b/const.go index a2b8881a..62be5a53 100644 --- a/const.go +++ b/const.go @@ -19,7 +19,7 @@ const ( TagErrorWire = "{1130}" // TagSenderSuppliedInformation is SenderSuppliedInformation - TagSenderSuppliedInformation = "{1500}" + TagSenderSuppliedInformation = "{1500}" // TagTypeSubType is TypeSubType TagTypeSubType = "{1510}" // TagInputMessageAccountabilityData is InputMessageAccountabilityData (IMAD) @@ -70,7 +70,6 @@ const ( // TagAccountCreditedDrawdown is AccountCreditedDrawdown TagAccountCreditedDrawdown = "{5400}" - // TagOriginatorToBeneficiary is OriginatorToBeneficiary TagOriginatorToBeneficiary = "{6000}" // TagFIReceiverFI is FIReceiverFI diff --git a/converters.go b/converters.go index ef50157f..5851ca53 100644 --- a/converters.go +++ b/converters.go @@ -46,4 +46,4 @@ func (c *converters) numericStringField(s string, max uint) string { func (c *converters) FormatTag(s string) string { s = "{" + s + "}" return s -} \ No newline at end of file +} diff --git a/coverPayment.go b/coverPayment.go index cb655bb3..602897b9 100644 --- a/coverPayment.go +++ b/coverPayment.go @@ -20,4 +20,4 @@ type CoverPayment struct { SwiftLineFive string `json:"swiftLineFive,omitempty"` // SwiftLineSix SwiftLineSix string `json:"swiftLineSix,omitempty"` -} \ No newline at end of file +} diff --git a/currencyInstructedAmount.go b/currencyInstructedAmount.go index 68b17779..819d103b 100644 --- a/currencyInstructedAmount.go +++ b/currencyInstructedAmount.go @@ -20,8 +20,8 @@ type CurrencyInstructedAmount struct { } // NewCurrencyInstructedAmount returns a new CurrencyInstructedAmount -func NewCurrencyInstructedAmount() CurrencyInstructedAmount { - cia := CurrencyInstructedAmount { +func NewCurrencyInstructedAmount() CurrencyInstructedAmount { + cia := CurrencyInstructedAmount{ tag: TagCurrencyInstructedAmount, } return cia diff --git a/dateRemittanceDocument.go b/dateRemittanceDocument.go index 8cbd9903..4e463b95 100644 --- a/dateRemittanceDocument.go +++ b/dateRemittanceDocument.go @@ -20,8 +20,8 @@ type DateRemittanceDocument struct { } // NewDateRemittanceDocument returns a new DateRemittanceDocument -func NewDateRemittanceDocument() DateRemittanceDocument { - drd := DateRemittanceDocument { +func NewDateRemittanceDocument() DateRemittanceDocument { + drd := DateRemittanceDocument{ tag: TagDateRemittanceDocument, } return drd diff --git a/errorWire.go b/errorWire.go index cf0192d0..8c0aaedf 100644 --- a/errorWire.go +++ b/errorWire.go @@ -24,8 +24,8 @@ type ErrorWire struct { } // NewErrorWire returns a new ErrorWire -func NewErrorWire() ErrorWire { - we := ErrorWire { +func NewErrorWire() ErrorWire { + we := ErrorWire{ tag: TagErrorWire, } return we @@ -60,4 +60,4 @@ func (we *ErrorWire) Validate() error { // invalid the WIRE will return an error. func (we *ErrorWire) fieldInclusion() error { return nil -} \ No newline at end of file +} diff --git a/exchangeRate.go b/exchangeRate.go index 92e19bc0..294a1d52 100644 --- a/exchangeRate.go +++ b/exchangeRate.go @@ -21,8 +21,8 @@ type ExchangeRate struct { } // NewExchangeRate returns a new ExchangeRate -func NewExchangeRate() ExchangeRate { - er := ExchangeRate { +func NewExchangeRate() ExchangeRate { + er := ExchangeRate{ tag: TagExchangeRate, } return er @@ -36,7 +36,7 @@ func (er *ExchangeRate) Parse(record string) { } // String writes ExchangeRate -func (er*ExchangeRate) String() string { +func (er *ExchangeRate) String() string { var buf strings.Builder // ToDo: Separator buf.Grow(12) diff --git a/fedWireMessage.go b/fedWireMessage.go index 80785dcb..1bef7bc7 100644 --- a/fedWireMessage.go +++ b/fedWireMessage.go @@ -83,11 +83,11 @@ type FedWireMessage struct { // FiBeneficiary FiBeneficiary FiToFi `json:"fiBeneficiary,omitempty"` // FiBeneficiaryAdvic - FiBeneficiaryAdvice Advice `json:"fibeneficiaryAdvice,omitempty"` + FiBeneficiaryAdvice Advice `json:"fiBeneficiaryAdvice,omitempty"` // FiPaymentMethodToBeneficiary - FiPaymentMethodToBeneficiary FIPaymentMethodToBeneficiary `json:"fipaymentMethodToBeneficiary,omitempty"` + FiPaymentMethodToBeneficiary FIPaymentMethodToBeneficiary `json:"fiPaymentMethodToBeneficiary,omitempty"` // FiAdditionalFiToFi - FiAdditionalFiToFi AdditionalFiToFi `json:"fiadditionalFiToFi,omitempty"` + FiAdditionalFiToFi AdditionalFiToFi `json:"fiAdditionalFiToFi,omitempty"` // CurrencyInstructedAmount CurrencyInstructedAmount CoverPayment `json:"currencyInstructedAmount,omitempty"` // OrderingCustomer @@ -130,8 +130,6 @@ type FedWireMessage struct { RemittanceFreeText RemittanceFreeText `json:"remittanceFreeText,omitempty"` // ServiceMessage ServiceMessage ServiceMessage `json:"serviceMessage,omitempty"` - - } // NewFedWireMessage returns a new FedWireMessage diff --git a/fiAdditionalFIToFI.go b/fiAdditionalFIToFI.go index cfb982a2..83a61c0b 100644 --- a/fiAdditionalFIToFI.go +++ b/fiAdditionalFIToFI.go @@ -20,8 +20,8 @@ type FIAdditionalFiToFi struct { } // NewFIAdditionalFiToFi returns a new FIAdditionalFiToFi -func NewFIAdditionalFiToFi() FIAdditionalFiToFi { - additional := FIAdditionalFiToFi { +func NewFIAdditionalFiToFi() FIAdditionalFiToFi { + additional := FIAdditionalFiToFi{ tag: TagFIAdditionalFiToFi, } return additional diff --git a/fiBeneficiaryAdvice.go b/fiBeneficiaryAdvice.go index ee14229b..92385c13 100644 --- a/fiBeneficiaryAdvice.go +++ b/fiBeneficiaryAdvice.go @@ -57,4 +57,3 @@ func (ba *FIBeneficiaryAdvice) Validate() error { func (ba *FIBeneficiaryAdvice) fieldInclusion() error { return nil } - diff --git a/fiBeneficiaryFI.go b/fiBeneficiaryFI.go index 8ea7411b..0c2abe3b 100644 --- a/fiBeneficiaryFI.go +++ b/fiBeneficiaryFI.go @@ -20,8 +20,8 @@ type FIBeneficiaryFI struct { } // NewFIBeneficiaryFI returns a new FIBeneficiaryFI -func NewFIBeneficiaryFI() FIBeneficiaryFI { - bfi := FIBeneficiaryFI { +func NewFIBeneficiaryFI() FIBeneficiaryFI { + bfi := FIBeneficiaryFI{ tag: TagFIBeneficiaryFI, } return bfi @@ -56,4 +56,4 @@ func (bfi *FIBeneficiaryFI) Validate() error { // invalid the WIRE will return an error. func (bfi *FIBeneficiaryFI) fieldInclusion() error { return nil -} \ No newline at end of file +} diff --git a/fiIntermediaryFI.go b/fiIntermediaryFI.go index 27f0b797..ad226ebc 100644 --- a/fiIntermediaryFI.go +++ b/fiIntermediaryFI.go @@ -57,5 +57,3 @@ func (ifi *FIIntermediaryFI) Validate() error { func (ifi *FIIntermediaryFI) fieldInclusion() error { return nil } - - diff --git a/fiIntermediaryFIAdvice.go b/fiIntermediaryFIAdvice.go index 44bbe47c..034fb934 100644 --- a/fiIntermediaryFIAdvice.go +++ b/fiIntermediaryFIAdvice.go @@ -57,6 +57,3 @@ func (ifia *FIIntermediaryFIAdvice) Validate() error { func (ifia *FIIntermediaryFIAdvice) fieldInclusion() error { return nil } - - - diff --git a/fiReceiverFI.go b/fiReceiverFI.go index b94b069d..2f18640a 100644 --- a/fiReceiverFI.go +++ b/fiReceiverFI.go @@ -20,8 +20,8 @@ type FIReceiverFI struct { } // NewFIReceiverFI returns a new FIReceiverFI -func NewFIReceiverFI() FIReceiverFI { - rfi := FIReceiverFI { +func NewFIReceiverFI() FIReceiverFI { + rfi := FIReceiverFI{ tag: TagFIReceiverFI, } return rfi @@ -57,4 +57,3 @@ func (rfi *FIReceiverFI) Validate() error { func (rfi *FIReceiverFI) fieldInclusion() error { return nil } - diff --git a/file.go b/file.go index 5b1a5567..79aaf886 100644 --- a/file.go +++ b/file.go @@ -5,7 +5,7 @@ package wire // File contains the structures of a parsed WIRE File. type File struct { - ID string `json:"id"` + ID string `json:"id"` FedWireMessage FedWireMessage `json:"fedWireMessage"` } diff --git a/financiaInstitution.go b/financiaInstitution.go index fcf46373..161be50d 100644 --- a/financiaInstitution.go +++ b/financiaInstitution.go @@ -14,4 +14,4 @@ type FinancialInstitution struct { Name string `json:"name"` // Address Address Address `json:"address"` -} \ No newline at end of file +} diff --git a/grossAmountRemittanceDocument.go b/grossAmountRemittanceDocument.go index f24d2857..84ddf804 100644 --- a/grossAmountRemittanceDocument.go +++ b/grossAmountRemittanceDocument.go @@ -20,8 +20,8 @@ type GrossAmountRemittanceDocument struct { } // NewGrossAmountRemittanceDocument returns a new GrossAmountRemittanceDocument -func NewGrossAmountRemittanceDocument() GrossAmountRemittanceDocument { - gard := GrossAmountRemittanceDocument { +func NewGrossAmountRemittanceDocument() GrossAmountRemittanceDocument { + gard := GrossAmountRemittanceDocument{ tag: TagGrossAmountRemittanceDocument, } return gard diff --git a/institutionAccount.go b/institutionAccount.go index 6189a9a2..bc78c317 100644 --- a/institutionAccount.go +++ b/institutionAccount.go @@ -20,8 +20,8 @@ type InstitutionAccount struct { } // NewInstitutionAccount returns a new InstitutionAccount -func NewInstitutionAccount() InstitutionAccount { - ia := InstitutionAccount { +func NewInstitutionAccount() InstitutionAccount { + ia := InstitutionAccount{ tag: TagInstitutionAccount, } return ia diff --git a/instructedAmount.go b/instructedAmount.go index f00abd3b..51ffe064 100644 --- a/instructedAmount.go +++ b/instructedAmount.go @@ -23,8 +23,8 @@ type InstructedAmount struct { } // NewInstructedAmount returns a new InstructedAmount -func NewInstructedAmount() InstructedAmount { - ia := InstructedAmount { +func NewInstructedAmount() InstructedAmount { + ia := InstructedAmount{ tag: TagInstructedAmount, } return ia @@ -60,6 +60,3 @@ func (ia *InstructedAmount) Validate() error { func (ia *InstructedAmount) fieldInclusion() error { return nil } - - - diff --git a/instructingFI.go b/instructingFI.go index 0301b7aa..0abf8d85 100644 --- a/instructingFI.go +++ b/instructingFI.go @@ -20,8 +20,8 @@ type InstructingFI struct { } // NewInstructingFI returns a new InstructingFI -func NewInstructingFI() InstructingFI { - ifi := InstructingFI { +func NewInstructingFI() InstructingFI { + ifi := InstructingFI{ tag: TagInstructingFI, } return ifi diff --git a/intermediaryInstitution.go b/intermediaryInstitution.go index 1ec712c4..3fb53329 100644 --- a/intermediaryInstitution.go +++ b/intermediaryInstitution.go @@ -20,8 +20,8 @@ type IntermediaryInstitution struct { } // NewIntermediaryInstitution returns a new IntermediaryInstitution -func NewIntermediaryInstitution() IntermediaryInstitution { - ii := IntermediaryInstitution { +func NewIntermediaryInstitution() IntermediaryInstitution { + ii := IntermediaryInstitution{ tag: TagIntermediaryInstitution, } return ii diff --git a/localInstrument.go b/localInstrument.go index 03aae72e..ff77d514 100644 --- a/localInstrument.go +++ b/localInstrument.go @@ -22,8 +22,8 @@ type LocalInstrument struct { } // NewLocalInstrument returns a new LocalInstrument -func NewLocalInstrument() LocalInstrument { - li := LocalInstrument { +func NewLocalInstrument() LocalInstrument { + li := LocalInstrument{ tag: TagLocalInstrument, } return li @@ -59,4 +59,3 @@ func (li *LocalInstrument) Validate() error { func (li *LocalInstrument) fieldInclusion() error { return nil } - diff --git a/messageDisposition.go b/messageDisposition.go index 95b0f4e6..cd712c2a 100644 --- a/messageDisposition.go +++ b/messageDisposition.go @@ -24,8 +24,8 @@ type MessageDisposition struct { } // NewMessageDisposition returns a new MessageDisposition -func NewMessageDisposition() MessageDisposition { - md := MessageDisposition { +func NewMessageDisposition() MessageDisposition { + md := MessageDisposition{ tag: TagMessageDisposition, } return md diff --git a/orderingCustomer.go b/orderingCustomer.go index ad2ae165..44182f2c 100644 --- a/orderingCustomer.go +++ b/orderingCustomer.go @@ -20,8 +20,8 @@ type OrderingCustomer struct { } // NewOrderingCustomer returns a new OrderingCustomer -func NewOrderingCustomer() OrderingCustomer { - oc := OrderingCustomer { +func NewOrderingCustomer() OrderingCustomer { + oc := OrderingCustomer{ tag: TagOrderingCustomer, } return oc diff --git a/orderingInstitution.go b/orderingInstitution.go index 6712b687..98fdf6ec 100644 --- a/orderingInstitution.go +++ b/orderingInstitution.go @@ -20,8 +20,8 @@ type OrderingInstitution struct { } // NewOrderingInstitution returns a new OrderingInstitution -func NewOrderingInstitution() OrderingInstitution { - oi := OrderingInstitution { +func NewOrderingInstitution() OrderingInstitution { + oi := OrderingInstitution{ tag: TagOrderingInstitution, } return oi diff --git a/originator.go b/originator.go index 7a46c841..711adf1b 100644 --- a/originator.go +++ b/originator.go @@ -20,8 +20,8 @@ type Originator struct { } // NewOriginator returns a new Originator -func NewOriginator() Originator { - o := Originator { +func NewOriginator() Originator { + o := Originator{ tag: TagOriginator, } return o @@ -57,4 +57,3 @@ func (o *Originator) Validate() error { func (o *Originator) fieldInclusion() error { return nil } - diff --git a/originatorFI.go b/originatorFI.go index d454b6dc..2990e989 100644 --- a/originatorFI.go +++ b/originatorFI.go @@ -20,8 +20,8 @@ type OriginatorFI struct { } // NewOriginatorFI returns a new OriginatorFI -func NewOriginatorFI() OriginatorFI { - ofi := OriginatorFI { +func NewOriginatorFI() OriginatorFI { + ofi := OriginatorFI{ tag: TagOriginatorFI, } return ofi diff --git a/originatorOptionF.go b/originatorOptionF.go index 00864c2c..fd08e7bd 100644 --- a/originatorOptionF.go +++ b/originatorOptionF.go @@ -80,8 +80,8 @@ type OriginatorOptionF struct { } // NewOriginatorOptionF returns a new OriginatorOptionF -func NewOriginatorOptionF() OriginatorOptionF { - oof := OriginatorOptionF { +func NewOriginatorOptionF() OriginatorOptionF { + oof := OriginatorOptionF{ tag: TagOriginatorOptionF, } return oof @@ -117,5 +117,3 @@ func (oof *OriginatorOptionF) Validate() error { func (oof *OriginatorOptionF) fieldInclusion() error { return nil } - - diff --git a/originatorToBeneficiary.go b/originatorToBeneficiary.go index 7a41e0e9..28909c61 100644 --- a/originatorToBeneficiary.go +++ b/originatorToBeneficiary.go @@ -26,8 +26,8 @@ type OriginatorToBeneficiary struct { } // NewOriginatorToBeneficiary returns a new OriginatorToBeneficiary -func NewOriginatorToBeneficiary() OriginatorToBeneficiary { - ob := OriginatorToBeneficiary { +func NewOriginatorToBeneficiary() OriginatorToBeneficiary { + ob := OriginatorToBeneficiary{ tag: TagOriginatorToBeneficiary, } return ob diff --git a/outputMessageAccountabilityData.go b/outputMessageAccountabilityData.go index 37d0f2be..be549ad9 100644 --- a/outputMessageAccountabilityData.go +++ b/outputMessageAccountabilityData.go @@ -17,7 +17,7 @@ type OutputMessageAccountabilityData struct { // OutputDate is the output date OutputDate string `json:"outputDate,omitempty"` // OutputTime is OutputTime - OutputTime string`json:"outputTime,omitempty"` + OutputTime string `json:"outputTime,omitempty"` // OutputFRBApplicationIdentification OutputFRBApplicationIdentification string `json:"outputFRBApplicationIdentification,omitempty"` @@ -28,8 +28,8 @@ type OutputMessageAccountabilityData struct { } // NewOutputMessageAccountabilityData returns a new OutputMessageAccountabilityData -func NewOutputMessageAccountabilityData() OutputMessageAccountabilityData { - omad := OutputMessageAccountabilityData { +func NewOutputMessageAccountabilityData() OutputMessageAccountabilityData { + omad := OutputMessageAccountabilityData{ tag: TagOutputMessageAccountabilityData, } return omad diff --git a/paymentNotification.go b/paymentNotification.go index 5cb5392e..61106016 100644 --- a/paymentNotification.go +++ b/paymentNotification.go @@ -34,8 +34,8 @@ type PaymentNotification struct { } // NewPaymentNotification returns a new PaymentNotification -func NewPaymentNotification() PaymentNotification { - pn := PaymentNotification { +func NewPaymentNotification() PaymentNotification { + pn := PaymentNotification{ tag: TagPaymentNotification, } return pn @@ -71,4 +71,3 @@ func (pn *PaymentNotification) Validate() error { func (pn *PaymentNotification) fieldInclusion() error { return nil } - diff --git a/personal.go b/personal.go index 0ca790c7..ad65daac 100644 --- a/personal.go +++ b/personal.go @@ -11,6 +11,6 @@ type Personal struct { // Identifier Identifier string `json:"identifier"` // Name - Name string `json:"name"` + Name string `json:"name"` Address Address `json:"address"` } diff --git a/previousMessageIdentifier.go b/previousMessageIdentifier.go index 881c2eb1..6d5fd5c4 100644 --- a/previousMessageIdentifier.go +++ b/previousMessageIdentifier.go @@ -20,8 +20,8 @@ type PreviousMessageIdentifier struct { } // NewPreviousMessageIdentifier returns a new PreviousMessageIdentifier -func NewPreviousMessageIdentifier() PreviousMessageIdentifier { - pmi := PreviousMessageIdentifier { +func NewPreviousMessageIdentifier() PreviousMessageIdentifier { + pmi := PreviousMessageIdentifier{ tag: TagPreviousMessageIdentifier, } return pmi @@ -57,4 +57,3 @@ func (pmi *PreviousMessageIdentifier) Validate() error { func (pmi *PreviousMessageIdentifier) fieldInclusion() error { return nil } - diff --git a/primaryRemittanceDocument.go b/primaryRemittanceDocument.go index 5cb12044..9bbd9e94 100644 --- a/primaryRemittanceDocument.go +++ b/primaryRemittanceDocument.go @@ -26,8 +26,8 @@ type PrimaryRemittanceDocument struct { } // NewPrimaryRemittanceDocument returns a new PrimaryRemittanceDocument -func NewPrimaryRemittanceDocument() PrimaryRemittanceDocument { - prd := PrimaryRemittanceDocument { +func NewPrimaryRemittanceDocument() PrimaryRemittanceDocument { + prd := PrimaryRemittanceDocument{ tag: TagPrimaryRemittanceDocument, } return prd diff --git a/reader.go b/reader.go index c92a19b0..4517ed4e 100644 --- a/reader.go +++ b/reader.go @@ -26,8 +26,6 @@ type Reader struct { tagName string } - - // Read reads each line of the FED Wire file and defines which parser to use based // on the first character of each line. It also enforces FED Wire formatting rules and returns // the appropriate error if issues are found. @@ -38,14 +36,16 @@ func (r *Reader) Read() (File, error) { line := r.scanner.Text() r.lineNum++ -/* lineLength := len(line) + /* lineLength := len(line) + + // ToDo: Adjust below stump code + if lineLength < 5 { + msg := fmt.Sprintf(msgRecordLength, lineLength) + err := &FileError{FieldName: "RecordLength", Value: strconv.Itoa(lineLength), Msg: msg} + return r.File, r.error(err) + }*/ - // ToDo: Adjust below stump code - if lineLength < 5 { - msg := fmt.Sprintf(msgRecordLength, lineLength) - err := &FileError{FieldName: "RecordLength", Value: strconv.Itoa(lineLength), Msg: msg} - return r.File, r.error(err) - }*/ + // ToDo: parseLine or parseTag? r.line = line if err := r.parseLine(); err != nil { @@ -61,4 +61,11 @@ func (r *Reader) parseLine() error { // ToDo: For each type check length based on the tag return nil -} \ No newline at end of file +} + +func (r *Reader) parseTag() error { + + // ToDo: For each type check length based on the tag + + return nil +} diff --git a/receiptTimeStamp.go b/receiptTimeStamp.go index 3f64c2e5..aab216f0 100644 --- a/receiptTimeStamp.go +++ b/receiptTimeStamp.go @@ -24,8 +24,8 @@ type ReceiptTimeStamp struct { } // NewReceiptTimeStamp returns a new ReceiptTimeStamp -func NewReceiptTimeStamp() ReceiptTimeStamp { - rts := ReceiptTimeStamp { +func NewReceiptTimeStamp() ReceiptTimeStamp { + rts := ReceiptTimeStamp{ tag: TagReceiptTimeStamp, } return rts diff --git a/relatedRemittance.go b/relatedRemittance.go index 26b8e01e..d0181679 100644 --- a/relatedRemittance.go +++ b/relatedRemittance.go @@ -26,8 +26,8 @@ type RelatedRemittance struct { } // NewRelatedRemittance returns a new RelatedRemittance -func NewRelatedRemittance() RelatedRemittance { - rr := RelatedRemittance { +func NewRelatedRemittance() RelatedRemittance { + rr := RelatedRemittance{ tag: TagRelatedRemittance, } return rr diff --git a/remittanceAmount.go b/remittanceAmount.go index 3aa389bc..7f06161e 100644 --- a/remittanceAmount.go +++ b/remittanceAmount.go @@ -10,4 +10,4 @@ type RemittanceAmount struct { CurrencyCode string `json:"currencyCode,omitempty"` // Amount Must contain at least one numeric character and only one decimal period marker (e.g., $1,234.56 should be entered as 1234.56). Can have up to 5 numeric characters following the decimal period marker (e.g., 1234.56789). Amount must be greater than zero (i.e., at least .01). Amount string `json:"amount,omitempty"` -} \ No newline at end of file +} diff --git a/remittanceBeneficiary.go b/remittanceBeneficiary.go index 36eadcff..d51583c9 100644 --- a/remittanceBeneficiary.go +++ b/remittanceBeneficiary.go @@ -11,7 +11,7 @@ type RemittanceBeneficiary struct { // tag tag string // IdentificationType is identification type - IdentificationType string`json:"identificationType,omitempty"` + IdentificationType string `json:"identificationType,omitempty"` // IdentificationCode Organization Identification Codes * `BANK` - Bank Party Identification * `CUST` - Customer Number * `DUNS` - Data Universal Number System (Dun & Bradstreet) * `EMPL` - Employer Identification Number * `GS1G` - Global Location Number * `PROP` - Proprietary Identification Number * `SWBB` - SWIFT BIC or BEI * `TXID` - Tax Identification Number Private Identification Codes * `ARNU` - Alien Registration Number * `CCPT` - Passport Number * `CUST` - Customer Number * `DPOB` - Date & Place of Birth * `DRLC` - Driver’s License Number * `EMPL` - Employee Identification Number * `NIDN` - National Identity Number * `PROP` - Proprietary Identification Number * `SOSE` - Social Security Number * `TXID` - Tax Identification Number IdentificationCode string `json:"identificationCode,omitempty"` // IdentificationNumber @@ -19,8 +19,8 @@ type RemittanceBeneficiary struct { // IdentificationNumberIssuer IdentificationNumberIssuer string `json:"identificationNumberIssuer,omitempty"` // DateAndfBirthPlace - DateAndBirthPlace string `json:"dateAndBirthPlace,omitempty"` - RemittanceData RemittanceData `json:"remittanceData,omitempty"` + DateAndBirthPlace string `json:"dateAndBirthPlace,omitempty"` + RemittanceData RemittanceData `json:"remittanceData,omitempty"` // validator is composed for data validation validator @@ -29,8 +29,8 @@ type RemittanceBeneficiary struct { } // NewRemittanceBeneficiary returns a new RemittanceBeneficiary -func NewRemittanceBeneficiary() RemittanceBeneficiary { - rb := RemittanceBeneficiary { +func NewRemittanceBeneficiary() RemittanceBeneficiary { + rb := RemittanceBeneficiary{ tag: TagRemittanceBeneficiary, } return rb diff --git a/remittanceData.go b/remittanceData.go index e29204a4..e90eeea8 100644 --- a/remittanceData.go +++ b/remittanceData.go @@ -7,7 +7,7 @@ package wire // RemittanceData is remittance data type RemittanceData struct { // Name - Name string `json:"name,omitempty"` + Name string `json:"name,omitempty"` AddressType string `json:"addressType,omitempty"` // Department Department string `json:"department,omitempty"` @@ -42,4 +42,3 @@ type RemittanceData struct { // CountryOfResidence CountryOfResidence string `json:"countryOfResidence,omitempty"` } - diff --git a/remittanceFreeText.go b/remittanceFreeText.go index ebac23d9..39a57c52 100644 --- a/remittanceFreeText.go +++ b/remittanceFreeText.go @@ -24,8 +24,8 @@ type RemittanceFreeText struct { } // NewRemittanceFreeText returns a new RemittanceFreeText -func NewRemittanceFreeText() RemittanceFreeText { - rft := RemittanceFreeText { +func NewRemittanceFreeText() RemittanceFreeText { + rft := RemittanceFreeText{ tag: TagRemittanceFreeText, } return rft diff --git a/remittanceInformation.go b/remittanceInformation.go index e99e3ed3..6fb8013b 100644 --- a/remittanceInformation.go +++ b/remittanceInformation.go @@ -20,8 +20,8 @@ type RemittanceInformation struct { } // NewRemittanceInformation returns a new RemittanceInformation -func NewRemittanceInformation() RemittanceInformation { - ri := RemittanceInformation { +func NewRemittanceInformation() RemittanceInformation { + ri := RemittanceInformation{ tag: TagRemittanceInformation, } return ri diff --git a/remittanceOriginator.go b/remittanceOriginator.go index ac8df16d..f2686140 100644 --- a/remittanceOriginator.go +++ b/remittanceOriginator.go @@ -11,7 +11,7 @@ type RemittanceOriginator struct { // tag tag string // IdentificationType is identification type - IdentificationType string`json:"identificationType,omitempty"` + IdentificationType string `json:"identificationType,omitempty"` // IdentificationCode Organization Identification Codes * `BANK` - Bank Party Identification * `CUST` - Customer Number * `DUNS` - Data Universal Number System (Dun & Bradstreet) * `EMPL` - Employer Identification Number * `GS1G` - Global Location Number * `PROP` - Proprietary Identification Number * `SWBB` - SWIFT BIC or BEI * `TXID` - Tax Identification Number Private Identification Codes * `ARNU` - Alien Registration Number * `CCPT` - Passport Number * `CUST` - Customer Number * `DPOB` - Date & Place of Birth * `DRLC` - Driver’s License Number * `EMPL` - Employee Identification Number * `NIDN` - National Identity Number * `PROP` - Proprietary Identification Number * `SOSE` - Social Security Number * `TXID` - Tax Identification Number IdentificationCode string `json:"identificationCode,omitempty"` // IdentificationNumber @@ -19,8 +19,8 @@ type RemittanceOriginator struct { // IdentificationNumberIssuer IdentificationNumberIssuer string `json:"identificationNumberIssuer,omitempty"` // DateAndBirthPlace - DateAndBirthPlace string `json:"dateAndBirthPlace,omitempty"` - RemittanceData RemittanceData `json:"remittanceData,omitempty"` + DateAndBirthPlace string `json:"dateAndBirthPlace,omitempty"` + RemittanceData RemittanceData `json:"remittanceData,omitempty"` // ContactName ContactName string `json:"contactName,omitempty"` // ContactPhoneNumber @@ -41,8 +41,8 @@ type RemittanceOriginator struct { } // NewRemittanceOriginator returns a new RemittanceOriginator -func NewRemittanceOriginator() RemittanceOriginator { - ro := RemittanceOriginator { +func NewRemittanceOriginator() RemittanceOriginator { + ro := RemittanceOriginator{ tag: TagRemittanceOriginator, } return ro diff --git a/secondaryRemittanceDocument.go b/secondaryRemittanceDocument.go index 265c6a46..0302eacf 100644 --- a/secondaryRemittanceDocument.go +++ b/secondaryRemittanceDocument.go @@ -26,8 +26,8 @@ type SecondaryRemittanceDocument struct { } // NewSecondaryRemittanceDocument returns a new SecondaryRemittanceDocument -func NewSecondaryRemittanceDocument() SecondaryRemittanceDocument { - srd := SecondaryRemittanceDocument { +func NewSecondaryRemittanceDocument() SecondaryRemittanceDocument { + srd := SecondaryRemittanceDocument{ tag: TagSecondaryRemittanceDocument, } return srd diff --git a/senderReference.go b/senderReference.go index 9ab92549..f0d2b797 100644 --- a/senderReference.go +++ b/senderReference.go @@ -20,8 +20,8 @@ type SenderReference struct { } // NewSenderReference returns a new SenderReference -func NewSenderReference() SenderReference { - sr := SenderReference { +func NewSenderReference() SenderReference { + sr := SenderReference{ tag: TagSenderReference, } return sr diff --git a/senderSupplied.go b/senderSupplied.go index 823ec69b..ec094275 100644 --- a/senderSupplied.go +++ b/senderSupplied.go @@ -28,9 +28,9 @@ type SenderSupplied struct { // NewSenderSupplied returns a new SenderSupplied func NewSenderSupplied() SenderSupplied { ss := SenderSupplied{ - tag: TagSenderSupplied, - FormatVersion: FormatVersion, - TestProductionCode: EnvironmentTest, + tag: TagSenderSupplied, + FormatVersion: FormatVersion, + TestProductionCode: EnvironmentTest, MessageDuplicationCode: MessageDuplicationOriginal, } return ss @@ -58,9 +58,9 @@ func (ss *SenderSupplied) Validate() error { if err := ss.fieldInclusion(); err != nil { return err } -/* if ssi.FormatVersion != FormatVersion { - return fieldError("FormatVersion", NewErrFormatVersion(30), ssi.FormatVersion) - }*/ + /* if ssi.FormatVersion != FormatVersion { + return fieldError("FormatVersion", NewErrFormatVersion(30), ssi.FormatVersion) + }*/ return nil } diff --git a/senderToReceiver.go b/senderToReceiver.go index c12782b6..bcd0bdff 100644 --- a/senderToReceiver.go +++ b/senderToReceiver.go @@ -20,8 +20,8 @@ type SenderToReceiver struct { } // NewSenderToReceiver returns a new SenderToReceiver -func NewSenderToReceiver() SenderToReceiver { - sr := SenderToReceiver { +func NewSenderToReceiver() SenderToReceiver { + sr := SenderToReceiver{ tag: TagSenderToReceiver, } return sr diff --git a/serviceMessage.go b/serviceMessage.go index 117ac980..d512c418 100644 --- a/serviceMessage.go +++ b/serviceMessage.go @@ -42,8 +42,8 @@ type ServiceMessage struct { } // NewServiceMessage returns a new ServiceMessage -func NewServiceMessage() ServiceMessage { - sm := ServiceMessage { +func NewServiceMessage() ServiceMessage { + sm := ServiceMessage{ tag: TagServiceMessage, } return sm diff --git a/unstructuredAddenda.go b/unstructuredAddenda.go index d31d5b26..6778b3ca 100644 --- a/unstructuredAddenda.go +++ b/unstructuredAddenda.go @@ -22,8 +22,8 @@ type UnstructuredAddenda struct { } // NewUnstructuredAddenda returns a new UnstructuredAddenda -func NewUnstructuredAddenda() UnstructuredAddenda { - ua := UnstructuredAddenda { +func NewUnstructuredAddenda() UnstructuredAddenda { + ua := UnstructuredAddenda{ tag: TagUnstructuredAddenda, } return ua diff --git a/validators.go b/validators.go index fbe2e312..687709df 100644 --- a/validators.go +++ b/validators.go @@ -88,4 +88,4 @@ func (v *validator) isPaymentNotificationIndicator(code string) error { return nil } return ErrPaymentNotificationIndicator -} \ No newline at end of file +}