From 020195a075a33abd8e3be8b6d6cebbfd53240c5a Mon Sep 17 00:00:00 2001 From: Andy Baxter Date: Tue, 11 Nov 2025 15:42:21 +0000 Subject: [PATCH 1/2] change erroring lines --- .../simpaths/model/taxes/database/TaxDonorDataParser.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java b/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java index 58ae755bc..d780e5eab 100644 --- a/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java +++ b/src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java @@ -28,8 +28,8 @@ /** * * CLASS TO MANAGE TRANSLATION OF CSV DATA FROM EUROMOD TO DATABASE FOR DONORS USED TO IMPUTE TAX AND BENEFIT PAYMENTS - * csv data are processed and saved to the DONORPERSON_ table in the relational database. These data - * are used as working variables to construct the DONORTAXUNIT_ table, which is then used exclusively \ + * csv data are processed and saved to the DONORPERSON_{country code} table in the relational database. These data + * are used as working variables to construct the DONORTAXUNIT_{country code} table, which is then used exclusively \ * for imputing tax and benefit payments, drawing heavily on SQL calls made via Hibernate * */ @@ -421,7 +421,6 @@ public static String stringAppender(Collection strings) { * output .txt files, picking up the relevant columns for each EUROMOD policy scenario, that * will eventually be parsed into the JAS-mine input database. * - * @return The name of the created CSV file (without the .csv extension) * */ public static void constructAggregateTaxDonorPopulationCSVfile(Country country, boolean showGui) { From 1c616f58fa10744e0863e682622bfbc5876fb427 Mon Sep 17 00:00:00 2001 From: Andy Baxter Date: Tue, 11 Nov 2025 15:42:42 +0000 Subject: [PATCH 2/2] add test on pull request, publish on push --- .github/workflows/publish-javadoc.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/publish-javadoc.yml b/.github/workflows/publish-javadoc.yml index f9e1c8f2c..4a1024b19 100644 --- a/.github/workflows/publish-javadoc.yml +++ b/.github/workflows/publish-javadoc.yml @@ -4,6 +4,8 @@ on: push: branches: - develop # Only publish when pushing to develop branch + pull_request: + branches: [ "main", "develop" ] jobs: publish-javadoc: @@ -29,6 +31,7 @@ jobs: run: mvn javadoc:javadoc --file pom.xml - name: Deploy Javadoc to branch + if: github.event.push uses: MathieuSoysal/Javadoc-publisher.yml@v3.0.2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}