diff --git a/.circleci/config.yml b/.circleci/config.yml
index fdbe634a..90b8ed85 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,16 +8,14 @@ jobs:
build:
<<: *defaults
docker:
- - image: killbill/kbbuild:0.1.0
+ - image: killbill/kbbuild:0.7.0
steps:
- checkout
- - restore_cache:
- key: v1-dependencies-{{ .Branch }}-{{ checksum "pom.xml" }}
- run:
name: Setup dependencies
command: |
if [ "${CIRCLE_BRANCH}" != "master" ]; then
- for i in killbill-oss-parent killbill-api killbill-plugin-api; do
+ for i in killbill-oss-parent killbill-api killbill-plugin-api killbill-commons killbill-plugin-framework-java killbill-platform; do
if [ -n "$(git ls-remote --heads https://github.com/killbill/$i.git ${CIRCLE_BRANCH})" ]; then
echo "*** Setting up $i"
mkdir -p /home/killbill/$i
@@ -29,20 +27,20 @@ jobs:
fi
done
fi
- - run: mvn -DskipTests=true clean install dependency:go-offline
+ - run: mvn -DskipTests=true clean install
- save_cache:
paths:
- ~/.m2
- key: v1-dependencies-{{ .Branch }}-{{ checksum "pom.xml" }}
+ key: v1-dependencies-{{ .Revision }}
test-h2:
<<: *defaults
docker:
- - image: killbill/kbbuild:0.1.0
+ - image: killbill/kbbuild:0.7.0
steps:
- checkout
- restore_cache:
- key: v1-dependencies-{{ .Branch }}-{{ checksum "pom.xml" }}
+ key: v1-dependencies-{{ .Revision }}
- run: mvn clean install -Ptravis
- run:
name: Save test results
@@ -58,11 +56,11 @@ jobs:
test-mysql:
<<: *defaults
docker:
- - image: killbill/kbbuild:0.1.0
+ - image: killbill/kbbuild:0.7.0
steps:
- checkout
- restore_cache:
- key: v1-dependencies-{{ .Branch }}-{{ checksum "pom.xml" }}
+ key: v1-dependencies-{{ .Revision }}
- run: mvn clean install -Pmysql
- run:
name: Save test results
@@ -78,11 +76,11 @@ jobs:
test-postgresql:
<<: *defaults
docker:
- - image: killbill/kbbuild:0.1.0
+ - image: killbill/kbbuild:0.7.0
steps:
- checkout
- restore_cache:
- key: v1-dependencies-{{ .Branch }}-{{ checksum "pom.xml" }}
+ key: v1-dependencies-{{ .Revision }}
- run: mvn clean install -Ppostgresql
- run:
name: Save test results
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 00000000..85dc760c
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,20 @@
+## How to contribute to Kill Bill
+
+**Do not open up a GitHub issue before reaching out to our [Mailing-List](https://groups.google.com/forum/#!forum/killbilling-users)**. GitHub issues are primarily intended for tracking bug reports and fixes by the core team.
+
+#### **Did you find a bug?**
+
+In your [Mailing-List](https://groups.google.com/forum/#!forum/killbilling-users) post, specify:
+
+* Step by step description on how to reproduce the issue
+* [Account data and system dump](http://docs.killbill.io/latest/debugging.html#_seeking_help) via KPM of an affected account
+
+#### **Do you intend to add a new feature or change an existing one?**
+
+Do not open an issue or pull request on GitHub until you have collected positive feedback about the change on the [Mailing-List](https://groups.google.com/forum/#!forum/killbilling-users).
+
+When submitting code, make sure to add [new tests](http://docs.killbill.io/latest/development.html#_navigating_the_kill_bill_codebase).
+
+#### **Do you want to contribute to the Kill Bill documentation?**
+
+Open a pull request on GitHub in the [killbill-docs](https://github.com/killbill/killbill-docs) repository.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..21cc4285
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [killbill]
diff --git a/.gitignore b/.gitignore
index 3a6a7bee..a3812480 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,41 +1,57 @@
#
-# https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
+# https://github.com/github/gitignore/blob/599646e9d0a26283d67715dead8f26e0eb2df753/Global/JetBrains.gitignore
#
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-# User-specific stuff:
+# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
-.idea/dictionaries
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
-# Sensitive or high-churn files:
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
-.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
-# Gradle:
+# Gradle
.idea/**/gradle.xml
.idea/**/libraries
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn. Uncomment if using
+# auto-import.
+.idea/artifacts
+.idea/compiler.xml
+.idea/jarRepositories.xml
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
+*.iml
+*.ipr
+
# CMake
-cmake-build-debug/
+cmake-build-*/
-# Mongo Explorer plugin:
+# Mongo Explorer plugin
.idea/**/mongoSettings.xml
-## File-based project format:
+# File-based project format
*.iws
-## Plugin-specific files:
-
# IntelliJ
-/out/
+out/
# mpeltonen/sbt-idea plugin
.idea_modules/
@@ -52,22 +68,95 @@ crashlytics.properties
crashlytics-build.properties
fabric.properties
-### Intellij+iml Patch ###
-# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+# Editor-based Rest Client
+.idea/httpRequests
-*.iml
-modules.xml
-.idea/misc.xml
-*.ipr
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+#
+# https://github.com/github/gitignore/blob/36ce3a894d9ddff2916bc98d71380aa7167ff1d7/Global/Eclipse.gitignore
+#
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+.apt_generated_test/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.project
+
+#
+# https://github.com/github/gitignore/blob/6651bca9c83572f908474fc6206ed8a80df91290/Maven.gitignore
+#
-### Misc. ###
-.idea/kotlinc.xml
-.idea/sbt.xml
-.idea/vcs.xml
-.idea/dbnavigator.xml
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+# https://github.com/takari/maven-wrapper#usage-without-binary-jar
+.mvn/wrapper/maven-wrapper.jar
#
-# https://github.com/github/gitignore/blob/master/Java.gitignore
+# https://github.com/github/gitignore/blob/36ce3a894d9ddff2916bc98d71380aa7167ff1d7/Java.gitignore
#
# Compiled class file
@@ -85,6 +174,7 @@ modules.xml
# Package Files #
*.jar
*.war
+*.nar
*.ear
*.zip
*.tar.gz
@@ -94,27 +184,46 @@ modules.xml
hs_err_pid*
#
-# https://github.com/github/gitignore/blob/master/Maven.gitignore
+# https://github.com/github/gitignore/blob/320a610b9ffba3ff28166370b6dd9f73096e34b7/Global/macOS.gitignore
#
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
-# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
-!/.mvn/wrapper/maven-wrapper.jar
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
#
-# Misc.
+# https://github.com/github/gitignore/blob/320a610b9ffba3ff28166370b6dd9f73096e34b7/Global/TextMate.gitignore
#
-*.db
-logs/
-.logs
+*.tmproj
+*.tmproject
+tmtags
+
+#
+# Project specific
+#
src/test/resources/adyen.properties
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..73f69e09
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 1f7287cf..00000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/copyright/apache.xml b/.idea/copyright/apache.xml
index 963683f9..f1d53318 100644
--- a/.idea/copyright/apache.xml
+++ b/.idea/copyright/apache.xml
@@ -1,9 +1,6 @@
-
-
-
+
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 81a68693..28609b6d 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,7 +1,9 @@
-
+
+
+
-
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 2b9fc3b0..2c340720 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,29 +1,39 @@
+
+
+
+
+
+
+
+
+
+ org.killbill.billing.account.api.Account,org.killbill.billing.invoice.api.Invoice,org.killbill.billing.tenant.api.Tenant
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..602a0ddb
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
new file mode 100644
index 00000000..e3b2ac88
--- /dev/null
+++ b/.idea/sqldialects.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 37ec93a1..7a4a3ea2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,180 +1,191 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made
-available under the License, as indicated by a copyright notice that is included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a whole,
-provided Your use, reproduction, and distribution of the Work otherwise complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction, or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License. However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification within
-third-party archives.
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
@@ -182,10 +193,10 @@ third-party archives.
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License.
+ limitations under the License.
\ No newline at end of file
diff --git a/NEWS b/NEWS
index 97396161..fe8a274d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+0.8.0
+ Initial release for Kill Bill 0.22.x
+
0.7.0
Initial release for Kill Bill 0.20.x
diff --git a/README.md b/README.md
index 4a61845c..3c791013 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,9 @@
-killbill-adyen-plugin
-=====================
+# killbill-adyen-plugin
+![Maven Central](https://img.shields.io/maven-central/v/org.kill-bill.billing.plugin.java/adyen-plugin?color=blue&label=Maven%20Central)
-Plugin to use [Adyen](https://www.adyen.com/home/) as a gateway.
+Plugin to use [Adyen](https://www.adyen.com/) as a gateway.
-Release builds are available on [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.kill-bill.billing.plugin.java%22%20AND%20a%3A%22adyen-plugin%22) with coordinates `org.kill-bill.billing.plugin.java:adyen-plugin`.
-
-Kill Bill compatibility
------------------------
+## Kill Bill compatibility
| Plugin version | Kill Bill version |
| -------------: | ----------------: |
@@ -17,14 +14,24 @@ Kill Bill compatibility
| 0.5.y | 0.18.z |
| 0.6.y | 0.19.z |
| 0.7.y | 0.20.z |
+| 0.8.y | 0.22.z |
+
+We've upgraded numerous dependencies in 0.8.x (required for Java 11 support).
-Requirements
-------------
+## Requirements
The plugin needs a database. The latest version of the schema can be found [here](https://github.com/killbill/killbill-adyen-plugin/blob/master/src/main/resources/ddl.sql).
-Configuration
--------------
+## Development
+
+To install the plugin from sources:
+
+```
+mvn clean install -DskipTests=true
+kpm install_java_plugin adyen --from-source-file target/adyen-plugin-*-SNAPSHOT.jar --destination /var/tmp/bundles
+```
+
+## Configuration
The following properties are required:
@@ -97,8 +104,7 @@ org.killbill.billing.plugin.adyen.password=ZZZ' \
To avoid runtime errors (such as `ClassCastException`), starting Kill Bill with the System Property `com.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize=true` is recommended.
-Usage
------
+## Usage
A full end-to-end integration demo is also available [here](https://github.com/killbill/killbill-adyen-demo).
@@ -421,8 +427,7 @@ curl -v \
At this point, the payment method is ready for recurring payments.
-Plugin properties
------------------
+## Plugin properties
| Key | Description |
| -----------------------: | :-------------------------------------------- |
@@ -467,3 +472,7 @@ Plugin properties
| acquirerMID | Value of Adyen's authorisationMid field |
| selectedBrand | Value of Adyen's selectedBrand field |
| lookupDirectory | If true, query the directory (HPP flow) |
+
+## About
+
+Kill Bill is the leading Open-Source Subscription Billing & Payments Platform. For more information about the project, go to https://killbill.io/.
diff --git a/pom.xml b/pom.xml
index c9e48e90..57b4ed6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
-
4.0.0
- killbill-oss-parentorg.kill-bill.billing
- 0.142.1
+ killbill-oss-parent
+ 0.144.29org.kill-bill.billing.plugin.javaadyen-plugin
- Kill Bill OSGI Adyen plugin
- 0.7.1-SNAPSHOT
+ 0.8.0-SNAPSHOTbundle
+ Kill Bill OSGI Adyen pluginKill Bill Adyen pluginhttp://github.com/killbill/killbill-adyen-plugin
@@ -40,38 +39,100 @@
https://github.com/killbill/killbill-adyen-plugin/issues
- 3.0.4
- 2.5.0
+ 3.4.01.8.3
-
- 21.0
- 2.9.5
+ javax.net.ssl;
+ javax.management;
+ javax.jws;
+ javax.jws.soap;
+ javax.annotation;
+ javax.activation;
+ javax.xml.soap;
+ javax.xml.ws;
+ javax.xml.ws.spi;
+ javax.xml.ws.handler.soap;
+ javax.xml.ws.handler;
+ javax.xml.ws.http;
+ javax.xml.ws.soap;
+ javax.xml.ws.wsaddressing;
+ javax.xml.stream;
+ javax.xml.stream.events;
+ javax.xml.stream.util;
+ javax.xml.bind.annotation.adapters;
+ javax.xml.bind;
+ javax.xml.bind.helpers;
+ javax.xml.bind.annotation;
+ javax.xml.bind.attachment;
+ javax.xml.datatype;
+ javax.xml.namespace;
+ javax.xml.parsers;
+ javax.xml.transform;
+ javax.xml.transform.sax;
+ javax.xml.transform.dom;
+ javax.xml.transform.stream;
+ javax.xml.validation;
+ javax.xml.xpath;
+ version="[0,3)",
+ org.killbill.billing.plugin.adyen.*
+ 2.5.0
+
+
+
+ org.ow2.asm
+ asm
+ 8.0.1
+
+
+
- com.google.inject
- guice
- compile
+ com.fasterxml.jackson.core
+ jackson-core
- com.google.inject.extensions
- guice-multibindings
- compile
+ com.fasterxml.jackson.core
+ jackson-databind
- com.ning
- async-http-client
+ com.fasterxml.woodstox
+ woodstox-core
+ 6.2.1
- com.fasterxml.jackson.core
- jackson-databind
- ${jackson.version}
+ com.github.tomakehurst
+ wiremock
+ 1.57
+ test
+
+
+ com.google.code.findbugs
+ jsr305
+
+
+ com.google.guava
+ guava
+
+
+ com.google.inject
+ guice
+
+
+ com.jayway.restassured
+ rest-assured
+ ${rest-assured.version}
+ testio.airliftcommandtest
+
+ io.airlift
+ testing-mysql-server
+ test
+ io.airlifttesting-postgresql-server
@@ -83,158 +144,162 @@
test
- org.joda
- joda-money
+ jakarta.xml.bind
+ jakarta.xml.bind-api
- org.mockito
- mockito-all
- test
+ javax.inject
+ javax.inject
- org.kill-bill.billing
- killbill-api
+ javax.servlet
+ javax.servlet-apiprovided
- org.kill-bill.billing.plugin
- killbill-plugin-api-payment
+ joda-time
+ joda-timeprovided
- org.kill-bill.billing.plugin
- killbill-plugin-api-notification
- provided
+ org.apache.cxf
+ cxf-core
+ ${cxf.version}
+
+
+ javax.activation
+
+ com.sun.activation
+
+
+ jakarta.activation
+
+ com.sun.activation
+
+
- org.kill-bill.billing.plugin.java
- killbill-base-plugin
+ org.apache.cxf
+ cxf-rt-bindings-soap
+ ${cxf.version}
- org.kill-bill.billing.plugin.java
- killbill-base-plugin
- test-jar
- test
+ org.apache.cxf
+ cxf-rt-frontend-jaxws
+ ${cxf.version}
+ runtime
- org.kill-bill.commons
- killbill-clock
+ org.apache.cxf
+ cxf-rt-frontend-simple
+ ${cxf.version}
- org.kill-bill.commons
- killbill-clock
- test-jar
- test
+ org.apache.cxf
+ cxf-rt-transports-http
+ ${cxf.version}
- org.kill-bill.billing
- killbill-platform-test
- test
+ org.apache.felix
+ org.apache.felix.framework
+ provided
- org.kill-bill.billing
- killbill-platform-osgi-api
+ org.asynchttpclient
+ async-http-client
- org.kill-bill.billing
- killbill-platform-osgi-bundles-lib-killbill
+ org.joda
+ joda-money
- org.kill-bill.billing
- killbill-platform-osgi-bundles-lib-slf4j-osgi
+ org.jooby
+ jooby
- mysql
- mysql-connector-mxj
- test
+ org.jooq
+ jooq
- org.kill-bill.commons
- killbill-embeddeddb-mysql
- test-jar
+ org.jsoup
+ jsoup
+ ${jsoup.version}test
- javax.servlet
- javax.servlet-api
+ org.kill-bill.billing
+ killbill-apiprovided
- joda-time
- joda-time
-
-
- org.osgi
- org.osgi.core
-
-
- org.osgi
- org.osgi.compendium
+ org.kill-bill.billing
+ killbill-platform-osgi-api
+ provided
- org.slf4j
- slf4j-api
+ org.kill-bill.billing
+ killbill-platform-osgi-bundles-lib-killbill
+ provided
- org.slf4j
- slf4j-simple
+ org.kill-bill.billing
+ killbill-platform-testtest
- com.google.guava
- guava
- ${guava.version}
- compile
+ org.kill-bill.billing.plugin
+ killbill-plugin-api-notification
+ provided
- org.jooq
- jooq
+ org.kill-bill.billing.plugin
+ killbill-plugin-api-payment
+ provided
- org.apache.cxf
- cxf-core
- ${cxf.version}
+ org.kill-bill.billing.plugin.java
+ killbill-base-plugin
- org.apache.cxf
- cxf-rt-frontend-jaxws
- ${cxf.version}
+ org.kill-bill.billing.plugin.java
+ killbill-base-plugin
+ test-jar
+ test
- org.apache.cxf
- cxf-rt-transports-http
- ${cxf.version}
+ org.kill-bill.commons
+ killbill-clock
+ provided
- com.google.code.findbugs
- jsr305
+ org.kill-bill.commons
+ killbill-clock
+ test-jar
+ test
- org.testng
- testng
- test
+ org.kill-bill.commons
+ killbill-embeddeddb-common
- com.github.tomakehurst
- wiremock
- 1.57
+ org.mockito
+ mockito-coretest
- com.jayway.restassured
- rest-assured
- ${rest-assured.version}
- test
+ org.slf4j
+ slf4j-api
+ provided
- org.jsoup
- jsoup
- ${jsoup.version}
+ org.slf4j
+ slf4j-simpletest
- org.yaml
- snakeyaml
+ org.testng
+ testng
+ test
@@ -247,6 +312,9 @@
generate-wsdl-sourcesgenerate-sources
+
+ wsdl2java
+ ${basedir}/target/generated-sources/cxf-sources
@@ -254,10 +322,8 @@
${basedir}/src/main/resources/cxf/Notification.wsdlclasspath:cxf/Notification.wsdl
- ${basedir}/src/main/resources/cxf/jaxbNotification.xjb
-
- ${basedir}/src/main/resources/cxf/jaxwsNotification.xjb
-
+ ${basedir}/src/main/resources/cxf/jaxbNotification.xjb
+ ${basedir}/src/main/resources/cxf/jaxwsNotification.xjb-xjc-extension
@@ -279,8 +345,7 @@
classpath:cxf/OpenInvoiceDetail.wsdl${basedir}/src/main/resources/cxf/jaxbOpenInvoice.xjb
- ${basedir}/src/main/resources/cxf/jaxwsOpenInvoice.xjb
-
+ ${basedir}/src/main/resources/cxf/jaxwsOpenInvoice.xjb-xjc-extension
@@ -299,228 +364,12 @@
-
- wsdl2java
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
-
-
-
- jar
- test-jar
-
-
-
-
-
- ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-
- false
-
- org.apache.felixmaven-bundle-plugin
- true
-
-
- org.killbill.billing.plugin.adyen.core.AdyenActivator
-
- org.killbill.billing.plugin.service
-
- org.killbill.billing.plugin.adyen.*
-
-
- org.killbill.billing.account.api;
- org.killbill.billing.catalog.api;
- org.killbill.billing.invoice.api;
- org.killbill.billing.entitlement.api;
- org.killbill.billing.notification.api;
- org.killbill.billing.notification.plugin.api;
- org.killbill.billing.notification.plugin;
- org.killbill.billing.osgi.api;
- org.killbill.billing.osgi.api.config;
- org.killbill.billing.payment.api;
- org.killbill.billing.payment.plugin.api;
- org.killbill.billing.control.plugin.api;
- org.killbill.billing.tenant.api;
- org.killbill.billing.usage.api;
- org.killbill.billing.util.api;
- org.killbill.billing.currency.plugin.api;
- org.killbill.billing.currency.api;
- org.killbill.billing.security.api;
- com.sun.xml.internal.ws;
- com.sun.xml.internal.ws.addressing;
- com.sun.xml.internal.ws.addressing.model;
- com.sun.xml.internal.ws.addressing.policy;
- com.sun.xml.internal.ws.addressing.v200408;
- com.sun.xml.internal.ws.api;
- com.sun.xml.internal.ws.api.addressing;
- com.sun.xml.internal.ws.api.client;
- com.sun.xml.internal.ws.api.config.management;
- com.sun.xml.internal.ws.api.config.management.policy;
- com.sun.xml.internal.ws.api.fastinfoset;
- com.sun.xml.internal.ws.api.ha;
- com.sun.xml.internal.ws.api.handler;
- com.sun.xml.internal.ws.api.message;
- com.sun.xml.internal.ws.api.message.stream;
- com.sun.xml.internal.ws.api.model;
- com.sun.xml.internal.ws.api.model.soap;
- com.sun.xml.internal.ws.api.model.wsdl;
- com.sun.xml.internal.ws.api.pipe;
- com.sun.xml.internal.ws.api.pipe.helper;
- com.sun.xml.internal.ws.api.policy;
- com.sun.xml.internal.ws.api.server;
- com.sun.xml.internal.ws.api.streaming;
- com.sun.xml.internal.ws.api.wsdl.parser;
- com.sun.xml.internal.ws.api.wsdl.writer;
- com.sun.xml.internal.ws.binding;
- com.sun.xml.internal.ws.client;
- com.sun.xml.internal.ws.client.dispatch;
- com.sun.xml.internal.ws.client.sei;
- com.sun.xml.internal.ws.config.management.policy;
- com.sun.xml.internal.ws.developer;
- com.sun.xml.internal.ws.encoding;
- com.sun.xml.internal.ws.encoding.fastinfoset;
- com.sun.xml.internal.ws.encoding.policy;
- com.sun.xml.internal.ws.encoding.soap;
- com.sun.xml.internal.ws.encoding.soap.streaming;
- com.sun.xml.internal.ws.encoding.xml;
- com.sun.xml.internal.ws.fault;
- com.sun.xml.internal.ws.handler;
- com.sun.xml.internal.ws.message;
- com.sun.xml.internal.ws.message.jaxb;
- com.sun.xml.internal.ws.message.saaj;
- com.sun.xml.internal.ws.message.source;
- com.sun.xml.internal.ws.message.stream;
- com.sun.xml.internal.ws.model;
- com.sun.xml.internal.ws.model.soap;
- com.sun.xml.internal.ws.model.wsdl;
- com.sun.xml.internal.ws.org.objectweb.asm;
- com.sun.xml.internal.ws.policy;
- com.sun.xml.internal.ws.policy.jaxws;
- com.sun.xml.internal.ws.policy.jaxws.spi;
- com.sun.xml.internal.ws.policy.privateutil;
- com.sun.xml.internal.ws.policy.sourcemodel;
- com.sun.xml.internal.ws.policy.sourcemodel.attach;
- com.sun.xml.internal.ws.policy.sourcemodel.wspolicy;
- com.sun.xml.internal.ws.policy.spi;
- com.sun.xml.internal.ws.policy.subject;
- com.sun.xml.internal.ws.protocol.soap;
- com.sun.xml.internal.ws.protocol.xml;
- com.sun.xml.internal.ws.resources;
- com.sun.xml.internal.ws.server;
- com.sun.xml.internal.ws.server.provider;
- com.sun.xml.internal.ws.server.sei;
- com.sun.xml.internal.ws.spi;
- com.sun.xml.internal.ws.streaming;
- com.sun.xml.internal.ws.transport;
- com.sun.xml.internal.ws.transport.http;
- com.sun.xml.internal.ws.transport.http.client;
- com.sun.xml.internal.ws.transport.http.server;
- com.sun.xml.internal.ws.util;
- com.sun.xml.internal.ws.util.exception;
- com.sun.xml.internal.ws.util.localization;
- com.sun.xml.internal.ws.util.pipe;
- com.sun.xml.internal.ws.util.xml;
- com.sun.xml.internal.ws.wsdl;
- com.sun.xml.internal.ws.wsdl.parser;
- com.sun.xml.internal.ws.wsdl.writer;
- com.sun.xml.internal.ws.wsdl.writer.document;
- com.sun.xml.internal.ws.wsdl.writer.document.http;
- com.sun.xml.internal.ws.wsdl.writer.document.soap;
- com.sun.xml.internal.ws.wsdl.writer.document.soap12;
- com.sun.xml.internal.ws.wsdl.writer.document.xsd,
- org.xml.sax.ext;
- org.xml.sax.helpers;
- org.xml.sax;
- org.w3c.dom;
- org.w3c.dom.ls;
- javax.net.ssl;
- javax.management;
- javax.jws;
- javax.jws.soap;
- javax.annotation;
- javax.activation;
- javax.xml.soap;
- javax.xml.ws;
- javax.xml.ws.spi;
- javax.xml.ws.handler.soap;
- javax.xml.ws.handler;
- javax.xml.ws.http;
- javax.xml.ws.soap;
- javax.xml.ws.wsaddressing;
- javax.xml.stream;
- javax.xml.stream.events;
- javax.xml.stream.util;
- javax.xml.bind.annotation.adapters;
- javax.xml.bind;
- javax.xml.bind.helpers;
- javax.xml.bind.annotation;
- javax.xml.bind.attachment;
- javax.xml.datatype;
- javax.xml.namespace;
- javax.xml.parsers;
- javax.xml.transform;
- javax.xml.transform.sax;
- javax.xml.transform.dom;
- javax.xml.transform.stream;
- javax.xml.validation;
- javax.xml.xpath;
- javax.naming.directory;
- javax.naming.event;
- javax.naming.ldap;
- javax.naming.spi;
- javax.naming;
- sun.misc;
- sun.misc.unsafe;
- sun.security;
- sun.security.util;
- org.osgi.service.log;
- version="[0,3)",
- *;resolution:=optional
-
-
-
-
-
- process-classes
-
- manifest
-
-
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
-
-
- assemble-killbill-osgi-bundles-adyen-plugin
-
- shade
-
- package
-
- true
- false
- jar-with-dependencies
-
-
- ${project.groupId}:${project.artifactId}
-
-
-
-
- org.apache.maven.plugins
@@ -528,10 +377,10 @@
jar-with-dep
+ packagesingle
- package${project.artifactId}-${project.version}false
@@ -545,47 +394,15 @@
+
+ org.basepom.maven
+ duplicate-finder-maven-plugin
+
+
+ .*\.xjb
+
+
+
-
-
- jdk18
-
- true
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- 1.8
- true
- true
- true
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
-
-
-
- jar
- test-jar
-
-
- jdk18
-
-
-
-
- true
-
-
-
-
-
-
diff --git a/src/main/assembly/cxf/cxf-extension-http-binding.xml b/src/main/assembly/cxf/cxf-extension-http-binding.xml
index c6990a4b..e8298fea 100644
--- a/src/main/assembly/cxf/cxf-extension-http-binding.xml
+++ b/src/main/assembly/cxf/cxf-extension-http-binding.xml
@@ -1,22 +1,20 @@
+ ~ Copyright 2014-2020 Groupon, Inc
+ ~ Copyright 2014-2020 The Billing Project, LLC
+ ~
+ ~ The Billing Project licenses this file to you under the Apache License, version 2.0
+ ~ (the "License"); you may not use this file except in compliance with the
+ ~ License. You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ ~ License for the specific language governing permissions and limitations
+ ~ under the License.
+ -->
+ ~ Copyright 2014-2020 Groupon, Inc
+ ~ Copyright 2014-2020 The Billing Project, LLC
+ ~
+ ~ The Billing Project licenses this file to you under the Apache License, version 2.0
+ ~ (the "License"); you may not use this file except in compliance with the
+ ~ License. You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ ~ License for the specific language governing permissions and limitations
+ ~ under the License.
+ -->
+ ~ Copyright 2014-2020 Groupon, Inc
+ ~ Copyright 2014-2020 The Billing Project, LLC
+ ~
+ ~ The Billing Project licenses this file to you under the Apache License, version 2.0
+ ~ (the "License"); you may not use this file except in compliance with the
+ ~ License. You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ ~ License for the specific language governing permissions and limitations
+ ~ under the License.
+ -->
+ ~ Copyright 2014-2020 Groupon, Inc
+ ~ Copyright 2014-2020 The Billing Project, LLC
+ ~
+ ~ The Billing Project licenses this file to you under the Apache License, version 2.0
+ ~ (the "License"); you may not use this file except in compliance with the
+ ~ License. You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ ~ License for the specific language governing permissions and limitations
+ ~ under the License.
+ -->
+ ~ Copyright 2014-2020 Groupon, Inc
+ ~ Copyright 2014-2020 The Billing Project, LLC
+ ~
+ ~ The Billing Project licenses this file to you under the Apache License, version 2.0
+ ~ (the "License"); you may not use this file except in compliance with the
+ ~ License. You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ ~ License for the specific language governing permissions and limitations
+ ~ under the License.
+ -->
+ ~ Copyright 2014-2020 Groupon, Inc
+ ~ Copyright 2014-2020 The Billing Project, LLC
+ ~
+ ~ The Billing Project licenses this file to you under the Apache License, version 2.0
+ ~ (the "License"); you may not use this file except in compliance with the
+ ~ License. You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ ~ License for the specific language governing permissions and limitations
+ ~ under the License.
+ -->
+ ~ Copyright 2014-2020 Groupon, Inc
+ ~ Copyright 2014-2020 The Billing Project, LLC
+ ~
+ ~ The Billing Project licenses this file to you under the Apache License, version 2.0
+ ~ (the "License"); you may not use this file except in compliance with the
+ ~ License. You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ ~ License for the specific language governing permissions and limitations
+ ~ under the License.
+ -->
+ ~ Copyright 2014-2020 Groupon, Inc
+ ~ Copyright 2014-2020 The Billing Project, LLC
+ ~
+ ~ The Billing Project licenses this file to you under the Apache License, version 2.0
+ ~ (the "License"); you may not use this file except in compliance with the
+ ~ License. You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ ~ License for the specific language governing permissions and limitations
+ ~ under the License.
+ -->
+ ~ Copyright 2014-2020 Groupon, Inc
+ ~ Copyright 2014-2020 The Billing Project, LLC
+ ~
+ ~ The Billing Project licenses this file to you under the Apache License, version 2.0
+ ~ (the "License"); you may not use this file except in compliance with the
+ ~ License. You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ ~ License for the specific language governing permissions and limitations
+ ~ under the License.
+ -->
org.apache.cxf.binding.soap.wsdl11.SoapAddressPlugin
diff --git a/src/main/assembly/jar-assembly.xml b/src/main/assembly/jar-assembly.xml
index 3961dfb7..d859573c 100644
--- a/src/main/assembly/jar-assembly.xml
+++ b/src/main/assembly/jar-assembly.xml
@@ -1,3 +1,20 @@
+
+
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenCallContext.java b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenCallContext.java
index 9f5172e8..8e789ed9 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenCallContext.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenCallContext.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenGatewayNotification.java b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenGatewayNotification.java
index b716373c..58edbec5 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenGatewayNotification.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenGatewayNotification.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenHostedPaymentPageFormDescriptor.java b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenHostedPaymentPageFormDescriptor.java
index 99496555..f2a2062a 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenHostedPaymentPageFormDescriptor.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenHostedPaymentPageFormDescriptor.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenModelPluginBase.java b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenModelPluginBase.java
index a590ff87..f6b3fb55 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenModelPluginBase.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenModelPluginBase.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentMethodInfoPlugin.java b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentMethodInfoPlugin.java
index 9b681cc4..385369d1 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentMethodInfoPlugin.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentMethodInfoPlugin.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentMethodPlugin.java b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentMethodPlugin.java
index 8ccd1bc5..3ea8c997 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentMethodPlugin.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentMethodPlugin.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentPluginApi.java b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentPluginApi.java
index 98f9c5d6..cb8e362f 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentPluginApi.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentPluginApi.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2018 Groupon, Inc
- * Copyright 2014-2018 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
@@ -39,7 +39,6 @@
import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.osgi.libs.killbill.OSGIConfigPropertiesService;
import org.killbill.billing.osgi.libs.killbill.OSGIKillbillAPI;
-import org.killbill.billing.osgi.libs.killbill.OSGIKillbillLogService;
import org.killbill.billing.payment.api.Payment;
import org.killbill.billing.payment.api.PaymentApiException;
import org.killbill.billing.payment.api.PaymentMethod;
@@ -89,7 +88,6 @@
import org.killbill.billing.util.callcontext.CallContext;
import org.killbill.billing.util.callcontext.TenantContext;
import org.killbill.clock.Clock;
-import org.osgi.service.log.LogService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -220,10 +218,9 @@ public AdyenPaymentPluginApi(final AdyenConfigurationHandler adyenConfigurationH
final AdyenRecurringConfigurationHandler adyenRecurringConfigurationHandler,
final OSGIKillbillAPI killbillApi,
final OSGIConfigPropertiesService osgiConfigPropertiesService,
- final OSGIKillbillLogService logService,
final Clock clock,
final AdyenDao dao) throws JAXBException {
- super(killbillApi, osgiConfigPropertiesService, logService, clock, dao);
+ super(killbillApi, osgiConfigPropertiesService, clock, dao);
this.adyenConfigurationHandler = adyenConfigurationHandler;
this.adyenHppConfigurationHandler = adyenHppConfigurationHandler;
this.adyenRecurringConfigurationHandler = adyenRecurringConfigurationHandler;
@@ -266,7 +263,7 @@ private void cancelExpiredPayment(PaymentTransactionInfoPlugin expiredTransactio
PluginProperties.merge(expiredTransaction.getProperties(), updatedStatusProperties),
context.getTenantId());
} catch (final SQLException e) {
- logService.log(LogService.LOG_ERROR, "Unable to update canceled payment", e);
+ logger.warn("Unable to update canceled payment", e);
}
}
@@ -385,7 +382,7 @@ public List getPaymentMethods(final UUID kbAccountId, f
try {
recurringDetailList = adyenRecurringClient.getRecurringDetailList(customerId.toString(), merchantAccount, recurringType.toString());
} catch (final ServiceException e) {
- logService.log(LogService.LOG_ERROR, "Unable to retrieve recurring details in Adyen", e);
+ logger.warn("Unable to retrieve recurring details in Adyen", e);
continue;
}
for (final RecurringDetail recurringDetail : recurringDetailList) {
@@ -393,7 +390,7 @@ public List getPaymentMethods(final UUID kbAccountId, f
try {
formerResponse = dao.getResponse(recurringDetail.getFirstPspReference());
} catch (final SQLException e) {
- logService.log(LogService.LOG_ERROR, "Unable to retrieve adyen response", e);
+ logger.warn("Unable to retrieve adyen response", e);
continue;
}
if (formerResponse == null) {
@@ -404,14 +401,14 @@ public List getPaymentMethods(final UUID kbAccountId, f
try {
payment = killbillAPI.getPaymentApi().getPayment(UUID.fromString(formerResponse.getKbPaymentId()), false, false, properties, context);
} catch (final PaymentApiException e) {
- logService.log(LogService.LOG_ERROR, "Unable to retrieve Payment for externalKey " + recurringDetail.getFirstPspReference(), e);
+ logger.warn("Unable to retrieve Payment for externalKey {}", recurringDetail.getFirstPspReference(), e);
continue;
}
if (payment.getPaymentMethodId().toString().equals(record.getKbPaymentMethodId())) {
try {
dao.setPaymentMethodToken(record.getKbPaymentMethodId(), recurringDetail.getRecurringDetailReference(), context.getTenantId().toString());
} catch (final SQLException e) {
- logService.log(LogService.LOG_ERROR, "Unable to update token", e);
+ logger.warn("Unable to update token", e);
continue;
}
}
@@ -957,7 +954,7 @@ private AdyenPaymentMethodsRecord getAdyenPaymentMethodsRecord(@Nullable final U
try {
paymentMethodsRecord = dao.getPaymentMethod(kbPaymentMethodId, context.getTenantId());
} catch (final SQLException e) {
- logService.log(LogService.LOG_WARNING, "Failed to retrieve payment method " + kbPaymentMethodId, e);
+ logger.warn("Failed to retrieve payment method {}", kbPaymentMethodId, e);
}
}
@@ -1024,7 +1021,7 @@ private AdyenResponsesRecord previousAdyenResponseRecord(final UUID kbPaymentId,
return null;
} catch (final SQLException e) {
- logService.log(LogService.LOG_ERROR, "Failed to get previous AdyenResponsesRecord", e);
+ logger.warn("Failed to get previous AdyenResponsesRecord", e);
return null;
}
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentTransactionInfoPlugin.java b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentTransactionInfoPlugin.java
index 136b46a0..778f303e 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentTransactionInfoPlugin.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/AdyenPaymentTransactionInfoPlugin.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
@@ -17,6 +18,7 @@
package org.killbill.billing.plugin.adyen.api;
import java.math.BigDecimal;
+import java.time.ZoneOffset;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -155,8 +157,14 @@ public AdyenPaymentTransactionInfoPlugin(final AdyenResponsesRecord record, @Nul
truncate(getGatewayErrorCode(record)),
record.getPspReference(),
record.getAuthCode(),
- new DateTime(record.getCreatedDate(), DateTimeZone.UTC),
- new DateTime(record.getCreatedDate(), DateTimeZone.UTC),
+ new DateTime(record.getCreatedDate()
+ .atZone(ZoneOffset.UTC)
+ .toInstant()
+ .toEpochMilli(), DateTimeZone.UTC),
+ new DateTime(record.getCreatedDate()
+ .atZone(ZoneOffset.UTC)
+ .toInstant()
+ .toEpochMilli(), DateTimeZone.UTC),
buildProperties(record, adyenHppRequestsRecord));
adyenResponseRecord = Optional.of(record);
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/ExpiredPaymentPolicy.java b/src/main/java/org/killbill/billing/plugin/adyen/api/ExpiredPaymentPolicy.java
index e748b987..16c9c126 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/ExpiredPaymentPolicy.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/ExpiredPaymentPolicy.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/AdyenPaymentTransaction.java b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/AdyenPaymentTransaction.java
index ced1ef5a..3752af5d 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/AdyenPaymentTransaction.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/AdyenPaymentTransaction.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/CardMappingService.java b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/CardMappingService.java
index e0aaba0e..8c84f200 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/CardMappingService.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/CardMappingService.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/PaymentInfoMappingService.java b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/PaymentInfoMappingService.java
index ba8bfc75..65033d7b 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/PaymentInfoMappingService.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/PaymentInfoMappingService.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/RecurringMappingService.java b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/RecurringMappingService.java
index b674cc4e..3505dae7 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/RecurringMappingService.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/RecurringMappingService.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/SepaDirectDebitMappingService.java b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/SepaDirectDebitMappingService.java
index 63310572..6643b8b7 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/SepaDirectDebitMappingService.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/SepaDirectDebitMappingService.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/UserDataMappingService.java b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/UserDataMappingService.java
index e0e394a9..fb1e9060 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/UserDataMappingService.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/UserDataMappingService.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/WebPaymentFrontendMappingService.java b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/WebPaymentFrontendMappingService.java
index 98009e69..a42a04e2 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/WebPaymentFrontendMappingService.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/api/mapping/WebPaymentFrontendMappingService.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/AdyenConfigProperties.java b/src/main/java/org/killbill/billing/plugin/adyen/client/AdyenConfigProperties.java
index bf754553..4b9b7c21 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/AdyenConfigProperties.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/AdyenConfigProperties.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2018 Groupon, Inc
- * Copyright 2014-2018 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/AdyenPaymentPortRegistry.java b/src/main/java/org/killbill/billing/plugin/adyen/client/AdyenPaymentPortRegistry.java
index 17427670..4ca89727 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/AdyenPaymentPortRegistry.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/AdyenPaymentPortRegistry.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/PaymentPortRegistry.java b/src/main/java/org/killbill/billing/plugin/adyen/client/PaymentPortRegistry.java
index 85d85ce7..078d644a 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/PaymentPortRegistry.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/PaymentPortRegistry.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/AuthorizationHeaderObfuscator.java b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/AuthorizationHeaderObfuscator.java
index caac8889..8a58772e 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/AuthorizationHeaderObfuscator.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/AuthorizationHeaderObfuscator.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/HttpHeaderInterceptor.java b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/HttpHeaderInterceptor.java
index 87e38f6b..49dda952 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/HttpHeaderInterceptor.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/HttpHeaderInterceptor.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/IgnoreUnexpectedElementsEventHandler.java b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/IgnoreUnexpectedElementsEventHandler.java
index 4afe0b7b..5be02124 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/IgnoreUnexpectedElementsEventHandler.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/IgnoreUnexpectedElementsEventHandler.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/LoggingInInterceptor.java b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/LoggingInInterceptor.java
index e0f13211..ff75cdcd 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/LoggingInInterceptor.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/LoggingInInterceptor.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/LoggingOutInterceptor.java b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/LoggingOutInterceptor.java
index 70e6fd72..2fa343f3 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/LoggingOutInterceptor.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/LoggingOutInterceptor.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/Obfuscator.java b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/Obfuscator.java
index 61a0ffaa..c9060843 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/Obfuscator.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/Obfuscator.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/PayUObfuscator.java b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/PayUObfuscator.java
index 4aa6d059..aa80f2df 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/PayUObfuscator.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/jaxws/PayUObfuscator.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/Acquirer.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/Acquirer.java
index 93754ed1..3866f703 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/Acquirer.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/Acquirer.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/FrontendForm.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/FrontendForm.java
index 5f37acec..1d17847b 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/FrontendForm.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/FrontendForm.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/HppCompletedResult.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/HppCompletedResult.java
index b7ce3b70..edbe95ef 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/HppCompletedResult.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/HppCompletedResult.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/NotificationItem.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/NotificationItem.java
index a991d30d..cf092378 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/NotificationItem.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/NotificationItem.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2018 Groupon, Inc
- * Copyright 2014-2018 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentData.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentData.java
index d8bd4049..f3959527 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentData.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentData.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentInfo.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentInfo.java
index 4eb352e4..f908b6d3 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentInfo.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentInfo.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentModificationResponse.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentModificationResponse.java
index 2a80fff6..f96cf21d 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentModificationResponse.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentModificationResponse.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentServiceProviderResult.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentServiceProviderResult.java
index 313defea..ef7006ab 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentServiceProviderResult.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/PaymentServiceProviderResult.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/PurchaseResult.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/PurchaseResult.java
index 5cf343af..83aa2e5a 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/PurchaseResult.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/PurchaseResult.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/SplitSettlementData.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/SplitSettlementData.java
index d15916b1..462aee99 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/SplitSettlementData.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/SplitSettlementData.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/UserData.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/UserData.java
index 7d9535d4..8d36ecd2 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/UserData.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/UserData.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/Card.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/Card.java
index dad04a68..224e643e 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/Card.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/Card.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/ELVDirectDebit.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/ELVDirectDebit.java
index f312374e..9b47e5f7 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/ELVDirectDebit.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/ELVDirectDebit.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/Recurring.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/Recurring.java
index 71326282..cd5da215 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/Recurring.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/Recurring.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/SepaDirectDebit.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/SepaDirectDebit.java
index d39ad383..7e5622a9 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/SepaDirectDebit.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/SepaDirectDebit.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/WebPaymentFrontend.java b/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/WebPaymentFrontend.java
index 2aafe890..b1d8e7be 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/WebPaymentFrontend.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/model/paymentinfo/WebPaymentFrontend.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/notification/AdyenNotificationHandler.java b/src/main/java/org/killbill/billing/plugin/adyen/client/notification/AdyenNotificationHandler.java
index 9f1a0ef8..fc07e706 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/notification/AdyenNotificationHandler.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/notification/AdyenNotificationHandler.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014-2016 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/notification/AdyenNotificationService.java b/src/main/java/org/killbill/billing/plugin/adyen/client/notification/AdyenNotificationService.java
index b7a23bed..d1e51049 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/notification/AdyenNotificationService.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/notification/AdyenNotificationService.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014-2016 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/AdyenRequestFactory.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/AdyenRequestFactory.java
index 8105f2f3..3559fdbe 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/AdyenRequestFactory.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/AdyenRequestFactory.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/HPPRequestBuilder.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/HPPRequestBuilder.java
index fd26ff11..7b2013e5 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/HPPRequestBuilder.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/HPPRequestBuilder.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/ModificationRequestBuilder.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/ModificationRequestBuilder.java
index 25e3da2d..ad04975f 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/ModificationRequestBuilder.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/ModificationRequestBuilder.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2018 Groupon, Inc
- * Copyright 2014-2018 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/PaymentRequest3DBuilder.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/PaymentRequest3DBuilder.java
index 7c9535ae..563c166e 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/PaymentRequest3DBuilder.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/PaymentRequest3DBuilder.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/PaymentRequestBuilder.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/PaymentRequestBuilder.java
index 17cb783c..f8b9e946 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/PaymentRequestBuilder.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/PaymentRequestBuilder.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2018 Groupon, Inc
- * Copyright 2014-2018 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/RequestBuilder.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/RequestBuilder.java
index 9b7072eb..e5a86374 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/RequestBuilder.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/RequestBuilder.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2018 Groupon, Inc
- * Copyright 2014-2018 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/SplitSettlementParamsBuilder.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/SplitSettlementParamsBuilder.java
index aaf92a63..1ca358ac 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/SplitSettlementParamsBuilder.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/builder/SplitSettlementParamsBuilder.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/PaymentInfoConverter.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/PaymentInfoConverter.java
index 64c60f85..a20720bf 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/PaymentInfoConverter.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/PaymentInfoConverter.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/PaymentInfoConverterManagement.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/PaymentInfoConverterManagement.java
index a08adf00..8faf0bb8 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/PaymentInfoConverterManagement.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/PaymentInfoConverterManagement.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/CreditCardConverter.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/CreditCardConverter.java
index f412b327..ca6805eb 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/CreditCardConverter.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/CreditCardConverter.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/PaymentInfoConverterService.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/PaymentInfoConverterService.java
index 07c0b83b..1a11cda5 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/PaymentInfoConverterService.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/PaymentInfoConverterService.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/RecurringConverter.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/RecurringConverter.java
index a0bc5cda..1827918a 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/RecurringConverter.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/RecurringConverter.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/SepaDirectDebitConverter.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/SepaDirectDebitConverter.java
index c3b902ce..30c663bf 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/SepaDirectDebitConverter.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/converter/impl/SepaDirectDebitConverter.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/exception/SignatureGenerationException.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/exception/SignatureGenerationException.java
index 93ac773c..d6dbdc2c 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/exception/SignatureGenerationException.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/exception/SignatureGenerationException.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/exception/SignatureVerificationException.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/exception/SignatureVerificationException.java
index de6f57b8..75465189 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/exception/SignatureVerificationException.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/exception/SignatureVerificationException.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenCallErrorStatus.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenCallErrorStatus.java
index f9dfdce1..a0c89b1d 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenCallErrorStatus.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenCallErrorStatus.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2015 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenCallResult.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenCallResult.java
index b51e6b57..903628d3 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenCallResult.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenCallResult.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2015 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentRequestSender.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentRequestSender.java
index 3a6936a7..8137a377 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentRequestSender.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentRequestSender.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentServiceProviderHostedPaymentPagePort.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentServiceProviderHostedPaymentPagePort.java
index 325eaf2f..303d262f 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentServiceProviderHostedPaymentPagePort.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentServiceProviderHostedPaymentPagePort.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentServiceProviderPort.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentServiceProviderPort.java
index b66bdf25..20f02b60 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentServiceProviderPort.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/AdyenPaymentServiceProviderPort.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/BaseAdyenPaymentServiceProviderPort.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/BaseAdyenPaymentServiceProviderPort.java
index a02509ff..23e2e108 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/BaseAdyenPaymentServiceProviderPort.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/BaseAdyenPaymentServiceProviderPort.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2015-2016 Groupon, Inc
- * Copyright 2015-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/DirectoryClient.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/DirectoryClient.java
index 7812915e..dc7c119a 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/DirectoryClient.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/DirectoryClient.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2016-2018 Groupon, Inc
- * Copyright 2016-2018 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/PayPalCountryCodes.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/PayPalCountryCodes.java
index 83fd3442..d4a2347f 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/PayPalCountryCodes.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/PayPalCountryCodes.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/Signer.java b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/Signer.java
index 77c2a0bc..7e16535f 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/Signer.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/payment/service/Signer.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/AdyenRecurringClient.java b/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/AdyenRecurringClient.java
index bf29717c..cb9d5a58 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/AdyenRecurringClient.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/AdyenRecurringClient.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/AdyenRecurringPortRegistry.java b/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/AdyenRecurringPortRegistry.java
index 1f934e4b..1e58722c 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/AdyenRecurringPortRegistry.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/AdyenRecurringPortRegistry.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/RecurringPortRegistry.java b/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/RecurringPortRegistry.java
index 39b67716..2af97de4 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/RecurringPortRegistry.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/client/recurring/RecurringPortRegistry.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenActivator.java b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenActivator.java
index 276da749..662a8d49 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenActivator.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenActivator.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2014-2016 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
@@ -58,10 +59,10 @@ public void start(final BundleContext context) throws Exception {
final AdyenDao dao = new AdyenDao(dataSource.getDataSource());
final String region = PluginEnvironmentConfig.getRegion(configProperties.getProperties());
- adyenConfigurationHandler = new AdyenConfigurationHandler(PLUGIN_NAME, killbillAPI, logService, region);
- adyenConfigPropertiesConfigurationHandler = new AdyenConfigPropertiesConfigurationHandler(PLUGIN_NAME, killbillAPI, logService, region);
- adyenHostedPaymentPageConfigurationHandler = new AdyenHostedPaymentPageConfigurationHandler(PLUGIN_NAME, killbillAPI, logService, region);
- adyenRecurringConfigurationHandler = new AdyenRecurringConfigurationHandler(PLUGIN_NAME, killbillAPI, logService, region);
+ adyenConfigurationHandler = new AdyenConfigurationHandler(PLUGIN_NAME, killbillAPI, region);
+ adyenConfigPropertiesConfigurationHandler = new AdyenConfigPropertiesConfigurationHandler(PLUGIN_NAME, killbillAPI, region);
+ adyenHostedPaymentPageConfigurationHandler = new AdyenHostedPaymentPageConfigurationHandler(PLUGIN_NAME, killbillAPI, region);
+ adyenRecurringConfigurationHandler = new AdyenRecurringConfigurationHandler(PLUGIN_NAME, killbillAPI, region);
final AdyenPaymentServiceProviderPort globalAdyenClient = adyenConfigurationHandler.createConfigurable(configProperties.getProperties());
adyenConfigurationHandler.setDefaultConfigurable(globalAdyenClient);
@@ -82,7 +83,6 @@ public void start(final BundleContext context) throws Exception {
// Register the servlet
final PluginApp pluginApp = new PluginAppBuilder(PLUGIN_NAME,
killbillAPI,
- logService,
dataSource,
super.clock,
configProperties).withRouteClass(AdyenServlet.class)
@@ -99,7 +99,6 @@ public void start(final BundleContext context) throws Exception {
adyenRecurringConfigurationHandler,
killbillAPI,
configProperties,
- logService,
clock,
dao);
registerPaymentPluginApi(context, pluginApi);
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenConfigPropertiesConfigurationHandler.java b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenConfigPropertiesConfigurationHandler.java
index 7b6a05af..a9d22bd5 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenConfigPropertiesConfigurationHandler.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenConfigPropertiesConfigurationHandler.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
@@ -20,7 +20,6 @@
import java.util.Properties;
import org.killbill.billing.osgi.libs.killbill.OSGIKillbillAPI;
-import org.killbill.billing.osgi.libs.killbill.OSGIKillbillLogService;
import org.killbill.billing.plugin.adyen.client.AdyenConfigProperties;
import org.killbill.billing.plugin.api.notification.PluginTenantConfigurableConfigurationHandler;
@@ -30,9 +29,8 @@ public class AdyenConfigPropertiesConfigurationHandler extends PluginTenantConfi
public AdyenConfigPropertiesConfigurationHandler(final String pluginName,
final OSGIKillbillAPI osgiKillbillAPI,
- final OSGIKillbillLogService osgiKillbillLogService,
final String region) {
- super(pluginName, osgiKillbillAPI, osgiKillbillLogService);
+ super(pluginName, osgiKillbillAPI);
this.region = region;
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenConfigurationHandler.java b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenConfigurationHandler.java
index a8ada59a..4f5c01c5 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenConfigurationHandler.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenConfigurationHandler.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
@@ -20,7 +20,6 @@
import java.util.Properties;
import org.killbill.billing.osgi.libs.killbill.OSGIKillbillAPI;
-import org.killbill.billing.osgi.libs.killbill.OSGIKillbillLogService;
import org.killbill.billing.plugin.adyen.client.AdyenConfigProperties;
import org.killbill.billing.plugin.adyen.client.AdyenPaymentPortRegistry;
import org.killbill.billing.plugin.adyen.client.PaymentPortRegistry;
@@ -41,9 +40,8 @@ public class AdyenConfigurationHandler extends PluginTenantConfigurableConfigura
public AdyenConfigurationHandler(final String pluginName,
final OSGIKillbillAPI osgiKillbillAPI,
- final OSGIKillbillLogService osgiKillbillLogService,
final String region) {
- super(pluginName, osgiKillbillAPI, osgiKillbillLogService);
+ super(pluginName, osgiKillbillAPI);
this.region = region;
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenHealthcheck.java b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenHealthcheck.java
index aa437abd..f89f0519 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenHealthcheck.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenHealthcheck.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2017 Groupon, Inc
- * Copyright 2014-2017 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenHostedPaymentPageConfigurationHandler.java b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenHostedPaymentPageConfigurationHandler.java
index 917051ec..274c374f 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenHostedPaymentPageConfigurationHandler.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenHostedPaymentPageConfigurationHandler.java
@@ -1,7 +1,8 @@
/*
- * Copyright 2015-2016 Groupon, Inc
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
- * Groupon licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
@@ -20,7 +21,6 @@
import java.util.Properties;
import org.killbill.billing.osgi.libs.killbill.OSGIKillbillAPI;
-import org.killbill.billing.osgi.libs.killbill.OSGIKillbillLogService;
import org.killbill.billing.plugin.adyen.client.AdyenConfigProperties;
import org.killbill.billing.plugin.adyen.client.payment.builder.AdyenRequestFactory;
import org.killbill.billing.plugin.adyen.client.payment.converter.PaymentInfoConverterManagement;
@@ -40,9 +40,8 @@ public class AdyenHostedPaymentPageConfigurationHandler extends PluginTenantConf
public AdyenHostedPaymentPageConfigurationHandler(final String pluginName,
final OSGIKillbillAPI osgiKillbillAPI,
- final OSGIKillbillLogService osgiKillbillLogService,
final String region) {
- super(pluginName, osgiKillbillAPI, osgiKillbillLogService);
+ super(pluginName, osgiKillbillAPI);
this.region = region;
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenRecurringConfigurationHandler.java b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenRecurringConfigurationHandler.java
index 7df0e258..14ef4f1a 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenRecurringConfigurationHandler.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/core/AdyenRecurringConfigurationHandler.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
@@ -20,7 +20,6 @@
import java.util.Properties;
import org.killbill.billing.osgi.libs.killbill.OSGIKillbillAPI;
-import org.killbill.billing.osgi.libs.killbill.OSGIKillbillLogService;
import org.killbill.billing.plugin.adyen.client.AdyenConfigProperties;
import org.killbill.billing.plugin.adyen.client.jaxws.HttpHeaderInterceptor;
import org.killbill.billing.plugin.adyen.client.jaxws.LoggingInInterceptor;
@@ -34,9 +33,8 @@ public class AdyenRecurringConfigurationHandler extends PluginTenantConfigurable
public AdyenRecurringConfigurationHandler(final String pluginName,
final OSGIKillbillAPI osgiKillbillAPI,
- final OSGIKillbillLogService osgiKillbillLogService,
final String region) {
- super(pluginName, osgiKillbillAPI, osgiKillbillLogService);
+ super(pluginName, osgiKillbillAPI);
this.region = region;
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/core/KillbillAdyenNotificationHandler.java b/src/main/java/org/killbill/billing/plugin/adyen/core/KillbillAdyenNotificationHandler.java
index 942e5ae7..4c1a6dfa 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/core/KillbillAdyenNotificationHandler.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/core/KillbillAdyenNotificationHandler.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2018 Groupon, Inc
- * Copyright 2014-2018 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/core/resources/AdyenHealthcheckServlet.java b/src/main/java/org/killbill/billing/plugin/adyen/core/resources/AdyenHealthcheckServlet.java
index 69543580..a0e3a803 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/core/resources/AdyenHealthcheckServlet.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/core/resources/AdyenHealthcheckServlet.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2017 Groupon, Inc
- * Copyright 2014-2017 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/core/resources/AdyenServlet.java b/src/main/java/org/killbill/billing/plugin/adyen/core/resources/AdyenServlet.java
index 2a7336a8..f09b56af 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/core/resources/AdyenServlet.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/core/resources/AdyenServlet.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2017 Groupon, Inc
- * Copyright 2014-2017 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/dao/AdyenDao.java b/src/main/java/org/killbill/billing/plugin/adyen/dao/AdyenDao.java
index 19cd68c3..448d87a3 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/dao/AdyenDao.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/dao/AdyenDao.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2014-2016 Groupon, Inc
- * Copyright 2014-2016 The Billing Project, LLC
+ * Copyright 2014-2020 Groupon, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
*
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
@@ -88,7 +88,7 @@ public AdyenResponsesRecord withConnection(final Connection conn) throws SQLExce
.set(ADYEN_PAYMENT_METHODS.TOKEN, token)
.where(ADYEN_PAYMENT_METHODS.KB_PAYMENT_METHOD_ID.equal(kbPaymentMethodId))
.and(ADYEN_PAYMENT_METHODS.KB_TENANT_ID.equal(kbTenantId))
- .and(ADYEN_PAYMENT_METHODS.IS_DELETED.equal(FALSE))
+ .and(ADYEN_PAYMENT_METHODS.IS_DELETED.equal((short) FALSE))
.execute();
return null;
}
@@ -124,7 +124,7 @@ public Void withConnection(final Connection conn) throws SQLException {
kbPaymentTransactionId != null ? kbPaymentTransactionId.toString() : null,
transactionExternalKey,
additionalData,
- toTimestamp(utcNow),
+ toLocalDateTime(utcNow),
kbTenantId.toString())
.execute();
return null;
@@ -475,7 +475,7 @@ public Void withConnection(final Connection conn) throws SQLException {
notification.getAmount(),
notification.getCurrency(),
notification.getEventCode(),
- toTimestamp(notification.getEventDate()),
+ toLocalDateTime(notification.getEventDate()),
notification.getMerchantAccountCode(),
notification.getMerchantReference(),
getString(notification.getOperations()),
@@ -483,9 +483,9 @@ public Void withConnection(final Connection conn) throws SQLException {
notification.getPaymentMethod(),
notification.getPspReference(),
notification.getReason(),
- notification.getSuccess() == null ? FALSE : fromBoolean(notification.getSuccess()),
+ notification.getSuccess() == null ? (short) FALSE : fromBoolean(notification.getSuccess()),
additionalData,
- toTimestamp(utcNow),
+ toLocalDateTime(utcNow),
kbTenantId == null ? null : kbTenantId.toString())
.execute();
return null;
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/DefaultCatalog.java b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/DefaultCatalog.java
new file mode 100644
index 00000000..a1b0d02d
--- /dev/null
+++ b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/DefaultCatalog.java
@@ -0,0 +1,44 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package org.killbill.billing.plugin.adyen.dao.gen;
+
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.jooq.Schema;
+import org.jooq.impl.CatalogImpl;
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class DefaultCatalog extends CatalogImpl {
+
+ private static final long serialVersionUID = 991847000;
+
+ /**
+ * The reference instance of DEFAULT_CATALOG
+ */
+ public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog();
+
+ /**
+ * The schema killbill.
+ */
+ public final Killbill KILLBILL = Killbill.KILLBILL;
+
+ /**
+ * No further instances allowed
+ */
+ private DefaultCatalog() {
+ super("");
+ }
+
+ @Override
+ public final List getSchemas() {
+ return Arrays.asList(
+ Killbill.KILLBILL);
+ }
+}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Indexes.java b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Indexes.java
new file mode 100644
index 00000000..486b3bc5
--- /dev/null
+++ b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Indexes.java
@@ -0,0 +1,50 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package org.killbill.billing.plugin.adyen.dao.gen;
+
+
+import org.jooq.Index;
+import org.jooq.OrderField;
+import org.jooq.impl.Internal;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses;
+
+
+/**
+ * A class modelling indexes of tables of the killbill schema.
+ */
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Indexes {
+
+ // -------------------------------------------------------------------------
+ // INDEX definitions
+ // -------------------------------------------------------------------------
+
+ public static final Index ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_ACCOUNT_ID = Indexes0.ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_ACCOUNT_ID;
+ public static final Index ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_PAYMENT_TRANSACTION_ID = Indexes0.ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_PAYMENT_TRANSACTION_ID;
+ public static final Index ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_TRANSACTION_EXTERNAL_KEY = Indexes0.ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_TRANSACTION_EXTERNAL_KEY;
+ public static final Index ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_KB_PAYMENT_ID = Indexes0.ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_KB_PAYMENT_ID;
+ public static final Index ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_KB_PAYMENT_TRANSACTION_ID = Indexes0.ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_KB_PAYMENT_TRANSACTION_ID;
+ public static final Index ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_PSP_REFERENCE = Indexes0.ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_PSP_REFERENCE;
+ public static final Index ADYEN_RESPONSES_ADYEN_RESPONSES_KB_PAYMENT_ID = Indexes0.ADYEN_RESPONSES_ADYEN_RESPONSES_KB_PAYMENT_ID;
+ public static final Index ADYEN_RESPONSES_ADYEN_RESPONSES_KB_PAYMENT_TRANSACTION_ID = Indexes0.ADYEN_RESPONSES_ADYEN_RESPONSES_KB_PAYMENT_TRANSACTION_ID;
+ public static final Index ADYEN_RESPONSES_PSP_REFERENCE_IDX = Indexes0.ADYEN_RESPONSES_PSP_REFERENCE_IDX;
+
+ // -------------------------------------------------------------------------
+ // [#1459] distribute members to avoid static initialisers > 64kb
+ // -------------------------------------------------------------------------
+
+ private static class Indexes0 {
+ public static Index ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_ACCOUNT_ID = Internal.createIndex("adyen_hpp_requests_kb_account_id", AdyenHppRequests.ADYEN_HPP_REQUESTS, new OrderField[] { AdyenHppRequests.ADYEN_HPP_REQUESTS.KB_ACCOUNT_ID }, false);
+ public static Index ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_PAYMENT_TRANSACTION_ID = Internal.createIndex("adyen_hpp_requests_kb_payment_transaction_id", AdyenHppRequests.ADYEN_HPP_REQUESTS, new OrderField[] { AdyenHppRequests.ADYEN_HPP_REQUESTS.KB_PAYMENT_TRANSACTION_ID }, false);
+ public static Index ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_TRANSACTION_EXTERNAL_KEY = Internal.createIndex("adyen_hpp_requests_kb_transaction_external_key", AdyenHppRequests.ADYEN_HPP_REQUESTS, new OrderField[] { AdyenHppRequests.ADYEN_HPP_REQUESTS.TRANSACTION_EXTERNAL_KEY }, false);
+ public static Index ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_KB_PAYMENT_ID = Internal.createIndex("adyen_notifications_kb_payment_id", AdyenNotifications.ADYEN_NOTIFICATIONS, new OrderField[] { AdyenNotifications.ADYEN_NOTIFICATIONS.KB_PAYMENT_ID }, false);
+ public static Index ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_KB_PAYMENT_TRANSACTION_ID = Internal.createIndex("adyen_notifications_kb_payment_transaction_id", AdyenNotifications.ADYEN_NOTIFICATIONS, new OrderField[] { AdyenNotifications.ADYEN_NOTIFICATIONS.KB_PAYMENT_TRANSACTION_ID }, false);
+ public static Index ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_PSP_REFERENCE = Internal.createIndex("adyen_notifications_psp_reference", AdyenNotifications.ADYEN_NOTIFICATIONS, new OrderField[] { AdyenNotifications.ADYEN_NOTIFICATIONS.PSP_REFERENCE }, false);
+ public static Index ADYEN_RESPONSES_ADYEN_RESPONSES_KB_PAYMENT_ID = Internal.createIndex("adyen_responses_kb_payment_id", AdyenResponses.ADYEN_RESPONSES, new OrderField[] { AdyenResponses.ADYEN_RESPONSES.KB_PAYMENT_ID }, false);
+ public static Index ADYEN_RESPONSES_ADYEN_RESPONSES_KB_PAYMENT_TRANSACTION_ID = Internal.createIndex("adyen_responses_kb_payment_transaction_id", AdyenResponses.ADYEN_RESPONSES, new OrderField[] { AdyenResponses.ADYEN_RESPONSES.KB_PAYMENT_TRANSACTION_ID }, false);
+ public static Index ADYEN_RESPONSES_PSP_REFERENCE_IDX = Internal.createIndex("psp_reference_idx", AdyenResponses.ADYEN_RESPONSES, new OrderField[] { AdyenResponses.ADYEN_RESPONSES.PSP_REFERENCE }, false);
+ }
+}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Keys.java b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Keys.java
index 8bccdc16..d52084d0 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Keys.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Keys.java
@@ -1,64 +1,79 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
*/
package org.killbill.billing.plugin.adyen.dao.gen;
+
+import org.jooq.Identity;
+import org.jooq.TableField;
+import org.jooq.UniqueKey;
+import org.jooq.impl.Internal;
+import org.jooq.types.ULong;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenHppRequestsRecord;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenNotificationsRecord;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenPaymentMethodsRecord;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenResponsesRecord;
+
+
/**
- * A class modelling foreign key relationships between tables of the killbill
- * schema
+ * A class modelling foreign key relationships and constraints of tables of
+ * the killbill schema.
*/
-@javax.annotation.Generated(
- value = {
- "http://www.jooq.org",
- "jOOQ version:3.5.0"
- },
- comments = "This class is generated by jOOQ"
-)
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Keys {
- // -------------------------------------------------------------------------
- // IDENTITY definitions
- // -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
+ // IDENTITY definitions
+ // -------------------------------------------------------------------------
- public static final org.jooq.Identity IDENTITY_ADYEN_HPP_REQUESTS = Identities0.IDENTITY_ADYEN_HPP_REQUESTS;
- public static final org.jooq.Identity IDENTITY_ADYEN_NOTIFICATIONS = Identities0.IDENTITY_ADYEN_NOTIFICATIONS;
- public static final org.jooq.Identity IDENTITY_ADYEN_PAYMENT_METHODS = Identities0.IDENTITY_ADYEN_PAYMENT_METHODS;
- public static final org.jooq.Identity IDENTITY_ADYEN_RESPONSES = Identities0.IDENTITY_ADYEN_RESPONSES;
+ public static final Identity IDENTITY_ADYEN_HPP_REQUESTS = Identities0.IDENTITY_ADYEN_HPP_REQUESTS;
+ public static final Identity IDENTITY_ADYEN_NOTIFICATIONS = Identities0.IDENTITY_ADYEN_NOTIFICATIONS;
+ public static final Identity IDENTITY_ADYEN_PAYMENT_METHODS = Identities0.IDENTITY_ADYEN_PAYMENT_METHODS;
+ public static final Identity IDENTITY_ADYEN_RESPONSES = Identities0.IDENTITY_ADYEN_RESPONSES;
- // -------------------------------------------------------------------------
- // UNIQUE and PRIMARY KEY definitions
- // -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
+ // UNIQUE and PRIMARY KEY definitions
+ // -------------------------------------------------------------------------
- public static final org.jooq.UniqueKey KEY_ADYEN_HPP_REQUESTS_PRIMARY = UniqueKeys0.KEY_ADYEN_HPP_REQUESTS_PRIMARY;
- public static final org.jooq.UniqueKey KEY_ADYEN_NOTIFICATIONS_PRIMARY = UniqueKeys0.KEY_ADYEN_NOTIFICATIONS_PRIMARY;
- public static final org.jooq.UniqueKey KEY_ADYEN_PAYMENT_METHODS_PRIMARY = UniqueKeys0.KEY_ADYEN_PAYMENT_METHODS_PRIMARY;
- public static final org.jooq.UniqueKey KEY_ADYEN_PAYMENT_METHODS_ADYEN_PAYMENT_METHODS_KB_PAYMENT_ID = UniqueKeys0.KEY_ADYEN_PAYMENT_METHODS_ADYEN_PAYMENT_METHODS_KB_PAYMENT_ID;
- public static final org.jooq.UniqueKey KEY_ADYEN_RESPONSES_PRIMARY = UniqueKeys0.KEY_ADYEN_RESPONSES_PRIMARY;
- public static final org.jooq.UniqueKey KEY_ADYEN_RESPONSES_ADYEN_RESPONSES_PSP_REFERENCE = UniqueKeys0.KEY_ADYEN_RESPONSES_ADYEN_RESPONSES_PSP_REFERENCE;
+ public static final UniqueKey KEY_ADYEN_HPP_REQUESTS_PRIMARY = UniqueKeys0.KEY_ADYEN_HPP_REQUESTS_PRIMARY;
+ public static final UniqueKey KEY_ADYEN_HPP_REQUESTS_RECORD_ID = UniqueKeys0.KEY_ADYEN_HPP_REQUESTS_RECORD_ID;
+ public static final UniqueKey KEY_ADYEN_NOTIFICATIONS_PRIMARY = UniqueKeys0.KEY_ADYEN_NOTIFICATIONS_PRIMARY;
+ public static final UniqueKey KEY_ADYEN_NOTIFICATIONS_RECORD_ID = UniqueKeys0.KEY_ADYEN_NOTIFICATIONS_RECORD_ID;
+ public static final UniqueKey KEY_ADYEN_PAYMENT_METHODS_PRIMARY = UniqueKeys0.KEY_ADYEN_PAYMENT_METHODS_PRIMARY;
+ public static final UniqueKey KEY_ADYEN_PAYMENT_METHODS_RECORD_ID = UniqueKeys0.KEY_ADYEN_PAYMENT_METHODS_RECORD_ID;
+ public static final UniqueKey KEY_ADYEN_PAYMENT_METHODS_ADYEN_PAYMENT_METHODS_KB_PAYMENT_ID = UniqueKeys0.KEY_ADYEN_PAYMENT_METHODS_ADYEN_PAYMENT_METHODS_KB_PAYMENT_ID;
+ public static final UniqueKey KEY_ADYEN_RESPONSES_PRIMARY = UniqueKeys0.KEY_ADYEN_RESPONSES_PRIMARY;
+ public static final UniqueKey KEY_ADYEN_RESPONSES_RECORD_ID = UniqueKeys0.KEY_ADYEN_RESPONSES_RECORD_ID;
- // -------------------------------------------------------------------------
- // FOREIGN KEY definitions
- // -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
+ // FOREIGN KEY definitions
+ // -------------------------------------------------------------------------
- // -------------------------------------------------------------------------
- // [#1459] distribute members to avoid static initialisers > 64kb
- // -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
+ // [#1459] distribute members to avoid static initialisers > 64kb
+ // -------------------------------------------------------------------------
- private static class Identities0 extends org.jooq.impl.AbstractKeys {
- public static org.jooq.Identity IDENTITY_ADYEN_HPP_REQUESTS = createIdentity(org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests.ADYEN_HPP_REQUESTS, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests.ADYEN_HPP_REQUESTS.RECORD_ID);
- public static org.jooq.Identity IDENTITY_ADYEN_NOTIFICATIONS = createIdentity(org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications.ADYEN_NOTIFICATIONS, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications.ADYEN_NOTIFICATIONS.RECORD_ID);
- public static org.jooq.Identity IDENTITY_ADYEN_PAYMENT_METHODS = createIdentity(org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods.ADYEN_PAYMENT_METHODS, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods.ADYEN_PAYMENT_METHODS.RECORD_ID);
- public static org.jooq.Identity IDENTITY_ADYEN_RESPONSES = createIdentity(org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses.ADYEN_RESPONSES, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses.ADYEN_RESPONSES.RECORD_ID);
- }
+ private static class Identities0 {
+ public static Identity IDENTITY_ADYEN_HPP_REQUESTS = Internal.createIdentity(AdyenHppRequests.ADYEN_HPP_REQUESTS, AdyenHppRequests.ADYEN_HPP_REQUESTS.RECORD_ID);
+ public static Identity IDENTITY_ADYEN_NOTIFICATIONS = Internal.createIdentity(AdyenNotifications.ADYEN_NOTIFICATIONS, AdyenNotifications.ADYEN_NOTIFICATIONS.RECORD_ID);
+ public static Identity IDENTITY_ADYEN_PAYMENT_METHODS = Internal.createIdentity(AdyenPaymentMethods.ADYEN_PAYMENT_METHODS, AdyenPaymentMethods.ADYEN_PAYMENT_METHODS.RECORD_ID);
+ public static Identity IDENTITY_ADYEN_RESPONSES = Internal.createIdentity(AdyenResponses.ADYEN_RESPONSES, AdyenResponses.ADYEN_RESPONSES.RECORD_ID);
+ }
- private static class UniqueKeys0 extends org.jooq.impl.AbstractKeys {
- public static final org.jooq.UniqueKey KEY_ADYEN_HPP_REQUESTS_PRIMARY = createUniqueKey(org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests.ADYEN_HPP_REQUESTS, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests.ADYEN_HPP_REQUESTS.RECORD_ID);
- public static final org.jooq.UniqueKey KEY_ADYEN_NOTIFICATIONS_PRIMARY = createUniqueKey(org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications.ADYEN_NOTIFICATIONS, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications.ADYEN_NOTIFICATIONS.RECORD_ID);
- public static final org.jooq.UniqueKey KEY_ADYEN_PAYMENT_METHODS_PRIMARY = createUniqueKey(org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods.ADYEN_PAYMENT_METHODS, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods.ADYEN_PAYMENT_METHODS.RECORD_ID);
- public static final org.jooq.UniqueKey KEY_ADYEN_PAYMENT_METHODS_ADYEN_PAYMENT_METHODS_KB_PAYMENT_ID = createUniqueKey(org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods.ADYEN_PAYMENT_METHODS, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods.ADYEN_PAYMENT_METHODS.KB_PAYMENT_METHOD_ID);
- public static final org.jooq.UniqueKey KEY_ADYEN_RESPONSES_PRIMARY = createUniqueKey(org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses.ADYEN_RESPONSES, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses.ADYEN_RESPONSES.RECORD_ID);
- public static final org.jooq.UniqueKey KEY_ADYEN_RESPONSES_ADYEN_RESPONSES_PSP_REFERENCE = createUniqueKey(org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses.ADYEN_RESPONSES, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses.ADYEN_RESPONSES.PSP_REFERENCE);
- }
+ private static class UniqueKeys0 {
+ public static final UniqueKey KEY_ADYEN_HPP_REQUESTS_PRIMARY = Internal.createUniqueKey(AdyenHppRequests.ADYEN_HPP_REQUESTS, "KEY_adyen_hpp_requests_PRIMARY", new TableField[] { AdyenHppRequests.ADYEN_HPP_REQUESTS.RECORD_ID }, true);
+ public static final UniqueKey KEY_ADYEN_HPP_REQUESTS_RECORD_ID = Internal.createUniqueKey(AdyenHppRequests.ADYEN_HPP_REQUESTS, "KEY_adyen_hpp_requests_record_id", new TableField[] { AdyenHppRequests.ADYEN_HPP_REQUESTS.RECORD_ID }, true);
+ public static final UniqueKey KEY_ADYEN_NOTIFICATIONS_PRIMARY = Internal.createUniqueKey(AdyenNotifications.ADYEN_NOTIFICATIONS, "KEY_adyen_notifications_PRIMARY", new TableField[] { AdyenNotifications.ADYEN_NOTIFICATIONS.RECORD_ID }, true);
+ public static final UniqueKey KEY_ADYEN_NOTIFICATIONS_RECORD_ID = Internal.createUniqueKey(AdyenNotifications.ADYEN_NOTIFICATIONS, "KEY_adyen_notifications_record_id", new TableField[] { AdyenNotifications.ADYEN_NOTIFICATIONS.RECORD_ID }, true);
+ public static final UniqueKey KEY_ADYEN_PAYMENT_METHODS_PRIMARY = Internal.createUniqueKey(AdyenPaymentMethods.ADYEN_PAYMENT_METHODS, "KEY_adyen_payment_methods_PRIMARY", new TableField[] { AdyenPaymentMethods.ADYEN_PAYMENT_METHODS.RECORD_ID }, true);
+ public static final UniqueKey KEY_ADYEN_PAYMENT_METHODS_RECORD_ID = Internal.createUniqueKey(AdyenPaymentMethods.ADYEN_PAYMENT_METHODS, "KEY_adyen_payment_methods_record_id", new TableField[] { AdyenPaymentMethods.ADYEN_PAYMENT_METHODS.RECORD_ID }, true);
+ public static final UniqueKey KEY_ADYEN_PAYMENT_METHODS_ADYEN_PAYMENT_METHODS_KB_PAYMENT_ID = Internal.createUniqueKey(AdyenPaymentMethods.ADYEN_PAYMENT_METHODS, "KEY_adyen_payment_methods_adyen_payment_methods_kb_payment_id", new TableField[] { AdyenPaymentMethods.ADYEN_PAYMENT_METHODS.KB_PAYMENT_METHOD_ID }, true);
+ public static final UniqueKey KEY_ADYEN_RESPONSES_PRIMARY = Internal.createUniqueKey(AdyenResponses.ADYEN_RESPONSES, "KEY_adyen_responses_PRIMARY", new TableField[] { AdyenResponses.ADYEN_RESPONSES.RECORD_ID }, true);
+ public static final UniqueKey KEY_ADYEN_RESPONSES_RECORD_ID = Internal.createUniqueKey(AdyenResponses.ADYEN_RESPONSES, "KEY_adyen_responses_record_id", new TableField[] { AdyenResponses.ADYEN_RESPONSES.RECORD_ID }, true);
+ }
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Killbill.java b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Killbill.java
index fd003e6f..f605b4ba 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Killbill.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Killbill.java
@@ -1,47 +1,73 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
*/
package org.killbill.billing.plugin.adyen.dao.gen;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.jooq.Catalog;
+import org.jooq.Table;
+import org.jooq.impl.SchemaImpl;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses;
+
+
/**
* This class is generated by jOOQ.
*/
-@javax.annotation.Generated(
- value = {
- "http://www.jooq.org",
- "jOOQ version:3.5.0"
- },
- comments = "This class is generated by jOOQ"
-)
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class Killbill extends org.jooq.impl.SchemaImpl {
-
- private static final long serialVersionUID = 87710133;
-
- /**
- * The reference instance of killbill
- */
- public static final Killbill KILLBILL = new Killbill();
-
- /**
- * No further instances allowed
- */
- private Killbill() {
- super("killbill");
- }
-
- @Override
- public final java.util.List> getTables() {
- java.util.List result = new java.util.ArrayList();
- result.addAll(getTables0());
- return result;
- }
-
- private final java.util.List> getTables0() {
- return java.util.Arrays.>asList(
- org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests.ADYEN_HPP_REQUESTS,
- org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications.ADYEN_NOTIFICATIONS,
- org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods.ADYEN_PAYMENT_METHODS,
- org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses.ADYEN_RESPONSES);
- }
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class Killbill extends SchemaImpl {
+
+ private static final long serialVersionUID = 2113142273;
+
+ /**
+ * The reference instance of killbill
+ */
+ public static final Killbill KILLBILL = new Killbill();
+
+ /**
+ * The table killbill.adyen_hpp_requests.
+ */
+ public final AdyenHppRequests ADYEN_HPP_REQUESTS = AdyenHppRequests.ADYEN_HPP_REQUESTS;
+
+ /**
+ * The table killbill.adyen_notifications.
+ */
+ public final AdyenNotifications ADYEN_NOTIFICATIONS = AdyenNotifications.ADYEN_NOTIFICATIONS;
+
+ /**
+ * The table killbill.adyen_payment_methods.
+ */
+ public final AdyenPaymentMethods ADYEN_PAYMENT_METHODS = AdyenPaymentMethods.ADYEN_PAYMENT_METHODS;
+
+ /**
+ * The table killbill.adyen_responses.
+ */
+ public final AdyenResponses ADYEN_RESPONSES = AdyenResponses.ADYEN_RESPONSES;
+
+ /**
+ * No further instances allowed
+ */
+ private Killbill() {
+ super("killbill", null);
+ }
+
+
+ @Override
+ public Catalog getCatalog() {
+ return DefaultCatalog.DEFAULT_CATALOG;
+ }
+
+ @Override
+ public final List
> getTables() {
+ return Arrays.
>asList(
+ AdyenHppRequests.ADYEN_HPP_REQUESTS,
+ AdyenNotifications.ADYEN_NOTIFICATIONS,
+ AdyenPaymentMethods.ADYEN_PAYMENT_METHODS,
+ AdyenResponses.ADYEN_RESPONSES);
+ }
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Tables.java b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Tables.java
index 0e2a6480..a38bcae7 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Tables.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/Tables.java
@@ -1,38 +1,38 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
*/
package org.killbill.billing.plugin.adyen.dao.gen;
+
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses;
+
+
/**
* Convenience access to all tables in killbill
*/
-@javax.annotation.Generated(
- value = {
- "http://www.jooq.org",
- "jOOQ version:3.5.0"
- },
- comments = "This class is generated by jOOQ"
-)
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables {
- /**
- * The table killbill.adyen_hpp_requests
- */
- public static final org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests ADYEN_HPP_REQUESTS = org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests.ADYEN_HPP_REQUESTS;
-
- /**
- * The table killbill.adyen_notifications
- */
- public static final org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications ADYEN_NOTIFICATIONS = org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications.ADYEN_NOTIFICATIONS;
-
- /**
- * The table killbill.adyen_payment_methods
- */
- public static final org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods ADYEN_PAYMENT_METHODS = org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods.ADYEN_PAYMENT_METHODS;
-
- /**
- * The table killbill.adyen_responses
- */
- public static final org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses ADYEN_RESPONSES = org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses.ADYEN_RESPONSES;
+ /**
+ * The table killbill.adyen_hpp_requests.
+ */
+ public static final AdyenHppRequests ADYEN_HPP_REQUESTS = AdyenHppRequests.ADYEN_HPP_REQUESTS;
+
+ /**
+ * The table killbill.adyen_notifications.
+ */
+ public static final AdyenNotifications ADYEN_NOTIFICATIONS = AdyenNotifications.ADYEN_NOTIFICATIONS;
+
+ /**
+ * The table killbill.adyen_payment_methods.
+ */
+ public static final AdyenPaymentMethods ADYEN_PAYMENT_METHODS = AdyenPaymentMethods.ADYEN_PAYMENT_METHODS;
+
+ /**
+ * The table killbill.adyen_responses.
+ */
+ public static final AdyenResponses ADYEN_RESPONSES = AdyenResponses.ADYEN_RESPONSES;
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenHppRequests.java b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenHppRequests.java
index b9a88b98..4b230d98 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenHppRequests.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenHppRequests.java
@@ -1,134 +1,185 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
*/
package org.killbill.billing.plugin.adyen.dao.gen.tables;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Identity;
+import org.jooq.Index;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Row8;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.types.ULong;
+import org.killbill.billing.plugin.adyen.dao.gen.Indexes;
+import org.killbill.billing.plugin.adyen.dao.gen.Keys;
+import org.killbill.billing.plugin.adyen.dao.gen.Killbill;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenHppRequestsRecord;
+
+
/**
* This class is generated by jOOQ.
*/
-@javax.annotation.Generated(
- value = {
- "http://www.jooq.org",
- "jOOQ version:3.5.0"
- },
- comments = "This class is generated by jOOQ"
-)
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class AdyenHppRequests extends org.jooq.impl.TableImpl {
-
- private static final long serialVersionUID = 1755384022;
-
- /**
- * The reference instance of killbill.adyen_hpp_requests
- */
- public static final org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests ADYEN_HPP_REQUESTS = new org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests();
-
- /**
- * The class holding records for this type
- */
- @Override
- public java.lang.Class getRecordType() {
- return org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenHppRequestsRecord.class;
- }
-
- /**
- * The column killbill.adyen_hpp_requests.record_id.
- */
- public final org.jooq.TableField RECORD_ID = createField("record_id", org.jooq.impl.SQLDataType.INTEGERUNSIGNED.nullable(false), this, "");
-
- /**
- * The column killbill.adyen_hpp_requests.kb_account_id.
- */
- public final org.jooq.TableField KB_ACCOUNT_ID = createField("kb_account_id", org.jooq.impl.SQLDataType.CHAR.length(36).nullable(false), this, "");
-
- /**
- * The column killbill.adyen_hpp_requests.kb_payment_id.
- */
- public final org.jooq.TableField KB_PAYMENT_ID = createField("kb_payment_id", org.jooq.impl.SQLDataType.CHAR.length(36), this, "");
-
- /**
- * The column killbill.adyen_hpp_requests.kb_payment_transaction_id.
- */
- public final org.jooq.TableField KB_PAYMENT_TRANSACTION_ID = createField("kb_payment_transaction_id", org.jooq.impl.SQLDataType.CHAR.length(36), this, "");
-
- /**
- * The column killbill.adyen_hpp_requests.transaction_external_key.
- */
- public final org.jooq.TableField TRANSACTION_EXTERNAL_KEY = createField("transaction_external_key", org.jooq.impl.SQLDataType.VARCHAR.length(255).nullable(false), this, "");
-
- /**
- * The column killbill.adyen_hpp_requests.additional_data.
- */
- public final org.jooq.TableField ADDITIONAL_DATA = createField("additional_data", org.jooq.impl.SQLDataType.CLOB, this, "");
-
- /**
- * The column killbill.adyen_hpp_requests.created_date.
- */
- public final org.jooq.TableField CREATED_DATE = createField("created_date", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false), this, "");
-
- /**
- * The column killbill.adyen_hpp_requests.kb_tenant_id.
- */
- public final org.jooq.TableField KB_TENANT_ID = createField("kb_tenant_id", org.jooq.impl.SQLDataType.CHAR.length(36).nullable(false), this, "");
-
- /**
- * Create a killbill.adyen_hpp_requests table reference
- */
- public AdyenHppRequests() {
- this("adyen_hpp_requests", null);
- }
-
- /**
- * Create an aliased killbill.adyen_hpp_requests table reference
- */
- public AdyenHppRequests(java.lang.String alias) {
- this(alias, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests.ADYEN_HPP_REQUESTS);
- }
-
- private AdyenHppRequests(java.lang.String alias, org.jooq.Table aliased) {
- this(alias, aliased, null);
- }
-
- private AdyenHppRequests(java.lang.String alias, org.jooq.Table aliased, org.jooq.Field>[] parameters) {
- super(alias, org.killbill.billing.plugin.adyen.dao.gen.Killbill.KILLBILL, aliased, parameters, "");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public org.jooq.Identity getIdentity() {
- return org.killbill.billing.plugin.adyen.dao.gen.Keys.IDENTITY_ADYEN_HPP_REQUESTS;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public org.jooq.UniqueKey getPrimaryKey() {
- return org.killbill.billing.plugin.adyen.dao.gen.Keys.KEY_ADYEN_HPP_REQUESTS_PRIMARY;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public java.util.List> getKeys() {
- return java.util.Arrays.>asList(org.killbill.billing.plugin.adyen.dao.gen.Keys.KEY_ADYEN_HPP_REQUESTS_PRIMARY);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests as(java.lang.String alias) {
- return new org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests(alias, this);
- }
-
- /**
- * Rename this table
- */
- public org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests rename(java.lang.String name) {
- return new org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenHppRequests(name, null);
- }
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class AdyenHppRequests extends TableImpl {
+
+ private static final long serialVersionUID = 1031176500;
+
+ /**
+ * The reference instance of killbill.adyen_hpp_requests
+ */
+ public static final AdyenHppRequests ADYEN_HPP_REQUESTS = new AdyenHppRequests();
+
+ /**
+ * The class holding records for this type
+ */
+ @Override
+ public Class getRecordType() {
+ return AdyenHppRequestsRecord.class;
+ }
+
+ /**
+ * The column killbill.adyen_hpp_requests.record_id.
+ */
+ public final TableField RECORD_ID = createField(DSL.name("record_id"), org.jooq.impl.SQLDataType.BIGINTUNSIGNED.nullable(false).identity(true), this, "");
+
+ /**
+ * The column killbill.adyen_hpp_requests.kb_account_id.
+ */
+ public final TableField KB_ACCOUNT_ID = createField(DSL.name("kb_account_id"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), this, "");
+
+ /**
+ * The column killbill.adyen_hpp_requests.kb_payment_id.
+ */
+ public final TableField KB_PAYMENT_ID = createField(DSL.name("kb_payment_id"), org.jooq.impl.SQLDataType.CHAR(36), this, "");
+
+ /**
+ * The column killbill.adyen_hpp_requests.kb_payment_transaction_id.
+ */
+ public final TableField KB_PAYMENT_TRANSACTION_ID = createField(DSL.name("kb_payment_transaction_id"), org.jooq.impl.SQLDataType.CHAR(36), this, "");
+
+ /**
+ * The column killbill.adyen_hpp_requests.transaction_external_key.
+ */
+ public final TableField TRANSACTION_EXTERNAL_KEY = createField(DSL.name("transaction_external_key"), org.jooq.impl.SQLDataType.VARCHAR(255).nullable(false), this, "");
+
+ /**
+ * The column killbill.adyen_hpp_requests.additional_data.
+ */
+ public final TableField ADDITIONAL_DATA = createField(DSL.name("additional_data"), org.jooq.impl.SQLDataType.CLOB, this, "");
+
+ /**
+ * The column killbill.adyen_hpp_requests.created_date.
+ */
+ public final TableField CREATED_DATE = createField(DSL.name("created_date"), org.jooq.impl.SQLDataType.LOCALDATETIME.nullable(false), this, "");
+
+ /**
+ * The column killbill.adyen_hpp_requests.kb_tenant_id.
+ */
+ public final TableField KB_TENANT_ID = createField(DSL.name("kb_tenant_id"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), this, "");
+
+ /**
+ * Create a killbill.adyen_hpp_requests table reference
+ */
+ public AdyenHppRequests() {
+ this(DSL.name("adyen_hpp_requests"), null);
+ }
+
+ /**
+ * Create an aliased killbill.adyen_hpp_requests table reference
+ */
+ public AdyenHppRequests(String alias) {
+ this(DSL.name(alias), ADYEN_HPP_REQUESTS);
+ }
+
+ /**
+ * Create an aliased killbill.adyen_hpp_requests table reference
+ */
+ public AdyenHppRequests(Name alias) {
+ this(alias, ADYEN_HPP_REQUESTS);
+ }
+
+ private AdyenHppRequests(Name alias, Table aliased) {
+ this(alias, aliased, null);
+ }
+
+ private AdyenHppRequests(Name alias, Table aliased, Field>[] parameters) {
+ super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+ }
+
+ public AdyenHppRequests(Table child, ForeignKey key) {
+ super(child, key, ADYEN_HPP_REQUESTS);
+ }
+
+ @Override
+ public Schema getSchema() {
+ return Killbill.KILLBILL;
+ }
+
+ @Override
+ public List getIndexes() {
+ return Arrays.asList(Indexes.ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_ACCOUNT_ID, Indexes.ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_PAYMENT_TRANSACTION_ID, Indexes.ADYEN_HPP_REQUESTS_ADYEN_HPP_REQUESTS_KB_TRANSACTION_EXTERNAL_KEY);
+ }
+
+ @Override
+ public Identity getIdentity() {
+ return Keys.IDENTITY_ADYEN_HPP_REQUESTS;
+ }
+
+ @Override
+ public UniqueKey getPrimaryKey() {
+ return Keys.KEY_ADYEN_HPP_REQUESTS_PRIMARY;
+ }
+
+ @Override
+ public List> getKeys() {
+ return Arrays.>asList(Keys.KEY_ADYEN_HPP_REQUESTS_PRIMARY, Keys.KEY_ADYEN_HPP_REQUESTS_RECORD_ID);
+ }
+
+ @Override
+ public AdyenHppRequests as(String alias) {
+ return new AdyenHppRequests(DSL.name(alias), this);
+ }
+
+ @Override
+ public AdyenHppRequests as(Name alias) {
+ return new AdyenHppRequests(alias, this);
+ }
+
+ /**
+ * Rename this table
+ */
+ @Override
+ public AdyenHppRequests rename(String name) {
+ return new AdyenHppRequests(DSL.name(name), null);
+ }
+
+ /**
+ * Rename this table
+ */
+ @Override
+ public AdyenHppRequests rename(Name name) {
+ return new AdyenHppRequests(name, null);
+ }
+
+ // -------------------------------------------------------------------------
+ // Row8 type methods
+ // -------------------------------------------------------------------------
+
+ @Override
+ public Row8 fieldsRow() {
+ return (Row8) super.fieldsRow();
+ }
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenNotifications.java b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenNotifications.java
index 21f7aaf9..3dacdd60 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenNotifications.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenNotifications.java
@@ -1,194 +1,246 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
*/
package org.killbill.billing.plugin.adyen.dao.gen.tables;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Identity;
+import org.jooq.Index;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Row20;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.types.ULong;
+import org.killbill.billing.plugin.adyen.dao.gen.Indexes;
+import org.killbill.billing.plugin.adyen.dao.gen.Keys;
+import org.killbill.billing.plugin.adyen.dao.gen.Killbill;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenNotificationsRecord;
+
+
/**
* This class is generated by jOOQ.
*/
-@javax.annotation.Generated(
- value = {
- "http://www.jooq.org",
- "jOOQ version:3.5.0"
- },
- comments = "This class is generated by jOOQ"
-)
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class AdyenNotifications extends org.jooq.impl.TableImpl {
-
- private static final long serialVersionUID = 1036609928;
-
- /**
- * The reference instance of killbill.adyen_notifications
- */
- public static final org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications ADYEN_NOTIFICATIONS = new org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications();
-
- /**
- * The class holding records for this type
- */
- @Override
- public java.lang.Class getRecordType() {
- return org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenNotificationsRecord.class;
- }
-
- /**
- * The column killbill.adyen_notifications.record_id.
- */
- public final org.jooq.TableField RECORD_ID = createField("record_id", org.jooq.impl.SQLDataType.INTEGERUNSIGNED.nullable(false), this, "");
-
- /**
- * The column killbill.adyen_notifications.kb_account_id.
- */
- public final org.jooq.TableField KB_ACCOUNT_ID = createField("kb_account_id", org.jooq.impl.SQLDataType.CHAR.length(36), this, "");
-
- /**
- * The column killbill.adyen_notifications.kb_payment_id.
- */
- public final org.jooq.TableField KB_PAYMENT_ID = createField("kb_payment_id", org.jooq.impl.SQLDataType.CHAR.length(36), this, "");
-
- /**
- * The column killbill.adyen_notifications.kb_payment_transaction_id.
- */
- public final org.jooq.TableField KB_PAYMENT_TRANSACTION_ID = createField("kb_payment_transaction_id", org.jooq.impl.SQLDataType.CHAR.length(36), this, "");
-
- /**
- * The column killbill.adyen_notifications.transaction_type.
- */
- public final org.jooq.TableField TRANSACTION_TYPE = createField("transaction_type", org.jooq.impl.SQLDataType.VARCHAR.length(32), this, "");
-
- /**
- * The column killbill.adyen_notifications.amount.
- */
- public final org.jooq.TableField AMOUNT = createField("amount", org.jooq.impl.SQLDataType.DECIMAL.precision(15, 9), this, "");
-
- /**
- * The column killbill.adyen_notifications.currency.
- */
- public final org.jooq.TableField CURRENCY = createField("currency", org.jooq.impl.SQLDataType.CHAR.length(3), this, "");
-
- /**
- * The column killbill.adyen_notifications.event_code.
- */
- public final org.jooq.TableField EVENT_CODE = createField("event_code", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, "");
-
- /**
- * The column killbill.adyen_notifications.event_date.
- */
- public final org.jooq.TableField EVENT_DATE = createField("event_date", org.jooq.impl.SQLDataType.TIMESTAMP, this, "");
-
- /**
- * The column killbill.adyen_notifications.merchant_account_code.
- */
- public final org.jooq.TableField MERCHANT_ACCOUNT_CODE = createField("merchant_account_code", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, "");
-
- /**
- * The column killbill.adyen_notifications.merchant_reference.
- */
- public final org.jooq.TableField MERCHANT_REFERENCE = createField("merchant_reference", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, "");
-
- /**
- * The column killbill.adyen_notifications.operations.
- */
- public final org.jooq.TableField OPERATIONS = createField("operations", org.jooq.impl.SQLDataType.VARCHAR.length(1024), this, "");
-
- /**
- * The column killbill.adyen_notifications.original_reference.
- */
- public final org.jooq.TableField ORIGINAL_REFERENCE = createField("original_reference", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, "");
-
- /**
- * The column killbill.adyen_notifications.payment_method.
- */
- public final org.jooq.TableField PAYMENT_METHOD = createField("payment_method", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, "");
-
- /**
- * The column killbill.adyen_notifications.psp_reference.
- */
- public final org.jooq.TableField PSP_REFERENCE = createField("psp_reference", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, "");
-
- /**
- * The column killbill.adyen_notifications.reason.
- */
- public final org.jooq.TableField REASON = createField("reason", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, "");
-
- /**
- * The column killbill.adyen_notifications.success.
- */
- public final org.jooq.TableField SUCCESS = createField("success", org.jooq.impl.SQLDataType.TINYINT.nullable(false).defaulted(true), this, "");
-
- /**
- * The column killbill.adyen_notifications.additional_data.
- */
- public final org.jooq.TableField ADDITIONAL_DATA = createField("additional_data", org.jooq.impl.SQLDataType.CLOB, this, "");
-
- /**
- * The column killbill.adyen_notifications.created_date.
- */
- public final org.jooq.TableField CREATED_DATE = createField("created_date", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false), this, "");
-
- /**
- * The column killbill.adyen_notifications.kb_tenant_id.
- */
- public final org.jooq.TableField KB_TENANT_ID = createField("kb_tenant_id", org.jooq.impl.SQLDataType.CHAR.length(36), this, "");
-
- /**
- * Create a killbill.adyen_notifications table reference
- */
- public AdyenNotifications() {
- this("adyen_notifications", null);
- }
-
- /**
- * Create an aliased killbill.adyen_notifications table reference
- */
- public AdyenNotifications(java.lang.String alias) {
- this(alias, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications.ADYEN_NOTIFICATIONS);
- }
-
- private AdyenNotifications(java.lang.String alias, org.jooq.Table aliased) {
- this(alias, aliased, null);
- }
-
- private AdyenNotifications(java.lang.String alias, org.jooq.Table aliased, org.jooq.Field>[] parameters) {
- super(alias, org.killbill.billing.plugin.adyen.dao.gen.Killbill.KILLBILL, aliased, parameters, "");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public org.jooq.Identity getIdentity() {
- return org.killbill.billing.plugin.adyen.dao.gen.Keys.IDENTITY_ADYEN_NOTIFICATIONS;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public org.jooq.UniqueKey getPrimaryKey() {
- return org.killbill.billing.plugin.adyen.dao.gen.Keys.KEY_ADYEN_NOTIFICATIONS_PRIMARY;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public java.util.List> getKeys() {
- return java.util.Arrays.>asList(org.killbill.billing.plugin.adyen.dao.gen.Keys.KEY_ADYEN_NOTIFICATIONS_PRIMARY);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications as(java.lang.String alias) {
- return new org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications(alias, this);
- }
-
- /**
- * Rename this table
- */
- public org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications rename(java.lang.String name) {
- return new org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenNotifications(name, null);
- }
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class AdyenNotifications extends TableImpl {
+
+ private static final long serialVersionUID = 1328345695;
+
+ /**
+ * The reference instance of killbill.adyen_notifications
+ */
+ public static final AdyenNotifications ADYEN_NOTIFICATIONS = new AdyenNotifications();
+
+ /**
+ * The class holding records for this type
+ */
+ @Override
+ public Class getRecordType() {
+ return AdyenNotificationsRecord.class;
+ }
+
+ /**
+ * The column killbill.adyen_notifications.record_id.
+ */
+ public final TableField RECORD_ID = createField(DSL.name("record_id"), org.jooq.impl.SQLDataType.BIGINTUNSIGNED.nullable(false).identity(true), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.kb_account_id.
+ */
+ public final TableField KB_ACCOUNT_ID = createField(DSL.name("kb_account_id"), org.jooq.impl.SQLDataType.CHAR(36), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.kb_payment_id.
+ */
+ public final TableField KB_PAYMENT_ID = createField(DSL.name("kb_payment_id"), org.jooq.impl.SQLDataType.CHAR(36), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.kb_payment_transaction_id.
+ */
+ public final TableField KB_PAYMENT_TRANSACTION_ID = createField(DSL.name("kb_payment_transaction_id"), org.jooq.impl.SQLDataType.CHAR(36), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.transaction_type.
+ */
+ public final TableField TRANSACTION_TYPE = createField(DSL.name("transaction_type"), org.jooq.impl.SQLDataType.VARCHAR(32), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.amount.
+ */
+ public final TableField AMOUNT = createField(DSL.name("amount"), org.jooq.impl.SQLDataType.DECIMAL(15, 9), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.currency.
+ */
+ public final TableField CURRENCY = createField(DSL.name("currency"), org.jooq.impl.SQLDataType.CHAR(3), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.event_code.
+ */
+ public final TableField EVENT_CODE = createField(DSL.name("event_code"), org.jooq.impl.SQLDataType.VARCHAR(64), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.event_date.
+ */
+ public final TableField EVENT_DATE = createField(DSL.name("event_date"), org.jooq.impl.SQLDataType.LOCALDATETIME, this, "");
+
+ /**
+ * The column killbill.adyen_notifications.merchant_account_code.
+ */
+ public final TableField MERCHANT_ACCOUNT_CODE = createField(DSL.name("merchant_account_code"), org.jooq.impl.SQLDataType.VARCHAR(64), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.merchant_reference.
+ */
+ public final TableField MERCHANT_REFERENCE = createField(DSL.name("merchant_reference"), org.jooq.impl.SQLDataType.VARCHAR(64), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.operations.
+ */
+ public final TableField OPERATIONS = createField(DSL.name("operations"), org.jooq.impl.SQLDataType.VARCHAR(1024), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.original_reference.
+ */
+ public final TableField ORIGINAL_REFERENCE = createField(DSL.name("original_reference"), org.jooq.impl.SQLDataType.VARCHAR(64), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.payment_method.
+ */
+ public final TableField PAYMENT_METHOD = createField(DSL.name("payment_method"), org.jooq.impl.SQLDataType.VARCHAR(64), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.psp_reference.
+ */
+ public final TableField PSP_REFERENCE = createField(DSL.name("psp_reference"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.reason.
+ */
+ public final TableField REASON = createField(DSL.name("reason"), org.jooq.impl.SQLDataType.CLOB, this, "");
+
+ /**
+ * The column killbill.adyen_notifications.success.
+ */
+ public final TableField SUCCESS = createField(DSL.name("success"), org.jooq.impl.SQLDataType.SMALLINT.nullable(false).defaultValue(org.jooq.impl.DSL.inline("0", org.jooq.impl.SQLDataType.SMALLINT)), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.additional_data.
+ */
+ public final TableField ADDITIONAL_DATA = createField(DSL.name("additional_data"), org.jooq.impl.SQLDataType.CLOB, this, "");
+
+ /**
+ * The column killbill.adyen_notifications.created_date.
+ */
+ public final TableField CREATED_DATE = createField(DSL.name("created_date"), org.jooq.impl.SQLDataType.LOCALDATETIME.nullable(false), this, "");
+
+ /**
+ * The column killbill.adyen_notifications.kb_tenant_id.
+ */
+ public final TableField KB_TENANT_ID = createField(DSL.name("kb_tenant_id"), org.jooq.impl.SQLDataType.CHAR(36), this, "");
+
+ /**
+ * Create a killbill.adyen_notifications table reference
+ */
+ public AdyenNotifications() {
+ this(DSL.name("adyen_notifications"), null);
+ }
+
+ /**
+ * Create an aliased killbill.adyen_notifications table reference
+ */
+ public AdyenNotifications(String alias) {
+ this(DSL.name(alias), ADYEN_NOTIFICATIONS);
+ }
+
+ /**
+ * Create an aliased killbill.adyen_notifications table reference
+ */
+ public AdyenNotifications(Name alias) {
+ this(alias, ADYEN_NOTIFICATIONS);
+ }
+
+ private AdyenNotifications(Name alias, Table aliased) {
+ this(alias, aliased, null);
+ }
+
+ private AdyenNotifications(Name alias, Table aliased, Field>[] parameters) {
+ super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+ }
+
+ public AdyenNotifications(Table child, ForeignKey key) {
+ super(child, key, ADYEN_NOTIFICATIONS);
+ }
+
+ @Override
+ public Schema getSchema() {
+ return Killbill.KILLBILL;
+ }
+
+ @Override
+ public List getIndexes() {
+ return Arrays.asList(Indexes.ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_KB_PAYMENT_ID, Indexes.ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_KB_PAYMENT_TRANSACTION_ID, Indexes.ADYEN_NOTIFICATIONS_ADYEN_NOTIFICATIONS_PSP_REFERENCE);
+ }
+
+ @Override
+ public Identity getIdentity() {
+ return Keys.IDENTITY_ADYEN_NOTIFICATIONS;
+ }
+
+ @Override
+ public UniqueKey getPrimaryKey() {
+ return Keys.KEY_ADYEN_NOTIFICATIONS_PRIMARY;
+ }
+
+ @Override
+ public List> getKeys() {
+ return Arrays.>asList(Keys.KEY_ADYEN_NOTIFICATIONS_PRIMARY, Keys.KEY_ADYEN_NOTIFICATIONS_RECORD_ID);
+ }
+
+ @Override
+ public AdyenNotifications as(String alias) {
+ return new AdyenNotifications(DSL.name(alias), this);
+ }
+
+ @Override
+ public AdyenNotifications as(Name alias) {
+ return new AdyenNotifications(alias, this);
+ }
+
+ /**
+ * Rename this table
+ */
+ @Override
+ public AdyenNotifications rename(String name) {
+ return new AdyenNotifications(DSL.name(name), null);
+ }
+
+ /**
+ * Rename this table
+ */
+ @Override
+ public AdyenNotifications rename(Name name) {
+ return new AdyenNotifications(name, null);
+ }
+
+ // -------------------------------------------------------------------------
+ // Row20 type methods
+ // -------------------------------------------------------------------------
+
+ @Override
+ public Row20 fieldsRow() {
+ return (Row20) super.fieldsRow();
+ }
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenPaymentMethods.java b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenPaymentMethods.java
index e0ba90b5..7745470c 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenPaymentMethods.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenPaymentMethods.java
@@ -1,234 +1,268 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
*/
package org.killbill.billing.plugin.adyen.dao.gen.tables;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Identity;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.types.ULong;
+import org.killbill.billing.plugin.adyen.dao.gen.Keys;
+import org.killbill.billing.plugin.adyen.dao.gen.Killbill;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenPaymentMethodsRecord;
+
+
/**
* This class is generated by jOOQ.
*/
-@javax.annotation.Generated(
- value = {
- "http://www.jooq.org",
- "jOOQ version:3.5.0"
- },
- comments = "This class is generated by jOOQ"
-)
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class AdyenPaymentMethods extends org.jooq.impl.TableImpl {
-
- private static final long serialVersionUID = 1757875636;
-
- /**
- * The reference instance of killbill.adyen_payment_methods
- */
- public static final org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods ADYEN_PAYMENT_METHODS = new org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods();
-
- /**
- * The class holding records for this type
- */
- @Override
- public java.lang.Class getRecordType() {
- return org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenPaymentMethodsRecord.class;
- }
-
- /**
- * The column killbill.adyen_payment_methods.record_id.
- */
- public final org.jooq.TableField RECORD_ID = createField("record_id", org.jooq.impl.SQLDataType.INTEGERUNSIGNED.nullable(false), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.kb_account_id.
- */
- public final org.jooq.TableField KB_ACCOUNT_ID = createField("kb_account_id", org.jooq.impl.SQLDataType.CHAR.length(36).nullable(false), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.kb_payment_method_id.
- */
- public final org.jooq.TableField KB_PAYMENT_METHOD_ID = createField("kb_payment_method_id", org.jooq.impl.SQLDataType.CHAR.length(36).nullable(false), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.token.
- */
- public final org.jooq.TableField TOKEN = createField("token", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_first_name.
- */
- public final org.jooq.TableField CC_FIRST_NAME = createField("cc_first_name", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_last_name.
- */
- public final org.jooq.TableField CC_LAST_NAME = createField("cc_last_name", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_type.
- */
- public final org.jooq.TableField CC_TYPE = createField("cc_type", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_exp_month.
- */
- public final org.jooq.TableField CC_EXP_MONTH = createField("cc_exp_month", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_exp_year.
- */
- public final org.jooq.TableField CC_EXP_YEAR = createField("cc_exp_year", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_number.
- */
- public final org.jooq.TableField CC_NUMBER = createField("cc_number", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_last_4.
- */
- public final org.jooq.TableField CC_LAST_4 = createField("cc_last_4", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_start_month.
- */
- public final org.jooq.TableField CC_START_MONTH = createField("cc_start_month", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_start_year.
- */
- public final org.jooq.TableField CC_START_YEAR = createField("cc_start_year", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_issue_number.
- */
- public final org.jooq.TableField CC_ISSUE_NUMBER = createField("cc_issue_number", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_verification_value.
- */
- public final org.jooq.TableField CC_VERIFICATION_VALUE = createField("cc_verification_value", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.cc_track_data.
- */
- public final org.jooq.TableField CC_TRACK_DATA = createField("cc_track_data", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.address1.
- */
- public final org.jooq.TableField ADDRESS1 = createField("address1", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.address2.
- */
- public final org.jooq.TableField ADDRESS2 = createField("address2", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.city.
- */
- public final org.jooq.TableField CITY = createField("city", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.state.
- */
- public final org.jooq.TableField STATE = createField("state", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.zip.
- */
- public final org.jooq.TableField ZIP = createField("zip", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.country.
- */
- public final org.jooq.TableField COUNTRY = createField("country", org.jooq.impl.SQLDataType.VARCHAR.length(255), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.is_default.
- */
- public final org.jooq.TableField IS_DEFAULT = createField("is_default", org.jooq.impl.SQLDataType.TINYINT.nullable(false).defaulted(true), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.is_deleted.
- */
- public final org.jooq.TableField IS_DELETED = createField("is_deleted", org.jooq.impl.SQLDataType.TINYINT.nullable(false).defaulted(true), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.additional_data.
- */
- public final org.jooq.TableField ADDITIONAL_DATA = createField("additional_data", org.jooq.impl.SQLDataType.CLOB, this, "");
-
- /**
- * The column killbill.adyen_payment_methods.created_date.
- */
- public final org.jooq.TableField CREATED_DATE = createField("created_date", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.updated_date.
- */
- public final org.jooq.TableField UPDATED_DATE = createField("updated_date", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false), this, "");
-
- /**
- * The column killbill.adyen_payment_methods.kb_tenant_id.
- */
- public final org.jooq.TableField KB_TENANT_ID = createField("kb_tenant_id", org.jooq.impl.SQLDataType.CHAR.length(36).nullable(false), this, "");
-
- /**
- * Create a killbill.adyen_payment_methods table reference
- */
- public AdyenPaymentMethods() {
- this("adyen_payment_methods", null);
- }
-
- /**
- * Create an aliased killbill.adyen_payment_methods table reference
- */
- public AdyenPaymentMethods(java.lang.String alias) {
- this(alias, org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods.ADYEN_PAYMENT_METHODS);
- }
-
- private AdyenPaymentMethods(java.lang.String alias, org.jooq.Table aliased) {
- this(alias, aliased, null);
- }
-
- private AdyenPaymentMethods(java.lang.String alias, org.jooq.Table aliased, org.jooq.Field>[] parameters) {
- super(alias, org.killbill.billing.plugin.adyen.dao.gen.Killbill.KILLBILL, aliased, parameters, "");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public org.jooq.Identity getIdentity() {
- return org.killbill.billing.plugin.adyen.dao.gen.Keys.IDENTITY_ADYEN_PAYMENT_METHODS;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public org.jooq.UniqueKey getPrimaryKey() {
- return org.killbill.billing.plugin.adyen.dao.gen.Keys.KEY_ADYEN_PAYMENT_METHODS_PRIMARY;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public java.util.List> getKeys() {
- return java.util.Arrays.>asList(org.killbill.billing.plugin.adyen.dao.gen.Keys.KEY_ADYEN_PAYMENT_METHODS_PRIMARY, org.killbill.billing.plugin.adyen.dao.gen.Keys.KEY_ADYEN_PAYMENT_METHODS_ADYEN_PAYMENT_METHODS_KB_PAYMENT_ID);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods as(java.lang.String alias) {
- return new org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods(alias, this);
- }
-
- /**
- * Rename this table
- */
- public org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods rename(java.lang.String name) {
- return new org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenPaymentMethods(name, null);
- }
+@SuppressWarnings({ "all", "unchecked", "rawtypes" })
+public class AdyenPaymentMethods extends TableImpl {
+
+ private static final long serialVersionUID = -283960291;
+
+ /**
+ * The reference instance of killbill.adyen_payment_methods
+ */
+ public static final AdyenPaymentMethods ADYEN_PAYMENT_METHODS = new AdyenPaymentMethods();
+
+ /**
+ * The class holding records for this type
+ */
+ @Override
+ public Class getRecordType() {
+ return AdyenPaymentMethodsRecord.class;
+ }
+
+ /**
+ * The column killbill.adyen_payment_methods.record_id.
+ */
+ public final TableField RECORD_ID = createField(DSL.name("record_id"), org.jooq.impl.SQLDataType.BIGINTUNSIGNED.nullable(false).identity(true), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.kb_account_id.
+ */
+ public final TableField KB_ACCOUNT_ID = createField(DSL.name("kb_account_id"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.kb_payment_method_id.
+ */
+ public final TableField KB_PAYMENT_METHOD_ID = createField(DSL.name("kb_payment_method_id"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.token.
+ */
+ public final TableField TOKEN = createField(DSL.name("token"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_first_name.
+ */
+ public final TableField CC_FIRST_NAME = createField(DSL.name("cc_first_name"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_last_name.
+ */
+ public final TableField CC_LAST_NAME = createField(DSL.name("cc_last_name"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_type.
+ */
+ public final TableField CC_TYPE = createField(DSL.name("cc_type"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_exp_month.
+ */
+ public final TableField CC_EXP_MONTH = createField(DSL.name("cc_exp_month"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_exp_year.
+ */
+ public final TableField CC_EXP_YEAR = createField(DSL.name("cc_exp_year"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_number.
+ */
+ public final TableField CC_NUMBER = createField(DSL.name("cc_number"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_last_4.
+ */
+ public final TableField CC_LAST_4 = createField(DSL.name("cc_last_4"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_start_month.
+ */
+ public final TableField CC_START_MONTH = createField(DSL.name("cc_start_month"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_start_year.
+ */
+ public final TableField CC_START_YEAR = createField(DSL.name("cc_start_year"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_issue_number.
+ */
+ public final TableField CC_ISSUE_NUMBER = createField(DSL.name("cc_issue_number"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_verification_value.
+ */
+ public final TableField CC_VERIFICATION_VALUE = createField(DSL.name("cc_verification_value"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.cc_track_data.
+ */
+ public final TableField CC_TRACK_DATA = createField(DSL.name("cc_track_data"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.address1.
+ */
+ public final TableField ADDRESS1 = createField(DSL.name("address1"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.address2.
+ */
+ public final TableField ADDRESS2 = createField(DSL.name("address2"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.city.
+ */
+ public final TableField CITY = createField(DSL.name("city"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.state.
+ */
+ public final TableField STATE = createField(DSL.name("state"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.zip.
+ */
+ public final TableField ZIP = createField(DSL.name("zip"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.country.
+ */
+ public final TableField COUNTRY = createField(DSL.name("country"), org.jooq.impl.SQLDataType.VARCHAR(255), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.is_default.
+ */
+ public final TableField IS_DEFAULT = createField(DSL.name("is_default"), org.jooq.impl.SQLDataType.SMALLINT.nullable(false).defaultValue(org.jooq.impl.DSL.inline("0", org.jooq.impl.SQLDataType.SMALLINT)), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.is_deleted.
+ */
+ public final TableField IS_DELETED = createField(DSL.name("is_deleted"), org.jooq.impl.SQLDataType.SMALLINT.nullable(false).defaultValue(org.jooq.impl.DSL.inline("0", org.jooq.impl.SQLDataType.SMALLINT)), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.additional_data.
+ */
+ public final TableField ADDITIONAL_DATA = createField(DSL.name("additional_data"), org.jooq.impl.SQLDataType.CLOB, this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.created_date.
+ */
+ public final TableField CREATED_DATE = createField(DSL.name("created_date"), org.jooq.impl.SQLDataType.LOCALDATETIME.nullable(false), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.updated_date.
+ */
+ public final TableField UPDATED_DATE = createField(DSL.name("updated_date"), org.jooq.impl.SQLDataType.LOCALDATETIME.nullable(false), this, "");
+
+ /**
+ * The column killbill.adyen_payment_methods.kb_tenant_id.
+ */
+ public final TableField KB_TENANT_ID = createField(DSL.name("kb_tenant_id"), org.jooq.impl.SQLDataType.CHAR(36).nullable(false), this, "");
+
+ /**
+ * Create a killbill.adyen_payment_methods table reference
+ */
+ public AdyenPaymentMethods() {
+ this(DSL.name("adyen_payment_methods"), null);
+ }
+
+ /**
+ * Create an aliased killbill.adyen_payment_methods table reference
+ */
+ public AdyenPaymentMethods(String alias) {
+ this(DSL.name(alias), ADYEN_PAYMENT_METHODS);
+ }
+
+ /**
+ * Create an aliased killbill.adyen_payment_methods table reference
+ */
+ public AdyenPaymentMethods(Name alias) {
+ this(alias, ADYEN_PAYMENT_METHODS);
+ }
+
+ private AdyenPaymentMethods(Name alias, Table aliased) {
+ this(alias, aliased, null);
+ }
+
+ private AdyenPaymentMethods(Name alias, Table aliased, Field>[] parameters) {
+ super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table());
+ }
+
+ public AdyenPaymentMethods(Table child, ForeignKey key) {
+ super(child, key, ADYEN_PAYMENT_METHODS);
+ }
+
+ @Override
+ public Schema getSchema() {
+ return Killbill.KILLBILL;
+ }
+
+ @Override
+ public Identity getIdentity() {
+ return Keys.IDENTITY_ADYEN_PAYMENT_METHODS;
+ }
+
+ @Override
+ public UniqueKey getPrimaryKey() {
+ return Keys.KEY_ADYEN_PAYMENT_METHODS_PRIMARY;
+ }
+
+ @Override
+ public List> getKeys() {
+ return Arrays.>asList(Keys.KEY_ADYEN_PAYMENT_METHODS_PRIMARY, Keys.KEY_ADYEN_PAYMENT_METHODS_RECORD_ID, Keys.KEY_ADYEN_PAYMENT_METHODS_ADYEN_PAYMENT_METHODS_KB_PAYMENT_ID);
+ }
+
+ @Override
+ public AdyenPaymentMethods as(String alias) {
+ return new AdyenPaymentMethods(DSL.name(alias), this);
+ }
+
+ @Override
+ public AdyenPaymentMethods as(Name alias) {
+ return new AdyenPaymentMethods(alias, this);
+ }
+
+ /**
+ * Rename this table
+ */
+ @Override
+ public AdyenPaymentMethods rename(String name) {
+ return new AdyenPaymentMethods(DSL.name(name), null);
+ }
+
+ /**
+ * Rename this table
+ */
+ @Override
+ public AdyenPaymentMethods rename(Name name) {
+ return new AdyenPaymentMethods(name, null);
+ }
}
diff --git a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenResponses.java b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenResponses.java
index 27858898..4ed60702 100644
--- a/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenResponses.java
+++ b/src/main/java/org/killbill/billing/plugin/adyen/dao/gen/tables/AdyenResponses.java
@@ -1,219 +1,261 @@
-/**
- * This class is generated by jOOQ
+/*
+ * This file is generated by jOOQ.
*/
package org.killbill.billing.plugin.adyen.dao.gen.tables;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Identity;
+import org.jooq.Index;
+import org.jooq.Name;
+import org.jooq.Record;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableOptions;
+import org.jooq.UniqueKey;
+import org.jooq.impl.DSL;
+import org.jooq.impl.TableImpl;
+import org.jooq.types.ULong;
+import org.killbill.billing.plugin.adyen.dao.gen.Indexes;
+import org.killbill.billing.plugin.adyen.dao.gen.Keys;
+import org.killbill.billing.plugin.adyen.dao.gen.Killbill;
+import org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenResponsesRecord;
+
+
/**
* This class is generated by jOOQ.
*/
-@javax.annotation.Generated(
- value = {
- "http://www.jooq.org",
- "jOOQ version:3.5.0"
- },
- comments = "This class is generated by jOOQ"
-)
-@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class AdyenResponses extends org.jooq.impl.TableImpl {
-
- private static final long serialVersionUID = -464526266;
-
- /**
- * The reference instance of killbill.adyen_responses
- */
- public static final org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses ADYEN_RESPONSES = new org.killbill.billing.plugin.adyen.dao.gen.tables.AdyenResponses();
-
- /**
- * The class holding records for this type
- */
- @Override
- public java.lang.Class getRecordType() {
- return org.killbill.billing.plugin.adyen.dao.gen.tables.records.AdyenResponsesRecord.class;
- }
-
- /**
- * The column killbill.adyen_responses.record_id.
- */
- public final org.jooq.TableField RECORD_ID = createField("record_id", org.jooq.impl.SQLDataType.INTEGERUNSIGNED.nullable(false), this, "");
-
- /**
- * The column killbill.adyen_responses.kb_account_id.
- */
- public final org.jooq.TableField KB_ACCOUNT_ID = createField("kb_account_id", org.jooq.impl.SQLDataType.CHAR.length(36).nullable(false), this, "");
-
- /**
- * The column killbill.adyen_responses.kb_payment_id.
- */
- public final org.jooq.TableField KB_PAYMENT_ID = createField("kb_payment_id", org.jooq.impl.SQLDataType.CHAR.length(36).nullable(false), this, "");
-
- /**
- * The column killbill.adyen_responses.kb_payment_transaction_id.
- */
- public final org.jooq.TableField KB_PAYMENT_TRANSACTION_ID = createField("kb_payment_transaction_id", org.jooq.impl.SQLDataType.CHAR.length(36).nullable(false), this, "");
-
- /**
- * The column killbill.adyen_responses.transaction_type.
- */
- public final org.jooq.TableField TRANSACTION_TYPE = createField("transaction_type", org.jooq.impl.SQLDataType.VARCHAR.length(32).nullable(false), this, "");
-
- /**
- * The column killbill.adyen_responses.amount.
- */
- public final org.jooq.TableField AMOUNT = createField("amount", org.jooq.impl.SQLDataType.DECIMAL.precision(15, 9), this, "");
-
- /**
- * The column killbill.adyen_responses.currency.
- */
- public final org.jooq.TableField CURRENCY = createField("currency", org.jooq.impl.SQLDataType.CHAR.length(3), this, "");
-
- /**
- * The column killbill.adyen_responses.psp_result.
- */
- public final org.jooq.TableField PSP_RESULT = createField("psp_result", org.jooq.impl.SQLDataType.CHAR.length(64), this, "");
-
- /**
- * The column killbill.adyen_responses.psp_reference.
- */
- public final org.jooq.TableField PSP_REFERENCE = createField("psp_reference", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, "");
-
- /**
- * The column