killbill-memoizeit
Changes
.gitignore 141(+113 -28)
.idea/.name 1(+1 -0)
.idea/codeStyleSettings.xml 62(+62 -0)
.idea/compiler.xml 7(+5 -2)
.idea/copyright/apache.xml 9(+9 -0)
.idea/encodings.xml 4(+2 -2)
.idea/inspectionProfiles/Project_Default.xml 49(+49 -0)
.idea/scopes/scope_settings.xml 5(+5 -0)
.travis.yml 70(+32 -38)
account/pom.xml 10(+5 -5)
beatrix/pom.xml 10(+5 -5)
currency/pom.xml 10(+5 -5)
entitlement/pom.xml 10(+5 -5)
invoice/pom.xml 10(+5 -5)
invoice/src/test/java/org/killbill/billing/invoice/notification/TestNextBillingDateNotifier.java 2(+1 -1)
junction/pom.xml 10(+5 -5)
overdue/pom.xml 10(+5 -5)
overdue/src/test/java/org/killbill/billing/overdue/applicator/TestOverdueStateApplicator.java 2(+1 -1)
overdue/src/test/java/org/killbill/billing/overdue/notification/TestOverdueCheckNotifier.java 2(+1 -1)
payment/pom.xml 10(+5 -5)
pom.xml 2(+1 -1)
profiles/killbill/pom.xml 10(+5 -5)
subscription/pom.xml 10(+5 -5)
util/pom.xml 10(+5 -5)
Details
.gitignore 141(+113 -28)
diff --git a/.gitignore b/.gitignore
index fba5383..dea7666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,119 @@
-.idea/workspace.xml
-.idea/libraries
-.idea/kotlinc.xml
-*.ipr
+#
+# https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
+#
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# 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
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
*.iws
-*.DS_Store
-*.bak
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### Intellij+iml Patch ###
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
*.iml
-target
-staging
-overlays
-examples
-pom.xml.bak
+modules.xml
+.idea/misc.xml
+*.ipr
+
+### Misc. ###
+.idea/kotlinc.xml
+.idea/sbt.xml
+.idea/vcs.xml
+.idea/dbnavigator.xml
+
+#
+# https://github.com/github/gitignore/blob/master/Java.gitignore
+#
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+#
+# https://github.com/github/gitignore/blob/master/Maven.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
+
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
+!/.mvn/wrapper/maven-wrapper.jar
+
+#
+# Misc.
+#
+
+*.db
logs/
.logs
-.diskspool
-*.classpath
-*.settings
-*.project
-*/bin/
-catalog/src/test/resources/CatalogSchema.xsd
-*/test-output/
-*/src/test/resources/*.jar
-server/load
-dependency-reduced-pom.xml
-dependency-reduced-pom.xml.bak
-killbill.h2.db
-killbill.lock.db
-killbill.trace.db
-server/test.db
-.idea/dictionaries/
-.idea/dbnavigator.xml
.idea/.name 1(+1 -0)
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..9b66548
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+killbill
\ No newline at end of file
.idea/codeStyleSettings.xml 62(+62 -0)
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000..0a01d27
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectCodeStyleSettingsManager">
+ <option name="PER_PROJECT_SETTINGS">
+ <value>
+ <option name="GENERATE_FINAL_LOCALS" value="true" />
+ <option name="GENERATE_FINAL_PARAMETERS" value="true" />
+ <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
+ <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+ <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+ <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+ <value />
+ </option>
+ <option name="IMPORT_LAYOUT_TABLE">
+ <value>
+ <emptyLine />
+ <package name="java" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="javax" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="org" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="com.ning" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="" withSubpackages="true" static="true" />
+ </value>
+ </option>
+ <XML>
+ <option name="XML_ATTRIBUTE_WRAP" value="0" />
+ <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+ </XML>
+ <codeStyleSettings language="JAVA">
+ <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+ <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+ <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
+ <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+ <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+ <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+ <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+ <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_METHOD_BRACKETS" value="true" />
+ <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+ <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+ <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+ <option name="IF_BRACE_FORCE" value="3" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <option name="WHILE_BRACE_FORCE" value="3" />
+ <option name="FOR_BRACE_FORCE" value="3" />
+ </codeStyleSettings>
+ </value>
+ </option>
+ <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+ </component>
+</project>
+
.idea/compiler.xml 7(+5 -2)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 7a229a7..f66e730 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -36,6 +36,7 @@
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
+ <module name="killbill" target="1.6" />
<module name="killbill-account" target="1.6" />
<module name="killbill-beatrix" target="1.6" />
<module name="killbill-catalog" target="1.6" />
@@ -54,7 +55,9 @@
<module name="killbill-tenant" target="1.6" />
<module name="killbill-usage" target="1.6" />
<module name="killbill-util" target="1.6" />
- <module name="killbill2" target="1.6" />
</bytecodeTargetLevel>
</component>
-</project>
\ No newline at end of file
+ <component name="JavacSettings">
+ <option name="ADDITIONAL_OPTIONS_STRING" value="-Xlint:unchecked " />
+ </component>
+</project>
.idea/copyright/apache.xml 9(+9 -0)
diff --git a/.idea/copyright/apache.xml b/.idea/copyright/apache.xml
new file mode 100644
index 0000000..963683f
--- /dev/null
+++ b/.idea/copyright/apache.xml
@@ -0,0 +1,9 @@
+<component name="CopyrightManager">
+ <copyright>
+ <option name="notice" value="Copyright 2014-&#36;today.year Groupon, Inc Copyright 2014-&#36;today.year 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." />
+ <option name="keyword" value="Copyright" />
+ <option name="allowReplaceKeyword" value="" />
+ <option name="myName" value="apache" />
+ <option name="myLocal" value="true" />
+ </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..7fafdd7
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+ <settings default="apache" />
+</component>
\ No newline at end of file
.idea/encodings.xml 4(+2 -2)
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 366a39f..7108d94 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="Encoding">
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/account" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/api" charset="UTF-8" />
@@ -22,4 +22,4 @@
<file url="file://$PROJECT_DIR$/util" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
-</project>
\ No newline at end of file
+</project>
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..3b31283
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+ <settings>
+ <option name="PROJECT_PROFILE" value="Project Default" />
+ <option name="USE_PROJECT_PROFILE" value="true" />
+ <version value="1.0" />
+ </settings>
+</component>
\ No newline at end of file
.idea/inspectionProfiles/Project_Default.xml 49(+49 -0)
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..a106408
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,49 @@
+<component name="InspectionProjectProfileManager">
+ <profile version="1.0" is_locked="false">
+ <option name="myName" value="Project Default" />
+ <option name="myLocal" value="false" />
+ <inspection_tool class="CheckTagEmptyBody" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="ConfusingOctalEscape" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ControlFlowStatementWithoutBraces" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CyclicClassDependency" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="HardcodedLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ListIndexOfReplaceableByContains" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="LiteralAsArgToStringEquals" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="LocalCanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="REPORT_VARIABLES" value="true" />
+ <option name="REPORT_PARAMETERS" value="true" />
+ </inspection_tool>
+ <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
+ <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
+ <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
+ </inspection_tool>
+ <inspection_tool class="MissortedModifiers" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="m_requireAnnotationsFirst" value="true" />
+ </inspection_tool>
+ <inspection_tool class="RedundantTypeArguments" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="SizeReplaceableByIsEmpty" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="TypeMayBeWeakened" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="useRighthandTypeAsWeakestTypeInAssignments" value="true" />
+ <option name="useParameterizedTypeForCollectionMethods" value="true" />
+ <option name="doNotWeakenToJavaLangObject" value="true" />
+ <option name="onlyWeakentoInterface" value="true" />
+ </inspection_tool>
+ <inspection_tool class="UnnecessaryConstantArrayCreationExpression" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="UseOfJDBCDriverClass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="UseOfSunClasses" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="groupsTestNG" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="groups">
+ <value>
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="slow" />
+ <item index="1" class="java.lang.String" itemvalue="fast" />
+ <item index="2" class="java.lang.String" itemvalue="mysql" />
+ <item index="3" class="java.lang.String" itemvalue="load" />
+ </list>
+ </value>
+ </option>
+ </inspection_tool>
+ </profile>
+</component>
\ No newline at end of file
.idea/scopes/scope_settings.xml 5(+5 -0)
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
new file mode 100644
index 0000000..922003b
--- /dev/null
+++ b/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+ <state>
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </state>
+</component>
\ No newline at end of file
.travis.yml 70(+32 -38)
diff --git a/.travis.yml b/.travis.yml
index 531da15..bdf121e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,22 @@
language: java
sudo: false
-# Flaky - see https://github.com/travis-ci/travis-ci/issues/3566
-#cache:
-# directories:
-# - $HOME/.m2
+cache:
+ directories:
+ - $HOME/.m2
-script: if [[ -v COMMAND ]]; then $COMMAND; else travis_retry mvn -q -Djava.security.egd=file:/dev/./urandom -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dorg.slf4j.simpleLogger.log.org.killbill.billing.util.cache=ERROR -Dorg.slf4j.simpleLogger.log.org.killbill.billing.lifecycle=ERROR -Dlogback.configurationFile=$PWD/profiles/killbill/src/test/resources/logback.travis.xml clean install $PHASE -pl '!beatrix,!profiles,!profiles/killbill,!profiles/killpay' 2>&1 | egrep -v 'Download|Install|[ \t]*at [ \ta-zA-Z0-9\.\:\(\)]+'; [ ${PIPESTATUS[0]} == 0 ]; fi
+dist: trusty
+
+before_install:
+ - echo "<settings><profiles><profile><repositories><repository><id>central</id><name>bintray</name><url>http://jcenter.bintray.com</url></repository></repositories><id>bintray</id></profile></profiles><activeProfiles><activeProfile>bintray</activeProfile></activeProfiles></settings>" > /var/tmp/settings.xml
+ - mvn -N io.takari:maven:wrapper -Dmaven=3.3.9
+
+before_script:
+ - jdk_switcher use $JDK
+
+script: if [[ -v COMMAND ]]; then $COMMAND; else travis_retry ./mvnw -q -Djava.security.egd=file:/dev/./urandom -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN -Dorg.slf4j.simpleLogger.log.org.killbill.billing.util.cache=ERROR -Dorg.slf4j.simpleLogger.log.org.killbill.billing.lifecycle=ERROR -Dlogback.configurationFile=$PWD/profiles/killbill/src/test/resources/logback.travis.xml clean install $PHASE -pl '!beatrix,!profiles,!profiles/killbill,!profiles/killpay' 2>&1 | egrep -v 'Download|Install|[ \t]*at [ \ta-zA-Z0-9\.\:\(\)]+'; [ ${PIPESTATUS[0]} == 0 ]; fi
# Remove --quiet to avoid timeouts
-install: mvn -U install -DskipTests=true | egrep -v 'Download|Install'
+install: mvn -U install -DskipTests=true --settings /var/tmp/settings.xml | egrep -v 'Download|Install'
notifications:
email:
@@ -19,39 +27,25 @@ env:
- MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=192m"
matrix:
- allow_failures:
- - jdk: oraclejdk8
include:
- - env: PHASE="-Pmysql"
- jdk: openjdk7
- - env: PHASE="-Pmysql"
- jdk: oraclejdk7
- - env: PHASE="-Pmysql,jdk17"
- jdk: openjdk7
- - env: PHASE="-Pmysql,jdk17"
- jdk: oraclejdk7
- - env: PHASE="-Pmysql,jdk18"
- jdk: oraclejdk8
- - env: PHASE="-Ppostgresql"
- jdk: openjdk7
- - env: PHASE="-Ppostgresql"
- jdk: oraclejdk7
- - env: PHASE="-Ppostgresql,jdk17"
- jdk: openjdk7
- - env: PHASE="-Ppostgresql,jdk17"
- jdk: oraclejdk7
- - env: PHASE="-Ppostgresql,jdk18"
- jdk: oraclejdk8
- - env: PHASE="-Ptravis"
- jdk: openjdk7
- - env: PHASE="-Ptravis"
- jdk: oraclejdk7
- - env: PHASE="-Ptravis,jdk17"
- jdk: openjdk7
- - env: PHASE="-Ptravis,jdk17"
- jdk: oraclejdk7
- - env: PHASE="-Ptravis,jdk18"
- jdk: oraclejdk8
+ - env: PHASE="-Ptravis,jdk16" JDK=oraclejdk8
+ - env: PHASE="-Ptravis,jdk16" JDK=openjdk8
+ - env: PHASE="-Ptravis,jdk17" JDK=oraclejdk8
+ - env: PHASE="-Ptravis,jdk17" JDK=openjdk8
+ - env: PHASE="-Ptravis,jdk18" JDK=oraclejdk8
+ - env: PHASE="-Ptravis,jdk18" JDK=openjdk8
+ - env: PHASE="-Pmysql,jdk16" JDK=oraclejdk8
+ - env: PHASE="-Pmysql,jdk16" JDK=openjdk8
+ - env: PHASE="-Pmysql,jdk17" JDK=oraclejdk8
+ - env: PHASE="-Pmysql,jdk17" JDK=openjdk8
+ - env: PHASE="-Pmysql,jdk18" JDK=oraclejdk8
+ - env: PHASE="-Pmysql,jdk18" JDK=openjdk8
+ - env: PHASE="-Ppostgresql,jdk16" JDK=oraclejdk8
+ - env: PHASE="-Ppostgresql,jdk16" JDK=openjdk8
+ - env: PHASE="-Ppostgresql,jdk17" JDK=oraclejdk8
+ - env: PHASE="-Ppostgresql,jdk17" JDK=openjdk8
+ - env: PHASE="-Ppostgresql,jdk18" JDK=oraclejdk8
+ - env: PHASE="-Ppostgresql,jdk18" JDK=openjdk8
fast_finish: true
after_success:
account/pom.xml 10(+5 -5)
diff --git a/account/pom.xml b/account/pom.xml
index 0059a35..6983bf4 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -49,11 +49,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>io.airlift</groupId>
<artifactId>command</artifactId>
<scope>test</scope>
@@ -88,6 +83,11 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId>
</dependency>
diff --git a/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApi.java b/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApi.java
index b5dbac0..041c18b 100644
--- a/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApi.java
+++ b/account/src/test/java/org/killbill/billing/account/api/user/TestDefaultAccountUserApi.java
@@ -46,7 +46,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.eventbus.Subscribe;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.killbill.billing.account.AccountTestUtils.createAccountData;
import static org.killbill.billing.account.AccountTestUtils.createTestAccount;
beatrix/pom.xml 10(+5 -5)
diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index cfdbaaa..8e2e45c 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -56,11 +56,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java6</artifactId>
<scope>test</scope>
@@ -110,6 +105,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<scope>test</scope>
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java
index 27b7116..06e6817 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegrationBase.java
@@ -137,7 +137,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Callable;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPublicBus.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPublicBus.java
index 2d5f61e..353ae0d 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPublicBus.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestPublicBus.java
@@ -62,7 +62,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.eventbus.Subscribe;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.testng.Assert.assertNotNull;
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestWithFakeKPMPlugin.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestWithFakeKPMPlugin.java
index 4113d01..b239488 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestWithFakeKPMPlugin.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestWithFakeKPMPlugin.java
@@ -79,7 +79,7 @@ import com.google.inject.Module;
import com.google.inject.Stage;
import com.google.inject.util.Modules;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.SECONDS;
public class TestWithFakeKPMPlugin extends TestIntegrationBase {
currency/pom.xml 10(+5 -5)
diff --git a/currency/pom.xml b/currency/pom.xml
index 6592d18..d98cacd 100644
--- a/currency/pom.xml
+++ b/currency/pom.xml
@@ -47,11 +47,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<scope>provided</scope>
@@ -61,6 +56,11 @@
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-api</artifactId>
</dependency>
entitlement/pom.xml 10(+5 -5)
diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index 7c236e7..4f87510 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -45,11 +45,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>io.airlift</groupId>
<artifactId>command</artifactId>
<scope>test</scope>
@@ -88,6 +83,11 @@
<artifactId>shiro-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId>
</dependency>
invoice/pom.xml 10(+5 -5)
diff --git a/invoice/pom.xml b/invoice/pom.xml
index dd27586..9e00d2f 100644
--- a/invoice/pom.xml
+++ b/invoice/pom.xml
@@ -50,11 +50,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>io.airlift</groupId>
<artifactId>command</artifactId>
<scope>test</scope>
@@ -89,6 +84,11 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId>
</dependency>
diff --git a/invoice/src/test/java/org/killbill/billing/invoice/notification/TestNextBillingDateNotifier.java b/invoice/src/test/java/org/killbill/billing/invoice/notification/TestNextBillingDateNotifier.java
index 51ddb3a..763bd45 100644
--- a/invoice/src/test/java/org/killbill/billing/invoice/notification/TestNextBillingDateNotifier.java
+++ b/invoice/src/test/java/org/killbill/billing/invoice/notification/TestNextBillingDateNotifier.java
@@ -31,7 +31,7 @@ import org.killbill.notificationq.api.NotificationQueue;
import org.testng.Assert;
import org.testng.annotations.Test;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.MINUTES;
public class TestNextBillingDateNotifier extends InvoiceTestSuiteWithEmbeddedDB {
junction/pom.xml 10(+5 -5)
diff --git a/junction/pom.xml b/junction/pom.xml
index 40b0ae0..07517d2 100644
--- a/junction/pom.xml
+++ b/junction/pom.xml
@@ -45,11 +45,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>io.airlift</groupId>
<artifactId>command</artifactId>
<scope>test</scope>
@@ -74,6 +69,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-account</artifactId>
<type>test-jar</type>
overdue/pom.xml 10(+5 -5)
diff --git a/overdue/pom.xml b/overdue/pom.xml
index 86f2f21..2717f46 100644
--- a/overdue/pom.xml
+++ b/overdue/pom.xml
@@ -45,11 +45,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.samskivert</groupId>
<artifactId>jmustache</artifactId>
</dependency>
@@ -83,6 +78,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId>
</dependency>
diff --git a/overdue/src/test/java/org/killbill/billing/overdue/applicator/TestOverdueStateApplicator.java b/overdue/src/test/java/org/killbill/billing/overdue/applicator/TestOverdueStateApplicator.java
index 42e70ce..37d2db8 100644
--- a/overdue/src/test/java/org/killbill/billing/overdue/applicator/TestOverdueStateApplicator.java
+++ b/overdue/src/test/java/org/killbill/billing/overdue/applicator/TestOverdueStateApplicator.java
@@ -36,7 +36,7 @@ import org.killbill.xmlloader.XMLLoader;
import org.killbill.billing.events.OverdueChangeInternalEvent;
import org.killbill.billing.junction.DefaultBlockingState;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.SECONDS;
public class TestOverdueStateApplicator extends OverdueTestSuiteWithEmbeddedDB {
diff --git a/overdue/src/test/java/org/killbill/billing/overdue/notification/TestOverdueCheckNotifier.java b/overdue/src/test/java/org/killbill/billing/overdue/notification/TestOverdueCheckNotifier.java
index 9fee915..162d756 100644
--- a/overdue/src/test/java/org/killbill/billing/overdue/notification/TestOverdueCheckNotifier.java
+++ b/overdue/src/test/java/org/killbill/billing/overdue/notification/TestOverdueCheckNotifier.java
@@ -34,7 +34,7 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.SECONDS;
public class TestOverdueCheckNotifier extends OverdueTestSuiteWithEmbeddedDB {
payment/pom.xml 10(+5 -5)
diff --git a/payment/pom.xml b/payment/pom.xml
index 2352511..0d5df7d 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -60,11 +60,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.ning</groupId>
<artifactId>compress-lzf</artifactId>
</dependency>
@@ -101,6 +96,11 @@
<artifactId>shiro-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId>
</dependency>
diff --git a/payment/src/test/java/org/killbill/billing/payment/core/sm/TestPluginOperation.java b/payment/src/test/java/org/killbill/billing/payment/core/sm/TestPluginOperation.java
index 294a5f8..e55fa52 100644
--- a/payment/src/test/java/org/killbill/billing/payment/core/sm/TestPluginOperation.java
+++ b/payment/src/test/java/org/killbill/billing/payment/core/sm/TestPluginOperation.java
@@ -54,7 +54,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
public class TestPluginOperation extends PaymentTestSuiteNoDB {
diff --git a/payment/src/test/java/org/killbill/billing/payment/core/TestPaymentProcessor.java b/payment/src/test/java/org/killbill/billing/payment/core/TestPaymentProcessor.java
index 3e026fa..54d227b 100644
--- a/payment/src/test/java/org/killbill/billing/payment/core/TestPaymentProcessor.java
+++ b/payment/src/test/java/org/killbill/billing/payment/core/TestPaymentProcessor.java
@@ -47,7 +47,7 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.eventbus.Subscribe;
-import com.jayway.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import static java.math.BigDecimal.ZERO;
diff --git a/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java b/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java
index 03487f5..73d4bbd 100644
--- a/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java
+++ b/payment/src/test/java/org/killbill/billing/payment/TestJanitor.java
@@ -73,7 +73,7 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;
diff --git a/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java b/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java
index 676c940..fcf1dc6 100644
--- a/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java
+++ b/payment/src/test/java/org/killbill/billing/payment/TestRetryService.java
@@ -25,8 +25,8 @@ import java.util.Comparator;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.Callable;
-import java.util.concurrent.TimeoutException;
+import org.awaitility.Duration;
import org.joda.time.LocalDate;
import org.killbill.billing.account.api.Account;
import org.killbill.billing.catalog.api.Currency;
@@ -45,15 +45,12 @@ import org.testng.annotations.Test;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
-import static com.jayway.awaitility.Awaitility.await;
-import static com.jayway.awaitility.Awaitility.setDefaultPollInterval;
import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.setDefaultPollInterval;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
public class TestRetryService extends PaymentTestSuiteNoDB {
@@ -67,7 +64,6 @@ public class TestRetryService extends PaymentTestSuiteNoDB {
super.beforeMethod();
setDefaultPollInterval(Duration.ONE_HUNDRED_MILLISECONDS);
- Awaitility.setDefaultPollDelay(Duration.SAME_AS_POLL_INTERVAL);
mockPaymentProviderPlugin = (MockPaymentProviderPlugin) registry.getServiceForName(MockPaymentProviderPlugin.PLUGIN_NAME);
mockPaymentProviderPlugin.clear();
@@ -172,25 +168,21 @@ public class TestRetryService extends PaymentTestSuiteNoDB {
moveClockForFailureType(FailureType.PAYMENT_FAILURE, 0);
- try {
- await().atMost(TIMEOUT, SECONDS).until(new Callable<Boolean>() {
- @Override
- public Boolean call() throws Exception {
- final List<PaymentAttemptModelDao> attempts = paymentDao.getPaymentAttempts(paymentExternalKey, internalCallContext);
- final List<PaymentAttemptModelDao> filteredAttempts = ImmutableList.copyOf(Iterables.filter(attempts, new Predicate<PaymentAttemptModelDao>() {
- @Override
- public boolean apply(final PaymentAttemptModelDao input) {
- return input.getStateName().equals("SUCCESS") ||
- input.getStateName().equals("RETRIED") ||
- input.getStateName().equals("ABORTED");
- }
- }));
- return filteredAttempts.size() == 2;
- }
- });
- } catch (final TimeoutException e) {
- fail("Timeout ");
- }
+ await().atMost(TIMEOUT, SECONDS).until(new Callable<Boolean>() {
+ @Override
+ public Boolean call() throws Exception {
+ final List<PaymentAttemptModelDao> attempts = paymentDao.getPaymentAttempts(paymentExternalKey, internalCallContext);
+ final List<PaymentAttemptModelDao> filteredAttempts = ImmutableList.copyOf(Iterables.filter(attempts, new Predicate<PaymentAttemptModelDao>() {
+ @Override
+ public boolean apply(final PaymentAttemptModelDao input) {
+ return input.getStateName().equals("SUCCESS") ||
+ input.getStateName().equals("RETRIED") ||
+ input.getStateName().equals("ABORTED");
+ }
+ }));
+ return filteredAttempts.size() == 2;
+ }
+ });
attempts = paymentDao.getPaymentAttempts(payment.getExternalKey(), internalCallContext);
final int expectedAttempts = 2;
@@ -258,25 +250,21 @@ public class TestRetryService extends PaymentTestSuiteNoDB {
moveClockForFailureType(FailureType.PAYMENT_FAILURE, curFailure);
final int curFailureCondition = curFailure;
- try {
- await().atMost(TIMEOUT, SECONDS).until(new Callable<Boolean>() {
- @Override
- public Boolean call() throws Exception {
- final List<PaymentAttemptModelDao> attempts = paymentDao.getPaymentAttempts(paymentExternalKey, internalCallContext);
- final List<PaymentAttemptModelDao> filteredAttempts = ImmutableList.copyOf(Iterables.filter(attempts, new Predicate<PaymentAttemptModelDao>() {
- @Override
- public boolean apply(final PaymentAttemptModelDao input) {
- return input.getStateName().equals("SUCCESS") ||
- input.getStateName().equals("RETRIED") ||
- input.getStateName().equals("ABORTED");
- }
- }));
- return filteredAttempts.size() == curFailureCondition + 2;
- }
- });
- } catch (final TimeoutException e) {
- fail("Timeout curFailure = " + curFailureCondition);
- }
+ await().atMost(TIMEOUT, SECONDS).until(new Callable<Boolean>() {
+ @Override
+ public Boolean call() throws Exception {
+ final List<PaymentAttemptModelDao> attempts = paymentDao.getPaymentAttempts(paymentExternalKey, internalCallContext);
+ final List<PaymentAttemptModelDao> filteredAttempts = ImmutableList.copyOf(Iterables.filter(attempts, new Predicate<PaymentAttemptModelDao>() {
+ @Override
+ public boolean apply(final PaymentAttemptModelDao input) {
+ return input.getStateName().equals("SUCCESS") ||
+ input.getStateName().equals("RETRIED") ||
+ input.getStateName().equals("ABORTED");
+ }
+ }));
+ return filteredAttempts.size() == curFailureCondition + 2;
+ }
+ });
}
attempts = paymentDao.getPaymentAttempts(payment.getExternalKey(), internalCallContext);
final int expectedAttempts = maxTries + 1;
@@ -343,25 +331,21 @@ public class TestRetryService extends PaymentTestSuiteNoDB {
moveClockForFailureType(FailureType.PAYMENT_FAILURE, curFailure);
final int curFailureCondition = curFailure;
- try {
- await().atMost(TIMEOUT, SECONDS).until(new Callable<Boolean>() {
- @Override
- public Boolean call() throws Exception {
- final List<PaymentAttemptModelDao> attempts = paymentDao.getPaymentAttempts(paymentExternalKey, internalCallContext);
- final List<PaymentAttemptModelDao> filteredAttempts = ImmutableList.copyOf(Iterables.filter(attempts, new Predicate<PaymentAttemptModelDao>() {
- @Override
- public boolean apply(final PaymentAttemptModelDao input) {
- return input.getStateName().equals("SUCCESS") ||
- input.getStateName().equals("RETRIED") ||
- input.getStateName().equals("ABORTED");
- }
- }));
- return filteredAttempts.size() == curFailureCondition + 2;
- }
- });
- } catch (final TimeoutException e) {
- fail("Timeout curFailure = " + curFailureCondition);
- }
+ await().atMost(TIMEOUT, SECONDS).until(new Callable<Boolean>() {
+ @Override
+ public Boolean call() throws Exception {
+ final List<PaymentAttemptModelDao> attempts = paymentDao.getPaymentAttempts(paymentExternalKey, internalCallContext);
+ final List<PaymentAttemptModelDao> filteredAttempts = ImmutableList.copyOf(Iterables.filter(attempts, new Predicate<PaymentAttemptModelDao>() {
+ @Override
+ public boolean apply(final PaymentAttemptModelDao input) {
+ return input.getStateName().equals("SUCCESS") ||
+ input.getStateName().equals("RETRIED") ||
+ input.getStateName().equals("ABORTED");
+ }
+ }));
+ return filteredAttempts.size() == curFailureCondition + 2;
+ }
+ });
}
attempts = paymentDao.getPaymentAttempts(payment.getExternalKey(), internalCallContext);
final int expectedAttempts = maxTries + 1;
pom.xml 2(+1 -1)
diff --git a/pom.xml b/pom.xml
index d5d52ae..4ea808d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>killbill-oss-parent</artifactId>
<groupId>org.kill-bill.billing</groupId>
- <version>0.140.21</version>
+ <version>0.140.25</version>
</parent>
<artifactId>killbill</artifactId>
<version>0.18.7-SNAPSHOT</version>
profiles/killbill/pom.xml 10(+5 -5)
diff --git a/profiles/killbill/pom.xml b/profiles/killbill/pom.xml
index d8ad48c..02e182a 100644
--- a/profiles/killbill/pom.xml
+++ b/profiles/killbill/pom.xml
@@ -73,11 +73,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.ning</groupId>
<artifactId>async-http-client</artifactId>
</dependency>
@@ -179,6 +174,11 @@
<artifactId>shiro-web</artifactId>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<scope>runtime</scope>
diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestBuildResponse.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestBuildResponse.java
index c7c622d..db8a13f 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestBuildResponse.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestBuildResponse.java
@@ -29,8 +29,7 @@ import org.killbill.billing.server.log.ServerTestSuiteNoDB;
import org.killbill.billing.util.config.definition.JaxrsConfig;
import org.testng.annotations.Test;
-import com.sun.jersey.api.client.ClientResponse.Status;
-
+import static javax.ws.rs.core.Response.Status.CREATED;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
@@ -50,7 +49,7 @@ public class TestBuildResponse extends ServerTestSuiteNoDB {
JaxrsUriBuilder uriBuilder = new JaxrsUriBuilder(jaxrsConfig);
Response response = uriBuilder.buildResponse(uriInfo, AccountResource.class, "getAccount", objectId, mockRequest(uriInfo));
- assertEquals(response.getStatus(), Status.CREATED.getStatusCode());
+ assertEquals(response.getStatus(), CREATED.getStatusCode());
assertEquals(response.getMetadata().get("Location").get(0), "/1.0/kb/accounts/" + objectId.toString());
}
@@ -67,7 +66,7 @@ public class TestBuildResponse extends ServerTestSuiteNoDB {
JaxrsUriBuilder uriBuilder = new JaxrsUriBuilder(jaxrsConfig);
Response response = uriBuilder.buildResponse(uriInfo, AccountResource.class, "getAccount", objectId, mockRequest(uriInfo));
- assertEquals(response.getStatus(), Status.CREATED.getStatusCode());
+ assertEquals(response.getStatus(), CREATED.getStatusCode());
assertEquals(response.getMetadata().get("Location").get(0), "/killbill/1.0/kb/accounts/" + objectId.toString());
}
@@ -85,7 +84,7 @@ public class TestBuildResponse extends ServerTestSuiteNoDB {
JaxrsUriBuilder uriBuilder = new JaxrsUriBuilder(jaxrsConfig);
Response response = uriBuilder.buildResponse(uriInfo, AccountResource.class, "getAccount", objectId, mockRequest(uriInfo));
- assertEquals(response.getStatus(), Status.CREATED.getStatusCode());
+ assertEquals(response.getStatus(), CREATED.getStatusCode());
assertEquals(response.getMetadata().get("Location").get(0).toString(), uri.toString() + "/1.0/kb/accounts/" + objectId.toString());
}
@@ -103,7 +102,7 @@ public class TestBuildResponse extends ServerTestSuiteNoDB {
JaxrsUriBuilder uriBuilder = new JaxrsUriBuilder(jaxrsConfig);
Response response = uriBuilder.buildResponse(uriInfo, AccountResource.class, "getAccount", objectId, mockRequest(uriInfo));
- assertEquals(response.getStatus(), Status.CREATED.getStatusCode());
+ assertEquals(response.getStatus(), CREATED.getStatusCode());
assertEquals(response.getMetadata().get("Location").get(0).toString(), uri.toString() + "/1.0/kb/accounts/" + objectId.toString());
}
diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPerTenantConfig.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPerTenantConfig.java
index ea4ab18..a8d572d 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPerTenantConfig.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestPerTenantConfig.java
@@ -36,8 +36,8 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.google.inject.Inject;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
+import org.awaitility.Awaitility;
+import org.awaitility.Duration;
public class TestPerTenantConfig extends TestJaxrsBase {
diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestTenantKV.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestTenantKV.java
index 5232201..fbff4b5 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestTenantKV.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestTenantKV.java
@@ -43,8 +43,8 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Resources;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
+import org.awaitility.Awaitility;
+import org.awaitility.Duration;
public class TestTenantKV extends TestJaxrsBase {
subscription/pom.xml 10(+5 -5)
diff --git a/subscription/pom.xml b/subscription/pom.xml
index f878deb..e955b77 100644
--- a/subscription/pom.xml
+++ b/subscription/pom.xml
@@ -45,11 +45,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>io.airlift</groupId>
<artifactId>command</artifactId>
<scope>test</scope>
@@ -84,6 +79,11 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jdbi</groupId>
<artifactId>jdbi</artifactId>
</dependency>
util/pom.xml 10(+5 -5)
diff --git a/util/pom.xml b/util/pom.xml
index 9d9fb0a..c41afa1 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -74,11 +74,6 @@
<artifactId>guice-multibindings</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.samskivert</groupId>
<artifactId>jmustache</artifactId>
</dependency>
@@ -150,6 +145,11 @@
<artifactId>shiro-guice</artifactId>
</dependency>
<dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
</dependency>
diff --git a/util/src/test/java/org/killbill/billing/api/TestApiListener.java b/util/src/test/java/org/killbill/billing/api/TestApiListener.java
index 95ac19d..886dd99 100644
--- a/util/src/test/java/org/killbill/billing/api/TestApiListener.java
+++ b/util/src/test/java/org/killbill/billing/api/TestApiListener.java
@@ -53,7 +53,7 @@ import org.testng.Assert;
import com.google.common.base.Joiner;
import com.google.common.eventbus.Subscribe;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;