diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 84f27f1..c31150f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,4 +4,4 @@ updates: directory: "/" schedule: interval: "daily" - target-branch: "work-for-release-0.23.x" + target-branch: "master" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0237023..3b1ad3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,8 @@ jobs: with: test-profile-matrix: '[ "travis", "integration-mysql", "integration-postgresql" ]' secrets: + CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }} + CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }} extra-env: '{ "AVATAX_URL": "${{ secrets.AVATAX_URL }}", "AVATAX_ACCOUNT_ID": "${{ secrets.AVATAX_ACCOUNT_ID }}", "AVATAX_LICENSE_KEY": "${{ secrets.AVATAX_LICENSE_KEY }}", "AVATAX_COMPANY_CODE": "${{ secrets.AVATAX_COMPANY_CODE }}", "AVATAX_COMMIT_DOCUMENTS": false, "AVATAX_TAXRATESAPI_URL": "${{ secrets.AVATAX_TAXRATESAPI_URL }}", "AVATAX_TAXRATESAPI_ACCOUNT_ID": "${{ secrets.AVATAX_TAXRATESAPI_ACCOUNT_ID }}", "AVATAX_TAXRATESAPI_LICENSE_KEY": "${{ secrets.AVATAX_TAXRATESAPI_LICENSE_KEY }}" }' integration_test: @@ -19,4 +21,6 @@ jobs: integration_tests_goal: 'test:plugins:avatax' integration_tests_ref: 'refs/heads/master' secrets: + CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }} + CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }} extra-env: '{ "AVATAX_URL": "${{ secrets.AVATAX_URL }}", "AVATAX_ACCOUNT_ID": "${{ secrets.AVATAX_ACCOUNT_ID }}", "AVATAX_LICENSE_KEY": "${{ secrets.AVATAX_LICENSE_KEY }}", "AVATAX_COMPANY_CODE": "${{ secrets.AVATAX_COMPANY_CODE }}", "AVATAX_COMMIT_DOCUMENTS": false, "AVATAX_TAXRATESAPI_URL": "${{ secrets.AVATAX_TAXRATESAPI_URL }}", "AVATAX_TAXRATESAPI_ACCOUNT_ID": "${{ secrets.AVATAX_TAXRATESAPI_ACCOUNT_ID }}", "AVATAX_TAXRATESAPI_LICENSE_KEY": "${{ secrets.AVATAX_TAXRATESAPI_LICENSE_KEY }}" }' diff --git a/.github/workflows/cloudsmith_release.yml b/.github/workflows/cloudsmith_release.yml deleted file mode 100644 index 126a557..0000000 --- a/.github/workflows/cloudsmith_release.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: cloudsmith_release - -on: - workflow_dispatch: - -env: - MAVEN_FLAGS: "-B --no-transfer-progress" - MAVEN_OPTS: "-Xmx2G -XX:+ExitOnOutOfMemoryError -Dmaven.wagon.rto=60000 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3" - -jobs: - cloudsmith_release: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Compute short sha1 - run: echo "GITHUB_SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - - name: Setup git user - env: - BUILD_USER: ${{ secrets.BUILD_USER }} - BUILD_TOKEN: ${{ secrets.BUILD_TOKEN }} - run: | - git config --global user.email "contact@killbill.io" - git config --global user.name "Kill Bill core team" - git config --global url."https://${BUILD_USER}:${BUILD_TOKEN}@github.com/".insteadOf "git@github.com:" - - name: Configure Java - uses: actions/setup-java@v1 - with: - java-version: 8 - - name: Configure Sonatype mirror - uses: s4u/maven-settings-action@v2.3.0 - # Go to Sonatype directly to avoid delay syncs (could get rid of this if actions/setup-java were to support mirrors). - with: - mirrors: '[{"id": "oss-releases", "name": "Sonatype releases", "mirrorOf": "*", "url": "https://oss.sonatype.org/content/repositories/releases/"}]' - - name: Update maven version - run: | - plugin_version=$(mvn ${MAVEN_FLAGS} help:evaluate -Dexpression=project.version -q -DforceStdout | cut -d - -f 1) - mvn versions:set -DnewVersion="${plugin_version}-${GITHUB_SHA_SHORT}" - - name: Build plugin - run: | - mvn ${MAVEN_FLAGS} clean install -DskipTests=true -Dgpg.skip=true -Dcheck.skip-rat=true -Dcheck.skip-spotbugs=true - - name: Configure settings.xml for release - uses: actions/setup-java@v1 - with: - java-version: 8 - server-id: ${{ secrets.CLOUDSMITH_REPO }} - server-username: CLOUDSMITH_USER - server-password: CLOUDSMITH_API_KEY - gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }} - gpg-passphrase: GPG_PASSPHRASE - - name: Publish to Cloudsmith - env: - CLOUDSMITH_USER: ${{ secrets.CLOUDSMITH_USER }} - CLOUDSMITH_REPO: ${{ secrets.CLOUDSMITH_REPO }} - CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - run: | - GROUP_ID=org.kill-bill.billing.plugin.java - VERSION=$(mvn ${MAVEN_FLAGS} help:evaluate -Dexpression=project.version -q -DforceStdout) - FILE=avatax-plugin-$VERSION.jar - # Make sure the current pom.xml file isn't uploaded - cp ./target/$FILE /var/tmp/ - cd /var/tmp - mvn ${MAVEN_FLAGS} deploy:deploy-file -Dfile=$FILE \ - -DrepositoryId=$CLOUDSMITH_REPO \ - -Durl=https://maven.cloudsmith.io/killbill/$CLOUDSMITH_REPO \ - -DgroupId=$GROUP_ID \ - -DartifactId=avatax-plugin \ - -Dversion=$VERSION \ - -Dpackaging=jar \ - -DgeneratePom=true \ - -DskipTests=true \ - -Dgpg.skip=true \ - -Dcheck.skip-rat=true \ - -Dcheck.skip-spotbugs=true diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c150684..7d120c8 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -8,3 +8,6 @@ on: jobs: analyze: uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@main + secrets: + CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }} + CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 26c9354..5c11aee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,88 +12,19 @@ on: required: false default: '' -env: - MAVEN_FLAGS: "-B --no-transfer-progress" - MAVEN_OPTS: "-Xmx2G -XX:+ExitOnOutOfMemoryError -Dmaven.wagon.rto=60000 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3" - jobs: release: - runs-on: ubuntu-latest - steps: - - name: Checkout code - if: github.event.inputs.perform_version == '' - uses: actions/checkout@v2 - - name: Checkout full repository - # Required when performing an existing release. - if: github.event.inputs.perform_version != '' - uses: actions/checkout@v2 - with: - fetch-depth: '0' - - name: Setup git user - env: - BUILD_USER: ${{ secrets.BUILD_USER }} - BUILD_TOKEN: ${{ secrets.BUILD_TOKEN }} - run: | - git config --global user.email "contact@killbill.io" - git config --global user.name "Kill Bill core team" - git config --global url."https://${BUILD_USER}:${BUILD_TOKEN}@github.com/".insteadOf "git@github.com:" - - name: Configure Java - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Download Java dependencies - # We do as much as we can, but it may not be enough (https://issues.apache.org/jira/browse/MDEP-82) - run: | - mvn ${MAVEN_FLAGS} clean install dependency:resolve dependency:resolve-plugins -DskipTests=true -Dgpg.skip=true -Psonatype-oss-release - - name: Update killbill-oss-parent - if: github.event.inputs.parent_version != '' - run: | - echo "Updating killbill-oss-parent pom.xml to ${{ github.event.inputs.parent_version }}:" - mvn ${MAVEN_FLAGS} versions:update-parent -DgenerateBackupPoms=false -DparentVersion="[${{ github.event.inputs.parent_version }}]" - echo "killbill-oss-parent pom.xml changes:" - git --no-pager diff - echo "Downloading new dependencies:" - mvn ${MAVEN_FLAGS} -U clean install -DskipTests=true - - git add pom.xml - # Will be pushed as part of the release process, only if the release is successful - git commit -m "pom.xml: update killbill-oss-parent to ${{ github.event.inputs.parent_version }}" - - name: Configure settings.xml for release - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: temurin - server-id: central - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }} - gpg-passphrase: GPG_PASSPHRASE - - name: Release artifacts - if: github.event.inputs.perform_version == '' - env: - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - AVATAX_URL: ${{ secrets.AVATAX_URL }} - AVATAX_ACCOUNT_ID: ${{ secrets.AVATAX_ACCOUNT_ID }} - AVATAX_LICENSE_KEY: ${{ secrets.AVATAX_LICENSE_KEY }} - AVATAX_COMPANY_CODE: ${{ secrets.AVATAX_COMPANY_CODE }} - AVATAX_COMMIT_DOCUMENTS: false - AVATAX_TAXRATESAPI_URL: ${{ secrets.AVATAX_TAXRATESAPI_URL }} - AVATAX_TAXRATESAPI_ACCOUNT_ID: ${{ secrets.AVATAX_TAXRATESAPI_ACCOUNT_ID }} - AVATAX_TAXRATESAPI_LICENSE_KEY: ${{ secrets.AVATAX_TAXRATESAPI_LICENSE_KEY }} - # It will still check the remote but hopefully not download much (0 B at 0 B/s). -o isn't safe because of MDEP-82 (see above). - run: | - mvn ${MAVEN_FLAGS} release:clean release:prepare release:perform - - name: Perform release - if: github.event.inputs.perform_version != '' - env: - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - # It will still check the remote but hopefully not download much (0 B at 0 B/s). -o isn't safe because of MDEP-82 (see above). - # See https://issues.apache.org/jira/browse/SCM-729 for why the release.properties file is required. - run: | - echo "scm.url=scm\:git\:git@github.com\:${GITHUB_REPOSITORY}.git" > release.properties - echo "scm.tag=${{ github.event.inputs.perform_version }}" >> release.properties - mvn ${MAVEN_FLAGS} release:perform + uses: killbill/gh-actions-shared/.github/workflows/release.yml@main + with: + parent_version: ${{ github.event.inputs.parent_version }} + perform_version: ${{ github.event.inputs.perform_version }} + secrets: + BUILD_USER: ${{ secrets.BUILD_USER }} + BUILD_TOKEN: ${{ secrets.BUILD_TOKEN }} + CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }} + CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }} + CLOUDSMITH_DISTRIBUTION_MAN_USERNAME: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_USERNAME }} + CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD }} + GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + extra-env: '{ "AVATAX_URL": "${{ secrets.AVATAX_URL }}", "AVATAX_ACCOUNT_ID": "${{ secrets.AVATAX_ACCOUNT_ID }}", "AVATAX_LICENSE_KEY": "${{ secrets.AVATAX_LICENSE_KEY }}", "AVATAX_COMPANY_CODE": "${{ secrets.AVATAX_COMPANY_CODE }}", "AVATAX_COMMIT_DOCUMENTS": false, "AVATAX_TAXRATESAPI_URL": "${{ secrets.AVATAX_TAXRATESAPI_URL }}", "AVATAX_TAXRATESAPI_ACCOUNT_ID": "${{ secrets.AVATAX_TAXRATESAPI_ACCOUNT_ID }}", "AVATAX_TAXRATESAPI_LICENSE_KEY": "${{ secrets.AVATAX_TAXRATESAPI_LICENSE_KEY }}" }' diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml new file mode 100644 index 0000000..d4ea57a --- /dev/null +++ b/.github/workflows/snapshot.yml @@ -0,0 +1,14 @@ +name: snapshot + +on: + push: + workflow_dispatch: + +jobs: + snapshot: + uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@main + secrets: + CLOUDSMITH_CENTRAL_PASSWORD: ${{ secrets.CLOUDSMITH_CENTRAL_PASSWORD }} + CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD: ${{ secrets.CLOUDSMITH_KILLBILL_MAVEN_REPO_PASSWORD }} + CLOUDSMITH_DISTRIBUTION_MAN_USERNAME: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_USERNAME }} + CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD: ${{ secrets.CLOUDSMITH_DISTRIBUTION_MAN_PASSWORD }} diff --git a/README.md b/README.md index 02d0cbc..4a22dd3 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,10 @@ The easiest way to get started with the AvaTax plugin is to take a look at our [ | 0.7.y | 0.22.z | Legacy REST API | | 0.8.y | 0.22.z | REST API | | 0.9.y | 0.24.z | REST API | +| 0.10.y | 0.26.z | REST API | -We've upgraded numerous dependencies in 0.8.x (required for Java 11 support). +We've upgraded numerous dependencies in 0.8.x (required for Java 11 support). In 0.10.x, the Java EE `javax` namespace +is replaced by the `jakarta` namespace. ## Requirements diff --git a/docker/docker-compose.ci.mysql.yml b/docker/docker-compose.ci.mysql.yml index 229e995..2221d50 100644 --- a/docker/docker-compose.ci.mysql.yml +++ b/docker/docker-compose.ci.mysql.yml @@ -3,7 +3,7 @@ version: '3.8' services: killbill: network_mode: host - image: killbill/killbill:0.24.15 + image: xsalefter/killbill:0.25.4 environment: - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml - KILLBILL_DAO_URL=jdbc:mysql://127.0.0.1:3306/killbill diff --git a/docker/docker-compose.ci.postgresql.yml b/docker/docker-compose.ci.postgresql.yml index 75177ea..d79e08b 100644 --- a/docker/docker-compose.ci.postgresql.yml +++ b/docker/docker-compose.ci.postgresql.yml @@ -3,7 +3,7 @@ version: '3.8' services: killbill: network_mode: host - image: killbill/killbill:0.24.15 + image: xsalefter/killbill:0.25.4 environment: - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml - KILLBILL_DAO_URL=jdbc:postgresql://127.0.0.1:5432/killbill diff --git a/pom.xml b/pom.xml index ecd0a99..8d10945 100644 --- a/pom.xml +++ b/pom.xml @@ -21,11 +21,11 @@ org.kill-bill.billing killbill-oss-parent - 0.146.63 + 0.147.30 org.kill-bill.billing.plugin.java avatax-plugin - 0.9.4-SNAPSHOT + 0.10.0-SNAPSHOT bundle Kill Bill OSGI AvaTax plugin Kill Bill AvaTax plugin @@ -45,6 +45,7 @@ spotbugs-exclude.xml false org.killbill.billing.plugin.avatax.* + killbill-avatax-plugin @@ -59,22 +60,10 @@ com.fasterxml.jackson.core jackson-databind - - com.github.spotbugs - spotbugs-annotations - - - com.google.code.findbugs - jsr305 - com.google.guava guava - - com.google.inject - guice - io.airlift command @@ -90,15 +79,19 @@ embedded-postgres test + + jakarta.annotation + jakarta.annotation-api + + + jakarta.inject + jakarta.inject-api + jakarta.servlet jakarta.servlet-api provided - - javax.inject - javax.inject - joda-time joda-time @@ -114,10 +107,6 @@ flyway-core 7.7.3 - - org.jooby - jooby - org.jooq jooq @@ -157,12 +146,28 @@ org.kill-bill.billing.plugin.java killbill-base-plugin + + + org.kill-bill.commons + killbill-jooby + + org.kill-bill.billing.plugin.java killbill-base-plugin test-jar test + + + org.kill-bill.commons + killbill-jooby + + + + + org.kill-bill.commons + killbill-jooby org.kill-bill.commons diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml index 8fe370a..9d81320 100644 --- a/spotbugs-exclude.xml +++ b/spotbugs-exclude.xml @@ -22,4 +22,9 @@ + + + + + diff --git a/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTaxCalculator.java b/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTaxCalculator.java index 54518fa..f4d4cb9 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTaxCalculator.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTaxCalculator.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.LocalDate; import org.killbill.billing.account.api.Account; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTaxCalculatorBase.java b/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTaxCalculatorBase.java index 7f4994c..f8e2cfc 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTaxCalculatorBase.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTaxCalculatorBase.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.LocalDate; import org.killbill.billing.account.api.Account; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTenantContext.java b/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTenantContext.java index 1252eea..9b1ffe2 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTenantContext.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/api/AvaTaxTenantContext.java @@ -20,7 +20,7 @@ import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.plugin.api.PluginTenantContext; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/api/TaxRatesTaxCalculator.java b/src/main/java/org/killbill/billing/plugin/avatax/api/TaxRatesTaxCalculator.java index da76e46..eb3fab0 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/api/TaxRatesTaxCalculator.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/api/TaxRatesTaxCalculator.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.joda.time.LocalDate; import org.killbill.billing.account.api.Account; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/AddressLocationInfo.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/AddressLocationInfo.java index 8f6ec1e..f0ca330 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/AddressLocationInfo.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/AddressLocationInfo.java @@ -20,10 +20,8 @@ import java.math.BigDecimal; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/AddressLocationInfo/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class AddressLocationInfo { public String locationCode; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/AddressesModel.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/AddressesModel.java index 114999e..9574082 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/AddressesModel.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/AddressesModel.java @@ -18,10 +18,8 @@ package org.killbill.billing.plugin.avatax.client.model; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/AddressesModel/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class AddressesModel { public AddressLocationInfo singleLocation; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/AvaTaxErrors.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/AvaTaxErrors.java index 25624a9..c09cf67 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/AvaTaxErrors.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/AvaTaxErrors.java @@ -20,9 +20,7 @@ import java.util.Arrays; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class AvaTaxErrors { public AvaTaxError error; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/AvaTaxMessage.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/AvaTaxMessage.java index 0846830..7d90ce2 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/AvaTaxMessage.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/AvaTaxMessage.java @@ -18,10 +18,8 @@ package org.killbill.billing.plugin.avatax.client.model; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/AvaTaxMessage/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class AvaTaxMessage { public String summary; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/CreateTransactionModel.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/CreateTransactionModel.java index fb456d7..640d90a 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/CreateTransactionModel.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/CreateTransactionModel.java @@ -24,10 +24,8 @@ import org.joda.time.DateTime; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/CreateTransactionModel/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class CreateTransactionModel { public Date date; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/LineItemModel.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/LineItemModel.java index 49b2a2b..eb16d4e 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/LineItemModel.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/LineItemModel.java @@ -20,10 +20,8 @@ import java.math.BigDecimal; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/LineItemModel/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class LineItemModel { public String number; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/PingResult.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/PingResult.java index 7b84e1c..8104075 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/PingResult.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/PingResult.java @@ -18,10 +18,8 @@ package org.killbill.billing.plugin.avatax.client.model; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/PingResultModel/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class PingResult { public String version; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/RateModel.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/RateModel.java index 7c8bccc..c25f414 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/RateModel.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/RateModel.java @@ -18,10 +18,8 @@ package org.killbill.billing.plugin.avatax.client.model; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/RateModel/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class RateModel { public double rate; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TaxOverrideModel.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TaxOverrideModel.java index 8b35bc6..7594944 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TaxOverrideModel.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TaxOverrideModel.java @@ -18,10 +18,8 @@ package org.killbill.billing.plugin.avatax.client.model; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/TaxOverrideModel/ -@SuppressFBWarnings({"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_NULL_FIELD"}) public class TaxOverrideModel { public String type; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TaxRateResult.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TaxRateResult.java index 0fd629b..65606e7 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TaxRateResult.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TaxRateResult.java @@ -20,10 +20,8 @@ import java.util.List; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/TaxRateModel/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class TaxRateResult { public double totalRate; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionAddressModel.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionAddressModel.java index 3e8c8d2..880147a 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionAddressModel.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionAddressModel.java @@ -18,10 +18,8 @@ package org.killbill.billing.plugin.avatax.client.model; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/TransactionAddressModel/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class TransactionAddressModel { public String id; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionLineDetailModel.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionLineDetailModel.java index f012728..0562da8 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionLineDetailModel.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionLineDetailModel.java @@ -18,10 +18,8 @@ package org.killbill.billing.plugin.avatax.client.model; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/TransactionLineDetailModel/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class TransactionLineDetailModel { public long id; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionLineModel.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionLineModel.java index d895de2..aa031d0 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionLineModel.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionLineModel.java @@ -20,10 +20,8 @@ import java.util.Arrays; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/TransactionLineModel/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class TransactionLineModel { public String lineNumber; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionModel.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionModel.java index 73d2fe5..b209e57 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionModel.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionModel.java @@ -23,10 +23,8 @@ import org.joda.time.DateTime; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/TransactionModel/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class TransactionModel { public long id; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionSummary.java b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionSummary.java index 4b53dff..854883d 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionSummary.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/client/model/TransactionSummary.java @@ -18,10 +18,8 @@ package org.killbill.billing.plugin.avatax.client.model; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; // https://developer.avalara.com/api-reference/avatax/rest/v2/models/TransactionSummary/ -@SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD") public class TransactionSummary { public double rate; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxActivator.java b/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxActivator.java index 833b02e..7c3c634 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxActivator.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxActivator.java @@ -21,8 +21,8 @@ import java.sql.SQLException; import java.util.Hashtable; -import javax.servlet.Servlet; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.Servlet; +import jakarta.servlet.http.HttpServlet; import org.flywaydb.core.Flyway; import org.killbill.billing.invoice.plugin.api.InvoicePluginApi; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxTaxCodesServlet.java b/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxTaxCodesServlet.java index fdf77fa..42af51d 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxTaxCodesServlet.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxTaxCodesServlet.java @@ -21,8 +21,8 @@ import java.sql.SQLException; import java.util.List; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jooby.MediaType; import org.jooby.Result; @@ -43,7 +43,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Function; import com.google.common.collect.Lists; -import com.google.inject.Inject; +import jakarta.inject.Inject; @Singleton // Handle /plugins/killbill-avatax/taxCodes diff --git a/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxTransactionsServlet.java b/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxTransactionsServlet.java index fe37716..a9456e2 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxTransactionsServlet.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/core/AvaTaxTransactionsServlet.java @@ -25,8 +25,8 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jooby.MediaType; import org.jooby.Result; @@ -43,7 +43,7 @@ import org.killbill.billing.tenant.api.Tenant; import org.killbill.billing.util.entity.Entity; -import com.google.inject.Inject; +import jakarta.inject.Inject; @Singleton // Handle /plugins/killbill-avatax/transactions diff --git a/src/main/java/org/killbill/billing/plugin/avatax/core/AvalaraHealthcheck.java b/src/main/java/org/killbill/billing/plugin/avatax/core/AvalaraHealthcheck.java index 0722db2..da5a7bb 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/core/AvalaraHealthcheck.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/core/AvalaraHealthcheck.java @@ -20,7 +20,7 @@ import java.util.Map; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.killbill.billing.osgi.api.Healthcheck; import org.killbill.billing.plugin.avatax.client.AvaTaxClient; diff --git a/src/main/java/org/killbill/billing/plugin/avatax/core/AvalaraHealthcheckServlet.java b/src/main/java/org/killbill/billing/plugin/avatax/core/AvalaraHealthcheckServlet.java index bb4d82f..59c3dc3 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/core/AvalaraHealthcheckServlet.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/core/AvalaraHealthcheckServlet.java @@ -20,8 +20,8 @@ import java.util.Optional; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.jooby.Result; import org.jooby.mvc.GET; @@ -30,7 +30,7 @@ import org.killbill.billing.plugin.core.resources.PluginHealthcheck; import org.killbill.billing.tenant.api.Tenant; -import com.google.inject.Inject; +import jakarta.inject.Inject; @Singleton @Path("/healthcheck") diff --git a/src/main/java/org/killbill/billing/plugin/avatax/dao/AvaTaxDao.java b/src/main/java/org/killbill/billing/plugin/avatax/dao/AvaTaxDao.java index 2e961aa..260bdc5 100644 --- a/src/main/java/org/killbill/billing/plugin/avatax/dao/AvaTaxDao.java +++ b/src/main/java/org/killbill/billing/plugin/avatax/dao/AvaTaxDao.java @@ -31,7 +31,7 @@ import java.util.Set; import java.util.UUID; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import javax.sql.DataSource; import org.joda.time.DateTime;