diff --git a/.github/workflows/build-lint-test.yml b/.github/workflows/build-lint-test.yml index ab8afd94b..fe7813471 100644 --- a/.github/workflows/build-lint-test.yml +++ b/.github/workflows/build-lint-test.yml @@ -27,8 +27,26 @@ jobs: env: GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY}} + - name: Set up Node environment + uses: actions/setup-node@v2 + with: + node-version: 20 + + - name: Install Prism + run: npm install -g @stoplight/prism-cli + + - name: Start PRISM Server + run: ./start-prism.sh feature/prism-changes-mt-v2 & sleep 15 + working-directory: Xero-Java/src/test/java/com/xero/api/util + - name: Build and test post generation run: | export GPG_TTY=$(tty) - mvn clean verify -DskipTests=true -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} + mvn clean verify + env: + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + working-directory: Xero-Java + + - name: Stop PRISM + run: pkill -f prism working-directory: Xero-Java diff --git a/README.md b/README.md index e2e838648..b3e15156a 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ The **Xero-Java** SDK makes it easy for developers to access Xero's APIs in thei - [App Store Subscriptions](#app-store-subscriptions) - [API Clients](#api-clients) - [Usage Examples](#usage-examples) +- [Running Test(s) in Local](#running-tests-in-local) - [SDK conventions](#sdk-conventions) - [Participating in Xero’s developer community](#participating-in-xeros-developoer-community) @@ -677,7 +678,17 @@ try { System.out.println(e.getMessage()); } ``` +## Running Test(s) in Local +For Running Test cases PRISM Mock Server needs to be started in the local machine. +Steps to Run Test(s) +* Install PRISM from npm using the command: **npm install -g @stoplight/prism-cli** +* Verify Installation: **prism --version** +* Navigate to **Xero-Java--> src--> test--> util** folder in the terminal +* Execute the script **./start-prism.sh** +* This will start the PRISM Server in Local +* Run **mvn clean verify -DskipTests=false** to build the Java code along with Test Cases. +--- ## SDK conventions ### Working with dates diff --git a/docs/v4/accounting/index.html b/docs/v4/accounting/index.html index 544d5ef46..f9b7e4de1 100644 --- a/docs/v4/accounting/index.html +++ b/docs/v4/accounting/index.html @@ -7212,7 +7212,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Account" }, - "example" : "{ \"Code\":\"123456\", \"Name\":\"Foobar\", \"Type\":\"EXPENSE\", \"Description\":\"Hello World\" }" + "example" : { + "Code" : "123456", + "Name" : "Foobar", + "Type" : "EXPENSE", + "Description" : "Hello World" + } } }, "required" : true @@ -7831,7 +7836,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -8007,7 +8016,23 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/BankTransactions" }, - "example" : "{ bankTransactions: [{ type: BankTransaction.TypeEnum.SPEND, contact: { contactID: \"00000000-0000-0000-0000-000000000000\" }, lineItems: [{ description: \"Foobar\", quantity: 1.0, unitAmount: 20.0, accountCode: \"000\" } ], bankAccount: { code: \"000\" }}]}" + "example" : { + "bankTransactions" : [ { + "type" : "BankTransaction.TypeEnum.SPEND", + "contact" : { + "contactID" : "00000000-0000-0000-0000-000000000000" + }, + "lineItems" : [ { + "description" : "Foobar", + "quantity" : 1.0, + "unitAmount" : 20.0, + "accountCode" : "000" + } ], + "bankAccount" : { + "code" : "000" + } + } ] + } } }, "required" : true @@ -8218,7 +8243,50 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/BankTransfers" }, - "example" : "{ \"BankTransfers\": [ { \"FromBankAccount\": { \"Code\": \"090\", \"Name\": \"My Savings\", \"AccountID\": \"00000000-0000-0000-0000-000000000000\", \"Type\": \"BANK\", \"BankAccountNumber\": \"123455\", \"Status\": \"ACTIVE\", \"BankAccountType\": \"BANK\", \"CurrencyCode\": \"USD\", \"TaxType\": \"NONE\", \"EnablePaymentsToAccount\": false, \"ShowInExpenseClaims\": false, \"Class\": \"ASSET\", \"ReportingCode\": \"ASS\", \"ReportingCodeName\": \"Assets\", \"HasAttachments\": false, \"UpdatedDateUTC\": \"2016-10-17T13:45:33.993-07:00\" }, \"ToBankAccount\": { \"Code\": \"088\", \"Name\": \"Business Wells Fargo\", \"AccountID\": \"00000000-0000-0000-0000-000000000000\", \"Type\": \"BANK\", \"BankAccountNumber\": \"123455\", \"Status\": \"ACTIVE\", \"BankAccountType\": \"BANK\", \"CurrencyCode\": \"USD\", \"TaxType\": \"NONE\", \"EnablePaymentsToAccount\": false, \"ShowInExpenseClaims\": false, \"Class\": \"ASSET\", \"ReportingCode\": \"ASS\", \"ReportingCodeName\": \"Assets\", \"HasAttachments\": false, \"UpdatedDateUTC\": \"2016-06-03T08:31:14.517-07:00\" }, \"Amount\": \"50.00\", \"FromIsReconciled\": true, \"ToIsReconciled\": true, \"Reference\": \"Sub 098801\" } ] }" + "example" : { + "BankTransfers" : [ { + "FromBankAccount" : { + "Code" : "090", + "Name" : "My Savings", + "AccountID" : "00000000-0000-0000-0000-000000000000", + "Type" : "BANK", + "BankAccountNumber" : "123455", + "Status" : "ACTIVE", + "BankAccountType" : "BANK", + "CurrencyCode" : "USD", + "TaxType" : "NONE", + "EnablePaymentsToAccount" : false, + "ShowInExpenseClaims" : false, + "Class" : "ASSET", + "ReportingCode" : "ASS", + "ReportingCodeName" : "Assets", + "HasAttachments" : false, + "UpdatedDateUTC" : "2016-10-17T13:45:33.993-07:00" + }, + "ToBankAccount" : { + "Code" : "088", + "Name" : "Business Wells Fargo", + "AccountID" : "00000000-0000-0000-0000-000000000000", + "Type" : "BANK", + "BankAccountNumber" : "123455", + "Status" : "ACTIVE", + "BankAccountType" : "BANK", + "CurrencyCode" : "USD", + "TaxType" : "NONE", + "EnablePaymentsToAccount" : false, + "ShowInExpenseClaims" : false, + "Class" : "ASSET", + "ReportingCode" : "ASS", + "ReportingCodeName" : "Assets", + "HasAttachments" : false, + "UpdatedDateUTC" : "2016-06-03T08:31:14.517-07:00" + }, + "Amount" : "50.00", + "FromIsReconciled" : true, + "ToIsReconciled" : true, + "Reference" : "Sub 098801" + } ] + } } }, "required" : true @@ -8623,7 +8691,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -8802,7 +8874,28 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/BatchPayments" }, - "example" : "{ \"BatchPayments\": [ { \"Account\": { \"AccountID\": \"00000000-0000-0000-0000-000000000000\" }, \"Reference\": \"ref\", \"Date\": \"2018-08-01\", \"Payments\": [ { \"Account\": { \"Code\": \"001\" }, \"Date\": \"2019-12-31\", \"Amount\": 500, \"Invoice\": { \"InvoiceID\": \"00000000-0000-0000-0000-000000000000\", \"LineItems\": [], \"Contact\": {}, \"Type\": \"ACCPAY\" } } ] } ] }" + "example" : { + "BatchPayments" : [ { + "Account" : { + "AccountID" : "00000000-0000-0000-0000-000000000000" + }, + "Reference" : "ref", + "Date" : "2018-08-01", + "Payments" : [ { + "Account" : { + "Code" : "001" + }, + "Date" : "2019-12-31", + "Amount" : 500, + "Invoice" : { + "InvoiceID" : "00000000-0000-0000-0000-000000000000", + "LineItems" : [ ], + "Contact" : { }, + "Type" : "ACCPAY" + } + } ] + } ] + } } }, "required" : true @@ -9020,7 +9113,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -9214,7 +9311,15 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PaymentServices" }, - "example" : "{ \"PaymentServices\": [ { \"PaymentServiceID\": \"54b3b4f6-0443-4fba-bcd1-61ec0c35ca55\", \"PaymentServiceName\": \"PayUpNow\", \"PaymentServiceUrl\": \"https://www.payupnow.com/\", \"PaymentServiceType\": \"Custom\", \"PayNowText\": \"Time To Pay\" } ] }" + "example" : { + "PaymentServices" : [ { + "PaymentServiceID" : "54b3b4f6-0443-4fba-bcd1-61ec0c35ca55", + "PaymentServiceName" : "PayUpNow", + "PaymentServiceUrl" : "https://www.payupnow.com/", + "PaymentServiceType" : "Custom", + "PayNowText" : "Time To Pay" + } ] + } } }, "required" : true @@ -9584,7 +9689,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/ContactGroups" }, - "example" : "{ \"ContactGroups\": [{ \"Name\": \"VIPs\" }]}" + "example" : { + "ContactGroups" : [ { + "Name" : "VIPs" + } ] + } } }, "required" : true @@ -9775,7 +9884,13 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Contacts" }, - "example" : "{ \"Contacts\": [ { \"ContactID\": \"a3675fc4-f8dd-4f03-ba5b-f1870566bcd7\" }, { \"ContactID\": \"4e1753b9-018a-4775-b6aa-1bc7871cfee3\" } ] }" + "example" : { + "Contacts" : [ { + "ContactID" : "a3675fc4-f8dd-4f03-ba5b-f1870566bcd7" + }, { + "ContactID" : "4e1753b9-018a-4775-b6aa-1bc7871cfee3" + } ] + } } }, "required" : true @@ -9966,7 +10081,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -10132,7 +10251,66 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Contacts" }, - "example" : "{ \"Contacts\": [ { \"ContactID\": \"3ff6d40c-af9a-40a3-89ce-3c1556a25591\", \"ContactStatus\": \"ACTIVE\", \"Name\": \"Foo9987\", \"EmailAddress\": \"sid32476@blah.com\", \"BankAccountDetails\": \"\", \"Addresses\": [ { \"AddressType\": \"STREET\", \"City\": \"\", \"Region\": \"\", \"PostalCode\": \"\", \"Country\": \"\" }, { \"AddressType\": \"POBOX\", \"City\": \"\", \"Region\": \"\", \"PostalCode\": \"\", \"Country\": \"\" } ], \"Phones\": [ { \"PhoneType\": \"DEFAULT\", \"PhoneNumber\": \"\", \"PhoneAreaCode\": \"\", \"PhoneCountryCode\": \"\" }, { \"PhoneType\": \"DDI\", \"PhoneNumber\": \"\", \"PhoneAreaCode\": \"\", \"PhoneCountryCode\": \"\" }, { \"PhoneType\": \"FAX\", \"PhoneNumber\": \"\", \"PhoneAreaCode\": \"\", \"PhoneCountryCode\": \"\" }, { \"PhoneType\": \"MOBILE\", \"PhoneNumber\": \"555-1212\", \"PhoneAreaCode\": \"415\", \"PhoneCountryCode\": \"\" } ], \"UpdatedDateUTC\": \"/Date(1551399321043+0000)/\", \"ContactGroups\": [], \"IsSupplier\": false, \"IsCustomer\": false, \"SalesTrackingCategories\": [], \"PurchasesTrackingCategories\": [], \"PaymentTerms\": { \"Bills\": { \"Day\": 15, \"Type\": \"OFCURRENTMONTH\" }, \"Sales\": { \"Day\": 10, \"Type\": \"DAYSAFTERBILLMONTH\" } }, \"ContactPersons\": [] } ] }" + "example" : { + "Contacts" : [ { + "ContactID" : "3ff6d40c-af9a-40a3-89ce-3c1556a25591", + "ContactStatus" : "ACTIVE", + "Name" : "Foo9987", + "EmailAddress" : "sid32476@blah.com", + "BankAccountDetails" : "", + "Addresses" : [ { + "AddressType" : "STREET", + "City" : "", + "Region" : "", + "PostalCode" : "", + "Country" : "" + }, { + "AddressType" : "POBOX", + "City" : "", + "Region" : "", + "PostalCode" : "", + "Country" : "" + } ], + "Phones" : [ { + "PhoneType" : "DEFAULT", + "PhoneNumber" : "", + "PhoneAreaCode" : "", + "PhoneCountryCode" : "" + }, { + "PhoneType" : "DDI", + "PhoneNumber" : "", + "PhoneAreaCode" : "", + "PhoneCountryCode" : "" + }, { + "PhoneType" : "FAX", + "PhoneNumber" : "", + "PhoneAreaCode" : "", + "PhoneCountryCode" : "" + }, { + "PhoneType" : "MOBILE", + "PhoneNumber" : "555-1212", + "PhoneAreaCode" : "415", + "PhoneCountryCode" : "" + } ], + "UpdatedDateUTC" : "/Date(1551399321043+0000)/", + "ContactGroups" : [ ], + "IsSupplier" : false, + "IsCustomer" : false, + "SalesTrackingCategories" : [ ], + "PurchasesTrackingCategories" : [ ], + "PaymentTerms" : { + "Bills" : { + "Day" : 15, + "Type" : "OFCURRENTMONTH" + }, + "Sales" : { + "Day" : 10, + "Type" : "DAYSAFTERBILLMONTH" + } + }, + "ContactPersons" : [ ] + } ] + } } }, "required" : true @@ -10357,7 +10535,16 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Allocations" }, - "example" : "{ \"Allocations\": [ { \"Invoice\": { \"LineItems\": [], \"InvoiceID\": \"c45720a1-ade3-4a38-a064-d15489be6841\" }, \"Amount\": 1, \"Date\": \"2019-03-05\" } ] }" + "example" : { + "Allocations" : [ { + "Invoice" : { + "LineItems" : [ ], + "InvoiceID" : "c45720a1-ade3-4a38-a064-d15489be6841" + }, + "Amount" : 1, + "Date" : "2019-03-05" + } ] + } } }, "required" : true @@ -10817,7 +11004,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -10991,7 +11182,21 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/CreditNotes" }, - "example" : "{ \"CreditNotes\":[ { \"Type\":\"ACCPAYCREDIT\", \"Contact\":{ \"ContactID\":\"430fa14a-f945-44d3-9f97-5df5e28441b8\" }, \"Date\":\"2019-01-05\", \"LineItems\":[ { \"Description\":\"Foobar\", \"Quantity\":2.0, \"UnitAmount\":20.0, \"AccountCode\":\"400\" } ] } ] }" + "example" : { + "CreditNotes" : [ { + "Type" : "ACCPAYCREDIT", + "Contact" : { + "ContactID" : "430fa14a-f945-44d3-9f97-5df5e28441b8" + }, + "Date" : "2019-01-05", + "LineItems" : [ { + "Description" : "Foobar", + "Quantity" : 2.0, + "UnitAmount" : 20.0, + "AccountCode" : "400" + } ] + } ] + } } }, "required" : true @@ -11192,7 +11397,10 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Currency" }, - "example" : "{ \"Code\": \"USD\", \"Description\": \"United States Dollar\" }" + "example" : { + "Code" : "USD", + "Description" : "United States Dollar" + } } }, "required" : true @@ -11350,7 +11558,15 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Employees" }, - "example" : "{ \"Employees\": [ { \"FirstName\": \"Nick\", \"LastName\": \"Fury\", \"ExternalLink\": { \"Url\": \"http://twitter.com/#!/search/Nick+Fury\" } } ] }" + "example" : { + "Employees" : [ { + "FirstName" : "Nick", + "LastName" : "Fury", + "ExternalLink" : { + "Url" : "http://twitter.com/#!/search/Nick+Fury" + } + } ] + } } }, "required" : true @@ -11568,7 +11784,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -11737,7 +11957,18 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/ExpenseClaims" }, - "example" : "{ \"ExpenseClaims\": [ { \"Status\": \"SUBMITTED\", \"User\": { \"UserID\": \"d1164823-0ac1-41ad-987b-b4e30fe0b273\" }, \"Receipts\": [ { \"Lineitems\": [], \"ReceiptID\": \"dc1c7f6d-0a4c-402f-acac-551d62ce5816\" } ] } ] }" + "example" : { + "ExpenseClaims" : [ { + "Status" : "SUBMITTED", + "User" : { + "UserID" : "d1164823-0ac1-41ad-987b-b4e30fe0b273" + }, + "Receipts" : [ { + "Lineitems" : [ ], + "ReceiptID" : "dc1c7f6d-0a4c-402f-acac-551d62ce5816" + } ] + } ] + } } }, "required" : true @@ -12170,7 +12401,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -12356,7 +12591,26 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Invoices" }, - "example" : "{ \"Invoices\": [ { \"Type\": \"ACCREC\", \"Contact\": { \"ContactID\": \"430fa14a-f945-44d3-9f97-5df5e28441b8\" }, \"LineItems\": [ { \"Description\": \"Acme Tires\", \"Quantity\": 2, \"UnitAmount\": 20, \"AccountCode\": \"200\", \"TaxType\": \"NONE\", \"LineAmount\": 40 } ], \"Date\": \"2019-03-11\", \"DueDate\": \"2018-12-10\", \"Reference\": \"Website Design\", \"Status\": \"AUTHORISED\" } ] }" + "example" : { + "Invoices" : [ { + "Type" : "ACCREC", + "Contact" : { + "ContactID" : "430fa14a-f945-44d3-9f97-5df5e28441b8" + }, + "LineItems" : [ { + "Description" : "Acme Tires", + "Quantity" : 2, + "UnitAmount" : 20, + "AccountCode" : "200", + "TaxType" : "NONE", + "LineAmount" : 40 + } ], + "Date" : "2019-03-11", + "DueDate" : "2018-12-10", + "Reference" : "Website Design", + "Status" : "AUTHORISED" + } ] + } } }, "required" : true @@ -12594,7 +12848,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -12759,7 +13017,17 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Items" }, - "example" : "{ \"Items\": [ { \"Code\": \"code123\", \"Name\": \"Item Name XYZ\", \"Description\": \"Foobar\", \"InventoryAssetAccountCode\": \"140\", \"PurchaseDetails\": { \"COGSAccountCode\": \"500\" } } ] }" + "example" : { + "Items" : [ { + "Code" : "code123", + "Name" : "Item Name XYZ", + "Description" : "Foobar", + "InventoryAssetAccountCode" : "140", + "PurchaseDetails" : { + "COGSAccountCode" : "500" + } + } ] + } } }, "required" : true @@ -12960,7 +13228,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/LinkedTransaction" }, - "example" : "{ \"LinkedTransactions\": [ { \"SourceTransactionID\": \"a848644a-f20f-4630-98c3-386bd7505631\", \"SourceLineItemID\": \"b0df260d-3cc8-4ced-9bd6-41924f624ed3\" } ] }" + "example" : { + "LinkedTransactions" : [ { + "SourceTransactionID" : "a848644a-f20f-4630-98c3-386bd7505631", + "SourceLineItemID" : "b0df260d-3cc8-4ced-9bd6-41924f624ed3" + } ] + } } }, "required" : true @@ -13365,7 +13638,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -13539,7 +13816,25 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/ManualJournals" }, - "example" : "{ \"ManualJournals\": [ { \"Narration\": \"Journal Desc\", \"JournalLines\": [ { \"LineAmount\": 100, \"AccountCode\": \"400\", \"Description\": \"Money Movement\" }, { \"LineAmount\": -100, \"AccountCode\": \"400\", \"Description\": \"Prepayment of things\", \"Tracking\": [ { \"Name\": \"North\", \"Option\": \"Region\" } ] } ], \"Date\": \"2019-03-14\" } ] }" + "example" : { + "ManualJournals" : [ { + "Narration" : "Journal Desc", + "JournalLines" : [ { + "LineAmount" : 100, + "AccountCode" : "400", + "Description" : "Money Movement" + }, { + "LineAmount" : -100, + "AccountCode" : "400", + "Description" : "Prepayment of things", + "Tracking" : [ { + "Name" : "North", + "Option" : "Region" + } ] + } ], + "Date" : "2019-03-14" + } ] + } } }, "required" : true @@ -13764,7 +14059,18 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Allocations" }, - "example" : "{ \"Allocations\": [ { \"Invoice\": { \"InvoiceID\": \"00000000-0000-0000-0000-000000000000\", \"LineItems\": [], \"Contact\": {}, \"Type\": \"ACCPAY\" }, \"Amount\": 10.00, \"Date\": \"2019-03-12\" } ] }" + "example" : { + "Allocations" : [ { + "Invoice" : { + "InvoiceID" : "00000000-0000-0000-0000-000000000000", + "LineItems" : [ ], + "Contact" : { }, + "Type" : "ACCPAY" + }, + "Amount" : 10.0, + "Date" : "2019-03-12" + } ] + } } }, "required" : true @@ -13982,7 +14288,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -14148,7 +14458,19 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Payment" }, - "example" : "{ \"Payments\": [ { \"Invoice\": { \"LineItems\": [], \"InvoiceID\": \"00000000-0000-0000-0000-000000000000\" }, \"Account\": { \"Code\": \"970\" }, \"Date\": \"2019-03-12\", \"Amount\": 1 } ] }" + "example" : { + "Payments" : [ { + "Invoice" : { + "LineItems" : [ ], + "InvoiceID" : "00000000-0000-0000-0000-000000000000" + }, + "Account" : { + "Code" : "970" + }, + "Date" : "2019-03-12", + "Amount" : 1 + } ] + } } }, "required" : true @@ -14339,7 +14661,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -14497,7 +14823,13 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PaymentServices" }, - "example" : "{ \"PaymentServices\": [ { \"PaymentServiceName\": \"PayUpNow\", \"PaymentServiceUrl\": \"https://www.payupnow.com/\", \"PayNowText\": \"Time To Pay\" } ] }" + "example" : { + "PaymentServices" : [ { + "PaymentServiceName" : "PayUpNow", + "PaymentServiceUrl" : "https://www.payupnow.com/", + "PayNowText" : "Time To Pay" + } ] + } } }, "required" : true @@ -14664,7 +14996,19 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Payments" }, - "example" : "{ \"Payments\": [ { \"Invoice\": { \"LineItems\": [], \"InvoiceID\": \"00000000-0000-0000-0000-000000000000\" }, \"Account\": { \"Code\": \"970\" }, \"Date\": \"2019-03-12\", \"Amount\": 1 } ] }" + "example" : { + "Payments" : [ { + "Invoice" : { + "LineItems" : [ ], + "InvoiceID" : "00000000-0000-0000-0000-000000000000" + }, + "Account" : { + "Code" : "970" + }, + "Date" : "2019-03-12", + "Amount" : 1 + } ] + } } }, "required" : true @@ -14889,7 +15233,16 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Allocations" }, - "example" : "{ \"Allocations\": [ { \"Invoice\": { \"LineItems\": [], \"InvoiceID\": \"00000000-0000-0000-0000-000000000000\" }, \"Amount\": 1, \"Date\": \"2019-01-10\" } ] }" + "example" : { + "Allocations" : [ { + "Invoice" : { + "LineItems" : [ ], + "InvoiceID" : "00000000-0000-0000-0000-000000000000" + }, + "Amount" : 1, + "Date" : "2019-01-10" + } ] + } } }, "required" : true @@ -15107,7 +15460,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -15512,7 +15869,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -15684,7 +16045,20 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PurchaseOrders" }, - "example" : "{ \"PurchaseOrders\": [ { \"Contact\": { \"ContactID\": \"00000000-0000-0000-0000-000000000000\" }, \"LineItems\": [ { \"Description\": \"Foobar\", \"Quantity\": 1, \"UnitAmount\": 20, \"AccountCode\": \"710\" } ], \"Date\": \"2019-03-13\" } ] }" + "example" : { + "PurchaseOrders" : [ { + "Contact" : { + "ContactID" : "00000000-0000-0000-0000-000000000000" + }, + "LineItems" : [ { + "Description" : "Foobar", + "Quantity" : 1, + "UnitAmount" : 20, + "AccountCode" : "710" + } ], + "Date" : "2019-03-13" + } ] + } } }, "required" : true @@ -16116,7 +16490,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -16288,7 +16666,20 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Quotes" }, - "example" : "{ \"Quotes\": [ { \"Contact\": { \"ContactID\": \"00000000-0000-0000-0000-000000000000\" }, \"LineItems\": [ { \"Description\": \"Foobar\", \"Quantity\": 1, \"UnitAmount\": 20, \"AccountCode\": \"12775\" } ], \"Date\": \"2020-02-01\" } ] }" + "example" : { + "Quotes" : [ { + "Contact" : { + "ContactID" : "00000000-0000-0000-0000-000000000000" + }, + "LineItems" : [ { + "Description" : "Foobar", + "Quantity" : 1, + "UnitAmount" : 20, + "AccountCode" : "12775" + } ], + "Date" : "2020-02-01" + } ] + } } }, "required" : true @@ -16491,7 +16882,26 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Receipts" }, - "example" : "{ \"Receipts\": [ { \"Contact\": { \"ContactID\": \"00000000-0000-0000-0000-000000000000\" }, \"Lineitems\": [ { \"Description\": \"Foobar\", \"Quantity\": 2, \"UnitAmount\": 20, \"AccountCode\": \"400\", \"TaxType\": \"NONE\", \"LineAmount\": 40 } ], \"User\": { \"UserID\": \"00000000-0000-0000-0000-000000000000\" }, \"LineAmountTypes\": \"NoTax\", \"Status\": \"DRAFT\" } ] }" + "example" : { + "Receipts" : [ { + "Contact" : { + "ContactID" : "00000000-0000-0000-0000-000000000000" + }, + "Lineitems" : [ { + "Description" : "Foobar", + "Quantity" : 2, + "UnitAmount" : 20, + "AccountCode" : "400", + "TaxType" : "NONE", + "LineAmount" : 40 + } ], + "User" : { + "UserID" : "00000000-0000-0000-0000-000000000000" + }, + "LineAmountTypes" : "NoTax", + "Status" : "DRAFT" + } ] + } } }, "required" : true @@ -16923,7 +17333,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -17328,7 +17742,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/HistoryRecords" }, - "example" : "{ \"HistoryRecords\": [ { \"Details\": \"Hello World\" } ] }" + "example" : { + "HistoryRecords" : [ { + "Details" : "Hello World" + } ] + } } }, "required" : true @@ -17479,7 +17897,42 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/RepeatingInvoices" }, - "example" : "{ \"RepeatingInvoices\": [ { \"Schedule\": { \"Period\": 1, \"Unit\": \"MONTHLY\", \"DueDate\": 10, \"DueDateType\": \"OFFOLLOWINGMONTH\", \"StartDate\": \"\\/Date(1555286400000+0000)\\/\" }, \"Type\": \"ACCREC\", \"Reference\": \"[Week]\", \"ApprovedForSending\": false, \"SendCopy\": false, \"MarkAsSent\": false, \"IncludePDF\": false, \"Contact\": { \"ContactID\": \"430fa14a-f945-44d3-9f97-5df5e28441b8\", \"Name\": \"Liam Gallagher\" }, \"Status\": \"AUTHORISED\", \"LineAmountTypes\": \"Exclusive\", \"LineItems\": [ { \"Description\": \"Guitars Fender Strat\", \"UnitAmount\": 5000.00, \"TaxType\": \"OUTPUT2\", \"TaxAmount\": 750.00, \"LineAmount\": 5000.00, \"AccountCode\": \"200\", \"Tracking\": [], \"Quantity\": 1.0000, \"LineItemID\": \"13a8353c-d2af-4d5b-920c-438449f08900\", \"DiscountEnteredAsPercent\": true } ], \"CurrencyCode\": \"NZD\" } ] }" + "example" : { + "RepeatingInvoices" : [ { + "Schedule" : { + "Period" : 1, + "Unit" : "MONTHLY", + "DueDate" : 10, + "DueDateType" : "OFFOLLOWINGMONTH", + "StartDate" : "/Date(1555286400000+0000)/" + }, + "Type" : "ACCREC", + "Reference" : "[Week]", + "ApprovedForSending" : false, + "SendCopy" : false, + "MarkAsSent" : false, + "IncludePDF" : false, + "Contact" : { + "ContactID" : "430fa14a-f945-44d3-9f97-5df5e28441b8", + "Name" : "Liam Gallagher" + }, + "Status" : "AUTHORISED", + "LineAmountTypes" : "Exclusive", + "LineItems" : [ { + "Description" : "Guitars Fender Strat", + "UnitAmount" : 5000.0, + "TaxType" : "OUTPUT2", + "TaxAmount" : 750.0, + "LineAmount" : 5000.0, + "AccountCode" : "200", + "Tracking" : [ ], + "Quantity" : 1.0, + "LineItemID" : "13a8353c-d2af-4d5b-920c-438449f08900", + "DiscountEnteredAsPercent" : true + } ], + "CurrencyCode" : "NZD" + } ] + } } }, "required" : true @@ -17670,7 +18123,15 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/TaxRates" }, - "example" : "{ \"TaxRates\": [ { \"Name\": \"CA State Tax\", \"TaxComponents\": [ { \"Name\": \"State Tax\", \"Rate\": 2.25 } ] } ] }" + "example" : { + "TaxRates" : [ { + "Name" : "CA State Tax", + "TaxComponents" : [ { + "Name" : "State Tax", + "Rate" : 2.25 + } ] + } ] + } } }, "required" : true @@ -17823,7 +18284,9 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/TrackingCategory" }, - "example" : "{ name: \"FooBar\" }" + "example" : { + "name" : "FooBar" + } } }, "required" : true @@ -18011,7 +18474,9 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/TrackingOption" }, - "example" : "{ name: \" Bar\" }" + "example" : { + "name" : " Bar" + } } }, "required" : true @@ -18291,7 +18756,10 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/BatchPaymentDelete" }, - "example" : "{ \"BatchPaymentID\": \"9bf296e9-0748-4d29-a3dc-24dde1098030\", \"Status\":\"DELETED\" }" + "example" : { + "BatchPaymentID" : "9bf296e9-0748-4d29-a3dc-24dde1098030", + "Status" : "DELETED" + } } }, "required" : true @@ -18475,7 +18943,9 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/BatchPaymentDeleteByUrlParam" }, - "example" : "{ \"Status\":\"DELETED\" }" + "example" : { + "Status" : "DELETED" + } } }, "required" : true @@ -19504,7 +19974,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PaymentDelete" }, - "example" : "{ \"Payments\":[ { \"Status\":\"DELETED\" } ] }" + "example" : { + "Payments" : [ { + "Status" : "DELETED" + } ] + } } }, "required" : true @@ -20126,7 +20600,7 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/RequestEmpty" }, - "example" : "{}" + "example" : { } } }, "required" : true @@ -40660,7 +41134,33 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Setup" }, - "example" : "{ \"ConversionDate\": {}, \"ConversionBalances\": [], \"Accounts\": [ { \"Code\": \"200\", \"Name\": \"Sales\", \"Type\": \"SALES\", \"ReportingCode\": \"REV.TRA.GOO\" }, { \"Code\": \"400\", \"Name\": \"Advertising\", \"Type\": \"OVERHEADS\", \"ReportingCode\": \"EXP\" }, { \"Code\": \"610\", \"Name\": \"Accounts Receivable\", \"Type\": \"CURRENT\", \"SystemAccount\": \"DEBTORS\", \"ReportingCode\": \"ASS.CUR.REC.TRA\" }, { \"Code\": \"800\", \"Name\": \"Accounts Payable\", \"Type\": \"CURRLIAB\", \"SystemAccount\": \"CREDITORS\", \"ReportingCode\": \"LIA.CUR.PAY\" } ] }" + "example" : { + "ConversionDate" : { }, + "ConversionBalances" : [ ], + "Accounts" : [ { + "Code" : "200", + "Name" : "Sales", + "Type" : "SALES", + "ReportingCode" : "REV.TRA.GOO" + }, { + "Code" : "400", + "Name" : "Advertising", + "Type" : "OVERHEADS", + "ReportingCode" : "EXP" + }, { + "Code" : "610", + "Name" : "Accounts Receivable", + "Type" : "CURRENT", + "SystemAccount" : "DEBTORS", + "ReportingCode" : "ASS.CUR.REC.TRA" + }, { + "Code" : "800", + "Name" : "Accounts Payable", + "Type" : "CURRLIAB", + "SystemAccount" : "CREDITORS", + "ReportingCode" : "LIA.CUR.PAY" + } ] + } } }, "required" : true @@ -40855,7 +41355,22 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Accounts" }, - "example" : "{ \"Accounts\":[ { \"Code\":\"123456\", \"Name\":\"BarFoo\", \"AccountID\":\"99ce6032-0678-4aa0-8148-240c75fee33a\", \"Type\":\"EXPENSE\", \"Description\":\"GoodBye World\", \"TaxType\":\"INPUT\", \"EnablePaymentsToAccount\":false, \"ShowInExpenseClaims\":false, \"Class\":\"EXPENSE\", \"ReportingCode\":\"EXP\", \"ReportingCodeName\":\"Expense\", \"UpdatedDateUTC\":\"2019-02-21T16:29:47.96-08:00\" } ] }" + "example" : { + "Accounts" : [ { + "Code" : "123456", + "Name" : "BarFoo", + "AccountID" : "99ce6032-0678-4aa0-8148-240c75fee33a", + "Type" : "EXPENSE", + "Description" : "GoodBye World", + "TaxType" : "INPUT", + "EnablePaymentsToAccount" : false, + "ShowInExpenseClaims" : false, + "Class" : "EXPENSE", + "ReportingCode" : "EXP", + "ReportingCodeName" : "Expense", + "UpdatedDateUTC" : "2019-02-21T16:29:47.96-08:00" + } ] + } } }, "required" : true @@ -41279,7 +41794,77 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/BankTransactions" }, - "example" : "{ \"BankTransactions\": [ { \"Type\": \"SPEND\", \"Contact\": { \"ContactID\": \"00000000-0000-0000-0000-000000000000\", \"ContactStatus\": \"ACTIVE\", \"Name\": \"Buzz Lightyear\", \"FirstName\": \"Buzz\", \"LastName\": \"Lightyear\", \"EmailAddress\": \"buzz.Lightyear@email.com\", \"ContactPersons\": [], \"BankAccountDetails\": \"\", \"Addresses\": [ { \"AddressType\": \"STREET\", \"City\": \"\", \"Region\": \"\", \"PostalCode\": \"\", \"Country\": \"\" }, { \"AddressType\": \"POBOX\", \"AddressLine1\": \"\", \"AddressLine2\": \"\", \"AddressLine3\": \"\", \"AddressLine4\": \"\", \"City\": \"Palo Alto\", \"Region\": \"CA\", \"PostalCode\": \"94020\", \"Country\": \"United States\" } ], \"Phones\": [ { \"PhoneType\": \"DEFAULT\", \"PhoneNumber\": \"847-1294\", \"PhoneAreaCode\": \"(626)\", \"PhoneCountryCode\": \"\" }, { \"PhoneType\": \"DDI\", \"PhoneNumber\": \"\", \"PhoneAreaCode\": \"\", \"PhoneCountryCode\": \"\" }, { \"PhoneType\": \"FAX\", \"PhoneNumber\": \"\", \"PhoneAreaCode\": \"\", \"PhoneCountryCode\": \"\" }, { \"PhoneType\": \"MOBILE\", \"PhoneNumber\": \"\", \"PhoneAreaCode\": \"\", \"PhoneCountryCode\": \"\" } ], \"UpdatedDateUTC\": \"2017-08-21T13:49:04.227-07:00\", \"ContactGroups\": [] }, \"Lineitems\": [], \"BankAccount\": { \"Code\": \"088\", \"Name\": \"Business Wells Fargo\", \"AccountID\": \"00000000-0000-0000-0000-000000000000\" }, \"IsReconciled\": false, \"Date\": \"2019-02-25\", \"Reference\": \"You just updated\", \"CurrencyCode\": \"USD\", \"CurrencyRate\": 1, \"Status\": \"AUTHORISED\", \"LineAmountTypes\": \"Inclusive\", \"TotalTax\": 1.74, \"BankTransactionID\": \"00000000-0000-0000-0000-000000000000\", \"UpdatedDateUTC\": \"2019-02-26T12:39:27.813-08:00\" } ] }" + "example" : { + "BankTransactions" : [ { + "Type" : "SPEND", + "Contact" : { + "ContactID" : "00000000-0000-0000-0000-000000000000", + "ContactStatus" : "ACTIVE", + "Name" : "Buzz Lightyear", + "FirstName" : "Buzz", + "LastName" : "Lightyear", + "EmailAddress" : "buzz.Lightyear@email.com", + "ContactPersons" : [ ], + "BankAccountDetails" : "", + "Addresses" : [ { + "AddressType" : "STREET", + "City" : "", + "Region" : "", + "PostalCode" : "", + "Country" : "" + }, { + "AddressType" : "POBOX", + "AddressLine1" : "", + "AddressLine2" : "", + "AddressLine3" : "", + "AddressLine4" : "", + "City" : "Palo Alto", + "Region" : "CA", + "PostalCode" : "94020", + "Country" : "United States" + } ], + "Phones" : [ { + "PhoneType" : "DEFAULT", + "PhoneNumber" : "847-1294", + "PhoneAreaCode" : "(626)", + "PhoneCountryCode" : "" + }, { + "PhoneType" : "DDI", + "PhoneNumber" : "", + "PhoneAreaCode" : "", + "PhoneCountryCode" : "" + }, { + "PhoneType" : "FAX", + "PhoneNumber" : "", + "PhoneAreaCode" : "", + "PhoneCountryCode" : "" + }, { + "PhoneType" : "MOBILE", + "PhoneNumber" : "", + "PhoneAreaCode" : "", + "PhoneCountryCode" : "" + } ], + "UpdatedDateUTC" : "2017-08-21T13:49:04.227-07:00", + "ContactGroups" : [ ] + }, + "Lineitems" : [ ], + "BankAccount" : { + "Code" : "088", + "Name" : "Business Wells Fargo", + "AccountID" : "00000000-0000-0000-0000-000000000000" + }, + "IsReconciled" : false, + "Date" : "2019-02-25", + "Reference" : "You just updated", + "CurrencyCode" : "USD", + "CurrencyRate" : 1, + "Status" : "AUTHORISED", + "LineAmountTypes" : "Inclusive", + "TotalTax" : 1.74, + "BankTransactionID" : "00000000-0000-0000-0000-000000000000", + "UpdatedDateUTC" : "2019-02-26T12:39:27.813-08:00" + } ] + } } }, "required" : true @@ -41926,7 +42511,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Contacts" }, - "example" : "{ \"Contacts\": [{ \"ContactID\": \"00000000-0000-0000-0000-000000000000\", \"Name\": \"Thanos\" }]}" + "example" : { + "Contacts" : [ { + "ContactID" : "00000000-0000-0000-0000-000000000000", + "Name" : "Thanos" + } ] + } } }, "required" : true @@ -42331,7 +42921,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/ContactGroups" }, - "example" : "{ \"ContactGroups\":[ { \"Name\":\"Suppliers\" } ] }" + "example" : { + "ContactGroups" : [ { + "Name" : "Suppliers" + } ] + } } }, "required" : true @@ -42541,7 +43135,24 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/CreditNotes" }, - "example" : "{ \"CreditNotes\": [ { \"Type\": \"ACCPAYCREDIT\", \"Contact\": { \"ContactID\": \"430fa14a-f945-44d3-9f97-5df5e28441b8\" }, \"Date\": \"2019-01-05\", \"Status\": \"AUTHORISED\", \"Reference\": \"HelloWorld\", \"SentToContact\": true, \"LineItems\": [ { \"Description\": \"Foobar\", \"Quantity\": 2, \"UnitAmount\": 20, \"AccountCode\": \"400\" } ] } ] }" + "example" : { + "CreditNotes" : [ { + "Type" : "ACCPAYCREDIT", + "Contact" : { + "ContactID" : "430fa14a-f945-44d3-9f97-5df5e28441b8" + }, + "Date" : "2019-01-05", + "Status" : "AUTHORISED", + "Reference" : "HelloWorld", + "SentToContact" : true, + "LineItems" : [ { + "Description" : "Foobar", + "Quantity" : 2, + "UnitAmount" : 20, + "AccountCode" : "400" + } ] + } ] + } } }, "required" : true @@ -42985,7 +43596,18 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/ExpenseClaims" }, - "example" : "{ \"ExpenseClaims\": [ { \"Status\": \"SUBMITTED\", \"User\": { \"UserID\": \"d1164823-0ac1-41ad-987b-b4e30fe0b273\" }, \"Receipts\": [ { \"Lineitems\": [], \"ReceiptID\": \"dc1c7f6d-0a4c-402f-acac-551d62ce5816\" } ] } ] }" + "example" : { + "ExpenseClaims" : [ { + "Status" : "SUBMITTED", + "User" : { + "UserID" : "d1164823-0ac1-41ad-987b-b4e30fe0b273" + }, + "Receipts" : [ { + "Lineitems" : [ ], + "ReceiptID" : "dc1c7f6d-0a4c-402f-acac-551d62ce5816" + } ] + } ] + } } }, "required" : true @@ -43176,7 +43798,15 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Invoices" }, - "example" : "{ \"Invoices\": [{ Reference: \"May the force be with you\", \"InvoiceID\": \"00000000-0000-0000-0000-000000000000\", \"LineItems\": [], \"Contact\": {}, \"Type\": \"ACCPAY\" }]}" + "example" : { + "Invoices" : [ { + "Reference" : "May the force be with you", + "InvoiceID" : "00000000-0000-0000-0000-000000000000", + "LineItems" : [ ], + "Contact" : { }, + "Type" : "ACCPAY" + } ] + } } }, "required" : true @@ -43609,7 +44239,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Items" }, - "example" : "{ \"Items\": [ { \"Code\": \"ItemCode123\", \"Description\": \"Description 123\" } ] }" + "example" : { + "Items" : [ { + "Code" : "ItemCode123", + "Description" : "Description 123" + } ] + } } }, "required" : true @@ -43827,7 +44462,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/LinkedTransactions" }, - "example" : "{ \"LinkedTransactions\": [ { \"SourceTransactionID\": \"00000000-0000-0000-0000-000000000000\", \"SourceLineItemID\": \"00000000-0000-0000-0000-000000000000\" } ] }" + "example" : { + "LinkedTransactions" : [ { + "SourceTransactionID" : "00000000-0000-0000-0000-000000000000", + "SourceLineItemID" : "00000000-0000-0000-0000-000000000000" + } ] + } } }, "required" : true @@ -44034,7 +44674,13 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/ManualJournals" }, - "example" : "{ \"ManualJournals\": [ { \"Narration\": \"Hello Xero\", \"ManualJournalID\": \"00000000-0000-0000-0000-000000000000\", \"JournalLines\": [] } ] }" + "example" : { + "ManualJournals" : [ { + "Narration" : "Hello Xero", + "ManualJournalID" : "00000000-0000-0000-0000-000000000000", + "JournalLines" : [ ] + } ] + } } }, "required" : true @@ -44423,7 +45069,23 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/BankTransactions" }, - "example" : "{ \"BankTransactions\": [ { \"Type\": \"SPEND\", \"Contact\": { \"ContactID\": \"00000000-0000-0000-0000-000000000000\" }, \"Lineitems\": [ { \"Description\": \"Foobar\", \"Quantity\": 1, \"UnitAmount\": 20, \"AccountCode\": \"400\" } ], \"BankAccount\": { \"Code\": \"088\" } } ] }" + "example" : { + "BankTransactions" : [ { + "Type" : "SPEND", + "Contact" : { + "ContactID" : "00000000-0000-0000-0000-000000000000" + }, + "Lineitems" : [ { + "Description" : "Foobar", + "Quantity" : 1, + "UnitAmount" : 20, + "AccountCode" : "400" + } ], + "BankAccount" : { + "Code" : "088" + } + } ] + } } }, "required" : true @@ -44635,7 +45297,27 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Contacts" }, - "example" : "{ \"Contacts\": [ { \"Name\": \"Bruce Banner\", \"EmailAddress\": \"hulk@avengers.com\", \"Phones\": [ { \"PhoneType\": \"MOBILE\", \"PhoneNumber\": \"555-1212\", \"PhoneAreaCode\": \"415\" } ], \"PaymentTerms\": { \"Bills\": { \"Day\": 15, \"Type\": \"OFCURRENTMONTH\" }, \"Sales\": { \"Day\": 10, \"Type\": \"DAYSAFTERBILLMONTH\" } } } ] }" + "example" : { + "Contacts" : [ { + "Name" : "Bruce Banner", + "EmailAddress" : "hulk@avengers.com", + "Phones" : [ { + "PhoneType" : "MOBILE", + "PhoneNumber" : "555-1212", + "PhoneAreaCode" : "415" + } ], + "PaymentTerms" : { + "Bills" : { + "Day" : 15, + "Type" : "OFCURRENTMONTH" + }, + "Sales" : { + "Day" : 10, + "Type" : "DAYSAFTERBILLMONTH" + } + } + } ] + } } }, "required" : true @@ -44836,7 +45518,23 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/CreditNotes" }, - "example" : "{ \"CreditNotes\":[ { \"Type\":\"ACCPAYCREDIT\", \"Contact\":{ \"ContactID\":\"430fa14a-f945-44d3-9f97-5df5e28441b8\" }, \"Date\":\"2019-01-05\", \"Status\":\"AUTHORISED\", \"Reference\": \"HelloWorld\", \"LineItems\":[ { \"Description\":\"Foobar\", \"Quantity\":2.0, \"UnitAmount\":20.0, \"AccountCode\":\"400\" } ] } ] }" + "example" : { + "CreditNotes" : [ { + "Type" : "ACCPAYCREDIT", + "Contact" : { + "ContactID" : "430fa14a-f945-44d3-9f97-5df5e28441b8" + }, + "Date" : "2019-01-05", + "Status" : "AUTHORISED", + "Reference" : "HelloWorld", + "LineItems" : [ { + "Description" : "Foobar", + "Quantity" : 2.0, + "UnitAmount" : 20.0, + "AccountCode" : "400" + } ] + } ] + } } }, "required" : true @@ -45041,7 +45739,15 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Employees" }, - "example" : "{ \"Employees\": [ { \"FirstName\": \"Nick\", \"LastName\": \"Fury\", \"ExternalLink\": { \"Url\": \"http://twitter.com/#!/search/Nick+Fury\" } } ] }" + "example" : { + "Employees" : [ { + "FirstName" : "Nick", + "LastName" : "Fury", + "ExternalLink" : { + "Url" : "http://twitter.com/#!/search/Nick+Fury" + } + } ] + } } }, "required" : true @@ -45245,7 +45951,26 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Invoices" }, - "example" : "{ \"Invoices\": [ { \"Type\": \"ACCREC\", \"Contact\": { \"ContactID\": \"430fa14a-f945-44d3-9f97-5df5e28441b8\" }, \"LineItems\": [ { \"Description\": \"Acme Tires\", \"Quantity\": 2, \"UnitAmount\": 20, \"AccountCode\": \"200\", \"TaxType\": \"NONE\", \"LineAmount\": 40 } ], \"Date\": \"2019-03-11\", \"DueDate\": \"2018-12-10\", \"Reference\": \"Website Design\", \"Status\": \"AUTHORISED\" } ] }" + "example" : { + "Invoices" : [ { + "Type" : "ACCREC", + "Contact" : { + "ContactID" : "430fa14a-f945-44d3-9f97-5df5e28441b8" + }, + "LineItems" : [ { + "Description" : "Acme Tires", + "Quantity" : 2, + "UnitAmount" : 20, + "AccountCode" : "200", + "TaxType" : "NONE", + "LineAmount" : 40 + } ], + "Date" : "2019-03-11", + "DueDate" : "2018-12-10", + "Reference" : "Website Design", + "Status" : "AUTHORISED" + } ] + } } }, "required" : true @@ -45451,7 +46176,13 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Items" }, - "example" : "{ \"Items\": [ { \"Code\": \"ItemCode123\", \"Name\": \"ItemName XYZ\", \"Description\": \"Item Description ABC\" } ] }" + "example" : { + "Items" : [ { + "Code" : "ItemCode123", + "Name" : "ItemName XYZ", + "Description" : "Item Description ABC" + } ] + } } }, "required" : true @@ -45672,7 +46403,25 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/ManualJournals" }, - "example" : "{ \"ManualJournals\": [ { \"Narration\": \"Journal Desc\", \"JournalLines\": [ { \"LineAmount\": 100, \"AccountCode\": \"400\", \"Description\": \"Money Movement\" }, { \"LineAmount\": -100, \"AccountCode\": \"400\", \"Description\": \"Prepayment of things\", \"Tracking\": [ { \"Name\": \"North\", \"Option\": \"Region\" } ] } ], \"Date\": \"2019-03-14\" } ] }" + "example" : { + "ManualJournals" : [ { + "Narration" : "Journal Desc", + "JournalLines" : [ { + "LineAmount" : 100, + "AccountCode" : "400", + "Description" : "Money Movement" + }, { + "LineAmount" : -100, + "AccountCode" : "400", + "Description" : "Prepayment of things", + "Tracking" : [ { + "Name" : "North", + "Option" : "Region" + } ] + } ], + "Date" : "2019-03-14" + } ] + } } }, "required" : true @@ -45870,7 +46619,20 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PurchaseOrders" }, - "example" : "{ \"PurchaseOrders\": [ { \"Contact\": { \"ContactID\": \"00000000-0000-0000-0000-000000000000\" }, \"LineItems\": [ { \"Description\": \"Foobar\", \"Quantity\": 1, \"UnitAmount\": 20, \"AccountCode\": \"710\" } ], \"Date\": \"2019-03-13\" } ] }" + "example" : { + "PurchaseOrders" : [ { + "Contact" : { + "ContactID" : "00000000-0000-0000-0000-000000000000" + }, + "LineItems" : [ { + "Description" : "Foobar", + "Quantity" : 1, + "UnitAmount" : 20, + "AccountCode" : "710" + } ], + "Date" : "2019-03-13" + } ] + } } }, "required" : true @@ -46068,7 +46830,20 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Quotes" }, - "example" : "{ \"Quotes\": [ { \"Contact\": { \"ContactID\": \"00000000-0000-0000-0000-000000000000\" }, \"LineItems\": [ { \"Description\": \"Foobar\", \"Quantity\": 1, \"UnitAmount\": 20, \"AccountCode\": \"12775\" } ], \"Date\": \"2020-02-01\" } ] }" + "example" : { + "Quotes" : [ { + "Contact" : { + "ContactID" : "00000000-0000-0000-0000-000000000000" + }, + "LineItems" : [ { + "Description" : "Foobar", + "Quantity" : 1, + "UnitAmount" : 20, + "AccountCode" : "12775" + } ], + "Date" : "2020-02-01" + } ] + } } }, "required" : true @@ -46246,7 +47021,42 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/RepeatingInvoices" }, - "example" : "{ \"RepeatingInvoices\": [ { \"Schedule\": { \"Period\": 1, \"Unit\": \"MONTHLY\", \"DueDate\": 10, \"DueDateType\": \"OFFOLLOWINGMONTH\", \"StartDate\": \"\\/Date(1555286400000+0000)\\/\" }, \"Type\": \"ACCREC\", \"Reference\": \"[Week]\", \"ApprovedForSending\": false, \"SendCopy\": false, \"MarkAsSent\": false, \"IncludePDF\": false, \"Contact\": { \"ContactID\": \"430fa14a-f945-44d3-9f97-5df5e28441b8\", \"Name\": \"Liam Gallagher\" }, \"Status\": \"AUTHORISED\", \"LineAmountTypes\": \"Exclusive\", \"LineItems\": [ { \"Description\": \"Guitars Fender Strat\", \"UnitAmount\": 5000.00, \"TaxType\": \"OUTPUT2\", \"TaxAmount\": 750.00, \"LineAmount\": 5000.00, \"AccountCode\": \"200\", \"Tracking\": [], \"Quantity\": 1.0000, \"LineItemID\": \"13a8353c-d2af-4d5b-920c-438449f08900\", \"DiscountEnteredAsPercent\": true } ], \"CurrencyCode\": \"NZD\" } ] }" + "example" : { + "RepeatingInvoices" : [ { + "Schedule" : { + "Period" : 1, + "Unit" : "MONTHLY", + "DueDate" : 10, + "DueDateType" : "OFFOLLOWINGMONTH", + "StartDate" : "/Date(1555286400000+0000)/" + }, + "Type" : "ACCREC", + "Reference" : "[Week]", + "ApprovedForSending" : false, + "SendCopy" : false, + "MarkAsSent" : false, + "IncludePDF" : false, + "Contact" : { + "ContactID" : "430fa14a-f945-44d3-9f97-5df5e28441b8", + "Name" : "Liam Gallagher" + }, + "Status" : "AUTHORISED", + "LineAmountTypes" : "Exclusive", + "LineItems" : [ { + "Description" : "Guitars Fender Strat", + "UnitAmount" : 5000.0, + "TaxType" : "OUTPUT2", + "TaxAmount" : 750.0, + "LineAmount" : 5000.0, + "AccountCode" : "200", + "Tracking" : [ ], + "Quantity" : 1.0, + "LineItemID" : "13a8353c-d2af-4d5b-920c-438449f08900", + "DiscountEnteredAsPercent" : true + } ], + "CurrencyCode" : "NZD" + } ] + } } }, "required" : true @@ -46463,7 +47273,13 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PurchaseOrders" }, - "example" : "{ \"PurchaseOrders\": [ { \"AttentionTo\": \"Peter Parker\", \"LineItems\": [], \"Contact\": {} } ] }" + "example" : { + "PurchaseOrders" : [ { + "AttentionTo" : "Peter Parker", + "LineItems" : [ ], + "Contact" : { } + } ] + } } }, "required" : true @@ -46873,7 +47689,15 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Quotes" }, - "example" : "{ \"Quotes\": [ { \"Reference\": \"I am an update\", \"Contact\": { \"ContactID\": \"00000000-0000-0000-0000-000000000000\" }, \"Date\": \"2020-02-01\" } ] }" + "example" : { + "Quotes" : [ { + "Reference" : "I am an update", + "Contact" : { + "ContactID" : "00000000-0000-0000-0000-000000000000" + }, + "Date" : "2020-02-01" + } ] + } } }, "required" : true @@ -47284,7 +48108,15 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Receipts" }, - "example" : "{ \"Receipts\": [ { \"Lineitems\": [], \"User\": { \"UserID\": \"00000000-0000-0000-0000-000000000000\" }, \"Reference\": \"Foobar\" } ] }" + "example" : { + "Receipts" : [ { + "Lineitems" : [ ], + "User" : { + "UserID" : "00000000-0000-0000-0000-000000000000" + }, + "Reference" : "Foobar" + } ] + } } }, "required" : true @@ -47709,7 +48541,53 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/RepeatingInvoices" }, - "example" : "{ \"Schedule\": { \"Period\": 1, \"Unit\": \"MONTHLY\", \"DueDate\": 10, \"DueDateType\": \"OFFOLLOWINGMONTH\", \"StartDate\": \"\\/Date(1555286400000+0000)\\/\", \"EndDate\": \"\\/Date(1569801600000+0000)\\/\", \"NextScheduledDate\": \"\\/Date(1555286400000+0000)\\/\" }, \"RepeatingInvoiceID\": \"428c0d75-909f-4b04-8403-a48dc27283b0\", \"Type\": \"ACCREC\", \"Reference\": \"[Week]\", \"HasAttachments\": true, \"ApprovedForSending\": false, \"SendCopy\": false, \"MarkAsSent\": false, \"IncludePDF\": false, \"ID\": \"428c0d75-909f-4b04-8403-a48dc27283b0\", \"Contact\": { \"ContactID\": \"430fa14a-f945-44d3-9f97-5df5e28441b8\", \"Name\": \"Liam Gallagher\", \"Addresses\": [], \"Phones\": [], \"ContactGroups\": [], \"ContactPersons\": [], \"HasValidationErrors\": false }, \"Status\": \"DELETED\", \"LineAmountTypes\": \"Exclusive\", \"LineItems\": [ { \"Description\": \"Guitars Fender Strat\", \"UnitAmount\": 5000.00, \"TaxType\": \"OUTPUT2\", \"TaxAmount\": 750.00, \"LineAmount\": 5000.00, \"AccountCode\": \"200\", \"Tracking\": [], \"Quantity\": 1.0000, \"LineItemID\": \"13a8353c-d2af-4d5b-920c-438449f08900\", \"DiscountEnteredAsPercent\": true } ], \"SubTotal\": 5000.00, \"TotalTax\": 750.00, \"Total\": 5750.00, \"CurrencyCode\": \"NZD\" }" + "example" : { + "Schedule" : { + "Period" : 1, + "Unit" : "MONTHLY", + "DueDate" : 10, + "DueDateType" : "OFFOLLOWINGMONTH", + "StartDate" : "/Date(1555286400000+0000)/", + "EndDate" : "/Date(1569801600000+0000)/", + "NextScheduledDate" : "/Date(1555286400000+0000)/" + }, + "RepeatingInvoiceID" : "428c0d75-909f-4b04-8403-a48dc27283b0", + "Type" : "ACCREC", + "Reference" : "[Week]", + "HasAttachments" : true, + "ApprovedForSending" : false, + "SendCopy" : false, + "MarkAsSent" : false, + "IncludePDF" : false, + "ID" : "428c0d75-909f-4b04-8403-a48dc27283b0", + "Contact" : { + "ContactID" : "430fa14a-f945-44d3-9f97-5df5e28441b8", + "Name" : "Liam Gallagher", + "Addresses" : [ ], + "Phones" : [ ], + "ContactGroups" : [ ], + "ContactPersons" : [ ], + "HasValidationErrors" : false + }, + "Status" : "DELETED", + "LineAmountTypes" : "Exclusive", + "LineItems" : [ { + "Description" : "Guitars Fender Strat", + "UnitAmount" : 5000.0, + "TaxType" : "OUTPUT2", + "TaxAmount" : 750.0, + "LineAmount" : 5000.0, + "AccountCode" : "200", + "Tracking" : [ ], + "Quantity" : 1.0, + "LineItemID" : "13a8353c-d2af-4d5b-920c-438449f08900", + "DiscountEnteredAsPercent" : true + } ], + "SubTotal" : 5000.0, + "TotalTax" : 750.0, + "Total" : 5750.0, + "CurrencyCode" : "NZD" + } } }, "required" : true @@ -48086,7 +48964,17 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/TaxRates" }, - "example" : "{ \"TaxRates\": [ { \"Name\": \"State Tax NY\", \"TaxComponents\": [ { \"Name\": \"State Tax\", \"Rate\": 2.25 } ], \"Status\": \"DELETED\", \"ReportTaxType\": \"INPUT\" } ] }" + "example" : { + "TaxRates" : [ { + "Name" : "State Tax NY", + "TaxComponents" : [ { + "Name" : "State Tax", + "Rate" : 2.25 + } ], + "Status" : "DELETED", + "ReportTaxType" : "INPUT" + } ] + } } }, "required" : true @@ -48273,7 +49161,9 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/TrackingCategory" }, - "example" : "{ \"Name\": \"Avengers\" }" + "example" : { + "Name" : "Avengers" + } } }, "required" : true @@ -48488,7 +49378,9 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/TrackingOption" }, - "example" : "{ name: \"Vision\" }" + "example" : { + "name" : "Vision" + } } }, "required" : true diff --git a/docs/v4/appstore/index.html b/docs/v4/appstore/index.html index 8ea3e8f21..f0bb477f1 100644 --- a/docs/v4/appstore/index.html +++ b/docs/v4/appstore/index.html @@ -1640,7 +1640,10 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/CreateUsageRecord" }, - "example" : "{ \"timestamp\": \"2022-01-21T13:01:00\", \"quantity\": 10 }" + "example" : { + "timestamp" : "2022-01-21T13:01:00", + "quantity" : 10 + } } }, "required" : true @@ -1857,7 +1860,9 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/UpdateUsageRecord" }, - "example" : "{ \"quantity\": 10 }" + "example" : { + "quantity" : 10 + } } }, "required" : true diff --git a/docs/v4/assets/index.html b/docs/v4/assets/index.html index 0ba0d500f..07b571494 100644 --- a/docs/v4/assets/index.html +++ b/docs/v4/assets/index.html @@ -1028,7 +1028,6 @@ }; defs["BookDepreciationDetail"] = { "title" : "", - "required" : [ "name" ], "properties" : { "currentCapitalGain" : { "type" : "number", @@ -1082,7 +1081,6 @@ }; defs["BookDepreciationSetting"] = { "title" : "", - "required" : [ "name" ], "properties" : { "depreciationMethod" : { "type" : "string", @@ -1571,7 +1569,28 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Asset" }, - "example" : "{ \"assetName\":\"Computer74863\", \"assetNumber\":\"123477544\", \"purchaseDate\":\"2020-01-01\", \"purchasePrice\":100.0, \"disposalPrice\":23.23, \"assetStatus\":\"Draft\", \"bookDepreciationSetting\":{ \"depreciationMethod\":\"StraightLine\", \"averagingMethod\":\"ActualDays\", \"depreciationRate\":0.5, \"depreciationCalculationMethod\":\"None\" }, \"bookDepreciationDetail\":{ \"currentCapitalGain\":5.32, \"currentGainLoss\":3.88, \"depreciationStartDate\":\"2020-01-02\", \"costLimit\":100.0, \"currentAccumDepreciationAmount\":2.25 }, \"AccountingBookValue\":99.5 }" + "example" : { + "assetName" : "Computer74863", + "assetNumber" : "123477544", + "purchaseDate" : "2020-01-01", + "purchasePrice" : 100.0, + "disposalPrice" : 23.23, + "assetStatus" : "Draft", + "bookDepreciationSetting" : { + "depreciationMethod" : "StraightLine", + "averagingMethod" : "ActualDays", + "depreciationRate" : 0.5, + "depreciationCalculationMethod" : "None" + }, + "bookDepreciationDetail" : { + "currentCapitalGain" : 5.32, + "currentGainLoss" : 3.88, + "depreciationStartDate" : "2020-01-02", + "costLimit" : 100.0, + "currentAccumDepreciationAmount" : 2.25 + }, + "AccountingBookValue" : 99.5 + } } }, "required" : true @@ -1734,7 +1753,18 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/AssetType" }, - "example" : "{ \"assetTypeName\":\"Machinery11004\", \"fixedAssetAccountId\":\"3d8d063a-c148-4bb8-8b3c-a5e2ad3b1e82\", \"depreciationExpenseAccountId\":\"d1602f69-f900-4616-8d34-90af393fa368\", \"accumulatedDepreciationAccountId\":\"9195cadd-8645-41e6-9f67-7bcd421defe8\", \"bookDepreciationSetting\":{ \"depreciationMethod\":\"DiminishingValue100\", \"averagingMethod\":\"ActualDays\", \"depreciationRate\":0.05, \"depreciationCalculationMethod\":\"None\" } }" + "example" : { + "assetTypeName" : "Machinery11004", + "fixedAssetAccountId" : "3d8d063a-c148-4bb8-8b3c-a5e2ad3b1e82", + "depreciationExpenseAccountId" : "d1602f69-f900-4616-8d34-90af393fa368", + "accumulatedDepreciationAccountId" : "9195cadd-8645-41e6-9f67-7bcd421defe8", + "bookDepreciationSetting" : { + "depreciationMethod" : "DiminishingValue100", + "averagingMethod" : "ActualDays", + "depreciationRate" : 0.05, + "depreciationCalculationMethod" : "None" + } + } } }, "required" : true diff --git a/docs/v4/payroll-au/index.html b/docs/v4/payroll-au/index.html index d1a97aa42..76577e976 100644 --- a/docs/v4/payroll-au/index.html +++ b/docs/v4/payroll-au/index.html @@ -4181,7 +4181,25 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PayItem" }, - "example" : "{ \"EarningsRates\": [ { \"Name\": \"MyRate\", \"AccountCode\": \"400\", \"TypeOfUnits\": \"4.00\", \"IsExemptFromTax\": true, \"IsExemptFromSuper\": true, \"IsReportableAsW1\": false, \"AllowanceContributesToAnnualLeaveRate\": false, \"AllowanceContributesToOvertimeRate\": false, \"EarningsType\": \"ORDINARYTIMEEARNINGS\", \"EarningsRateID\": \"1fa4e226-b711-46ba-a8a7-4344c9c5fb87\", \"RateType\": \"MULTIPLE\", \"RatePerUnit\": \"10.0\", \"Multiplier\": 1.5, \"Amount\": 5, \"EmploymentTerminationPaymentType\": \"O\" } ] }" + "example" : { + "EarningsRates" : [ { + "Name" : "MyRate", + "AccountCode" : "400", + "TypeOfUnits" : "4.00", + "IsExemptFromTax" : true, + "IsExemptFromSuper" : true, + "IsReportableAsW1" : false, + "AllowanceContributesToAnnualLeaveRate" : false, + "AllowanceContributesToOvertimeRate" : false, + "EarningsType" : "ORDINARYTIMEEARNINGS", + "EarningsRateID" : "1fa4e226-b711-46ba-a8a7-4344c9c5fb87", + "RateType" : "MULTIPLE", + "RatePerUnit" : "10.0", + "Multiplier" : 1.5, + "Amount" : 5, + "EmploymentTerminationPaymentType" : "O" + } ] + } } }, "required" : true @@ -8453,7 +8471,16 @@

Parameters

"$ref" : "#/components/schemas/PayslipLines" } }, - "example" : "{ \"Payslip\": { \"EmployeeID\": \"cdfb8371-0b21-4b8a-8903-1024df6c391e\", \"DeductionLines\": [ { \"DeductionTypeID\": \"727af5e8-b347-4ae7-85fc-9b82266d0aec\", \"CalculationType\": \"FIXEDAMOUNT\", \"NumberOfUnits\": 10 } ] } }" + "example" : { + "Payslip" : { + "EmployeeID" : "cdfb8371-0b21-4b8a-8903-1024df6c391e", + "DeductionLines" : [ { + "DeductionTypeID" : "727af5e8-b347-4ae7-85fc-9b82266d0aec", + "CalculationType" : "FIXEDAMOUNT", + "NumberOfUnits" : 10 + } ] + } + } } }, "required" : true diff --git a/docs/v4/payroll-nz/index.html b/docs/v4/payroll-nz/index.html index ed38789b9..dfea7fafd 100644 --- a/docs/v4/payroll-nz/index.html +++ b/docs/v4/payroll-nz/index.html @@ -1046,7 +1046,7 @@ }; defs["Deduction"] = { "title" : "", - "required" : [ "calculationType", "deductionCategory", "deductionName", "liabilityAccountId" ], + "required" : [ "deductionCategory", "deductionName", "liabilityAccountId" ], "type" : "object", "properties" : { "deductionId" : { @@ -1420,7 +1420,7 @@ }; defs["Employee"] = { "title" : "", - "required" : [ "Address", "DateOfBirth", "FirstName", "LastName" ], + "required" : [ "address", "dateOfBirth", "firstName", "lastName" ], "type" : "object", "properties" : { "employeeID" : { @@ -2461,7 +2461,7 @@ }; defs["Employment"] = { "title" : "", - "required" : [ "EngagementType", "PayrollCalendarID", "StartDate" ], + "required" : [ "engagementType", "payrollCalendarID", "startDate" ], "type" : "object", "properties" : { "payrollCalendarID" : { @@ -4611,7 +4611,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Deduction" }, - "example" : "{ \"deductionName\": \"My new deduction\", \"deductionCategory\": \"NzOther\", \"liabilityAccountId\": \"568f2e9a-0870-46cc-8678-f83f132ed4e3\" }" + "example" : { + "deductionName" : "My new deduction", + "deductionCategory" : "NzOther", + "liabilityAccountId" : "568f2e9a-0870-46cc-8678-f83f132ed4e3" + } } }, "required" : true @@ -4765,7 +4769,13 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EarningsRate" }, - "example" : "{ \"name\": \"My Earnings Rate\", \"earningsType\": \"RegularEarnings\", \"rateType\": \"RatePerUnit\", \"typeOfUnits\": \"hours\", \"expenseAccountID\": \"e4eb36f6-97e3-4427-a394-dd4e1b355c2e\" }" + "example" : { + "name" : "My Earnings Rate", + "earningsType" : "RegularEarnings", + "rateType" : "RatePerUnit", + "typeOfUnits" : "hours", + "expenseAccountID" : "e4eb36f6-97e3-4427-a394-dd4e1b355c2e" + } } }, "required" : true @@ -4927,7 +4937,20 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Employee" }, - "example" : "{ \"title\": \"Mr\", \"firstName\": \"Mike\", \"lastName\": \"Johntzxzpxhmkgson\", \"dateOfBirth\": \"2000-01-01\", \"address\": { \"addressLine1\": \"101 Green St\", \"city\": \"San Francisco\", \"postCode\": \"4351\", \"countryName\": \"United Kingdom\" }, \"email\": \"83139@starkindustries.com\", \"gender\": \"M\" }" + "example" : { + "title" : "Mr", + "firstName" : "Mike", + "lastName" : "Johntzxzpxhmkgson", + "dateOfBirth" : "2000-01-01", + "address" : { + "addressLine1" : "101 Green St", + "city" : "San Francisco", + "postCode" : "4351", + "countryName" : "United Kingdom" + }, + "email" : "83139@starkindustries.com", + "gender" : "M" + } } }, "required" : true @@ -5122,7 +5145,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EarningsTemplate" }, - "example" : "{ \"ratePerUnit\": 20, \"numberOfUnits\": 8, \"earningsRateID\": \"f9d8f5b5-9049-47f4-8541-35e200f750a5\", \"name\": \"My New One\" }" + "example" : { + "ratePerUnit" : 20, + "numberOfUnits" : 8, + "earningsRateID" : "f9d8f5b5-9049-47f4-8541-35e200f750a5", + "name" : "My New One" + } } }, "required" : true @@ -5315,7 +5343,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeLeave" }, - "example" : "{ \"leaveTypeID\": \"b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4\", \"description\": \"Creating a Description\", \"startDate\": \"2020-04-24\", \"endDate\": \"2020-04-26\" }" + "example" : { + "leaveTypeID" : "b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4", + "description" : "Creating a Description", + "startDate" : "2020-04-24", + "endDate" : "2020-04-26" + } } }, "required" : true @@ -5512,7 +5545,16 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeLeaveSetup" }, - "example" : "{ \"holidayPayOpeningBalance\": 10, \"annualLeaveOpeningBalance\": 100, \"sickLeaveHoursToAccrueAnnually\": 20, \"sickLeaveToAccrueAnnually\": 20, \"sickLeaveOpeningBalance\": 10, \"sickLeaveScheduleOfAccrual\": \"OnAnniversaryDate\", \"sickLeaveAnniversaryDate\": \"2023-12-31\", \"annualLeaveAnniversaryDate\": \"2023-12-31\" }" + "example" : { + "holidayPayOpeningBalance" : 10, + "annualLeaveOpeningBalance" : 100, + "sickLeaveHoursToAccrueAnnually" : 20, + "sickLeaveToAccrueAnnually" : 20, + "sickLeaveOpeningBalance" : 10, + "sickLeaveScheduleOfAccrual" : "OnAnniversaryDate", + "sickLeaveAnniversaryDate" : "2023-12-31", + "annualLeaveAnniversaryDate" : "2023-12-31" + } } }, "required" : true @@ -5702,7 +5744,17 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeLeaveType" }, - "example" : "{ \"leaveTypeID\": \"35da97ae-05b9-427f-9a98-69157ba42cec\", \"scheduleOfAccrual\": \"AnnuallyAfter6Months\", \"hoursAccruedAnnually\": 10, \"unitsAccruedAnnually\": 10, \"typeOfUnitsToAccrue\": \"Hours\", \"openingBalanceTypeOfUnits\": \"Hours\" \"maximumToAccrue\": 80, \"openingBalance\": 100, \"rateAccruedHourly\": 3.5 }" + "example" : { + "leaveTypeID" : "35da97ae-05b9-427f-9a98-69157ba42cec", + "scheduleOfAccrual" : "AnnuallyAfter6Months", + "hoursAccruedAnnually" : 10, + "unitsAccruedAnnually" : 10, + "typeOfUnitsToAccrue" : "Hours", + "openingBalanceTypeOfUnits" : "Hours", + "maximumToAccrue" : 80, + "openingBalance" : 100, + "rateAccruedHourly" : 3.5 + } } }, "required" : true @@ -6091,7 +6143,18 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PaymentMethod" }, - "example" : "" + "example" : { + "bankAccounts" : [ { + "accountName" : "Casual Worker", + "accountNumber" : "0607050201419000", + "sortCode" : null, + "particulars" : null, + "code" : null, + "dollarAmount" : null, + "reference" : "", + "calculationType" : "Balance" + } ] + } } }, "required" : true @@ -6281,7 +6344,17 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/SalaryAndWage" }, - "example" : "{ \"earningsRateID\": \"f9d8f5b5-9049-47f4-8541-35e200f750a5\", \"numberOfUnitsPerWeek\": 2, \"ratePerUnit\": 10, \"numberOfUnitsPerDay\": 2, \"daysPerWeek\": 1, \"effectiveFrom\": \"2020-05-01\", \"annualSalary\": 100, \"status\": \"Active\", \"paymentType\": \"Salary\" }" + "example" : { + "earningsRateID" : "f9d8f5b5-9049-47f4-8541-35e200f750a5", + "numberOfUnitsPerWeek" : 2, + "ratePerUnit" : 10, + "numberOfUnitsPerDay" : 2, + "daysPerWeek" : 1, + "effectiveFrom" : "2020-05-01", + "annualSalary" : 100, + "status" : "Active", + "paymentType" : "Salary" + } } }, "required" : true @@ -6475,7 +6548,18 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeWorkingPatternWithWorkingWeeksRequest" }, - "example" : "{ \"effectiveFrom\": \"2020-01-01T00:00:00\", \"workingWeeks\": [ { \"monday\": 0.0, \"tuesday\": 3.0000, \"wednesday\": 0.0, \"thursday\": 0.0, \"friday\": 0.0, \"saturday\": 0.0, \"sunday\": 0.0 } ] }" + "example" : { + "effectiveFrom" : "2020-01-01T00:00:00", + "workingWeeks" : [ { + "monday" : 0.0, + "tuesday" : 3.0, + "wednesday" : 0.0, + "thursday" : 0.0, + "friday" : 0.0, + "saturday" : 0.0, + "sunday" : 0.0 + } ] + } } }, "required" : true @@ -6666,7 +6750,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Employment" }, - "example" : "{ \"payrollCalendarID\": \"9aa56064-990f-4ad3-a189-d966d8f6a030\", \"startDate\": \"2020-09-02\", \"engagementType\": \"FixedTerm\", \"fixedTermEndDate\": \"2026-01-01\" }" + "example" : { + "payrollCalendarID" : "9aa56064-990f-4ad3-a189-d966d8f6a030", + "startDate" : "2020-09-02", + "engagementType" : "FixedTerm", + "fixedTermEndDate" : "2026-01-01" + } } }, "required" : true @@ -6820,7 +6909,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/LeaveType" }, - "example" : "{ \"name\": \"My wqwhhiktun Leave\", \"isPaidLeave\": false, \"showOnPayslip\": true }" + "example" : { + "name" : "My wqwhhiktun Leave", + "isPaidLeave" : false, + "showOnPayslip" : true + } } }, "required" : true @@ -7168,7 +7261,15 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PayRun" }, - "example" : "{ \"payrollCalendarID\": \"9aa56064-990f-4ad3-a189-d966d8f6a030\", \"periodStartDate\": \"2020-09-08\", \"periodEndDate\": \"2020-09-15\", \"paymentDate\": \"2020-09-20\", \"payRunStatus\": \"Draft\", \"payRunType\": \"Scheduled\", \"calendarType\": \"Weekly\" }" + "example" : { + "payrollCalendarID" : "9aa56064-990f-4ad3-a189-d966d8f6a030", + "periodStartDate" : "2020-09-08", + "periodEndDate" : "2020-09-15", + "paymentDate" : "2020-09-20", + "payRunStatus" : "Draft", + "payRunType" : "Scheduled", + "calendarType" : "Weekly" + } } }, "required" : true @@ -7324,7 +7425,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PayRunCalendar" }, - "example" : "{ \"name\": \"My Weekly Cal\", \"calendarType\": \"Weekly\", \"periodStartDate\": \"2020-05-01\", \"paymentDate\": \"2020-05-15\" }" + "example" : { + "name" : "My Weekly Cal", + "calendarType" : "Weekly", + "periodStartDate" : "2020-05-01", + "paymentDate" : "2020-05-15" + } } }, "required" : true @@ -7479,7 +7585,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Reimbursement" }, - "example" : "{ \"name\": \"My new Reimburse\", \"accountID\": \"fa5cdc43-643b-4ad8-b4ac-3ffe0d0f4488\", \"reimbursementCategory\": \"GSTInclusive\", \"calculationType\": \"FixedAmount\" }" + "example" : { + "name" : "My new Reimburse", + "accountID" : "fa5cdc43-643b-4ad8-b4ac-3ffe0d0f4488", + "reimbursementCategory" : "GSTInclusive", + "calculationType" : "FixedAmount" + } } }, "required" : true @@ -7636,7 +7747,14 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Benefit" }, - "example" : "{ \"name\": \"SidSaver\", \"category\": \"Other\", \"liabilityAccountId\": \"568f2e9a-0870-46cc-8678-f83f132ed4e3\", \"expenseAccountId\": \"e4eb36f6-97e3-4427-a394-dd4e1b355c2e\", \"CalculationTypeNZ\": \"FixedAmount\", \"standardAmount\": 10 }" + "example" : { + "name" : "SidSaver", + "category" : "Other", + "liabilityAccountId" : "568f2e9a-0870-46cc-8678-f83f132ed4e3", + "expenseAccountId" : "e4eb36f6-97e3-4427-a394-dd4e1b355c2e", + "CalculationTypeNZ" : "FixedAmount", + "standardAmount" : 10 + } } }, "required" : true @@ -7793,7 +7911,21 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Timesheet" }, - "example" : "{ \"payrollCalendarID\": \"9aa56064-990f-4ad3-a189-d966d8f6a030\", \"employeeID\": \"68342973-c405-4b86-b5d3-d7b877c27995\", \"startDate\": \"2020-04-13\", \"endDate\": \"2020-04-19\", \"timesheetLines\": [ { \"date\": \"2020-04-13\", \"earningsRateID\": \"f9d8f5b5-9049-47f4-8541-35e200f750a5\", \"numberOfUnits\": 8 }, { \"date\": \"2020-04-15\", \"earningsRateID\": \"f9d8f5b5-9049-47f4-8541-35e200f750a5\", \"numberOfUnits\": 6 } ] }" + "example" : { + "payrollCalendarID" : "9aa56064-990f-4ad3-a189-d966d8f6a030", + "employeeID" : "68342973-c405-4b86-b5d3-d7b877c27995", + "startDate" : "2020-04-13", + "endDate" : "2020-04-19", + "timesheetLines" : [ { + "date" : "2020-04-13", + "earningsRateID" : "f9d8f5b5-9049-47f4-8541-35e200f750a5", + "numberOfUnits" : 8 + }, { + "date" : "2020-04-15", + "earningsRateID" : "f9d8f5b5-9049-47f4-8541-35e200f750a5", + "numberOfUnits" : 6 + } ] + } } }, "required" : true @@ -7985,7 +8117,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/TimesheetLine" }, - "example" : "{ \"date\": \"2020-08-03\", \"earningsRateID\": \"f9d8f5b5-9049-47f4-8541-35e200f750a5\", \"numberOfUnits\": 1 }" + "example" : { + "date" : "2020-08-03", + "earningsRateID" : "f9d8f5b5-9049-47f4-8541-35e200f750a5", + "numberOfUnits" : 1 + } } }, "required" : true @@ -14172,7 +14308,20 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Employee" }, - "example" : "{ \"title\": \"Mr\", \"firstName\": \"Tony\", \"lastName\": \"Starkgtrzgquusrson\", \"dateOfBirth\": \"1999-01-01\", \"address\": { \"addressLine1\": \"101 Green St\", \"city\": \"San Francisco\", \"postCode\": \"4432\", \"countryName\": \"United Kingdom\" }, \"email\": \"58315@starkindustries.com\", \"gender\": \"M\" }" + "example" : { + "title" : "Mr", + "firstName" : "Tony", + "lastName" : "Starkgtrzgquusrson", + "dateOfBirth" : "1999-01-01", + "address" : { + "addressLine1" : "101 Green St", + "city" : "San Francisco", + "postCode" : "4432", + "countryName" : "United Kingdom" + }, + "email" : "58315@starkindustries.com", + "gender" : "M" + } } }, "required" : true @@ -14395,7 +14544,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EarningsTemplate" }, - "example" : "{ \"ratePerUnit\": 25, \"numberOfUnits\": 4, \"earningsRateID\": \"f9d8f5b5-9049-47f4-8541-35e200f750a5\" }" + "example" : { + "ratePerUnit" : 25, + "numberOfUnits" : 4, + "earningsRateID" : "f9d8f5b5-9049-47f4-8541-35e200f750a5" + } } }, "required" : true @@ -14614,7 +14767,18 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeLeave" }, - "example" : "{ \"leaveTypeID\": \"b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4\", \"description\": \"Creating a Description\", \"startDate\": \"2020-04-24\", \"endDate\": \"2020-04-26\", \"periods\": [ { \"periodStartDate\": \"2020-04-20\", \"periodEndDate\": \"2020-04-26\", \"numberOfUnits\": 1, \"periodStatus\": \"Approved\" } ] }" + "example" : { + "leaveTypeID" : "b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4", + "description" : "Creating a Description", + "startDate" : "2020-04-24", + "endDate" : "2020-04-26", + "periods" : [ { + "periodStartDate" : "2020-04-20", + "periodEndDate" : "2020-04-26", + "numberOfUnits" : 1, + "periodStatus" : "Approved" + } ] + } } }, "required" : true @@ -14832,7 +14996,17 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/SalaryAndWage" }, - "example" : "{ \"earningsRateID\": \"f9d8f5b5-9049-47f4-8541-35e200f750a5\", \"numberOfUnitsPerWeek\": 3, \"ratePerUnit\": 11, \"numberOfUnitsPerDay\": 3, \"daysPerWeek\": 1, \"effectiveFrom\": \"2020-05-15\", \"annualSalary\": 101, \"status\": \"Active\", \"paymentType\": \"Salary\" }" + "example" : { + "earningsRateID" : "f9d8f5b5-9049-47f4-8541-35e200f750a5", + "numberOfUnitsPerWeek" : 3, + "ratePerUnit" : 11, + "numberOfUnitsPerDay" : 3, + "daysPerWeek" : 1, + "effectiveFrom" : "2020-05-15", + "annualSalary" : 101, + "status" : "Active", + "paymentType" : "Salary" + } } }, "required" : true @@ -15031,7 +15205,24 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeTax" }, - "example" : "" + "example" : { + "irdNumber" : "111111111", + "taxCode" : "M", + "esctRatePercentage" : 17.5, + "isEligibleForKiwiSaver" : true, + "hasSpecialStudentLoanRate" : false, + "specialStudentLoanRatePercentage" : null, + "specialTaxRatePercentage" : null, + "kiwiSaverContributions" : "MakeContributions", + "kiwiSaverOptOutDate" : null, + "kiwiSaverContributionHolidayEndDate" : null, + "kiwiSaverEmployeeContributionRatePercentage" : 3, + "kiwiSaverEmployerContributionRatePercentage" : 3, + "kiwiSaverEmployerSalarySacrificeContributionRatePercentage" : 0, + "hasStudentLoanBalance" : false, + "studentLoanBalance" : null, + "studentLoanAsAt" : null + } } }, "required" : true @@ -15222,7 +15413,9 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PayRun" }, - "example" : "{ \"paymentDate\": \"2019-07-01\" }" + "example" : { + "paymentDate" : "2019-07-01" + } } }, "required" : true @@ -15420,7 +15613,81 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PaySlip" }, - "example" : "{ \"earningsLines\": [ { \"earningsLineID\": \"f9d8f5b5-9049-47f4-8541-35e200f750a5\", \"earningsRateID\": \"f9d8f5b5-9049-47f4-8541-35e200f750a5\", \"displayName\": \"Ordinary Time\", \"ratePerUnit\": 25, \"numberOfUnits\": 0, \"amount\": 0, \"isLinkedToTimesheet\": false, \"isSystemGenerated\": true }, { \"earningsLineID\": \"65b83d94-f20f-45e1-85ae-387fcf460c26\", \"earningsRateID\": \"65b83d94-f20f-45e1-85ae-387fcf460c26\", \"displayName\": \"Salary\", \"ratePerUnit\": 0, \"numberOfUnits\": 8, \"amount\": 0, \"isLinkedToTimesheet\": false, \"isSystemGenerated\": false } ], \"leaveEarningsLines\": [ { \"earningsLineID\": \"0441497f-5dc7-4cd3-a90d-f2e07e21b2a6\", \"earningsRateID\": \"39b3560a-5d2f-4538-924a-4349dc86396e\", \"displayName\": \"Holiday Pay\", \"fixedAmount\": 268.8, \"amount\": 268.8, \"isLinkedToTimesheet\": false, \"isSystemGenerated\": true } ], \"deductionLines\": [ { \"deductionTypeID\": \"a3760fe4-68a4-4e38-8326-fe616af7dc74\", \"amount\": 100 } ], \"leaveAccrualLines\": [ { \"leaveTypeID\": \"0441497f-5dc7-4cd3-a90d-f2e07e21b2a6\", \"numberOfUnits\": 268.8 }, { \"leaveTypeID\": \"b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4\", \"numberOfUnits\": 0 }, { \"leaveTypeID\": \"f2f994cf-1899-46f3-ad4f-5d92d78c3719\", \"numberOfUnits\": 0 }, { \"leaveTypeID\": \"34129765-11cb-4d8c-b568-84a2219beda3\", \"numberOfUnits\": 0 } ], \"superannuationLines\": [ { \"superannuationTypeID\": \"563273ea-0dae-4f82-86a4-e0db77c008ea\", \"displayName\": \"KiwiSaver\", \"amount\": 108.86, \"fixedAmount\": 3, \"percentage\": 3, \"manualAdjustment\": false } ], \"employeeTaxLines\": [ { \"taxLineID\": \"1084146b-e890-489c-aed3-06de80f63d84\", \"amount\": 1057.22, \"globalTaxTypeID\": \"11\", \"manualAdjustment\": false } ], \"employerTaxLines\": [ { \"taxLineID\": \"6f9eb8cd-0f4a-440b-939c-bdb0f6ad694c\", \"amount\": 18.9, \"globalTaxTypeID\": \"10\", \"manualAdjustment\": false } ], \"statutoryDeductionLines\": [ { \"statutoryDeductionTypeID\": \"b5efd8d1-0c93-4a14-a314-b5cba4a4e6b3\", \"amount\": 108.86 } ], \"grossEarningsHistory\": { \"daysPaid\": 3, \"unpaidWeeks\": 0 } }" + "example" : { + "earningsLines" : [ { + "earningsLineID" : "f9d8f5b5-9049-47f4-8541-35e200f750a5", + "earningsRateID" : "f9d8f5b5-9049-47f4-8541-35e200f750a5", + "displayName" : "Ordinary Time", + "ratePerUnit" : 25, + "numberOfUnits" : 0, + "amount" : 0, + "isLinkedToTimesheet" : false, + "isSystemGenerated" : true + }, { + "earningsLineID" : "65b83d94-f20f-45e1-85ae-387fcf460c26", + "earningsRateID" : "65b83d94-f20f-45e1-85ae-387fcf460c26", + "displayName" : "Salary", + "ratePerUnit" : 0, + "numberOfUnits" : 8, + "amount" : 0, + "isLinkedToTimesheet" : false, + "isSystemGenerated" : false + } ], + "leaveEarningsLines" : [ { + "earningsLineID" : "0441497f-5dc7-4cd3-a90d-f2e07e21b2a6", + "earningsRateID" : "39b3560a-5d2f-4538-924a-4349dc86396e", + "displayName" : "Holiday Pay", + "fixedAmount" : 268.8, + "amount" : 268.8, + "isLinkedToTimesheet" : false, + "isSystemGenerated" : true + } ], + "deductionLines" : [ { + "deductionTypeID" : "a3760fe4-68a4-4e38-8326-fe616af7dc74", + "amount" : 100 + } ], + "leaveAccrualLines" : [ { + "leaveTypeID" : "0441497f-5dc7-4cd3-a90d-f2e07e21b2a6", + "numberOfUnits" : 268.8 + }, { + "leaveTypeID" : "b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4", + "numberOfUnits" : 0 + }, { + "leaveTypeID" : "f2f994cf-1899-46f3-ad4f-5d92d78c3719", + "numberOfUnits" : 0 + }, { + "leaveTypeID" : "34129765-11cb-4d8c-b568-84a2219beda3", + "numberOfUnits" : 0 + } ], + "superannuationLines" : [ { + "superannuationTypeID" : "563273ea-0dae-4f82-86a4-e0db77c008ea", + "displayName" : "KiwiSaver", + "amount" : 108.86, + "fixedAmount" : 3, + "percentage" : 3, + "manualAdjustment" : false + } ], + "employeeTaxLines" : [ { + "taxLineID" : "1084146b-e890-489c-aed3-06de80f63d84", + "amount" : 1057.22, + "globalTaxTypeID" : "11", + "manualAdjustment" : false + } ], + "employerTaxLines" : [ { + "taxLineID" : "6f9eb8cd-0f4a-440b-939c-bdb0f6ad694c", + "amount" : 18.9, + "globalTaxTypeID" : "10", + "manualAdjustment" : false + } ], + "statutoryDeductionLines" : [ { + "statutoryDeductionTypeID" : "b5efd8d1-0c93-4a14-a314-b5cba4a4e6b3", + "amount" : 108.86 + } ], + "grossEarningsHistory" : { + "daysPaid" : 3, + "unpaidWeeks" : 0 + } + } } }, "required" : true @@ -15640,7 +15907,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/TimesheetLine" }, - "example" : "{ \"date\": \"2020-08-04\", \"earningsRateID\": \"f9d8f5b5-9049-47f4-8541-35e200f750a5\", \"numberOfUnits\": 2 }" + "example" : { + "date" : "2020-08-04", + "earningsRateID" : "f9d8f5b5-9049-47f4-8541-35e200f750a5", + "numberOfUnits" : 2 + } } }, "required" : true diff --git a/docs/v4/payroll-uk/index.html b/docs/v4/payroll-uk/index.html index aa79e69ca..e6600330a 100644 --- a/docs/v4/payroll-uk/index.html +++ b/docs/v4/payroll-uk/index.html @@ -1512,7 +1512,7 @@ }; defs["Employee"] = { "title" : "", - "required" : [ "Address", "DateOfBirth", "FirstName", "Gender", "LastName", "Title" ], + "required" : [ "address", "dateOfBirth", "firstName", "gender", "lastName", "title" ], "type" : "object", "properties" : { "employeeID" : { @@ -2270,7 +2270,7 @@ }; defs["Employment"] = { "title" : "", - "required" : [ "EmployeeNumber", "NICategories", "PayrollCalendarID", "StartDate" ], + "required" : [ "employeeNumber", "niCategories", "payrollCalendarID", "startDate" ], "type" : "object", "properties" : { "payrollCalendarID" : { @@ -4119,7 +4119,15 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Benefit" }, - "example" : "{ \"name\": \"My Big Bennie\", \"category\": \"StakeholderPension\", \"liabilityAccountId\": \"e0faa299-ca0d-4b0a-9e32-0dfabdf9179a\", \"expenseAccountId\": \"4b03500d-32fd-4616-8d70-e1e56e0519c6\", \"standardAmount\": 50, \"percentage\": 25, \"calculationType\": \"PercentageOfGross\" }" + "example" : { + "name" : "My Big Bennie", + "category" : "StakeholderPension", + "liabilityAccountId" : "e0faa299-ca0d-4b0a-9e32-0dfabdf9179a", + "expenseAccountId" : "4b03500d-32fd-4616-8d70-e1e56e0519c6", + "standardAmount" : 50, + "percentage" : 25, + "calculationType" : "PercentageOfGross" + } } }, "required" : true @@ -4274,7 +4282,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Deduction" }, - "example" : "{ \"deductionName\": \"My new deduction\", \"deductionCategory\": \"SalarySacrifice\", \"liabilityAccountId\": \"e0faa299-ca0d-4b0a-9e32-0dfabdf9179a\", \"calculationType\": \"FixedAmount\" }" + "example" : { + "deductionName" : "My new deduction", + "deductionCategory" : "SalarySacrifice", + "liabilityAccountId" : "e0faa299-ca0d-4b0a-9e32-0dfabdf9179a", + "calculationType" : "FixedAmount" + } } }, "required" : true @@ -4429,7 +4442,13 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EarningsRate" }, - "example" : "{ \"name\": \"My Earnings Rate\", \"earningsType\": \"RegularEarnings\", \"rateType\": \"RatePerUnit\", \"typeOfUnits\": \"hours\", \"expenseAccountID\": \"4b03500d-32fd-4616-8d70-e1e56e0519c6\" }" + "example" : { + "name" : "My Earnings Rate", + "earningsType" : "RegularEarnings", + "rateType" : "RatePerUnit", + "typeOfUnits" : "hours", + "expenseAccountID" : "4b03500d-32fd-4616-8d70-e1e56e0519c6" + } } }, "required" : true @@ -4591,7 +4610,20 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Employee" }, - "example" : "{ \"title\":\"Mr\", \"firstName\":\"Mike\", \"lastName\":\"Fancy\", \"dateOfBirth\":\"1999-01-01T00:00:00\", \"gender\":\"M\", \"email\":\"mike@starkindustries.com\", \"isOffPayrollWorker\": false, \"address\": { \"addressLine1\": \"171 Midsummer\", \"city\": \"Milton Keyness\", \"postCode\": \"MK9 1EB\" } }" + "example" : { + "title" : "Mr", + "firstName" : "Mike", + "lastName" : "Fancy", + "dateOfBirth" : "1999-01-01T00:00:00Z", + "gender" : "M", + "email" : "mike@starkindustries.com", + "isOffPayrollWorker" : false, + "address" : { + "addressLine1" : "171 Midsummer", + "city" : "Milton Keyness", + "postCode" : "MK9 1EB" + } + } } }, "required" : true @@ -4976,7 +5008,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeLeave" }, - "example" : "{ \"leaveTypeID\": \"1d2778ee-86ea-45c0-bbf8-1045485f6b3f\", \"description\": \"Creating a Description\", \"startDate\": \"2020-03-24\", \"endDate\": \"2020-03-26\" }" + "example" : { + "leaveTypeID" : "1d2778ee-86ea-45c0-bbf8-1045485f6b3f", + "description" : "Creating a Description", + "startDate" : "2020-03-24", + "endDate" : "2020-03-26" + } } }, "required" : true @@ -5166,7 +5203,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeLeaveType" }, - "example" : "{ \"leaveTypeID\": \"4918f233-bd31-43f9-9633-bcc6de1178f2\", \"scheduleOfAccrual\": \"BeginningOfCalendarYear\", \"hoursAccruedAnnually\": 10 }" + "example" : { + "leaveTypeID" : "4918f233-bd31-43f9-9633-bcc6de1178f2", + "scheduleOfAccrual" : "BeginningOfCalendarYear", + "hoursAccruedAnnually" : 10 + } } }, "required" : true @@ -5357,7 +5398,14 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeOpeningBalances" }, - "example" : "{ \"statutoryAdoptionPay\": 10, \"statutoryMaternityPay\": 10, \"statutoryPaternityPay\": 10, \"statutorySharedParentalPay\": 10, \"statutorySickPay\": 10, \"priorEmployeeNumber\": 10 }" + "example" : { + "statutoryAdoptionPay" : 10, + "statutoryMaternityPay" : 10, + "statutoryPaternityPay" : 10, + "statutorySharedParentalPay" : 10, + "statutorySickPay" : 10, + "priorEmployeeNumber" : 10 + } } }, "required" : true @@ -5552,7 +5600,14 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PaymentMethod" }, - "example" : "{ \"paymentMethod\": \"Electronically\", \"bankAccounts\": [ { \"accountName\": \"Sid BofA\", \"accountNumber\": \"24987654\", \"sortCode\": \"287654\" } ] }" + "example" : { + "paymentMethod" : "Electronically", + "bankAccounts" : [ { + "accountName" : "Sid BofA", + "accountNumber" : "24987654", + "sortCode" : "287654" + } ] + } } }, "required" : true @@ -5743,7 +5798,16 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/SalaryAndWage" }, - "example" : "{ \"earningsRateID\": \"87f5b43a-cf51-4b74-92de-94c819e82d27\", \"numberOfUnitsPerWeek\": 2, \"ratePerUnit\": 10, \"numberOfUnitsPerDay\": 2, \"effectiveFrom\": \"2020-05-01\", \"annualSalary\": 100, \"status\": \"ACTIVE\", \"paymentType\": \"Salary\" }" + "example" : { + "earningsRateID" : "87f5b43a-cf51-4b74-92de-94c819e82d27", + "numberOfUnitsPerWeek" : 2, + "ratePerUnit" : 10, + "numberOfUnitsPerDay" : 2, + "effectiveFrom" : "2020-05-01", + "annualSalary" : 100, + "status" : "ACTIVE", + "paymentType" : "Salary" + } } }, "required" : true @@ -5900,7 +5964,15 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeStatutorySickLeave" }, - "example" : "{ \"employeeID\": \"aad6b292-7b94-408b-93f6-e489867e3fb0\", \"leaveTypeID\": \"aab78802-e9d3-4bbd-bc87-df858054988f\", \"startDate\": \"2020-04-21\", \"endDate\": \"2020-04-24\", \"workPattern\": [ \"Monday\", \"Tuesday\", \"Wednesday\", \"Thursday\", \"Friday\" ], \"isPregnancyRelated\": false, \"sufficientNotice\": true }" + "example" : { + "employeeID" : "aad6b292-7b94-408b-93f6-e489867e3fb0", + "leaveTypeID" : "aab78802-e9d3-4bbd-bc87-df858054988f", + "startDate" : "2020-04-21", + "endDate" : "2020-04-24", + "workPattern" : [ "Monday", "Tuesday", "Wednesday", "Thursday", "Friday" ], + "isPregnancyRelated" : false, + "sufficientNotice" : true + } } }, "required" : true @@ -6091,7 +6163,16 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Employment" }, - "example" : "{ \"PayrollCalendarID\": \"216d80e6-af55-47b1-b718-9457c3f5d2fe\", \"StartDate\": \"2020-04-01\", \"NICategories\": [ { \"NICategory\": \"A\", \"StartDate\": \"2020-05-01\" } ], \"EmployeeNumber\": \"123ABC\" }" + "example" : { + "payrollCalendarID" : "cdfb8371-0b21-4b8a-8903-1024df6c391e", + "startDate" : "2024-04-01", + "niCategories" : [ { + "niCategory" : "I", + "startDate" : "2020-05-01", + "workplacePostcode" : "SW1A 1AA" + } ], + "employeeNumber" : "123ABC" + } } }, "required" : true @@ -6245,7 +6326,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/LeaveType" }, - "example" : "{ \"name\": \"My opebvwbfxf Leave\", \"isPaidLeave\": false, \"showOnPayslip\": true }" + "example" : { + "name" : "My opebvwbfxf Leave", + "isPaidLeave" : false, + "showOnPayslip" : true + } } }, "required" : true @@ -6596,7 +6681,12 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PayRunCalendar" }, - "example" : "{ \"name\": \"My Weekly Cal\", \"calendarType\": \"Weekly\", \"periodStartDate\": \"2020-05-01\", \"paymentDate\": \"2020-05-15\" }" + "example" : { + "name" : "My Weekly Cal", + "calendarType" : "Weekly", + "periodStartDate" : "2020-05-01", + "paymentDate" : "2020-05-15" + } } }, "required" : true @@ -6749,7 +6839,10 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Reimbursement" }, - "example" : "{ \"name\": \"My new Reimburse\", \"accountID\": \"9ee28149-32a9-4661-8eab-a28738696983\" }" + "example" : { + "name" : "My new Reimburse", + "accountID" : "9ee28149-32a9-4661-8eab-a28738696983" + } } }, "required" : true @@ -6906,7 +6999,21 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Timesheet" }, - "example" : "{ \"payrollCalendarID\": \"216d80e6-af55-47b1-b718-9457c3f5d2fe\", \"employeeID\": \"aad6b292-7b94-408b-93f6-e489867e3fb0\", \"startDate\": \"2020-04-13\", \"endDate\": \"2020-04-19\", \"timesheetLines\": [ { \"date\": \"2020-04-13\", \"earningsRateID\": \"87f5b43a-cf51-4b74-92de-94c819e82d27\", \"numberOfUnits\": 8 }, { \"date\": \"2020-04-15\", \"earningsRateID\": \"87f5b43a-cf51-4b74-92de-94c819e82d27\", \"numberOfUnits\": 6 } ] }" + "example" : { + "payrollCalendarID" : "216d80e6-af55-47b1-b718-9457c3f5d2fe", + "employeeID" : "aad6b292-7b94-408b-93f6-e489867e3fb0", + "startDate" : "2020-04-13", + "endDate" : "2020-04-19", + "timesheetLines" : [ { + "date" : "2020-04-13", + "earningsRateID" : "87f5b43a-cf51-4b74-92de-94c819e82d27", + "numberOfUnits" : 8 + }, { + "date" : "2020-04-15", + "earningsRateID" : "87f5b43a-cf51-4b74-92de-94c819e82d27", + "numberOfUnits" : 6 + } ] + } } }, "required" : true @@ -7098,7 +7205,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/TimesheetLine" }, - "example" : "{ \"date\": \"2020-04-14\", \"earningsRateID\": \"87f5b43a-cf51-4b74-92de-94c819e82d27\", \"numberOfUnits\": 1 }" + "example" : { + "date" : "2020-04-14", + "earningsRateID" : "87f5b43a-cf51-4b74-92de-94c819e82d27", + "numberOfUnits" : 1 + } } }, "required" : true @@ -13472,7 +13583,21 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/Employee" }, - "example" : "{ \"title\": \"Mr.\", \"firstName\": \"TestDataUK\", \"lastName\": \"Tester\", \"dateOfBirth\": \"1992-11-22T00:00:00\", \"gender\": \"M\", \"email\": \"tester@gmail.com\", \"phoneNumber\": \"0400123456\", \"isOffPayrollWorker\": false, \"address\": { \"addressLine1\": \"171 Midsummer\", \"city\": \"Milton Keyness\", \"postCode\": \"MK9 1EB\" } }" + "example" : { + "title" : "Mr.", + "firstName" : "TestDataUK", + "lastName" : "Tester", + "dateOfBirth" : "1992-11-22T00:00:00Z", + "gender" : "M", + "email" : "tester@gmail.com", + "phoneNumber" : "0400123456", + "isOffPayrollWorker" : false, + "address" : { + "addressLine1" : "171 Midsummer", + "city" : "Milton Keyness", + "postCode" : "MK9 1EB" + } + } } }, "required" : true @@ -13695,7 +13820,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EarningsTemplate" }, - "example" : "{ \"ratePerUnit\": 30, \"numberOfUnits\": 4, \"earningsRateID\": \"87f5b43a-cf51-4b74-92de-94c819e82d27\" }" + "example" : { + "ratePerUnit" : 30, + "numberOfUnits" : 4, + "earningsRateID" : "87f5b43a-cf51-4b74-92de-94c819e82d27" + } } }, "required" : true @@ -13914,7 +14043,18 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeLeave" }, - "example" : "{ \"leaveTypeID\": \"ed08dffe-788e-4b24-9630-f0fa2f4d164c\", \"description\": \"Creating a Description\", \"startDate\": \"2020-04-24\", \"endDate\": \"2020-04-26\", \"periods\": [ { \"periodStartDate\": \"2020-04-20\", \"periodEndDate\": \"2020-04-26\", \"numberOfUnits\": 1, \"periodStatus\": \"Approved\" } ] }" + "example" : { + "leaveTypeID" : "ed08dffe-788e-4b24-9630-f0fa2f4d164c", + "description" : "Creating a Description", + "startDate" : "2020-04-24", + "endDate" : "2020-04-26", + "periods" : [ { + "periodStartDate" : "2020-04-20", + "periodEndDate" : "2020-04-26", + "numberOfUnits" : 1, + "periodStatus" : "Approved" + } ] + } } }, "required" : true @@ -14105,7 +14245,14 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/EmployeeOpeningBalances" }, - "example" : "{ \"statutoryAdoptionPay\": 20, \"statutoryMaternityPay\": 20, \"statutoryPaternityPay\": 20, \"statutorySharedParentalPay\": 20, \"statutorySickPay\": 20, \"priorEmployeeNumber\": 20 }" + "example" : { + "statutoryAdoptionPay" : 20, + "statutoryMaternityPay" : 20, + "statutoryPaternityPay" : 20, + "statutorySharedParentalPay" : 20, + "statutorySickPay" : 20, + "priorEmployeeNumber" : 20 + } } }, "required" : true @@ -14324,7 +14471,15 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/SalaryAndWage" }, - "example" : "{ \"earningsRateID\": \"87f5b43a-cf51-4b74-92de-94c819e82d27\", \"numberOfUnitsPerWeek\": 3, \"ratePerUnit\": 11, \"effectiveFrom\": \"2020-05-15\", \"annualSalary\": 101, \"status\": \"ACTIVE\", \"paymentType\": \"Salary\" }" + "example" : { + "earningsRateID" : "87f5b43a-cf51-4b74-92de-94c819e82d27", + "numberOfUnitsPerWeek" : 3, + "ratePerUnit" : 11, + "effectiveFrom" : "2020-05-15", + "annualSalary" : 101, + "status" : "ACTIVE", + "paymentType" : "Salary" + } } }, "required" : true @@ -14515,7 +14670,9 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/PayRun" }, - "example" : "{ \"paymentDate\": \"2020-05-01\" }" + "example" : { + "paymentDate" : "2020-05-01" + } } }, "required" : true @@ -14735,7 +14892,11 @@

Parameters

"schema" : { "$ref" : "#/components/schemas/TimesheetLine" }, - "example" : "{ \"date\": \"2020-04-14\", \"earningsRateID\": \"87f5b43a-cf51-4b74-92de-94c819e82d27\", \"numberOfUnits\": 2 }" + "example" : { + "date" : "2020-04-14", + "earningsRateID" : "87f5b43a-cf51-4b74-92de-94c819e82d27", + "numberOfUnits" : 2 + } } }, "required" : true diff --git a/pom.xml b/pom.xml index 8a22769ea..ea3732ee1 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ com.auth0 java-jwt - 3.19.4 + 4.4.0 com.auth0 @@ -68,17 +68,17 @@ commons-io commons-io - 2.7 + 2.17.0 jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 org.mockito mockito-core - 5.10.0 + 5.14.1 test @@ -92,7 +92,7 @@ org.slf4j slf4j-api - 1.7.30 + 2.0.16 @@ -159,7 +159,7 @@ maven-deploy-plugin - 2.8.2 + 3.1.3 org.apache.maven.plugins @@ -173,7 +173,7 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.3.1 attach-sources @@ -203,17 +203,17 @@ org.apache.maven.plugins maven-pmd-plugin - 3.8 + 3.25.0 org.codehaus.mojo findbugs-maven-plugin - 3.0.4 + 3.0.5 org.apache.maven.plugins maven-war-plugin - 3.1.0 + 3.4.0 example/src/main/webapp/WEB-INF/web.xml @@ -232,7 +232,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.10.1 8 @@ -248,7 +248,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.2.7 sign-artifacts @@ -261,7 +261,6 @@ --pinentry-mode loopback - gpg.passphrase @@ -269,7 +268,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true ossrh @@ -280,7 +279,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.5.0 -Duser.timezone=GMT-08:00 @@ -292,12 +291,12 @@ org.apache.maven.plugins maven-pmd-plugin - 3.8 + 3.25.0 org.codehaus.mojo findbugs-maven-plugin - 3.0.4 + 3.0.5 @@ -316,12 +315,12 @@ UTF-8 UTF-8 11 - 1.6.3 - 2.3.0 + 1.6.14 + 2.7.0 2.25.1 - 2.16.1 - 2.16.1 - 2.12.5 + 2.18.0 + 2.18.0 + 2.15.2 4.13.2 4.5.3 3.1.5 diff --git a/src/main/java/com/xero/api/client/AccountingApi.java b/src/main/java/com/xero/api/client/AccountingApi.java index f87a3256a..a7bc4c423 100644 --- a/src/main/java/com/xero/api/client/AccountingApi.java +++ b/src/main/java/com/xero/api/client/AccountingApi.java @@ -255,6 +255,7 @@ public HttpResponse createAccountForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Accounts"); String url = uriBuilder.build().toString(); @@ -385,6 +386,7 @@ public HttpResponse createAccountAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -527,6 +529,7 @@ public HttpResponse createAccountAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -671,6 +674,7 @@ public HttpResponse createBankTransactionAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -815,6 +819,7 @@ public HttpResponse createBankTransactionAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -952,6 +957,7 @@ public HttpResponse createBankTransactionHistoryRecordForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1089,6 +1095,7 @@ public HttpResponse createBankTransactionsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/BankTransactions"); if (summarizeErrors != null) { @@ -1238,6 +1245,7 @@ public HttpResponse createBankTransferForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/BankTransfers"); String url = uriBuilder.build().toString(); @@ -1367,6 +1375,7 @@ public HttpResponse createBankTransferAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1508,6 +1517,7 @@ public HttpResponse createBankTransferAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1644,6 +1654,7 @@ public HttpResponse createBankTransferHistoryRecordForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1770,6 +1781,7 @@ public HttpResponse createBatchPaymentForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/BatchPayments"); if (summarizeErrors != null) { @@ -1919,6 +1931,7 @@ public HttpResponse createBatchPaymentHistoryRecordForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -2053,6 +2066,7 @@ public HttpResponse createBrandingThemePaymentServicesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -2187,6 +2201,7 @@ public HttpResponse createContactAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -2327,6 +2342,7 @@ public HttpResponse createContactAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -2445,6 +2461,7 @@ public HttpResponse createContactGroupForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/ContactGroups"); String url = uriBuilder.build().toString(); @@ -2571,6 +2588,7 @@ public HttpResponse createContactGroupContactsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -2701,6 +2719,7 @@ public HttpResponse createContactHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -2827,6 +2846,7 @@ public HttpResponse createContactsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Contacts"); if (summarizeErrors != null) { @@ -2983,6 +3003,7 @@ public HttpResponse createCreditNoteAllocationForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -3154,6 +3175,7 @@ public HttpResponse createCreditNoteAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -3331,6 +3353,7 @@ public HttpResponse createCreditNoteAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -3483,6 +3506,7 @@ public HttpResponse createCreditNoteHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -3617,6 +3641,7 @@ public HttpResponse createCreditNotesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/CreditNotes"); if (summarizeErrors != null) { @@ -3763,6 +3788,7 @@ public HttpResponse createCurrencyForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Currencies"); String url = uriBuilder.build().toString(); @@ -3884,6 +3910,7 @@ public HttpResponse createEmployeesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Employees"); if (summarizeErrors != null) { @@ -4025,6 +4052,7 @@ public HttpResponse createExpenseClaimHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -4141,6 +4169,7 @@ public HttpResponse createExpenseClaimsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/ExpenseClaims"); String url = uriBuilder.build().toString(); @@ -4286,6 +4315,7 @@ public HttpResponse createInvoiceAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -4456,6 +4486,7 @@ public HttpResponse createInvoiceAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -4608,6 +4639,7 @@ public HttpResponse createInvoiceHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -4740,6 +4772,7 @@ public HttpResponse createInvoicesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Invoices"); if (summarizeErrors != null) { @@ -4901,6 +4934,7 @@ public HttpResponse createItemHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -5032,6 +5066,7 @@ public HttpResponse createItemsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Items"); if (summarizeErrors != null) { @@ -5190,6 +5225,7 @@ public HttpResponse createLinkedTransactionForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/LinkedTransactions"); String url = uriBuilder.build().toString(); @@ -5323,6 +5359,7 @@ public HttpResponse createManualJournalAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -5468,6 +5505,7 @@ public HttpResponse createManualJournalAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -5604,6 +5642,7 @@ public HttpResponse createManualJournalHistoryRecordForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -5732,6 +5771,7 @@ public HttpResponse createManualJournalsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/ManualJournals"); if (summarizeErrors != null) { @@ -5890,6 +5930,7 @@ public HttpResponse createOverpaymentAllocationsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -6042,6 +6083,7 @@ public HttpResponse createOverpaymentHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -6155,6 +6197,7 @@ public HttpResponse createPaymentForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Payments"); String url = uriBuilder.build().toString(); @@ -6282,6 +6325,7 @@ public HttpResponse createPaymentHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -6404,6 +6448,7 @@ public HttpResponse createPaymentServiceForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/PaymentServices"); String url = uriBuilder.build().toString(); @@ -6525,6 +6570,7 @@ public HttpResponse createPaymentsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Payments"); if (summarizeErrors != null) { @@ -6681,6 +6727,7 @@ public HttpResponse createPrepaymentAllocationsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -6833,6 +6880,7 @@ public HttpResponse createPrepaymentHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -6969,6 +7017,7 @@ public HttpResponse createPurchaseOrderAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7112,6 +7161,7 @@ public HttpResponse createPurchaseOrderAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7246,6 +7296,7 @@ public HttpResponse createPurchaseOrderHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7374,6 +7425,7 @@ public HttpResponse createPurchaseOrdersForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/PurchaseOrders"); if (summarizeErrors != null) { @@ -7522,6 +7574,7 @@ public HttpResponse createQuoteAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7661,6 +7714,7 @@ public HttpResponse createQuoteAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7792,6 +7846,7 @@ public HttpResponse createQuoteHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7918,6 +7973,7 @@ public HttpResponse createQuotesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Quotes"); if (summarizeErrors != null) { @@ -8058,6 +8114,7 @@ public HttpResponse createReceiptForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Receipts"); if (unitdp != null) { @@ -8210,6 +8267,7 @@ public HttpResponse createReceiptAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -8354,6 +8412,7 @@ public HttpResponse createReceiptAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -8488,6 +8547,7 @@ public HttpResponse createReceiptHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -8632,6 +8692,7 @@ public HttpResponse createRepeatingInvoiceAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -8778,6 +8839,7 @@ public HttpResponse createRepeatingInvoiceAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -8915,6 +8977,7 @@ public HttpResponse createRepeatingInvoiceHistoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -9047,6 +9110,7 @@ public HttpResponse createRepeatingInvoicesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/RepeatingInvoices"); if (summarizeErrors != null) { @@ -9175,6 +9239,7 @@ public HttpResponse createTaxRatesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/TaxRates"); String url = uriBuilder.build().toString(); @@ -9292,6 +9357,7 @@ public HttpResponse createTrackingCategoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/TrackingCategories"); String url = uriBuilder.build().toString(); @@ -9417,6 +9483,7 @@ public HttpResponse createTrackingOptionsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -9642,6 +9709,7 @@ public HttpResponse deleteBatchPaymentForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/BatchPayments"); String url = uriBuilder.build().toString(); @@ -9761,6 +9829,7 @@ public HttpResponse deleteBatchPaymentByUrlParamForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -10451,6 +10520,7 @@ public HttpResponse deletePaymentForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -10876,6 +10946,7 @@ public HttpResponse emailInvoiceForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -26524,6 +26595,7 @@ public HttpResponse postSetupForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Setup"); String url = uriBuilder.build().toString(); @@ -26649,6 +26721,7 @@ public HttpResponse updateAccountForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -26783,6 +26856,7 @@ public HttpResponse updateAccountAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -26925,6 +26999,7 @@ public HttpResponse updateAccountAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -27068,6 +27143,7 @@ public HttpResponse updateBankTransactionForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -27230,6 +27306,7 @@ public HttpResponse updateBankTransactionAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -27374,6 +27451,7 @@ public HttpResponse updateBankTransactionAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -27511,6 +27589,7 @@ public HttpResponse updateBankTransferAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -27652,6 +27731,7 @@ public HttpResponse updateBankTransferAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -27782,6 +27862,7 @@ public HttpResponse updateContactForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -27912,6 +27993,7 @@ public HttpResponse updateContactAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -28050,6 +28132,7 @@ public HttpResponse updateContactAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -28180,6 +28263,7 @@ public HttpResponse updateContactGroupForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -28314,6 +28398,7 @@ public HttpResponse updateCreditNoteForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -28472,6 +28557,7 @@ public HttpResponse updateCreditNoteAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -28617,6 +28703,7 @@ public HttpResponse updateCreditNoteAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -28747,6 +28834,7 @@ public HttpResponse updateExpenseClaimForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -28881,6 +28969,7 @@ public HttpResponse updateInvoiceForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -29035,6 +29124,7 @@ public HttpResponse updateInvoiceAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -29177,6 +29267,7 @@ public HttpResponse updateInvoiceAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -29313,6 +29404,7 @@ public HttpResponse updateItemForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -29466,6 +29558,7 @@ public HttpResponse updateLinkedTransactionForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -29596,6 +29689,7 @@ public HttpResponse updateManualJournalForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -29734,6 +29828,7 @@ public HttpResponse updateManualJournalAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -29879,6 +29974,7 @@ public HttpResponse updateManualJournalAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -30018,6 +30114,7 @@ public HttpResponse updateOrCreateBankTransactionsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/BankTransactions"); if (summarizeErrors != null) { @@ -30179,6 +30276,7 @@ public HttpResponse updateOrCreateContactsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Contacts"); if (summarizeErrors != null) { @@ -30328,6 +30426,7 @@ public HttpResponse updateOrCreateCreditNotesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/CreditNotes"); if (summarizeErrors != null) { @@ -30489,6 +30588,7 @@ public HttpResponse updateOrCreateEmployeesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Employees"); if (summarizeErrors != null) { @@ -30636,6 +30736,7 @@ public HttpResponse updateOrCreateInvoicesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Invoices"); if (summarizeErrors != null) { @@ -30803,6 +30904,7 @@ public HttpResponse updateOrCreateItemsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Items"); if (summarizeErrors != null) { @@ -30968,6 +31070,7 @@ public HttpResponse updateOrCreateManualJournalsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/ManualJournals"); if (summarizeErrors != null) { @@ -31113,6 +31216,7 @@ public HttpResponse updateOrCreatePurchaseOrdersForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/PurchaseOrders"); if (summarizeErrors != null) { @@ -31254,6 +31358,7 @@ public HttpResponse updateOrCreateQuotesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Quotes"); if (summarizeErrors != null) { @@ -31402,6 +31507,7 @@ public HttpResponse updateOrCreateRepeatingInvoicesForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/RepeatingInvoices"); if (summarizeErrors != null) { @@ -31545,6 +31651,7 @@ public HttpResponse updatePurchaseOrderForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -31681,6 +31788,7 @@ public HttpResponse updatePurchaseOrderAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -31824,6 +31932,7 @@ public HttpResponse updatePurchaseOrderAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -31945,6 +32054,7 @@ public HttpResponse updateQuoteForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -32077,6 +32187,7 @@ public HttpResponse updateQuoteAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -32216,6 +32327,7 @@ public HttpResponse updateQuoteAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -32351,6 +32463,7 @@ public HttpResponse updateReceiptForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -32507,6 +32620,7 @@ public HttpResponse updateReceiptAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -32651,6 +32765,7 @@ public HttpResponse updateReceiptAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -32782,6 +32897,7 @@ public HttpResponse updateRepeatingInvoiceForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -32926,6 +33042,7 @@ public HttpResponse updateRepeatingInvoiceAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -33072,6 +33189,7 @@ public HttpResponse updateRepeatingInvoiceAttachmentByFileNameForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/octet-stream"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -33188,6 +33306,7 @@ public HttpResponse updateTaxRateForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/TaxRates"); String url = uriBuilder.build().toString(); @@ -33314,6 +33433,7 @@ public HttpResponse updateTrackingCategoryForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -33457,6 +33577,7 @@ public HttpResponse updateTrackingOptionsForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); diff --git a/src/main/java/com/xero/api/client/AppStoreApi.java b/src/main/java/com/xero/api/client/AppStoreApi.java index 3f47d9fd3..1d2e768ec 100644 --- a/src/main/java/com/xero/api/client/AppStoreApi.java +++ b/src/main/java/com/xero/api/client/AppStoreApi.java @@ -372,6 +372,7 @@ public HttpResponse postUsageRecordsForHttpResponse( HttpHeaders headers = new HttpHeaders(); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -504,6 +505,7 @@ public HttpResponse putUsageRecordsForHttpResponse( HttpHeaders headers = new HttpHeaders(); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); diff --git a/src/main/java/com/xero/api/client/AssetApi.java b/src/main/java/com/xero/api/client/AssetApi.java index ef879e8ab..a428d6abf 100644 --- a/src/main/java/com/xero/api/client/AssetApi.java +++ b/src/main/java/com/xero/api/client/AssetApi.java @@ -197,6 +197,7 @@ public HttpResponse createAssetForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Assets"); String url = uriBuilder.build().toString(); @@ -306,6 +307,7 @@ public HttpResponse createAssetTypeForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/AssetTypes"); String url = uriBuilder.build().toString(); diff --git a/src/main/java/com/xero/api/client/BankFeedsApi.java b/src/main/java/com/xero/api/client/BankFeedsApi.java index e2fbb3ec9..3be4ad934 100644 --- a/src/main/java/com/xero/api/client/BankFeedsApi.java +++ b/src/main/java/com/xero/api/client/BankFeedsApi.java @@ -204,6 +204,7 @@ public HttpResponse createFeedConnectionsForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/FeedConnections"); String url = uriBuilder.build().toString(); @@ -327,7 +328,8 @@ public HttpResponse createStatementsForHttpResponse( HttpHeaders headers = new HttpHeaders(); headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); - headers.setAccept("application/jsonapplication/problem+json"); + headers.setAccept("application/json;application/problem+json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Statements"); String url = uriBuilder.build().toString(); @@ -434,6 +436,7 @@ public HttpResponse deleteFeedConnectionsForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/FeedConnections/DeleteRequests"); @@ -872,7 +875,7 @@ public HttpResponse getStatementsForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Xero-Application-Id", xeroApplicationId); headers.set("Xero-User-Id", xeroUserId); - headers.setAccept("application/jsonapplication/problem+json"); + headers.setAccept("application/json;application/problem+json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Statements"); if (page != null) { diff --git a/src/main/java/com/xero/api/client/FilesApi.java b/src/main/java/com/xero/api/client/FilesApi.java index c00c42a8f..63351c0c8 100644 --- a/src/main/java/com/xero/api/client/FilesApi.java +++ b/src/main/java/com/xero/api/client/FilesApi.java @@ -211,6 +211,7 @@ public HttpResponse createFileAssociationForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -313,6 +314,7 @@ public HttpResponse createFolderForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Folders"); String url = uriBuilder.build().toString(); @@ -1690,6 +1692,7 @@ public HttpResponse updateFileForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1799,6 +1802,7 @@ public HttpResponse updateFolderForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1927,6 +1931,7 @@ public HttpResponse uploadFileForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("multipart/form-data"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Files"); String url = uriBuilder.build().toString(); @@ -2084,6 +2089,7 @@ public HttpResponse uploadFileToFolderForHttpResponse( headers.set("xero-tenant-id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("multipart/form-data"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); diff --git a/src/main/java/com/xero/api/client/PayrollAuApi.java b/src/main/java/com/xero/api/client/PayrollAuApi.java index 464184187..e3bef17db 100644 --- a/src/main/java/com/xero/api/client/PayrollAuApi.java +++ b/src/main/java/com/xero/api/client/PayrollAuApi.java @@ -321,6 +321,7 @@ public HttpResponse createEmployeeForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Employees"); String url = uriBuilder.build().toString(); @@ -439,6 +440,7 @@ public HttpResponse createLeaveApplicationForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/LeaveApplications"); String url = uriBuilder.build().toString(); @@ -536,6 +538,7 @@ public HttpResponse createPayItemForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/PayItems"); String url = uriBuilder.build().toString(); @@ -646,6 +649,7 @@ public HttpResponse createPayRunForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/PayRuns"); String url = uriBuilder.build().toString(); @@ -764,6 +768,7 @@ public HttpResponse createPayrollCalendarForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/PayrollCalendars"); String url = uriBuilder.build().toString(); @@ -874,6 +879,7 @@ public HttpResponse createSuperfundForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Superfunds"); String url = uriBuilder.build().toString(); @@ -984,6 +990,7 @@ public HttpResponse createTimesheetForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Timesheets"); String url = uriBuilder.build().toString(); @@ -3343,6 +3350,7 @@ public HttpResponse updateEmployeeForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -3460,6 +3468,7 @@ public HttpResponse updateLeaveApplicationForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -3572,6 +3581,7 @@ public HttpResponse updatePayRunForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -3692,6 +3702,7 @@ public HttpResponse updatePayslipForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -3804,6 +3815,7 @@ public HttpResponse updateSuperfundForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -3917,6 +3929,7 @@ public HttpResponse updateTimesheetForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); diff --git a/src/main/java/com/xero/api/client/PayrollNzApi.java b/src/main/java/com/xero/api/client/PayrollNzApi.java index 9757d8ace..8777b7352 100644 --- a/src/main/java/com/xero/api/client/PayrollNzApi.java +++ b/src/main/java/com/xero/api/client/PayrollNzApi.java @@ -363,6 +363,7 @@ public HttpResponse createDeductionForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Deductions"); String url = uriBuilder.build().toString(); @@ -468,6 +469,7 @@ public HttpResponse createEarningsRateForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/EarningsRates"); String url = uriBuilder.build().toString(); @@ -571,6 +573,7 @@ public HttpResponse createEmployeeForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Employees"); String url = uriBuilder.build().toString(); @@ -697,6 +700,7 @@ public HttpResponse createEmployeeEarningsTemplateForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -823,6 +827,7 @@ public HttpResponse createEmployeeLeaveForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -953,6 +958,7 @@ public HttpResponse createEmployeeLeaveSetupForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1081,6 +1087,7 @@ public HttpResponse createEmployeeLeaveTypeForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1211,6 +1218,7 @@ public HttpResponse createEmployeeOpeningBalancesForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1337,6 +1345,7 @@ public HttpResponse createEmployeePaymentMethodForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1463,6 +1472,7 @@ public HttpResponse createEmployeeSalaryAndWageForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1601,6 +1611,7 @@ public HttpResponse createEmployeeWorkingPatternForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1725,6 +1736,7 @@ public HttpResponse createEmploymentForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1834,6 +1846,7 @@ public HttpResponse createLeaveTypeForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/LeaveTypes"); String url = uriBuilder.build().toString(); @@ -1960,6 +1973,7 @@ public HttpResponse createMultipleEmployeeEarningsTemplateForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -2068,6 +2082,7 @@ public HttpResponse createPayRunForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/PayRuns"); String url = uriBuilder.build().toString(); @@ -2174,6 +2189,7 @@ public HttpResponse createPayRunCalendarForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/PayRunCalendars"); String url = uriBuilder.build().toString(); @@ -2280,6 +2296,7 @@ public HttpResponse createReimbursementForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Reimbursements"); String url = uriBuilder.build().toString(); @@ -2385,6 +2402,7 @@ public HttpResponse createSuperannuationForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Superannuations"); String url = uriBuilder.build().toString(); @@ -2489,6 +2507,7 @@ public HttpResponse createTimesheetForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Timesheets"); String url = uriBuilder.build().toString(); @@ -2609,6 +2628,7 @@ public HttpResponse createTimesheetLineForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7355,6 +7375,7 @@ public HttpResponse updateEmployeeForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7499,6 +7520,7 @@ public HttpResponse updateEmployeeEarningsTemplateForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7635,6 +7657,7 @@ public HttpResponse updateEmployeeLeaveForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7776,6 +7799,7 @@ public HttpResponse updateEmployeeSalaryAndWageForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7898,6 +7922,7 @@ public HttpResponse updateEmployeeTaxForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -8012,6 +8037,7 @@ public HttpResponse updatePayRunForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -8134,6 +8160,7 @@ public HttpResponse updatePaySlipLineItemsForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -8271,6 +8298,7 @@ public HttpResponse updateTimesheetLineForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); diff --git a/src/main/java/com/xero/api/client/PayrollUkApi.java b/src/main/java/com/xero/api/client/PayrollUkApi.java index 6cd3c93ed..60d2179a0 100644 --- a/src/main/java/com/xero/api/client/PayrollUkApi.java +++ b/src/main/java/com/xero/api/client/PayrollUkApi.java @@ -359,6 +359,7 @@ public HttpResponse createBenefitForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Benefits"); String url = uriBuilder.build().toString(); @@ -463,6 +464,7 @@ public HttpResponse createDeductionForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Deductions"); String url = uriBuilder.build().toString(); @@ -568,6 +570,7 @@ public HttpResponse createEarningsRateForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/EarningsRates"); String url = uriBuilder.build().toString(); @@ -671,6 +674,7 @@ public HttpResponse createEmployeeForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Employees"); String url = uriBuilder.build().toString(); @@ -797,6 +801,7 @@ public HttpResponse createEmployeeEarningsTemplateForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -923,6 +928,7 @@ public HttpResponse createEmployeeLeaveForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1051,6 +1057,7 @@ public HttpResponse createEmployeeLeaveTypeForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1181,6 +1188,7 @@ public HttpResponse createEmployeeOpeningBalancesForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1307,6 +1315,7 @@ public HttpResponse createEmployeePaymentMethodForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1433,6 +1442,7 @@ public HttpResponse createEmployeeSalaryAndWageForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1555,6 +1565,7 @@ public HttpResponse createEmployeeStatutorySickLeaveForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/StatutoryLeaves/Sick"); String url = uriBuilder.build().toString(); @@ -1674,6 +1685,7 @@ public HttpResponse createEmploymentForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1783,6 +1795,7 @@ public HttpResponse createLeaveTypeForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/LeaveTypes"); String url = uriBuilder.build().toString(); @@ -1907,6 +1920,7 @@ public HttpResponse createMultipleEmployeeEarningsTemplateForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -2018,6 +2032,7 @@ public HttpResponse createPayRunCalendarForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/PayRunCalendars"); String url = uriBuilder.build().toString(); @@ -2124,6 +2139,7 @@ public HttpResponse createReimbursementForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Reimbursements"); String url = uriBuilder.build().toString(); @@ -2228,6 +2244,7 @@ public HttpResponse createTimesheetForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Timesheets"); String url = uriBuilder.build().toString(); @@ -2348,6 +2365,7 @@ public HttpResponse createTimesheetLineForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7273,6 +7291,7 @@ public HttpResponse updateEmployeeForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7417,6 +7436,7 @@ public HttpResponse updateEmployeeEarningsTemplateForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7553,6 +7573,7 @@ public HttpResponse updateEmployeeLeaveForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7684,6 +7705,7 @@ public HttpResponse updateEmployeeOpeningBalancesForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7824,6 +7846,7 @@ public HttpResponse updateEmployeeSalaryAndWageForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -7940,6 +7963,7 @@ public HttpResponse updatePayRunForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -8077,6 +8101,7 @@ public HttpResponse updateTimesheetLineForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); diff --git a/src/main/java/com/xero/api/client/ProjectApi.java b/src/main/java/com/xero/api/client/ProjectApi.java index 6e95b6272..105f72212 100644 --- a/src/main/java/com/xero/api/client/ProjectApi.java +++ b/src/main/java/com/xero/api/client/ProjectApi.java @@ -204,6 +204,7 @@ public HttpResponse createProjectForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/Projects"); String url = uriBuilder.build().toString(); @@ -316,6 +317,7 @@ public HttpResponse createTaskForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -435,6 +437,7 @@ public HttpResponse createTimeEntryForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -1960,6 +1963,7 @@ public HttpResponse patchProjectForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -2073,6 +2077,7 @@ public HttpResponse updateProjectForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -2194,6 +2199,7 @@ public HttpResponse updateTaskForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); @@ -2322,6 +2328,7 @@ public HttpResponse updateTimeEntryForHttpResponse( headers.set("Xero-Tenant-Id", xeroTenantId); headers.set("Idempotency-Key", idempotencyKey); headers.setAccept("application/json"); + headers.setContentType("application/json"); headers.setUserAgent(this.getUserAgent()); // create a map of path variables final Map uriVariables = new HashMap(); diff --git a/src/main/java/com/xero/models/payrollnz/Employee.java b/src/main/java/com/xero/models/payrollnz/Employee.java index 50d4c3cc3..551bd7aaf 100644 --- a/src/main/java/com/xero/models/payrollnz/Employee.java +++ b/src/main/java/com/xero/models/payrollnz/Employee.java @@ -212,7 +212,7 @@ public Employee firstName(String firstName) { * * @return firstName */ - @ApiModelProperty(example = "Karen", value = "First name of employee") + @ApiModelProperty(example = "Karen", required = true, value = "First name of employee") /** * First name of employee * @@ -247,7 +247,7 @@ public Employee lastName(String lastName) { * * @return lastName */ - @ApiModelProperty(example = "Jones", value = "Last name of employee") + @ApiModelProperty(example = "Jones", required = true, value = "Last name of employee") /** * Last name of employee * @@ -284,6 +284,7 @@ public Employee dateOfBirth(LocalDate dateOfBirth) { */ @ApiModelProperty( example = "Wed Jan 02 00:00:00 UTC 2019", + required = true, value = "Date of birth of the employee (YYYY-MM-DD)") /** * Date of birth of the employee (YYYY-MM-DD) @@ -319,7 +320,7 @@ public Employee address(Address address) { * * @return address */ - @ApiModelProperty(value = "") + @ApiModelProperty(required = true, value = "") /** * address * diff --git a/src/main/java/com/xero/models/payrollnz/Employment.java b/src/main/java/com/xero/models/payrollnz/Employment.java index 073a135aa..60f641ace 100644 --- a/src/main/java/com/xero/models/payrollnz/Employment.java +++ b/src/main/java/com/xero/models/payrollnz/Employment.java @@ -52,7 +52,9 @@ public Employment payrollCalendarID(UUID payrollCalendarID) { * * @return payrollCalendarID */ - @ApiModelProperty(value = "Xero unique identifier for the payroll calendar of the employee") + @ApiModelProperty( + required = true, + value = "Xero unique identifier for the payroll calendar of the employee") /** * Xero unique identifier for the payroll calendar of the employee * @@ -125,7 +127,7 @@ public Employment startDate(LocalDate startDate) { * * @return startDate */ - @ApiModelProperty(value = "Start date of the employment (YYYY-MM-DD)") + @ApiModelProperty(required = true, value = "Start date of the employment (YYYY-MM-DD)") /** * Start date of the employment (YYYY-MM-DD) * @@ -160,7 +162,10 @@ public Employment engagementType(String engagementType) { * * @return engagementType */ - @ApiModelProperty(example = "Permanent", value = "Engagement type of the employee") + @ApiModelProperty( + example = "Permanent", + required = true, + value = "Engagement type of the employee") /** * Engagement type of the employee * diff --git a/src/main/java/com/xero/models/payrolluk/Employee.java b/src/main/java/com/xero/models/payrolluk/Employee.java index 7436d3e80..a22d358b2 100644 --- a/src/main/java/com/xero/models/payrolluk/Employee.java +++ b/src/main/java/com/xero/models/payrolluk/Employee.java @@ -182,7 +182,7 @@ public Employee title(String title) { * * @return title */ - @ApiModelProperty(example = "Mrs", value = "Title of the employee") + @ApiModelProperty(example = "Mrs", required = true, value = "Title of the employee") /** * Title of the employee * @@ -217,7 +217,7 @@ public Employee firstName(String firstName) { * * @return firstName */ - @ApiModelProperty(example = "Karen", value = "First name of employee") + @ApiModelProperty(example = "Karen", required = true, value = "First name of employee") /** * First name of employee * @@ -252,7 +252,7 @@ public Employee lastName(String lastName) { * * @return lastName */ - @ApiModelProperty(example = "Jones", value = "Last name of employee") + @ApiModelProperty(example = "Jones", required = true, value = "Last name of employee") /** * Last name of employee * @@ -289,6 +289,7 @@ public Employee dateOfBirth(LocalDate dateOfBirth) { */ @ApiModelProperty( example = "Wed Jan 02 00:00:00 UTC 2019", + required = true, value = "Date of birth of the employee (YYYY-MM-DD)") /** * Date of birth of the employee (YYYY-MM-DD) @@ -324,7 +325,7 @@ public Employee address(Address address) { * * @return address */ - @ApiModelProperty(value = "") + @ApiModelProperty(required = true, value = "") /** * address * @@ -394,7 +395,7 @@ public Employee gender(GenderEnum gender) { * * @return gender */ - @ApiModelProperty(example = "F", value = "The employee’s gender") + @ApiModelProperty(example = "F", required = true, value = "The employee’s gender") /** * The employee’s gender * diff --git a/src/main/java/com/xero/models/payrolluk/Employment.java b/src/main/java/com/xero/models/payrolluk/Employment.java index a84dd2003..c3406294a 100644 --- a/src/main/java/com/xero/models/payrolluk/Employment.java +++ b/src/main/java/com/xero/models/payrolluk/Employment.java @@ -54,7 +54,9 @@ public Employment payrollCalendarID(UUID payrollCalendarID) { * * @return payrollCalendarID */ - @ApiModelProperty(value = "Xero unique identifier for the payroll calendar of the employee") + @ApiModelProperty( + required = true, + value = "Xero unique identifier for the payroll calendar of the employee") /** * Xero unique identifier for the payroll calendar of the employee * @@ -89,7 +91,7 @@ public Employment startDate(LocalDate startDate) { * * @return startDate */ - @ApiModelProperty(value = "Start date of the employment (YYYY-MM-DD)") + @ApiModelProperty(required = true, value = "Start date of the employment (YYYY-MM-DD)") /** * Start date of the employment (YYYY-MM-DD) * @@ -124,7 +126,7 @@ public Employment employeeNumber(String employeeNumber) { * * @return employeeNumber */ - @ApiModelProperty(example = "7", value = "The employment number of the employee") + @ApiModelProperty(example = "7", required = true, value = "The employment number of the employee") /** * The employment number of the employee * @@ -196,9 +198,6 @@ public Employment niCategories(List niCategories) { * @return Employment */ public Employment addNiCategoriesItem(NICategory niCategoriesItem) { - if (this.niCategories == null) { - this.niCategories = new ArrayList(); - } this.niCategories.add(niCategoriesItem); return this; } @@ -208,7 +207,7 @@ public Employment addNiCategoriesItem(NICategory niCategoriesItem) { * * @return niCategories */ - @ApiModelProperty(value = "The employee's NI categories") + @ApiModelProperty(required = true, value = "The employee's NI categories") /** * The employee's NI categories * diff --git a/src/test/java/com/xero/api/client/AccountingApiAccountsTest.java b/src/test/java/com/xero/api/client/AccountingApiAccountsTest.java index 52a3b0798..ace68e91f 100644 --- a/src/test/java/com/xero/api/client/AccountingApiAccountsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiAccountsTest.java @@ -1,45 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - -import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; -import org.junit.*; - import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - public class AccountingApiAccountsTest { ApiClient defaultClient; @@ -56,11 +29,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); - - accountingApi = AccountingApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); + accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { @@ -152,17 +122,18 @@ public void testGetAccountAttachments() throws Exception { } + @Ignore("Enable when OpenAPI schema is changed to binary wherever octet/stream is used") @Test public void testCreateAccountAttachmentByFileName() throws Exception { System.out.println("@Test - createAccountAttachmentByFileName"); - UUID accountID = UUID.fromString("297c2dc5-cc47-4afd-8ec8-74990b8761e9"); - + UUID accountID = UUID.fromString("297c2dc5-cc47-4afd-8ec8-74990b8761e9"); + ClassLoader classLoader = getClass().getClassLoader(); File bytes = new File(classLoader.getResource("helo-heros.jpg").getFile()); String newFileName = "sample5.jpg"; - Attachments createAccountsAttachments = accountingApi.createAccountAttachmentByFileName(accessToken,xeroTenantId,accountID, newFileName, bytes, null); + Attachments createAccountsAttachments = accountingApi.createAccountAttachmentByFileName(accessToken,xeroTenantId,accountID, newFileName, bytes, null); assertThat(createAccountsAttachments.getAttachments().get(0).getAttachmentID().toString(), is(equalTo("ab95b276-9dce-4925-9077-439818ba270f"))); assertThat(createAccountsAttachments.getAttachments().get(0).getFileName().toString(), is(equalTo("sample5.jpg"))); diff --git a/src/test/java/com/xero/api/client/AccountingApiBankTransactionTest.java b/src/test/java/com/xero/api/client/AccountingApiBankTransactionTest.java index 22006ab40..3f50e03ac 100644 --- a/src/test/java/com/xero/api/client/AccountingApiBankTransactionTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiBankTransactionTest.java @@ -1,42 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiBankTransactionTest { @@ -53,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); - - accountingApi = AccountingApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); + accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { @@ -152,6 +124,7 @@ public void testCreateBankTransaction() throws Exception { } */ + @Ignore("Enable when OpenAPI schema is changed to binary wherever octet/stream is used") @Test public void createBankTransactionAttachmentByFileNameTest() throws IOException { System.out.println("@Test - createBankTransactionAttachmentByFileNameTest"); @@ -159,7 +132,6 @@ public void createBankTransactionAttachmentByFileNameTest() throws IOException { ClassLoader classLoader = getClass().getClassLoader(); File bytes = new File(classLoader.getResource("helo-heros.jpg").getFile()); String fileName = "sample5.jpg"; - Attachments response = accountingApi.createBankTransactionAttachmentByFileName(accessToken,xeroTenantId,bankTransactionID, fileName, bytes, null); assertThat(response.getAttachments().get(0).getAttachmentID(), is(equalTo(UUID.fromString("4508a692-e52c-4ad8-a138-2f13e22bf57b")))); assertThat(response.getAttachments().get(0).getFileName().toString(), is(equalTo("sample5.jpg"))); diff --git a/src/test/java/com/xero/api/client/AccountingApiBankTransferTest.java b/src/test/java/com/xero/api/client/AccountingApiBankTransferTest.java index b36ffb21c..25850173f 100644 --- a/src/test/java/com/xero/api/client/AccountingApiBankTransferTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiBankTransferTest.java @@ -1,43 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiBankTransferTest { @@ -56,10 +30,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); - - accountingApi = AccountingApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); + accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); bytes = new File(classLoader.getResource("helo-heros.jpg").getFile()); @@ -134,6 +106,7 @@ public void createBankTransferTest() throws IOException { //System.out.println(response.getBankTransfers().get(0).toString()); } + @Ignore("Enable when OpenAPI schema is changed to binary wherever octet/stream is used") @Test public void createBankTransferAttachmentByFileNameTest() throws IOException { System.out.println("@Test - createBankTransferAttachmentByFileNameTest"); diff --git a/src/test/java/com/xero/api/client/AccountingApiBatchPaymentTest.java b/src/test/java/com/xero/api/client/AccountingApiBatchPaymentTest.java index 4d574b2d1..34635d365 100644 --- a/src/test/java/com/xero/api/client/AccountingApiBatchPaymentTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiBatchPaymentTest.java @@ -1,40 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; public class AccountingApiBatchPaymentTest { @@ -53,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); - - accountingApi = AccountingApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); + accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); bytes = new File(classLoader.getResource("helo-heros.jpg").getFile()); diff --git a/src/test/java/com/xero/api/client/AccountingApiBrandingThemeTest.java b/src/test/java/com/xero/api/client/AccountingApiBrandingThemeTest.java index 2119a9694..02a3d9b82 100644 --- a/src/test/java/com/xero/api/client/AccountingApiBrandingThemeTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiBrandingThemeTest.java @@ -1,40 +1,13 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; public class AccountingApiBrandingThemeTest { @@ -52,12 +25,9 @@ public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; xeroTenantId = "xyz"; - - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); - - accountingApi = AccountingApi.getInstance(defaultClient); + + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); + accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { diff --git a/src/test/java/com/xero/api/client/AccountingApiContactGroupTest.java b/src/test/java/com/xero/api/client/AccountingApiContactGroupTest.java index 218ed4eb7..951265469 100644 --- a/src/test/java/com/xero/api/client/AccountingApiContactGroupTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiContactGroupTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiContactGroupTest { @@ -56,11 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); - - accountingApi = AccountingApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); + accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { diff --git a/src/test/java/com/xero/api/client/AccountingApiContactsTest.java b/src/test/java/com/xero/api/client/AccountingApiContactsTest.java index da18515c1..56b11dc93 100644 --- a/src/test/java/com/xero/api/client/AccountingApiContactsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiContactsTest.java @@ -1,42 +1,19 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiContactsTest { @@ -55,11 +32,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); - - accountingApi = AccountingApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); + accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); body = new File(classLoader.getResource("helo-heros.jpg").getFile()); @@ -221,6 +195,7 @@ public void updateContactTest() throws IOException { //System.out.println(response.getContacts().get(0).toString()); } + @Ignore("Enable when OpenAPI schema is changed to binary wherever octet/stream is used") @Test public void createContactAttachmentByFileNameTest() throws IOException { System.out.println("@Test - createContactAttachmentByFileNameTest"); diff --git a/src/test/java/com/xero/api/client/AccountingApiCreditNotesTest.java b/src/test/java/com/xero/api/client/AccountingApiCreditNotesTest.java index b70e1ba8f..a157a3778 100644 --- a/src/test/java/com/xero/api/client/AccountingApiCreditNotesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiCreditNotesTest.java @@ -1,42 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiCreditNotesTest { @@ -55,9 +30,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); - accountingApi = AccountingApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); + accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); body = new File(classLoader.getResource("helo-heros.jpg").getFile()); diff --git a/src/test/java/com/xero/api/client/AccountingApiEmployeesTest.java b/src/test/java/com/xero/api/client/AccountingApiEmployeesTest.java index b9b9feffc..9d3ddff3a 100644 --- a/src/test/java/com/xero/api/client/AccountingApiEmployeesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiEmployeesTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiEmployeesTest { @@ -56,9 +28,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiExpenseClaimsTest.java b/src/test/java/com/xero/api/client/AccountingApiExpenseClaimsTest.java index 49fc446f3..dbe23f64e 100644 --- a/src/test/java/com/xero/api/client/AccountingApiExpenseClaimsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiExpenseClaimsTest.java @@ -1,43 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiExpenseClaimsTest { @@ -56,9 +30,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); diff --git a/src/test/java/com/xero/api/client/AccountingApiInvoicesTest.java b/src/test/java/com/xero/api/client/AccountingApiInvoicesTest.java index 0ec2420da..585445b30 100644 --- a/src/test/java/com/xero/api/client/AccountingApiInvoicesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiInvoicesTest.java @@ -1,42 +1,19 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiInvoicesTest { @@ -54,9 +31,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); diff --git a/src/test/java/com/xero/api/client/AccountingApiItemsTest.java b/src/test/java/com/xero/api/client/AccountingApiItemsTest.java index bf90e61c9..284cb0ef2 100644 --- a/src/test/java/com/xero/api/client/AccountingApiItemsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiItemsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiItemsTest { @@ -56,9 +28,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -95,7 +65,7 @@ public void createItemTest() throws IOException { assertThat(response.getItems().get(0).getIsTrackedAsInventory(), is(equalTo(false))); assertThat(response.getItems().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-03-11T19:17:51.707Z")))); assertThat(response.getItems().get(0).getItemID(), is(equalTo(UUID.fromString("a4544d51-48f6-441f-a623-99ecbced6ab7")))); - assertThat(response.getItems().get(0).getValidationErrors().get(0).getMessage(), is(equalTo("Price List Item with Code 'abc' already exists"))); + assertThat(response.getItems().get(0).getValidationErrors().get(0).getMessage(), is(equalTo("Price List Item with Code ''abc'' already exists"))); //System.out.println(response.getItems().get(0).toString()); } diff --git a/src/test/java/com/xero/api/client/AccountingApiJournalsTest.java b/src/test/java/com/xero/api/client/AccountingApiJournalsTest.java index 678651f17..df0e4c7fb 100644 --- a/src/test/java/com/xero/api/client/AccountingApiJournalsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiJournalsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiJournalsTest { @@ -55,9 +27,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -80,44 +50,46 @@ public void tearDown() { defaultClient = null; } - @Test - public void getJournalTest() throws IOException { - System.out.println("@Test - getJournal"); - UUID journalID = UUID.fromString("8138a266-fb42-49b2-a104-014b7045753d"); - Journals response = accountingApi.getJournal(accessToken,xeroTenantId,journalID); - - assertThat(response.getJournals().get(0).getJournalID(), is(equalTo(UUID.fromString("1b31feeb-aa23-404c-8c19-24c827c53661")))); - assertThat(response.getJournals().get(0).getJournalDateAsDate(), is(equalTo(LocalDate.of(2018,10,20)))); - assertThat(response.getJournals().get(0).getJournalNumber(), is(equalTo(1))); - assertThat(response.getJournals().get(0).getCreatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2018-11-02T16:30:43.467Z")))); - assertThat(response.getJournals().get(0).getReference(), is(equalTo("Red Fish, Blue Fish"))); - assertThat(response.getJournals().get(0).getJournalLines().get(0).getJournalLineID(), is(equalTo(UUID.fromString("81e6b1bf-d812-4f87-8dc4-698558ae043e")))); - assertThat(response.getJournals().get(0).getJournalLines().get(0).getAccountID(), is(equalTo(UUID.fromString("b94495d0-44ab-4199-a1d0-427a4877e100")))); - assertThat(response.getJournals().get(0).getJournalLines().get(0).getAccountCode(), is(equalTo("610"))); - assertThat(response.getJournals().get(0).getJournalLines().get(0).getAccountType(), is(equalTo(com.xero.models.accounting.AccountType.CURRENT))); - assertThat(response.getJournals().get(0).getJournalLines().get(0).getAccountName(), is(equalTo("Accounts Receivable"))); - assertThat(response.getJournals().get(0).getJournalLines().get(0).getNetAmount(), is(equalTo(40.0))); - assertThat(response.getJournals().get(0).getJournalLines().get(0).getNetAmount().toString(), is(equalTo("40.0"))); - assertThat(response.getJournals().get(0).getJournalLines().get(0).getGrossAmount(), is(equalTo(40.0))); - assertThat(response.getJournals().get(0).getJournalLines().get(0).getGrossAmount().toString(), is(equalTo("40.0"))); - assertThat(response.getJournals().get(0).getJournalLines().get(0).getTaxAmount(), is(equalTo(0.0))); - assertThat(response.getJournals().get(0).getJournalLines().get(0).getTaxAmount().toString(), is(equalTo("0.0"))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getJournalLineID(), is(equalTo(UUID.fromString("ad221a8c-ebee-4c1b-88ed-d574e27e8803")))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getAccountID(), is(equalTo(UUID.fromString("e0a5d892-9f9f-44f0-a153-5cb7db125170")))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getAccountCode(), is(equalTo("200"))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getAccountType(), is(equalTo(com.xero.models.accounting.AccountType.REVENUE))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getAccountName(), is(equalTo("Sales"))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getDescription(), is(equalTo("Acme Tires"))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getNetAmount(), is(equalTo(-40.0))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getNetAmount().toString(), is(equalTo("-40.0"))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getGrossAmount(), is(equalTo(-40.0))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getGrossAmount().toString(), is(equalTo("-40.0"))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getTaxAmount(), is(equalTo(0.0))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getTaxAmount().toString(), is(equalTo("0.0"))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getTaxType(), is(equalTo("NONE"))); - assertThat(response.getJournals().get(0).getJournalLines().get(1).getTaxName(), is(equalTo("No GST"))); - //System.out.println(response.getJournals().get(0).toString()); - } + /** There is an ambiguity between the endpoints /journals/{uuid} and /journals/{integer}. The Prism mock server treats both uuid and integer as strings, resulting in non-deterministic behavior. A solution is needed to resolve this conflict; otherwise, API teams will need to eliminate the ambiguity in the endpoint definitions. The following test can be uncommented once the issue is addressed. */ + + // @Test + // public void getJournalTest() throws IOException { + // System.out.println("@Test - getJournal"); + // UUID journalID = UUID.fromString("8138a266-fb42-49b2-a104-014b7045753d"); + // Journals response = accountingApi.getJournalByNumber(accessToken,xeroTenantId,1); + + // assertThat(response.getJournals().get(0).getJournalID(), is(equalTo(UUID.fromString("1b31feeb-aa23-404c-8c19-24c827c53661")))); + // assertThat(response.getJournals().get(0).getJournalDateAsDate(), is(equalTo(LocalDate.of(2018,10,20)))); + // assertThat(response.getJournals().get(0).getJournalNumber(), is(equalTo(1))); + // assertThat(response.getJournals().get(0).getCreatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2018-11-02T16:30:43.467Z")))); + // assertThat(response.getJournals().get(0).getReference(), is(equalTo("Red Fish, Blue Fish"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(0).getJournalLineID(), is(equalTo(UUID.fromString("81e6b1bf-d812-4f87-8dc4-698558ae043e")))); + // assertThat(response.getJournals().get(0).getJournalLines().get(0).getAccountID(), is(equalTo(UUID.fromString("b94495d0-44ab-4199-a1d0-427a4877e100")))); + // assertThat(response.getJournals().get(0).getJournalLines().get(0).getAccountCode(), is(equalTo("610"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(0).getAccountType(), is(equalTo(com.xero.models.accounting.AccountType.CURRENT))); + // assertThat(response.getJournals().get(0).getJournalLines().get(0).getAccountName(), is(equalTo("Accounts Receivable"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(0).getNetAmount(), is(equalTo(40.0))); + // assertThat(response.getJournals().get(0).getJournalLines().get(0).getNetAmount().toString(), is(equalTo("40.0"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(0).getGrossAmount(), is(equalTo(40.0))); + // assertThat(response.getJournals().get(0).getJournalLines().get(0).getGrossAmount().toString(), is(equalTo("40.0"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(0).getTaxAmount(), is(equalTo(0.0))); + // assertThat(response.getJournals().get(0).getJournalLines().get(0).getTaxAmount().toString(), is(equalTo("0.0"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getJournalLineID(), is(equalTo(UUID.fromString("ad221a8c-ebee-4c1b-88ed-d574e27e8803")))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getAccountID(), is(equalTo(UUID.fromString("e0a5d892-9f9f-44f0-a153-5cb7db125170")))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getAccountCode(), is(equalTo("200"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getAccountType(), is(equalTo(com.xero.models.accounting.AccountType.REVENUE))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getAccountName(), is(equalTo("Sales"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getDescription(), is(equalTo("Acme Tires"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getNetAmount(), is(equalTo(-40.0))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getNetAmount().toString(), is(equalTo("-40.0"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getGrossAmount(), is(equalTo(-40.0))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getGrossAmount().toString(), is(equalTo("-40.0"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getTaxAmount(), is(equalTo(0.0))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getTaxAmount().toString(), is(equalTo("0.0"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getTaxType(), is(equalTo("NONE"))); + // assertThat(response.getJournals().get(0).getJournalLines().get(1).getTaxName(), is(equalTo("No GST"))); + // //System.out.println(response.getJournals().get(0).toString()); + // } @Test diff --git a/src/test/java/com/xero/api/client/AccountingApiLinkedTransactionsTest.java b/src/test/java/com/xero/api/client/AccountingApiLinkedTransactionsTest.java index 4e412d57d..d58e040c3 100644 --- a/src/test/java/com/xero/api/client/AccountingApiLinkedTransactionsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiLinkedTransactionsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiLinkedTransactionsTest { @@ -56,9 +28,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiManualJournalsTest.java b/src/test/java/com/xero/api/client/AccountingApiManualJournalsTest.java index 70a7fc8fa..2b0985ed6 100644 --- a/src/test/java/com/xero/api/client/AccountingApiManualJournalsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiManualJournalsTest.java @@ -1,42 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiManualJournalsTest { @@ -55,9 +30,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); @@ -112,12 +85,13 @@ public void createManualJournalsTest() throws IOException { assertThat(response.getManualJournals().get(0).getShowOnCashBasisReports(), is(equalTo(true))); assertThat(response.getManualJournals().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-03-14T20:39:32.920Z")))); assertThat(response.getManualJournals().get(0).getManualJournalID(), is(equalTo(UUID.fromString("d312dd5e-a53e-46d1-9d51-c569ef4570b7")))); - assertThat(response.getManualJournals().get(0).getWarnings().get(0).getMessage(), is(equalTo("Account code '476' has been removed as it does not match a recognised account."))); + assertThat(response.getManualJournals().get(0).getWarnings().get(0).getMessage(), is(equalTo("Account code ''476'' has been removed as it does not match a recognised account."))); assertThat(response.getManualJournals().get(0).getValidationErrors().get(0).getMessage(), is(equalTo("The total debits (100.00) must equal total credits (-10.00)"))); //System.out.println(response.getManualJournals().get(0).toString()); } + @Ignore("Enable when OpenAPI schema is changed to binary wherever octet/stream is used") @Test public void createManualJournalAttachmentByFileNameTest() throws IOException { System.out.println("@Test - createManualJournalAttachmentByFileName"); @@ -140,11 +114,11 @@ public void getManualJournalTest() throws IOException { UUID manualJournalID = UUID.fromString("8138a266-fb42-49b2-a104-014b7045753d"); ManualJournals response = accountingApi.getManualJournal(accessToken,xeroTenantId,manualJournalID); - assertThat(response.getManualJournals().get(0).getNarration(), is(equalTo("These aren't the droids you are looking for"))); + assertThat(response.getManualJournals().get(0).getNarration(), is(equalTo("These aren''t the droids you are looking for"))); assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getLineAmount(), is(equalTo(100.0))); assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getLineAmount().toString(), is(equalTo("100.0"))); assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getAccountCode(), is(equalTo("429"))); - assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getDescription(), is(equalTo("These aren't the droids you are looking for"))); + assertThat(response.getManualJournals().get(0).getNarration(), is(equalTo("These aren''t the droids you are looking for"))); assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getTaxType(), is(equalTo("NONE"))); assertThat(response.getManualJournals().get(0).getJournalLines().get(0).getIsBlank(), is(equalTo(false))); assertThat(response.getManualJournals().get(0).getJournalLines().get(1).getLineAmount(), is(equalTo(-100.0))); @@ -193,7 +167,7 @@ public void getManualJournalsTest() throws IOException { Integer pageSize = null; ManualJournals response = accountingApi.getManualJournals(accessToken,xeroTenantId,ifModifiedSince, where, order, page, pageSize); - assertThat(response.getManualJournals().get(0).getNarration(), is(equalTo("Reversal: These aren't the droids you are looking for"))); + assertThat(response.getManualJournals().get(0).getNarration(), is(equalTo("Reversal: These aren''t the droids you are looking for"))); assertThat(response.getManualJournals().get(0).getDateAsDate(), is(equalTo(LocalDate.of(2019,03,21)))); assertThat(response.getManualJournals().get(0).getLineAmountTypes(), is(equalTo(com.xero.models.accounting.LineAmountTypes.NOTAX))); assertThat(response.getManualJournals().get(0).getStatus(), is(equalTo(com.xero.models.accounting.ManualJournal.StatusEnum.POSTED))); diff --git a/src/test/java/com/xero/api/client/AccountingApiOrganisationsTest.java b/src/test/java/com/xero/api/client/AccountingApiOrganisationsTest.java index 3d25d954d..a2e945daa 100644 --- a/src/test/java/com/xero/api/client/AccountingApiOrganisationsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiOrganisationsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiOrganisationsTest { @@ -56,9 +28,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiOverpaymentsTest.java b/src/test/java/com/xero/api/client/AccountingApiOverpaymentsTest.java index 962d993c7..c1cd3ae91 100644 --- a/src/test/java/com/xero/api/client/AccountingApiOverpaymentsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiOverpaymentsTest.java @@ -1,42 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiOverpaymentsTest { @@ -55,9 +30,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); diff --git a/src/test/java/com/xero/api/client/AccountingApiPaymentServicesTest.java b/src/test/java/com/xero/api/client/AccountingApiPaymentServicesTest.java index 4f5383cbe..6e05a70b4 100644 --- a/src/test/java/com/xero/api/client/AccountingApiPaymentServicesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiPaymentServicesTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiPaymentServicesTest { @@ -54,11 +25,9 @@ public class AccountingApiPaymentServicesTest { public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; - xeroTenantId = "xyz"; - - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + xeroTenantId = "xyz"; + + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiPaymentsTest.java b/src/test/java/com/xero/api/client/AccountingApiPaymentsTest.java index 1569d2848..6879d7ae1 100644 --- a/src/test/java/com/xero/api/client/AccountingApiPaymentsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiPaymentsTest.java @@ -1,42 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiPaymentsTest { @@ -51,9 +25,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/AccountingApiPrepaymentsTest.java b/src/test/java/com/xero/api/client/AccountingApiPrepaymentsTest.java index 9f664c91c..2b5fe2d18 100644 --- a/src/test/java/com/xero/api/client/AccountingApiPrepaymentsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiPrepaymentsTest.java @@ -1,42 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiPrepaymentsTest { @@ -54,9 +28,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiPurchaseOrdersTest.java b/src/test/java/com/xero/api/client/AccountingApiPurchaseOrdersTest.java index d6fdc271a..29dd59842 100644 --- a/src/test/java/com/xero/api/client/AccountingApiPurchaseOrdersTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiPurchaseOrdersTest.java @@ -1,42 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiPurchaseOrdersTest { @@ -51,11 +25,9 @@ public class AccountingApiPurchaseOrdersTest { public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; - xeroTenantId = "xyz"; - - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + xeroTenantId = "xyz"; + + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiQuotesTest.java b/src/test/java/com/xero/api/client/AccountingApiQuotesTest.java index aea933475..886623bd1 100644 --- a/src/test/java/com/xero/api/client/AccountingApiQuotesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiQuotesTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - -import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.*; - import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - public class AccountingApiQuotesTest { ApiClient defaultClient; @@ -56,11 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); - - accountingApi = AccountingApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); + accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { diff --git a/src/test/java/com/xero/api/client/AccountingApiReceiptsTest.java b/src/test/java/com/xero/api/client/AccountingApiReceiptsTest.java index ac2c7008a..e5a77d244 100644 --- a/src/test/java/com/xero/api/client/AccountingApiReceiptsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiReceiptsTest.java @@ -1,44 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiReceiptsTest { @@ -56,9 +29,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); @@ -109,6 +80,7 @@ public void createReceiptTest() throws IOException { //System.out.println(response.getReceipts().get(0).toString()); } + @Ignore("Enable when OpenAPI schema is changed to binary wherever octet/stream is used") @Test public void createReceiptAttachmentByFileNameTest() throws IOException { System.out.println("@Test - createReceiptAttachmentByFileName"); diff --git a/src/test/java/com/xero/api/client/AccountingApiRepeatingInvoicesTest.java b/src/test/java/com/xero/api/client/AccountingApiRepeatingInvoicesTest.java index 6fa289a6b..55b6bb1d5 100644 --- a/src/test/java/com/xero/api/client/AccountingApiRepeatingInvoicesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiRepeatingInvoicesTest.java @@ -1,44 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiRepeatingInvoicesTest { @@ -56,9 +29,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); ClassLoader classLoader = getClass().getClassLoader(); @@ -84,6 +55,7 @@ public void tearDown() { defaultClient = null; } + @Ignore("Enable when OpenAPI schema is changed to binary wherever octet/stream is used") @Test public void createRepeatingInvoiceAttachmentByFileNameTest() throws IOException { System.out.println("@Test - createRepeatingInvoiceAttachmentByFileName"); diff --git a/src/test/java/com/xero/api/client/AccountingApiReportsTest.java b/src/test/java/com/xero/api/client/AccountingApiReportsTest.java index 43a5a33f8..727254db3 100644 --- a/src/test/java/com/xero/api/client/AccountingApiReportsTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiReportsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiReportsTest { @@ -55,8 +27,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs @@ -254,9 +225,9 @@ public void getReportTenNinetyNineTest() throws IOException { Reports response = accountingApi.getReportTenNinetyNine(accessToken,xeroTenantId,reportYear); - assertThat(response.getReports().get(0).getReportName(), is(equalTo("1099 report"))); - assertThat(response.getReports().get(0).getReportDate(), is(equalTo("1 Jan 2016 to 31 Dec 2016"))); - assertThat(response.getReports().get(0).getContacts().get(0).getBox3(), is(equalTo(1000.00))); + assertThat(response.getReports().get(0).getReportName(), is(equalTo("1099-NEC report"))); + assertThat(response.getReports().get(0).getReportDate(), is(equalTo("1 Jan 2023 to 31 Dec 2023"))); + assertThat(response.getReports().get(0).getContacts().get(0).getBox4(), is(equalTo(1150.00))); assertThat(response.getReports().get(0).getContacts().get(0).getName(), is(equalTo("Bank West"))); assertThat(response.getReports().get(0).getContacts().get(0).getFederalTaxIDType(), is(equalTo("SSN"))); assertThat(response.getReports().get(0).getContacts().get(0).getCity(), is(equalTo("Pinehaven"))); @@ -265,7 +236,7 @@ public void getReportTenNinetyNineTest() throws IOException { assertThat(response.getReports().get(0).getContacts().get(0).getEmail(), is(equalTo("jack@bowest.com"))); assertThat(response.getReports().get(0).getContacts().get(0).getTaxID(), is(equalTo("234-22-2223"))); assertThat(response.getReports().get(0).getContacts().get(0).getContactId(), is(equalTo(UUID.fromString("81d5706a-8057-4338-8511-747cd85f4c68")))); - assertThat(response.getReports().get(0).getContacts().get(2).getBox1(), is(equalTo(5543.75))); + assertThat(response.getReports().get(0).getContacts().get(0).getBox1(), is(equalTo(0.00))); //System.out.println(response.getReports().toString()); } diff --git a/src/test/java/com/xero/api/client/AccountingApiTaxRatesTest.java b/src/test/java/com/xero/api/client/AccountingApiTaxRatesTest.java index a9c749e1c..f3cbb59c6 100644 --- a/src/test/java/com/xero/api/client/AccountingApiTaxRatesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiTaxRatesTest.java @@ -1,45 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; import java.io.IOException; -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; - public class AccountingApiTaxRatesTest { ApiClient defaultClient; @@ -54,10 +24,8 @@ public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; xeroTenantId = "xyz"; - - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiTrackingCategoriesTest.java b/src/test/java/com/xero/api/client/AccountingApiTrackingCategoriesTest.java index 030cbf127..7ae2823cb 100644 --- a/src/test/java/com/xero/api/client/AccountingApiTrackingCategoriesTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiTrackingCategoriesTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiTrackingCategoriesTest { @@ -55,9 +26,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AccountingApiUsersTest.java b/src/test/java/com/xero/api/client/AccountingApiUsersTest.java index c73767010..9cf9d6d42 100644 --- a/src/test/java/com/xero/api/client/AccountingApiUsersTest.java +++ b/src/test/java/com/xero/api/client/AccountingApiUsersTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.accounting.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class AccountingApiUsersTest { @@ -55,9 +27,7 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://25faf04a-c71e-40e7-b7ce-f1fae0149465.mock.pstmn.io/api.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("accounting.api.url"),null,null,null,null); accountingApi = AccountingApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs diff --git a/src/test/java/com/xero/api/client/AppStoreApiTest.java b/src/test/java/com/xero/api/client/AppStoreApiTest.java index b0dfd445c..3930a772a 100644 --- a/src/test/java/com/xero/api/client/AppStoreApiTest.java +++ b/src/test/java/com/xero/api/client/AppStoreApiTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - -import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.*; - import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; import com.xero.api.XeroApiException; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.appstore.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; - -import org.apache.commons.io.IOUtils; - public class AppStoreApiTest { ApiClient defaultClient; @@ -54,9 +25,9 @@ public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; xeroTenantId = "xyz"; - - defaultClient = new ApiClient("https://ec5d3540-e90b-47b9-9a5d-95180950a89b.mock.pstmn.io/appstore/2.0",null,null,null,null); - appStoreApi = AppStoreApi.getInstance(defaultClient); + + defaultClient = new ApiClient(ConfigurationLoader.getProperty("appstore.api.url"),null,null,null,null); + appStoreApi = AppStoreApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { diff --git a/src/test/java/com/xero/api/client/AssetsApiTest.java b/src/test/java/com/xero/api/client/AssetsApiTest.java index a997b20f7..b0c6efb40 100644 --- a/src/test/java/com/xero/api/client/AssetsApiTest.java +++ b/src/test/java/com/xero/api/client/AssetsApiTest.java @@ -1,45 +1,19 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - -import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.*; - import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; import com.xero.api.XeroApiException; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.assets.*; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; +import com.xero.models.assets.BookDepreciationSetting.DepreciationMethodEnum; import org.threeten.bp.*; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; - import java.util.List; -import org.apache.commons.io.IOUtils; - public class AssetsApiTest { ApiClient defaultClient; @@ -56,9 +30,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init clienthttps://3e140044-4914-47dd-b4e1-df0cc040a44f.mock.pstmn.io/bankfeeds.xro/1.0 - defaultClient = new ApiClient("https://0a44a319-84a5-4918-91ce-338acd97a84d.mock.pstmn.io/assets.xro/1.0",null,null,null,null); - assetApi = AssetApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("assets.api.url"),null,null,null,null); + assetApi = AssetApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { @@ -86,6 +59,7 @@ public void testCreateAsset() throws Exception { System.out.println("@Test - createAsset"); Asset newAsset = new Asset(); + newAsset.setAssetName("Computer7486"); try { Asset response = assetApi.createAsset(accessToken,xeroTenantId,newAsset,null); assertThat(response.getAssetId().toString(), (equalTo("2257c64a-77ca-444c-a5ea-fa9a588c7039"))); @@ -200,6 +174,12 @@ public void testCreateAssetType() throws Exception { System.out.println("@Test - createAssetType"); AssetType newAssetType = new AssetType(); + newAssetType.setAssetTypeName("Machinery11004"); + newAssetType.setFixedAssetAccountId(UUID.fromString("3d8d063a-c148-4bb8-8b3c-a5e2ad3b1e82")); + newAssetType.setDepreciationExpenseAccountId(UUID.fromString("d1602f69-f900-4616-8d34-90af393fa368")); + BookDepreciationSetting bookDepreciationSetting = new BookDepreciationSetting(); + bookDepreciationSetting.setDepreciationMethod(DepreciationMethodEnum.DIMINISHINGVALUE100); + newAssetType.setBookDepreciationSetting(bookDepreciationSetting); try { AssetType response = assetApi.createAssetType(accessToken,xeroTenantId,newAssetType,null); diff --git a/src/test/java/com/xero/api/client/BankfeedApiFeedConnectionTest.java b/src/test/java/com/xero/api/client/BankfeedApiFeedConnectionTest.java index 3a1033f2a..89588477c 100644 --- a/src/test/java/com/xero/api/client/BankfeedApiFeedConnectionTest.java +++ b/src/test/java/com/xero/api/client/BankfeedApiFeedConnectionTest.java @@ -7,6 +7,7 @@ import java.util.UUID; import com.xero.api.ApiClient; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.bankfeeds.FeedConnection; import com.xero.models.bankfeeds.FeedConnections; @@ -28,11 +29,9 @@ public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; xeroTenantId = "xyz"; - - // Init AccountingApi client - //defaultClient = new ApiClient("https://virtserver.swaggerhub.com/Xero/bankfeeds/1.0.0",null,null,null,null); - defaultClient = new ApiClient("https://3e140044-4914-47dd-b4e1-df0cc040a44f.mock.pstmn.io/bankfeeds.xro/1.0",null,null,null,null); - bankfeedsApi = BankFeedsApi.getInstance(defaultClient); + + defaultClient = new ApiClient(ConfigurationLoader.getProperty("bankfeeds.api.url"),null,null,null,null); + bankfeedsApi = BankFeedsApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { diff --git a/src/test/java/com/xero/api/client/BankfeedApiStatementTest.java b/src/test/java/com/xero/api/client/BankfeedApiStatementTest.java index afcb542d8..03bf63bf0 100644 --- a/src/test/java/com/xero/api/client/BankfeedApiStatementTest.java +++ b/src/test/java/com/xero/api/client/BankfeedApiStatementTest.java @@ -1,44 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - -import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.*; - import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.bankfeeds.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; public class BankfeedApiStatementTest { @@ -56,10 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init AccountingApi client - //defaultClient = new ApiClient("https://virtserver.swaggerhub.com/Xero/bankfeeds/1.0.0",null,null,null,null); - defaultClient = new ApiClient("https://3e140044-4914-47dd-b4e1-df0cc040a44f.mock.pstmn.io/bankfeeds.xro/1.0",null,null,null,null); - bankfeedsApi = BankFeedsApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("bankfeeds.api.url"),null,null,null,null); + bankfeedsApi = BankFeedsApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { diff --git a/src/test/java/com/xero/api/client/FinanceApiTest.java b/src/test/java/com/xero/api/client/FinanceApiTest.java index e00468fff..04ccaa6d8 100644 --- a/src/test/java/com/xero/api/client/FinanceApiTest.java +++ b/src/test/java/com/xero/api/client/FinanceApiTest.java @@ -1,44 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - -import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.*; - import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; import com.xero.api.XeroApiException; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.finance.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; - import java.util.*; - -import org.apache.commons.io.IOUtils; +import java.io.IOException; +import java.io.InputStream; public class FinanceApiTest { @@ -54,9 +27,8 @@ public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; xeroTenantId = "xyz"; - - defaultClient = new ApiClient("https://73cb2c15-a3e8-4230-86d6-8af203c03b5f.mock.pstmn.io/finance.xro/1.0",null,null,null,null); - financeApi = FinanceApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("finance.api.url"),null,null,null,null); + financeApi = FinanceApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { @@ -116,7 +88,7 @@ public void testGetAccountingActivityLockHistory() throws Exception { try { LockHistoryResponse response = financeApi.getAccountingActivityLockHistory(accessToken, "73151de8-3676-4887-a021-edec960dd537", null); assertThat(response.getOrganisationId().toString(), (equalTo("73151de8-3676-4887-a021-edec960dd537"))); - assertThat(response.getLockDates().get(1).getUpdatedDateUtc().toString(), (equalTo("2019-01-20T10:50:03Z"))); + assertThat(response.getLockDates().get(1).getUpdatedDateUtc().toString(), (equalTo("2019-01-21T10:59:33Z"))); } catch (XeroApiException xe) { System.out.println(xe.toString()); @@ -212,7 +184,6 @@ public void testGetFinancialStatementContactsRevenue() throws Exception { System.out.println("@Test - getFinancialStatementContactsRevenue"); List contacts = new ArrayList(); contacts.add(UUID.fromString("1f580fe2-0659-31ee-eeb4-5c49d15d8bfa")); - contacts.add(UUID.fromString("20e94281-4751-fb7e-ee5e-96b43ae93c8a")); try { IncomeByContactResponse response = financeApi.getFinancialStatementContactsRevenue(accessToken, "73151de8-3676-4887-a021-edec960dd537",contacts,true,null,null); assertThat(response.getContacts().get(0).getName(), (equalTo("FirstContact"))); @@ -226,7 +197,6 @@ public void testGetFinancialStatementContactsExpense() throws Exception { System.out.println("@Test - getFinancialStatementContactsExpense"); List contacts = new ArrayList(); contacts.add(UUID.fromString("1f580fe2-0659-31ee-eeb4-5c49d15d8bfa")); - contacts.add(UUID.fromString("20e94281-4751-fb7e-ee5e-96b43ae93c8a")); try { IncomeByContactResponse response = financeApi.getFinancialStatementContactsExpense(accessToken, "73151de8-3676-4887-a021-edec960dd537",contacts,true,null,null); assertThat(response.getContacts().get(0).getName(), (equalTo("FirstContact"))); diff --git a/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java b/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java index 4a26781ec..f3267341f 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiEmployeeTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiEmployeeTest { @@ -54,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java b/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java index a73ea5252..02531fb5a 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiLeaveApplicationTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiLeaveApplicationTest { @@ -54,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } public void tearDown() { @@ -102,7 +73,7 @@ public void getLeaveApplicationTest() throws IOException { assertThat(response.getLeaveApplications().get(0).getEndDateAsDate(), is(equalTo(LocalDate.of(2019,11,12)))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodStartDateAsDate() , is(equalTo(LocalDate.of(2019,11,8)))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodEndDateAsDate() , is(equalTo(LocalDate.of(2019,11,14)))); - assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(0.0))); + assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(7.6))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getLeavePeriodStatus(), is(equalTo(com.xero.models.payrollau.LeavePeriodStatus.SCHEDULED))); assertThat(response.getLeaveApplications().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-11-13T05:30:08Z")))); //System.out.println(response.toString()); @@ -123,7 +94,7 @@ public void createLeaveApplicationTest() throws IOException { assertThat(response.getLeaveApplications().get(0).getEndDateAsDate(), is(equalTo(LocalDate.of(2019,11,01)))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodStartDateAsDate() , is(equalTo(LocalDate.of(2019,11,1)))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodEndDateAsDate() , is(equalTo(LocalDate.of(2019,11,07)))); - assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(0.6))); + assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(7.6))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getLeavePeriodStatus(), is(equalTo(com.xero.models.payrollau.LeavePeriodStatus.SCHEDULED))); assertThat(response.getLeaveApplications().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-11-13T21:16:31.897Z")))); //System.out.println(response.toString()); @@ -146,7 +117,7 @@ public void updateLeaveApplicationTest() throws IOException { assertThat(response.getLeaveApplications().get(0).getDescription(), is(equalTo("My updated Description"))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodStartDateAsDate() , is(equalTo(LocalDate.of(2019,11,01)))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getPayPeriodEndDateAsDate() , is(equalTo(LocalDate.of(2019,11,07)))); - assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(0.6))); + assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getNumberOfUnits(), is(equalTo(7.6))); assertThat(response.getLeaveApplications().get(0).getLeavePeriods().get(0).getLeavePeriodStatus(), is(equalTo(com.xero.models.payrollau.LeavePeriodStatus.SCHEDULED))); assertThat(response.getLeaveApplications().get(0).getUpdatedDateUTCAsDate(), is(equalTo(OffsetDateTime.parse("2019-11-13T21:16:32.293Z")))); //System.out.println(response.toString()); diff --git a/src/test/java/com/xero/api/client/PayrollAuApiPayItemTest.java b/src/test/java/com/xero/api/client/PayrollAuApiPayItemTest.java index a18b3bb37..3e806a1bc 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayItemTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayItemTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiPayItemTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java b/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java index 59ce86246..d30ff1393 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayRunTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiPayRunTest { @@ -54,10 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiPayrollCalendarTest.java b/src/test/java/com/xero/api/client/PayrollAuApiPayrollCalendarTest.java index e91252346..2fdcc80f3 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayrollCalendarTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayrollCalendarTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiPayrollCalendarTest { @@ -54,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); payrollAuApi = PayrollAuApi.getInstance(defaultClient); - } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java b/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java index aa7019bf1..349ca07ac 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiPayslipTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiPayslipTest { @@ -54,10 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiSettingsTest.java b/src/test/java/com/xero/api/client/PayrollAuApiSettingsTest.java index ceb82cadd..343575b28 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiSettingsTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiSettingsTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiSettingsTest { @@ -54,10 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiSuperFundTest.java b/src/test/java/com/xero/api/client/PayrollAuApiSuperFundTest.java index 4ced621a2..5d7477a27 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiSuperFundTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiSuperFundTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollAuApiSuperFundTest { @@ -54,10 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiSuperfundProductTest.java b/src/test/java/com/xero/api/client/PayrollAuApiSuperfundProductTest.java index 4e8c466d6..e07614691 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiSuperfundProductTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiSuperfundProductTest.java @@ -1,45 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; - public class PayrollAuApiSuperfundProductTest { ApiClient defaultClient; @@ -54,10 +23,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollAuApiTimesheetTest.java b/src/test/java/com/xero/api/client/PayrollAuApiTimesheetTest.java index 1568d49bf..908b0a75d 100644 --- a/src/test/java/com/xero/api/client/PayrollAuApiTimesheetTest.java +++ b/src/test/java/com/xero/api/client/PayrollAuApiTimesheetTest.java @@ -1,44 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollau.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; +import java.io.InputStream; public class PayrollAuApiTimesheetTest { @@ -53,12 +26,9 @@ public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; xeroTenantId = "xyz"; - - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5f9f95f1-25c8-40dd-8b10-8192c658dd79.mock.pstmn.io/payroll.xro/1.0",null,null,null,null); - payrollAuApi = PayrollAuApi.getInstance(defaultClient); - + + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollau.api.url"),null,null,null,null); + payrollAuApi = PayrollAuApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java index 058e9b401..b97fb3738 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiDeductionsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; +import com.xero.models.payrollnz.Deduction.DeductionCategoryEnum; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiDeductionsTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -104,6 +73,9 @@ public void createDeductionTest() throws IOException { System.out.println("@Test NZ Payroll - createDeductionTest"); Deduction deduction = new Deduction(); + deduction.setDeductionName("Test Name"); + deduction.setDeductionCategory(DeductionCategoryEnum.NZOTHER); + deduction.setLiabilityAccountId(UUID.randomUUID()); DeductionObject response = payrollNzApi.createDeduction(accessToken, xeroTenantId, deduction, null); assertThat(response.getDeduction().getDeductionId(), is(equalTo(UUID.fromString("0ee805eb-f5b0-4061-9b35-d9ea550da04e")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEarningRatesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEarningRatesTest.java index 04e263c0d..28303e2f7 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEarningRatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEarningRatesTest.java @@ -1,43 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; +import com.xero.models.payrollnz.EarningsRate.EarningsTypeEnum; +import com.xero.models.payrollnz.EarningsRate.RateTypeEnum; -import java.io.File; import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEarningRatesTest { @@ -53,11 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -112,6 +83,11 @@ public void createEarningsRateTest() throws IOException { System.out.println("@Test NZ Payroll - createEarningsRateTest"); EarningsRate earningsRate = new EarningsRate(); + earningsRate.setName("My Earnings Rate"); + earningsRate.setEarningsType(EarningsTypeEnum.REGULAREARNINGS); + earningsRate.setRateType(RateTypeEnum.RATEPERUNIT); + earningsRate.setTypeOfUnits("hours"); + earningsRate.setExpenseAccountID(UUID.fromString("e4eb36f6-97e3-4427-a394-dd4e1b355c2e")); EarningsRateObject response = payrollNzApi.createEarningsRate(accessToken, xeroTenantId, earningsRate, null); assertThat(response.getEarningsRate().getEarningsRateID(),is(equalTo(UUID.fromString("4369b0ef-a64d-42e1-bb6d-f2fc984de133")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveBalancesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveBalancesTest.java index 58b507b74..f4464026a 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveBalancesTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeLeaveBalancesTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.java index dcdddcbca..1528dee14 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeavePeriodsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeLeavePeriodsTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -77,7 +46,7 @@ public void getEmployeeLeavePeriodsTest() throws IOException { assertThat(response.getPeriods().get(0).getPeriodStartDate(), is(equalTo(LocalDate.of(2020, 02, 24)))); assertThat(response.getPeriods().get(0).getPeriodEndDate(), is(equalTo(LocalDate.of(2020, 03, 01)))); - assertThat(response.getPeriods().get(0).getNumberOfUnits() , is(equalTo(0.0))); + assertThat(response.getPeriods().get(0).getNumberOfUnits() , is(equalTo(24.0))); //System.out.println(response.toString()); } diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java index f8ceaca21..99c3f4b5a 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveSetupTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeLeaveSetupTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java index bf06c15f8..c60994e63 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeLeaveTest { @@ -55,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -93,6 +61,10 @@ public void createEmployeeLeaveTest() throws IOException { System.out.println("@Test NZ Payroll - createEmployeeLeaveTest"); EmployeeLeave employeeLeave = new EmployeeLeave(); + employeeLeave.setLeaveTypeID(UUID.fromString("b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4")); + employeeLeave.setDescription("Creating a Description"); + employeeLeave.setStartDate(LocalDate.of(2020, 04, 24)); + employeeLeave.setEndDate(LocalDate.of(2020, 04, 26)); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeLeaveObject response = payrollNzApi.createEmployeeLeave(accessToken, xeroTenantId, employeeId, employeeLeave, null); @@ -119,6 +91,10 @@ public void updateEmployeeLeaveTest() throws IOException { UUID leaveId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeLeave employeeLeave = new EmployeeLeave(); + employeeLeave.setLeaveTypeID(UUID.fromString("b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4")); + employeeLeave.setDescription("Creating a Description"); + employeeLeave.setStartDate(LocalDate.of(2020, 04, 24)); + employeeLeave.setEndDate(LocalDate.of(2020, 04, 26)); EmployeeLeaveObject response = payrollNzApi.updateEmployeeLeave(accessToken, xeroTenantId, employeeId, leaveId, employeeLeave, null); assertThat(response.getLeave().getLeaveID(), is(equalTo(UUID.fromString("82a04ba6-a5cc-4e7d-86d4-b9f381a494e8")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java index ffd4b3e36..dc5cd87f5 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeLeaveTypesTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeLeaveTypesTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java index 69622c116..4052aba1a 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeOpeningBalancesTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeOpeningBalancesTest { @@ -54,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java index 0bcaff831..0f3f2f8d9 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeePayTemplatesTest.java @@ -1,44 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; import java.util.List; import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeePayTemplatesTest { @@ -54,11 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.java index 2cc685efc..b0f6c606b 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTaxTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeTaxTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); - } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java index 61c15c312..fd0ee7893 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmployeeTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmployeeTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -94,6 +63,14 @@ public void createEmployeeTest() throws IOException { System.out.println("@Test UK Payroll - createEmployeeTest"); Employee employee = new Employee(); + Address address = new Address(); + address.setAddressLine1("101 Green St"); + address.setCity("San Francisco"); + address.setPostCode("4351"); + employee.setAddress(address); + employee.setFirstName("Mike"); + employee.setLastName("Johntzxzpxhmkgson"); + employee.setDateOfBirth(LocalDate.now()); EmployeeObject response = payrollNzApi.createEmployee(accessToken, xeroTenantId, employee, null); assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("658be485-3feb-402e-9e77-ac17623aad42")))); @@ -141,6 +118,14 @@ public void updateEmployeeTest() throws IOException { UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); Employee employee = new Employee(); + Address address = new Address(); + address.setAddressLine1("101 Green St"); + address.setCity("San Francisco"); + address.setPostCode("4351"); + employee.setAddress(address); + employee.setFirstName("Mike"); + employee.setLastName("Johntzxzpxhmkgson"); + employee.setDateOfBirth(LocalDate.now()); EmployeeObject response = payrollNzApi.updateEmployee(accessToken, xeroTenantId, employeeId, employee, null); assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("68342973-c405-4b86-b5d3-d7b877c27995")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiEmploymentTest.java b/src/test/java/com/xero/api/client/PayrollNzApiEmploymentTest.java index 25411d6b6..c9277153a 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiEmploymentTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiEmploymentTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiEmploymentTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -72,6 +41,9 @@ public void createEmploymentTest() throws IOException { Employment employment = new Employment(); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); + employment.setPayrollCalendarID(UUID.fromString("9aa56064-990f-4ad3-a189-d966d8f6a030")); + employment.setStartDate(LocalDate.now()); + employment.setEngagementType("FixedTerm"); EmploymentObject response = payrollNzApi.createEmployment(accessToken, xeroTenantId, employeeId, employment, null); assertThat(response.getEmployment().getPayrollCalendarID(), is(equalTo(UUID.fromString("9aa56064-990f-4ad3-a189-d966d8f6a030")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java index d12394fee..ae9c42437 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiLeaveTypesTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiLeaveTypesTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -105,6 +74,11 @@ public void createLeaveTypeTest() throws IOException { System.out.println("@Test NZ Payroll - createLeaveTypeTest"); LeaveType leaveType = new LeaveType(); + leaveType.setLeaveTypeID(UUID.randomUUID()); + leaveType.setName("My opebvwbfxf Leave"); + leaveType.setIsPaidLeave(true); + leaveType.isActive(true); + leaveType.setShowOnPayslip(true); LeaveTypeObject response = payrollNzApi.createLeaveType(accessToken, xeroTenantId, leaveType, null); assertThat(response.getLeaveType().getLeaveTypeID(),is(equalTo(UUID.fromString("80464f55-b5c9-4d05-84c7-219d98baa3e2")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java index 0dad9252b..b3404e7cd 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPayRunCalendarsTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiPayRunCalendarsTest { @@ -55,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -110,6 +78,10 @@ public void createPayRunCalendarTest() throws IOException { System.out.println("@Test NZ Payroll - createPayRunCalendarTest"); PayRunCalendar payRunCalendar = new PayRunCalendar(); + payRunCalendar.setName("My Weekly Cal"); + payRunCalendar.setCalendarType(com.xero.models.payrollnz.CalendarType.WEEKLY); + payRunCalendar.setPeriodStartDate(LocalDate.of(2020, 05, 01)); + payRunCalendar.setPaymentDate(LocalDate.of(2020, 05, 15)); PayRunCalendarObject response = payrollNzApi.createPayRunCalendar(accessToken, xeroTenantId, payRunCalendar, null); assertThat(response.getPayRunCalendar().getPayrollCalendarID(),is(equalTo(UUID.fromString("54e9706a-c4e8-45ff-9c63-6fcac7ee7cde")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java index 428f8fae0..9e8cdf0a3 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPayRunsTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiPayRunsTest { @@ -55,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java index 2bbfbcd66..ef886e4ab 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPaySlipsTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiPaySlipsTest { @@ -55,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java index 7dd98fc23..a143ffaf7 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiPaymentMethodsTest.java @@ -1,45 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollNzApiPaymentMethodsTest { @@ -55,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); - } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.java index f6e689539..a665ea671 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiReimbursementsTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiReimbursementsTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -122,6 +90,8 @@ public void createReimbursementTest() throws IOException { System.out.println("@Test NZ Payroll - createReimbursementTest"); Reimbursement reimbursement = new Reimbursement(); + reimbursement.setName("My new Reimburse"); + reimbursement.setAccountID(UUID.randomUUID()); ReimbursementObject response = payrollNzApi.createReimbursement(accessToken, xeroTenantId, reimbursement, null); // assertThat(response.getReimbursement().getReimbursementID(),is(equalTo(UUID.fromString("2b1b587a-39f6-43f8-9dd9-a858314333c8")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiSalaryAndWagesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiSalaryAndWagesTest.java index 545163985..af3d59276 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiSalaryAndWagesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiSalaryAndWagesTest.java @@ -1,44 +1,18 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; +import com.xero.models.payrollnz.SalaryAndWage.PaymentTypeEnum; +import com.xero.models.payrollnz.SalaryAndWage.StatusEnum; import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiSalaryAndWagesTest { @@ -54,11 +28,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { @@ -91,7 +62,14 @@ public void getSalaryAndWagesTest() throws IOException { public void createEmployeeSalaryAndWageTest() throws IOException { System.out.println("@Test NZ Payroll - createEmployeeSalaryAndWageTest"); - SalaryAndWage salaryAndWage = new SalaryAndWage(); + SalaryAndWage salaryAndWage = new SalaryAndWage(); + salaryAndWage.setEarningsRateID(UUID.randomUUID()); + salaryAndWage.setNumberOfUnitsPerWeek(1.00); + salaryAndWage.setNumberOfUnitsPerDay(1.00); + salaryAndWage.setEffectiveFrom(LocalDate.now()); + salaryAndWage.setAnnualSalary(2.00); + salaryAndWage.setStatus(StatusEnum.ACTIVE); + salaryAndWage .setPaymentType(PaymentTypeEnum.HOURLY); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); SalaryAndWageObject response = payrollNzApi.createEmployeeSalaryAndWage(accessToken, xeroTenantId, employeeId, salaryAndWage, null); @@ -134,7 +112,14 @@ public void getEmployeeSalaryAndWageTest() throws IOException { public void updateEmployeeSalaryAndWageTest() throws IOException { System.out.println("@Test NZ Payroll - updateEmployeeSalaryAndWageTest"); - SalaryAndWage salaryAndWage = new SalaryAndWage(); + SalaryAndWage salaryAndWage = new SalaryAndWage(); + salaryAndWage.setEarningsRateID(UUID.randomUUID()); + salaryAndWage.setNumberOfUnitsPerWeek(1.00); + salaryAndWage.setNumberOfUnitsPerDay(1.00); + salaryAndWage.setEffectiveFrom(LocalDate.now()); + salaryAndWage.setAnnualSalary(2.00); + salaryAndWage.setStatus(StatusEnum.ACTIVE); + salaryAndWage .setPaymentType(PaymentTypeEnum.HOURLY); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); UUID salaryAndWagesId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); SalaryAndWageObject response = payrollNzApi.updateEmployeeSalaryAndWage(accessToken, xeroTenantId, employeeId, salaryAndWagesId, salaryAndWage, null); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiSettingsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiSettingsTest.java index 032022506..452fdb5d7 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiSettingsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiSettingsTest.java @@ -1,45 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiSettingsTest { @@ -55,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.java index ebf5f3fb1..6432b99ba 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiStatutoryDeductionsTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiStatutoryDeductionsTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.java index a647eea88..80deadf87 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiSuperannuationsTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiSuperannuationsTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); payrollNzApi = PayrollNzApi.getInstance(defaultClient); - } public void tearDown() { @@ -107,6 +75,12 @@ public void createSuperannuationTest() throws IOException { System.out.println("@Test NZ Payroll - createSuperannuationTest"); Benefit benefit = new Benefit(); + benefit.setName("New Benefit"); + benefit.setCategory(com.xero.models.payrollnz.Benefit.CategoryEnum.OTHER); + benefit.setLiabilityAccountId(UUID.randomUUID()); + benefit.setExpenseAccountId(UUID.randomUUID()); + benefit.setCalculationTypeNZ(com.xero.models.payrollnz.Benefit.CalculationTypeNZEnum.FIXEDAMOUNT); + benefit.setPercentage(12.00); SuperannuationObject response = payrollNzApi.createSuperannuation(accessToken, xeroTenantId, benefit, null); assertThat(response.getBenefit().getId(), is(equalTo(UUID.fromString("8905a754-7ce8-40e2-9fa5-f819deb7adce")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java b/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java index ba7e20b11..433ae18f5 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiTimesheetsTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiTimesheetsTest { @@ -55,10 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } @@ -116,7 +85,18 @@ public void createTimesheetTest() throws IOException { int page = 1; UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); + List timesheetLines = new ArrayList<>(); + TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); + timesheetLines.add(timesheetLine); Timesheet timesheet = new Timesheet(); + timesheet.setTimesheetLines(timesheetLines); + timesheet.setPayrollCalendarID(UUID.randomUUID()); + timesheet.setEndDate(LocalDate.of(2020, 04, 19)); + timesheet.setStartDate(LocalDate.of(2020, 04, 13)); + timesheet.setEmployeeID(UUID.randomUUID()); TimesheetObject response = payrollNzApi.createTimesheet(accessToken, xeroTenantId, timesheet, null); assertThat(response.getTimesheet().getTimesheetID(),is(equalTo(UUID.fromString("d227445a-4188-453a-a196-48163a38188c")))); @@ -141,6 +121,9 @@ public void createTimesheetLineTest() throws IOException { UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); TimesheetLineObject response = payrollNzApi.createTimesheetLine(accessToken, xeroTenantId, timesheetID, timesheetLine, null); assertThat(response.getTimesheetLine().getTimesheetLineID(),is(equalTo(UUID.fromString("10c3c63e-6cd0-4630-861f-08a2baa657fa")))); @@ -158,6 +141,9 @@ public void updateTimesheetLineTest() throws IOException { UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); UUID timesheetLineID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); TimesheetLineObject response = payrollNzApi.updateTimesheetLine(accessToken, xeroTenantId, timesheetID, timesheetLineID, timesheetLine, null); assertThat(response.getTimesheetLine().getTimesheetLineID(),is(equalTo(UUID.fromString("3397aab1-6cac-4804-a72b-00f396b04a08")))); diff --git a/src/test/java/com/xero/api/client/PayrollNzApiTrackingCategoriesTest.java b/src/test/java/com/xero/api/client/PayrollNzApiTrackingCategoriesTest.java index 9931127b7..bc9740cea 100644 --- a/src/test/java/com/xero/api/client/PayrollNzApiTrackingCategoriesTest.java +++ b/src/test/java/com/xero/api/client/PayrollNzApiTrackingCategoriesTest.java @@ -1,45 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrollnz.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; -import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollNzApiTrackingCategoriesTest { @@ -54,12 +24,9 @@ public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; xeroTenantId = "xyz"; - - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://5d4d8dd7-b3b2-4151-87c6-31841929f349.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollNzApi = PayrollNzApi.getInstance(defaultClient); - + + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrollnz.api.url"),null,null,null,null); + payrollNzApi = PayrollNzApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java index 49f59d2c9..b701af4ed 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiDeductionsTest.java @@ -1,46 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; public class PayrollUkApiDeductionsTest { @@ -56,11 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -111,6 +76,10 @@ public void createDeductionTest() throws IOException { System.out.println("@Test UK Payroll - createDeductionTest"); Deduction deduction = new Deduction(); + deduction.setDeductionName("Test Name"); + deduction.setDeductionCategory(com.xero.models.payrolluk.Deduction.DeductionCategoryEnum.SALARYSACRIFICE); + deduction.setLiabilityAccountId(UUID.randomUUID()); + deduction.calculationType(com.xero.models.payrolluk.Deduction.CalculationTypeEnum.FIXEDAMOUNT); DeductionObject response = payrollUkApi.createDeduction(accessToken, xeroTenantId, deduction, null); assertThat(response.getDeduction().getDeductionId(), is(equalTo(UUID.fromString("b3695b29-750f-4957-98b4-678e4a529043")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEarningRatesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEarningRatesTest.java index bfd83284b..69a795aab 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEarningRatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEarningRatesTest.java @@ -1,46 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEarningRatesTest { @@ -56,11 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -117,6 +82,11 @@ public void createEarningsRateTest() throws IOException { System.out.println("@Test UK Payroll - createEarningsRateTest"); EarningsRate earningsRate = new EarningsRate(); + earningsRate.setName("My Earnings Rate"); + earningsRate.setEarningsType(com.xero.models.payrolluk.EarningsRate.EarningsTypeEnum.REGULAREARNINGS); + earningsRate.setRateType(com.xero.models.payrolluk.EarningsRate.RateTypeEnum.RATEPERUNIT); + earningsRate.setTypeOfUnits("hours"); + earningsRate.setExpenseAccountID(UUID.fromString("e4eb36f6-97e3-4427-a394-dd4e1b355c2e")); EarningsRateObject response = payrollUkApi.createEarningsRate(accessToken, xeroTenantId, earningsRate, null); assertThat(response.getEarningsRate().getEarningsRateID(),is(equalTo(UUID.fromString("fcf811a8-3843-4e87-8431-c62e83158aef")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEarningsOrdersTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEarningsOrdersTest.java index caf1a4aa9..6db7d140e 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEarningsOrdersTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEarningsOrdersTest.java @@ -1,46 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEarningsOrdersTest { @@ -56,11 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java index 6ded2c292..efa5d0e49 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveBalancesTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeLeaveBalancesTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java index 1078fbe08..e1d7d529b 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeavePeriodsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeLeavePeriodsTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java index e1fe1bbcb..6d6ba3892 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTest.java @@ -1,45 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeLeaveTest { @@ -55,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -93,6 +61,10 @@ public void createEmployeeLeaveTest() throws IOException { System.out.println("@Test UK Payroll - createEmployeeLeaveTest"); EmployeeLeave employeeLeave = new EmployeeLeave(); + employeeLeave.setLeaveTypeID(UUID.fromString("b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4")); + employeeLeave.setDescription("Creating a Description"); + employeeLeave.setStartDate(LocalDate.of(2020, 04, 24)); + employeeLeave.setEndDate(LocalDate.of(2020, 04, 26)); UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeLeaveObject response = payrollUkApi.createEmployeeLeave(accessToken, xeroTenantId, employeeId, employeeLeave, null); @@ -141,6 +113,10 @@ public void updateEmployeeLeaveTest() throws IOException { UUID leaveId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeLeave employeeLeave = new EmployeeLeave(); + employeeLeave.setLeaveTypeID(UUID.fromString("b0b1b79e-2a25-46c2-ad08-ca25ef48d7e4")); + employeeLeave.setDescription("Creating a Description"); + employeeLeave.setStartDate(LocalDate.of(2020, 04, 24)); + employeeLeave.setEndDate(LocalDate.of(2020, 04, 26)); EmployeeLeaveObject response = payrollUkApi.updateEmployeeLeave(accessToken, xeroTenantId, employeeId, leaveId, employeeLeave, null); assertThat(response.getLeave().getLeaveID(), is(equalTo(UUID.fromString("8340b795-50c1-428e-9fda-90badf081ab4")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTypesTest.java index e8c202bbb..7b59395dc 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeLeaveTypesTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeLeaveTypesTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -91,6 +60,9 @@ public void createEmployeeLeaveTypesTest() throws IOException { UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeLeaveType employeeLeaveType = new EmployeeLeaveType(); + employeeLeaveType.setLeaveTypeID(UUID.randomUUID()); + employeeLeaveType.setScheduleOfAccrual(com.xero.models.payrolluk.EmployeeLeaveType.ScheduleOfAccrualEnum.BEGINNINGOFCALENDARYEAR); + employeeLeaveType.setHoursAccruedAnnually(10.00); EmployeeLeaveTypeObject response = payrollUkApi.createEmployeeLeaveType(accessToken, xeroTenantId, employeeId, employeeLeaveType, null); assertThat(response.getLeaveType().getLeaveTypeID(), is(equalTo(UUID.fromString("4918f233-bd31-43f9-9633-bcc6de1178f2")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeOpeningBalancesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeOpeningBalancesTest.java index f01cd051f..cb276d772 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeOpeningBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeOpeningBalancesTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeOpeningBalancesTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java index 9886e9797..1903527d7 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeePayTemplatesTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeePayTemplatesTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java index 6d05632f6..2541adfd9 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeaveBalancesTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeStatutoryLeaveBalancesTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java index 9125fd094..ebf24043b 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutoryLeavesSummaryTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeStatutoryLeavesSummaryTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java index e2a05da44..8ebb77494 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeStatutorySickLeaveTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeStatutorySickLeaveTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -72,6 +41,13 @@ public void createEmployeeStatutorySickLeaveTest() throws IOException { UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeStatutorySickLeave employeeStatutorySickLeave = new EmployeeStatutorySickLeave(); + employeeStatutorySickLeave.setEmployeeID(UUID.randomUUID()); + employeeStatutorySickLeave.setEndDate(LocalDate.of(2020, 04, 21)); + employeeStatutorySickLeave.setStartDate(LocalDate.of(2020, 04, 21)); + employeeStatutorySickLeave.setWorkPattern(List.of("Monday", "Wednesday")); + employeeStatutorySickLeave.setLeaveTypeID(UUID.randomUUID()); + employeeStatutorySickLeave.isPregnancyRelated(false); + employeeStatutorySickLeave.setSufficientNotice(true); EmployeeStatutorySickLeaveObject response = payrollUkApi.createEmployeeStatutorySickLeave(accessToken, xeroTenantId, employeeStatutorySickLeave, null); assertThat(response.getStatutorySickLeave().getStatutoryLeaveID(), is(equalTo(UUID.fromString("a2b5a1fb-ae21-47b4-876d-0b61fa6b37ab")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTaxTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTaxTest.java index 43578a888..aafdb7f5c 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTaxTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTaxTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeTaxTest { @@ -54,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java index 66fef7f76..c8678ee13 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployeeTest.java @@ -1,44 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; +import com.xero.models.payrolluk.Employee.GenderEnum; import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployeeTest { @@ -54,11 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -94,6 +64,23 @@ public void createEmployeeTest() throws IOException { System.out.println("@Test UK Payroll - createEmployeeTest"); Employee employee = new Employee(); + Address address = new Address(); + address.setAddressLine1("101 Green St"); + address.setCity("Rangiora"); + address.setPostCode("SW6 6EY"); + address.setCountryName("UNITED KINGDOM"); + employee.setAddress(address); + employee.setEmployeeID(UUID.randomUUID()); + employee.setFirstName("Adam"); + employee.setLastName("Adamson"); + employee.setDateOfBirth(LocalDate.of(2019, 7, 12)); + employee.setTitle("Mrs"); + employee.setGender(GenderEnum.M); + employee.email("test@test.com"); + employee.setPhoneNumber("415-555-1212"); + employee.setStartDate(LocalDate.of(2023, 7, 12)); + employee.setEndDate(LocalDate.of(2024, 7, 12)); + System.out.println(employee); EmployeeObject response = payrollUkApi.createEmployee(accessToken, xeroTenantId, employee, null); assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("316146c7-26a4-4065-b9bd-346d0557ea96")))); @@ -101,9 +88,9 @@ public void createEmployeeTest() throws IOException { assertThat(response.getEmployee().getFirstName(), is(equalTo("Mike"))); assertThat(response.getEmployee().getLastName(), is(equalTo("Fancy"))); assertThat(response.getEmployee().getDateOfBirth(), is(equalTo(LocalDate.of(1999, 01, 01)))); - assertThat(response.getEmployee().getAddress().getAddressLine1(), is(equalTo("101 Green St"))); - assertThat(response.getEmployee().getAddress().getCity(), is(equalTo("San Francisco"))); - assertThat(response.getEmployee().getAddress().getPostCode(), is(equalTo("6TGR4F"))); + assertThat(response.getEmployee().getAddress().getAddressLine1(), is(equalTo("171 Midsummer"))); + assertThat(response.getEmployee().getAddress().getCity(), is(equalTo("Milton Keyness"))); + assertThat(response.getEmployee().getAddress().getPostCode(), is(equalTo("MK9 1EB"))); assertThat(response.getEmployee().getEmail(), is(equalTo("mike@starkindustries.com"))); assertThat(response.getEmployee().getGender() , is(equalTo(com.xero.models.payrolluk.Employee.GenderEnum.M))); assertThat(response.getEmployee().getUpdatedDateUTC(), is(equalTo(LocalDateTime.of(2020, 03, 25, 03, 12, 10) ))); @@ -119,20 +106,19 @@ public void getEmployeeTest() throws IOException { UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmployeeObject response = payrollUkApi.getEmployee(accessToken, xeroTenantId, employeeId); - assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("aad6b292-7b94-408b-93f6-e489867e3fb0")))); + assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("d17e008e-3381-45c0-b50c-2fab7757e503")))); assertThat(response.getEmployee().getTitle(), is(equalTo("Mr."))); - assertThat(response.getEmployee().getFirstName(), is(equalTo("Jack"))); - assertThat(response.getEmployee().getLastName(), is(equalTo("Allan"))); - assertThat(response.getEmployee().getDateOfBirth(), is(equalTo(LocalDate.of(1987, 12, 23)))); - assertThat(response.getEmployee().getAddress().getAddressLine1(), is(equalTo("171 Midsummer Boulevard"))); - assertThat(response.getEmployee().getAddress().getCity(), is(equalTo("Milton Keynes"))); + assertThat(response.getEmployee().getFirstName(), is(equalTo("Edgar"))); + assertThat(response.getEmployee().getLastName(), is(equalTo("Allan Po"))); + assertThat(response.getEmployee().getDateOfBirth(), is(equalTo(LocalDate.of(1985, 03, 24)))); + assertThat(response.getEmployee().getAddress().getAddressLine1(), is(equalTo("171 Midsummer"))); + assertThat(response.getEmployee().getAddress().getCity(), is(equalTo("Milton Keyness"))); assertThat(response.getEmployee().getAddress().getPostCode(), is(equalTo("MK9 1EB"))); assertThat(response.getEmployee().getAddress().getCountryName(), is(equalTo("UNITED KINGDOM"))); assertThat(response.getEmployee().getGender() , is(equalTo(com.xero.models.payrolluk.Employee.GenderEnum.M))); - assertThat(response.getEmployee().getStartDate(), is(equalTo(LocalDate.of(2020, 02, 03)))); assertThat(response.getEmployee().getPayrollCalendarID(), is(equalTo(UUID.fromString("216d80e6-af55-47b1-b718-9457c3f5d2fe")))); - assertThat(response.getEmployee().getUpdatedDateUTC(), is(equalTo(LocalDateTime.of(2020, 02, 13, 16, 23 ,31) ))); - assertThat(response.getEmployee().getCreatedDateUTC(), is(equalTo(LocalDateTime.of(2020, 02, 10, 10, 00, 24) ))); + assertThat(response.getEmployee().getUpdatedDateUTC(), is(equalTo(LocalDateTime.of(2017, 05, 12, 10, 00 ,24) ))); + assertThat(response.getEmployee().getCreatedDateUTC(), is(equalTo(LocalDateTime.of(2017, 05, 12, 10, 00, 24) ))); assertThat(response.getEmployee().getNationalInsuranceNumber(), is(equalTo("AB123456C"))); //System.out.println(response.toString()); } @@ -143,9 +129,26 @@ public void updateEmployeeTest() throws IOException { UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); Employee employee = new Employee(); + employee.setEmployeeID(UUID.randomUUID()); + employee.setFirstName("Adam"); + employee.setLastName("Adamson"); + employee.setDateOfBirth(LocalDate.of(2019, 7, 12)); + employee.setTitle("Mrs"); + employee.setGender(GenderEnum.M); + employee.email("test@test.com"); + employee.setPhoneNumber("415-555-1212"); + employee.setStartDate(LocalDate.of(2023, 7, 12)); + employee.setEndDate(LocalDate.of(2024, 7, 12)); + Address address = new Address(); + address.setAddressLine1("101 Green St"); + address.setCity("Rangiora"); + address.setPostCode("SW6 6EY"); + address.setCountryName("UNITED KINGDOM"); + employee.setAddress(address); + EmployeeObject response = payrollUkApi.updateEmployee(accessToken, xeroTenantId, employeeId, employee, null); - assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("aad6b292-7b94-408b-93f6-e489867e3fb0")))); + assertThat(response.getEmployee().getEmployeeID(), is(equalTo(UUID.fromString("07f0f9fc-cc95-46ac-9a8a-aa03779f2bde")))); assertThat(response.getEmployee().getTitle(), is(equalTo("Mr"))); assertThat(response.getEmployee().getFirstName(), is(equalTo("Mike"))); assertThat(response.getEmployee().getLastName(), is(equalTo("Johnllsbkrhwopson"))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java index df3567a42..f6e5d0668 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmployerPensionsTest.java @@ -1,46 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; import com.xero.models.payrolluk.Benefit.CategoryEnum; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmployerPensionsTest { @@ -56,11 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); - } public void tearDown() { @@ -112,6 +80,12 @@ public void createBenefitTest() throws IOException { System.out.println("@Test UK Payroll - createBenefitTest"); Benefit benefit = new Benefit(); + benefit.setName("Test"); + benefit.setCategory(CategoryEnum.STAKEHOLDERPENSION); + benefit.setLiabilityAccountId(UUID.randomUUID()); + benefit.setExpenseAccountId(UUID.randomUUID()); + benefit.setCalculationType(CalculationTypeEnum.FIXEDAMOUNT); + benefit.setPercentage(100.00); BenefitObject response = payrollUkApi.createBenefit(accessToken, xeroTenantId, benefit, null); assertThat(response.getBenefit().getId(), is(equalTo(UUID.fromString("d295bf25-fb61-4f91-9b62-a9ae87633746")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiEmploymentTest.java b/src/test/java/com/xero/api/client/PayrollUkApiEmploymentTest.java index 3465569ec..f6685c8cc 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiEmploymentTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiEmploymentTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiEmploymentTest { @@ -54,11 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -71,13 +40,16 @@ public void createEmploymentTest() throws IOException { System.out.println("@Test UK Payroll - createEmploymentTest"); Employment employment = new Employment(); + employment.setPayrollCalendarID(UUID.randomUUID()); + employment.setEmployeeNumber("123ABC"); + employment.setStartDate(LocalDate.of(2024, 04, 01)); + employment.setNiCategories(Arrays.asList(new NICategory().niCategory(NICategoryLetter.I).workplacePostcode("SW1A 1AA"))); + UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); EmploymentObject response = payrollUkApi.createEmployment(accessToken, xeroTenantId, employeeId, employment, null); - assertThat(response.getEmployment().getPayrollCalendarID(), is(equalTo(UUID.fromString("216d80e6-af55-47b1-b718-9457c3f5d2fe")))); assertThat(response.getEmployment().getStartDate(), is(equalTo(LocalDate.of(2020, 04, 01)))); assertThat(response.getEmployment().getEmployeeNumber(), is(equalTo("123ABC"))); - assertThat(response.getEmployment().getNiCategory(), is(equalTo(com.xero.models.payrolluk.NICategoryLetter.A))); - //System.out.println(response.toString()); + assertThat(response.getEmployment().getNiCategories(), hasItem(hasProperty("niCategory", is(equalTo(NICategoryLetter.I))))); } } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java index 6d22aa7fe..a29ac76f9 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiLeaveTypesTest.java @@ -1,46 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiLeaveTypesTest { @@ -56,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -109,6 +75,12 @@ public void createLeaveTypeTest() throws IOException { System.out.println("@Test UK Payroll - createLeaveTypeTest"); LeaveType leaveType = new LeaveType(); + leaveType.setLeaveID(UUID.randomUUID()); + leaveType.setName("My opebvwbfxf Leave"); + leaveType.setIsStatutoryLeave(true); + leaveType.setIsPaidLeave(true); + leaveType.isActive(true); + leaveType.setShowOnPayslip(true); LeaveTypeObject response = payrollUkApi.createLeaveType(accessToken, xeroTenantId, leaveType, null); assertThat(response.getLeaveType().getLeaveTypeID(),is(equalTo(UUID.fromString("4c027a23-6e7b-4547-808b-c34b2b140fef")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPayRunCalendarsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPayRunCalendarsTest.java index c1fcc47be..9b5dc97cd 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayRunCalendarsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayRunCalendarsTest.java @@ -1,47 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiPayRunCalendarsTest { @@ -57,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { @@ -112,6 +77,10 @@ public void createPayRunCalendarTest() throws IOException { System.out.println("@Test UK Payroll - createPayRunCalendarTest"); PayRunCalendar payRunCalendar = new PayRunCalendar(); + payRunCalendar.setName("My Weekly Cal"); + payRunCalendar.setCalendarType(com.xero.models.payrolluk.PayRunCalendar.CalendarTypeEnum.ANNUAL); + payRunCalendar.setPeriodStartDate(LocalDate.of(2020, 05, 01)); + payRunCalendar.setPaymentDate(LocalDate.of(2020, 05, 15)); PayRunCalendarObject response = payrollUkApi.createPayRunCalendar(accessToken, xeroTenantId, payRunCalendar, null); assertThat(response.getPayRunCalendar().getPayrollCalendarID(),is(equalTo(UUID.fromString("5f29322d-9123-49be-bef0-9b14c35653d1")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java index f5a943f04..96540344b 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayRunsTest.java @@ -1,47 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiPayRunsTest { @@ -57,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.java index 1ab37ae8f..1430f260d 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPaymentMethodsTest.java @@ -1,47 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiPaymentMethodsTest { @@ -57,11 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); payrollUkApi = PayrollUkApi.getInstance(defaultClient); - } public void tearDown() { @@ -92,6 +56,7 @@ public void createEmployeePaymentMethodTest() throws IOException { int page = 1; UUID employeeId = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); PaymentMethod paymentMethod = new PaymentMethod(); + paymentMethod.setPaymentMethod(com.xero.models.payrolluk.PaymentMethod.PaymentMethodEnum.ELECTRONICALLY); PaymentMethodObject response = payrollUkApi.createEmployeePaymentMethod(accessToken, xeroTenantId, employeeId, paymentMethod, null); assertThat(response.getPaymentMethod().getPaymentMethod(), is(equalTo(com.xero.models.payrolluk.PaymentMethod.PaymentMethodEnum.ELECTRONICALLY))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiPayslipsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiPayslipsTest.java index d2bd33a44..3b0dbaedc 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiPayslipsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiPayslipsTest.java @@ -1,48 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; - +import java.util.*; public class PayrollUkApiPayslipsTest { ApiClient defaultClient; @@ -57,11 +23,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java index e903e9f5b..b4daf10e4 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiReimbursementsTest.java @@ -1,46 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiReimbursementsTest { @@ -56,10 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -103,6 +69,8 @@ public void createReimbursementTest() throws IOException { System.out.println("@Test UK Payroll - createReimbursementTest"); Reimbursement reimbursement = new Reimbursement(); + reimbursement.setName("My new Reimburse"); + reimbursement.setAccountID(UUID.randomUUID()); ReimbursementObject response = payrollUkApi.createReimbursement(accessToken, xeroTenantId, reimbursement, null); assertThat(response.getReimbursement().getReimbursementID(),is(equalTo(UUID.fromString("2b1b587a-39f6-43f8-9dd9-a858314333c8")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiSettingsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiSettingsTest.java index d58082d97..43d13f39e 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiSettingsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiSettingsTest.java @@ -1,47 +1,14 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiSettingsTest { @@ -57,10 +24,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } diff --git a/src/test/java/com/xero/api/client/PayrollUkApiTimesheetsTest.java b/src/test/java/com/xero/api/client/PayrollUkApiTimesheetsTest.java index 6ab5c5073..8141fc3a3 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiTimesheetsTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiTimesheetsTest.java @@ -1,47 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class PayrollUkApiTimesheetsTest { @@ -57,10 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } @@ -118,8 +84,19 @@ public void createTimesheetTest() throws IOException { System.out.println("@Test UK Payroll - createTimesheetTest"); int page = 1; - UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); + UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); + List timesheetLines = new ArrayList<>(); + TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); + timesheetLines.add(timesheetLine); Timesheet timesheet = new Timesheet(); + timesheet.setTimesheetLines(timesheetLines); + timesheet.setPayrollCalendarID(UUID.randomUUID()); + timesheet.setEndDate(LocalDate.of(2020, 04, 19)); + timesheet.setStartDate(LocalDate.of(2020, 04, 13)); + timesheet.setEmployeeID(UUID.randomUUID()); TimesheetObject response = payrollUkApi.createTimesheet(accessToken, xeroTenantId, timesheet, null); assertThat(response.getTimesheet().getTimesheetID(),is(equalTo(UUID.fromString("88d2038a-06f7-4b8a-bdab-809804c0aa1d")))); @@ -144,6 +121,9 @@ public void createTimesheetLineTest() throws IOException { UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); TimesheetLineObject response = payrollUkApi.createTimesheetLine(accessToken, xeroTenantId, timesheetID, timesheetLine, null); assertThat(response.getTimesheetLine().getTimesheetLineID(),is(equalTo(UUID.fromString("56fce87e-7f0d-4c19-8f74-7f5656651c81")))); @@ -161,6 +141,9 @@ public void updateTimesheetLineTest() throws IOException { UUID timesheetID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); UUID timesheetLineID = UUID.fromString("cdfb8371-0b21-4b8a-8903-1024df6c391e"); TimesheetLine timesheetLine = new TimesheetLine(); + timesheetLine.setEarningsRateID(UUID.randomUUID()); + timesheetLine.setNumberOfUnits(12.00); + timesheetLine.setDate(LocalDate.now()); TimesheetLineObject response = payrollUkApi.updateTimesheetLine(accessToken, xeroTenantId, timesheetID, timesheetLineID, timesheetLine, null); assertThat(response.getTimesheetLine().getTimesheetLineID(),is(equalTo(UUID.fromString("c88edcad-af32-4536-a682-9a4772c21c8d")))); diff --git a/src/test/java/com/xero/api/client/PayrollUkApiTrackingCategoriesTest.java b/src/test/java/com/xero/api/client/PayrollUkApiTrackingCategoriesTest.java index 081ca2826..9d09b9f62 100644 --- a/src/test/java/com/xero/api/client/PayrollUkApiTrackingCategoriesTest.java +++ b/src/test/java/com/xero/api/client/PayrollUkApiTrackingCategoriesTest.java @@ -1,47 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.payrolluk.*; -import com.xero.models.payrolluk.Benefit.CalculationTypeEnum; -import com.xero.models.payrolluk.Benefit.CategoryEnum; - -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; -import org.threeten.bp.temporal.ChronoUnit; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; +import java.io.InputStream; public class PayrollUkApiTrackingCategoriesTest { @@ -57,11 +25,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://ba3fd247-8fc6-4d7c-bcd1-bdbea4ea1803.mock.pstmn.io/payroll.xro/2.0",null,null,null,null); - payrollUkApi = PayrollUkApi.getInstance(defaultClient); - + defaultClient = new ApiClient(ConfigurationLoader.getProperty("payrolluk.api.url"),null,null,null,null); + payrollUkApi = PayrollUkApi.getInstance(defaultClient); } public void tearDown() { diff --git a/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java b/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java index 68ed245a6..a6c3b5421 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiProjectTasksTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.project.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class ProjectsApiProjectTasksTest { @@ -55,10 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectsApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://3fe1c2ee-7113-4035-9e6d-53dad2fb2af3.mock.pstmn.io/projects.xro/2.0",null,null,null,null); - projectApi = ProjectApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("projects.api.url"),null,null,null,null); + projectApi = ProjectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { diff --git a/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java b/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java index d48ea6f6d..7f8d5dadc 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiProjectUsersTest.java @@ -1,44 +1,15 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.project.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - -import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class ProjectsApiProjectUsersTest { @@ -55,10 +26,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://3fe1c2ee-7113-4035-9e6d-53dad2fb2af3.mock.pstmn.io/projects.xro/2.0",null,null,null,null); - projectApi = ProjectApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("projects.api.url"),null,null,null,null); + projectApi = ProjectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { @@ -93,8 +62,8 @@ public void getProjectUsersTest() throws IOException { assertThat(response.getPagination().getPageCount(), is(equalTo(1))); assertThat(response.getPagination().getPageSize(), is(equalTo(50))); assertThat(response.getItems().get(0).getUserId(), is(equalTo(UUID.fromString("740add2a-a703-4b8a-a670-1093919c2040")))); - assertThat(response.getItems().get(0).getName(), is(equalTo("Sidney Maestre"))); - assertThat(response.getItems().get(0).getEmail(), is(equalTo("sid.maestre@xero.com"))); + assertThat(response.getItems().get(0).getName(), is(equalTo("Test User"))); + assertThat(response.getItems().get(0).getEmail(), is(equalTo("test@xero.com"))); // System.out.println(response.toString()); } diff --git a/src/test/java/com/xero/api/client/ProjectsApiProjectsTest.java b/src/test/java/com/xero/api/client/ProjectsApiProjectsTest.java index 6b364be64..47580c375 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiProjectsTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiProjectsTest.java @@ -1,44 +1,16 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.project.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; public class ProjectsApiProjectsTest { @@ -55,10 +27,8 @@ public void setUp() { accessToken = "123"; xeroTenantId = "xyz"; - // Init projectApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://3fe1c2ee-7113-4035-9e6d-53dad2fb2af3.mock.pstmn.io/projects.xro/2.0",null,null,null,null); - projectApi = projectApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("projects.api.url"),null,null,null,null); + projectApi = ProjectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { @@ -134,6 +104,7 @@ public void createProjectsTest() throws IOException { System.out.println("@Test - createProjectsTest"); ProjectCreateOrUpdate projectCreateOrUpdate = new ProjectCreateOrUpdate(); + projectCreateOrUpdate.setName("New Kitchen"); Project response = projectApi.createProject(accessToken, xeroTenantId, projectCreateOrUpdate, null); assertThat(response.getContactId(), is(equalTo(UUID.fromString("216830cb-9a68-487e-928b-c1a7ccc4fc81")))); @@ -180,7 +151,7 @@ public void getProjectTest() throws IOException { assertThat(response.getContactId(), is(equalTo(UUID.fromString("216830cb-9a68-487e-928b-c1a7ccc4fc81")))); assertThat(response.getProjectId(), is(equalTo(UUID.fromString("b021e7cb-1903-4292-b48b-5b27b4271e3e")))); - assertThat(response.getName(), is(equalTo("FooProject28916"))); + assertThat(response.getName(), is(equalTo("Remodeling 2012"))); assertThat(response.getCurrencyCode(), is(equalTo(com.xero.models.project.CurrencyCode.AUD))); assertThat(response.getMinutesLogged(), is(equalTo(180))); assertThat(response.getTotalTaskAmount().getCurrency(), is(equalTo(com.xero.models.project.CurrencyCode.AUD))); diff --git a/src/test/java/com/xero/api/client/ProjectsApiTimeEntriesTest.java b/src/test/java/com/xero/api/client/ProjectsApiTimeEntriesTest.java index 7130b06d8..0444f4178 100644 --- a/src/test/java/com/xero/api/client/ProjectsApiTimeEntriesTest.java +++ b/src/test/java/com/xero/api/client/ProjectsApiTimeEntriesTest.java @@ -1,47 +1,17 @@ package com.xero.api.client; -import static org.junit.Assert.assertTrue; - import org.junit.*; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Every.everyItem; - import com.xero.api.ApiClient; -import com.xero.api.client.*; +import com.xero.api.util.ConfigurationLoader; import com.xero.models.project.*; -import java.io.File; -import java.net.URL; - -import com.google.api.client.auth.oauth2.BearerToken; -import com.google.api.client.auth.oauth2.Credential; -import com.google.api.client.http.HttpRequestFactory; -import com.google.api.client.http.HttpTransport; -import com.google.api.client.http.javanet.NetHttpTransport; - import org.threeten.bp.*; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.io.File; -import java.io.IOException; - -import org.apache.commons.io.IOUtils; - -import java.util.Calendar; -import java.util.Map; -import java.util.UUID; - -import jakarta.ws.rs.core.Response; - -import java.util.List; -import java.util.ArrayList; -import java.math.BigDecimal; +import java.util.*; +import java.io.InputStream; public class ProjectsApiTimeEntriesTest { @@ -57,11 +27,8 @@ public void setUp() { // Set Access Token and Tenant Id accessToken = "123"; xeroTenantId = "xyz"; - - // Init projectsApi client - // NEW Sandbox for API Mocking - defaultClient = new ApiClient("https://3fe1c2ee-7113-4035-9e6d-53dad2fb2af3.mock.pstmn.io/projects.xro/2.0",null,null,null,null); - projectApi = ProjectApi.getInstance(defaultClient); + defaultClient = new ApiClient(ConfigurationLoader.getProperty("projects.api.url"),null,null,null,null); + projectApi = ProjectApi.getInstance(defaultClient); // ADDED TO MANAGE RATE LIMITS while using SwaggerHub to mock APIs if (setUpIsDone) { @@ -109,7 +76,7 @@ public void getTimeEntriesTest() throws IOException { assertThat(response.getItems().get(0).getProjectId(), is(equalTo(UUID.fromString("b021e7cb-1903-4292-b48b-5b27b4271e3e")))); assertThat(response.getItems().get(0).getTaskId(), is(equalTo(UUID.fromString("7be77337-feec-4458-bb1b-dbaa5a4aafce")))); assertThat(response.getItems().get(0).getDateUtc(), is(equalTo(OffsetDateTime.parse("2020-02-27T15:00Z")))); - assertThat(response.getItems().get(0).getDateEnteredUtc(), is(equalTo(OffsetDateTime.parse("2020-02-21T21:41:22.264272700Z")))); + assertThat(response.getItems().get(0).getDateEnteredUtc(), is(equalTo(OffsetDateTime.parse("2020-02-28T03:24:29.221564100Z")))); assertThat(response.getItems().get(0).getDuration(), is(equalTo(45))); assertThat(response.getItems().get(0).getStatus(),is(equalTo(com.xero.models.project.TimeEntry.StatusEnum.ACTIVE))); //System.out.println(response.toString()); @@ -120,11 +87,15 @@ public void createTimeEntryTest() throws IOException { System.out.println("@Test - createTimeEntryTest"); TimeEntryCreateOrUpdate timeEntryCreateOrUpdate = new TimeEntryCreateOrUpdate(); + timeEntryCreateOrUpdate.setUserId(UUID.fromString("c6539534-f1d2-43a6-80df-3bd1f8aca24d")); + timeEntryCreateOrUpdate.setTaskId(UUID.fromString("7be77337-feec-4458-bb1b-dbaa5a4aafce")); + timeEntryCreateOrUpdate.setDateUtc(OffsetDateTime.parse("2020-02-26T15:00Z")); + timeEntryCreateOrUpdate.setDuration(1); UUID projectId = UUID.fromString("8138a266-fb42-49b2-a104-014b7045753d"); TimeEntry response = projectApi.createTimeEntry(accessToken, xeroTenantId, projectId, timeEntryCreateOrUpdate, null); assertThat(response.getTimeEntryId(),is(equalTo(UUID.fromString("c6539534-f1d2-43a6-80df-3bd1f8aca24d")))); - assertThat(response.getUserId(), is(equalTo(UUID.fromString("740add2a-a703-4b8a-a670-1093919c2040")))); + assertThat(response.getUserId(), is(equalTo(UUID.fromString("c6539534-f1d2-43a6-80df-3bd1f8aca24d")))); assertThat(response.getProjectId(), is(equalTo(UUID.fromString("b021e7cb-1903-4292-b48b-5b27b4271e3e")))); assertThat(response.getTaskId(), is(equalTo(UUID.fromString("7be77337-feec-4458-bb1b-dbaa5a4aafce")))); assertThat(response.getDateUtc(), is(equalTo(OffsetDateTime.parse("2020-02-26T15:00Z")))); diff --git a/src/test/java/com/xero/api/util/ConfigurationLoader.java b/src/test/java/com/xero/api/util/ConfigurationLoader.java new file mode 100644 index 000000000..e69c746c2 --- /dev/null +++ b/src/test/java/com/xero/api/util/ConfigurationLoader.java @@ -0,0 +1,20 @@ +package com.xero.api.util; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +public class ConfigurationLoader { + private static Properties properties = new Properties(); + + static { + try (InputStream input = ConfigurationLoader.class.getClassLoader().getResourceAsStream("config.properties")) { + properties.load(input); + } catch (IOException ex) { + ex.printStackTrace(); + } + } + + public static String getProperty(String key) { + return properties.getProperty(key); + } +} diff --git a/src/test/java/com/xero/api/util/start-prism.sh b/src/test/java/com/xero/api/util/start-prism.sh new file mode 100755 index 000000000..4f054e0e5 --- /dev/null +++ b/src/test/java/com/xero/api/util/start-prism.sh @@ -0,0 +1,11 @@ +branchName=${1:-"master"} + +prism mock https://raw.githubusercontent.com/XeroAPI/Xero-OpenAPI/refs/heads/$branchName/xero_accounting.yaml --host 127.0.0.1 --port 4010 & +prism mock https://raw.githubusercontent.com/XeroAPI/Xero-OpenAPI/refs/heads/$branchName/xero-app-store.yaml --host 127.0.0.1 --port 4011 & +prism mock https://raw.githubusercontent.com/XeroAPI/Xero-OpenAPI/refs/heads/$branchName/xero_assets.yaml --host 127.0.0.1 --port 4012 & +prism mock https://raw.githubusercontent.com/XeroAPI/Xero-OpenAPI/refs/heads/$branchName/xero_bankfeeds.yaml --host 127.0.0.1 --port 4013 & +prism mock https://raw.githubusercontent.com/XeroAPI/Xero-OpenAPI/refs/heads/$branchName/xero-finance.yaml --host 127.0.0.1 --port 4014 & +prism mock https://raw.githubusercontent.com/XeroAPI/Xero-OpenAPI/refs/heads/$branchName/xero-payroll-uk.yaml --host 127.0.0.1 --port 4015 & +prism mock https://raw.githubusercontent.com/XeroAPI/Xero-OpenAPI/refs/heads/$branchName/xero-payroll-nz.yaml --host 127.0.0.1 --port 4016 & +prism mock https://raw.githubusercontent.com/XeroAPI/Xero-OpenAPI/refs/heads/$branchName/xero-payroll-au.yaml --host 127.0.0.1 --port 4017 & +prism mock https://raw.githubusercontent.com/XeroAPI/Xero-OpenAPI/refs/heads/$branchName/xero-projects.yaml --host 127.0.0.1 --port 4018 diff --git a/src/test/resources/config.properties b/src/test/resources/config.properties new file mode 100644 index 000000000..092114adc --- /dev/null +++ b/src/test/resources/config.properties @@ -0,0 +1,9 @@ +accounting.api.url=http://127.0.0.1:4010 +appstore.api.url=http://127.0.0.1:4011 +assets.api.url=http://127.0.0.1:4012 +bankfeeds.api.url=http://127.0.0.1:4013 +finance.api.url=http://127.0.0.1:4014 +payrolluk.api.url=http://127.0.0.1:4015 +payrollnz.api.url=http://127.0.0.1:4016 +payrollau.api.url=http://127.0.0.1:4017 +projects.api.url=http://127.0.0.1:4018