killbill 3.1.3 → 3.1.4

data/lib/killbill/gen/api/tag_definition.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/tag_definition_api_exception.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/tag_user_api.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/tenant.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/tenant_api_exception.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/tenant_context.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/tenant_data.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/tenant_kv.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/tenant_user_api.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/tier.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/tiered_block.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/unit.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/usage.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/api/usage_user_api.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/plugin-api/currency_plugin_api.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/plugin-api/ext_bus_event.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/plugin-api/gateway_notification.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/plugin-api/notification_plugin_api.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/plugin-api/payment_method_info_plugin.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #

data/lib/killbill/gen/plugin-api/payment_plugin_api.rb

@@ -1,10 +1,11 @@
 ###################################################################################
 #                                                                                 #
 #                   Copyright 2010-2013 Ning, Inc.                                #
+#                   Copyright 2014 The Billing Project, LLC                       #
 #                                                                                 #
-#      Ning 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:                         #
+#      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                             #
 #                                                                                 #
@@ -37,8 +38,8 @@ module Killbill
         end
 
 
-        java_signature 'Java::org.killbill.billing.payment.plugin.api.PaymentInfoPlugin authorizePayment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def authorize_payment(kbAccountId, kbPaymentId, kbPaymentMethodId, amount, currency, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin authorizePayment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def authorize_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, amount, currency, properties, context)
 
           # conversion for kbAccountId [type = java.util.UUID]
           kbAccountId = kbAccountId.nil? ? nil : kbAccountId.to_s
@@ -46,6 +47,9 @@ module Killbill
           # conversion for kbPaymentId [type = java.util.UUID]
           kbPaymentId = kbPaymentId.nil? ? nil : kbPaymentId.to_s
 
+          # conversion for kbTransactionId [type = java.util.UUID]
+          kbTransactionId = kbTransactionId.nil? ? nil : kbTransactionId.to_s
+
           # conversion for kbPaymentMethodId [type = java.util.UUID]
           kbPaymentMethodId = kbPaymentMethodId.nil? ? nil : kbPaymentMethodId.to_s
 
@@ -67,8 +71,8 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = Killbill::Plugin::Model::CallContext.new.to_ruby(context) unless context.nil?
           begin
-            res = @delegate_plugin.authorize_payment(kbAccountId, kbPaymentId, kbPaymentMethodId, amount, currency, properties, context)
-            # conversion for res [type = org.killbill.billing.payment.plugin.api.PaymentInfoPlugin]
+            res = @delegate_plugin.authorize_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, amount, currency, properties, context)
+            # conversion for res [type = org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin]
             res = res.to_java unless res.nil?
             return res
           rescue Exception => e
@@ -83,8 +87,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::org.killbill.billing.payment.plugin.api.PaymentInfoPlugin capturePayment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def capture_payment(kbAccountId, kbPaymentId, kbPaymentMethodId, amount, currency, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin capturePayment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def capture_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, amount, currency, properties, context)
 
           # conversion for kbAccountId [type = java.util.UUID]
           kbAccountId = kbAccountId.nil? ? nil : kbAccountId.to_s
@@ -92,6 +96,9 @@ module Killbill
           # conversion for kbPaymentId [type = java.util.UUID]
           kbPaymentId = kbPaymentId.nil? ? nil : kbPaymentId.to_s
 
+          # conversion for kbTransactionId [type = java.util.UUID]
+          kbTransactionId = kbTransactionId.nil? ? nil : kbTransactionId.to_s
+
           # conversion for kbPaymentMethodId [type = java.util.UUID]
           kbPaymentMethodId = kbPaymentMethodId.nil? ? nil : kbPaymentMethodId.to_s
 
@@ -113,8 +120,8 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = Killbill::Plugin::Model::CallContext.new.to_ruby(context) unless context.nil?
           begin
-            res = @delegate_plugin.capture_payment(kbAccountId, kbPaymentId, kbPaymentMethodId, amount, currency, properties, context)
-            # conversion for res [type = org.killbill.billing.payment.plugin.api.PaymentInfoPlugin]
+            res = @delegate_plugin.capture_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, amount, currency, properties, context)
+            # conversion for res [type = org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin]
             res = res.to_java unless res.nil?
             return res
           rescue Exception => e
@@ -129,8 +136,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::org.killbill.billing.payment.plugin.api.PaymentInfoPlugin processPayment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def process_payment(kbAccountId, kbPaymentId, kbPaymentMethodId, amount, currency, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin purchasePayment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def purchase_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, amount, currency, properties, context)
 
           # conversion for kbAccountId [type = java.util.UUID]
           kbAccountId = kbAccountId.nil? ? nil : kbAccountId.to_s
@@ -138,6 +145,9 @@ module Killbill
           # conversion for kbPaymentId [type = java.util.UUID]
           kbPaymentId = kbPaymentId.nil? ? nil : kbPaymentId.to_s
 
+          # conversion for kbTransactionId [type = java.util.UUID]
+          kbTransactionId = kbTransactionId.nil? ? nil : kbTransactionId.to_s
+
           # conversion for kbPaymentMethodId [type = java.util.UUID]
           kbPaymentMethodId = kbPaymentMethodId.nil? ? nil : kbPaymentMethodId.to_s
 
@@ -159,24 +169,24 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = Killbill::Plugin::Model::CallContext.new.to_ruby(context) unless context.nil?
           begin
-            res = @delegate_plugin.process_payment(kbAccountId, kbPaymentId, kbPaymentMethodId, amount, currency, properties, context)
-            # conversion for res [type = org.killbill.billing.payment.plugin.api.PaymentInfoPlugin]
+            res = @delegate_plugin.purchase_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, amount, currency, properties, context)
+            # conversion for res [type = org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin]
             res = res.to_java unless res.nil?
             return res
           rescue Exception => e
-            message = "Failure in process_payment: #{e}"
+            message = "Failure in purchase_payment: #{e}"
             unless e.backtrace.nil?
               message = "#{message}\n#{e.backtrace.join("\n")}"
             end
             logger.warn message
-            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("process_payment failure", e.message)
+            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("purchase_payment failure", e.message)
           ensure
             @delegate_plugin.after_request
           end
         end
 
-        java_signature 'Java::org.killbill.billing.payment.plugin.api.PaymentInfoPlugin voidPayment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def void_payment(kbAccountId, kbPaymentId, kbPaymentMethodId, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin voidPayment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def void_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, properties, context)
 
           # conversion for kbAccountId [type = java.util.UUID]
           kbAccountId = kbAccountId.nil? ? nil : kbAccountId.to_s
@@ -184,6 +194,9 @@ module Killbill
           # conversion for kbPaymentId [type = java.util.UUID]
           kbPaymentId = kbPaymentId.nil? ? nil : kbPaymentId.to_s
 
+          # conversion for kbTransactionId [type = java.util.UUID]
+          kbTransactionId = kbTransactionId.nil? ? nil : kbTransactionId.to_s
+
           # conversion for kbPaymentMethodId [type = java.util.UUID]
           kbPaymentMethodId = kbPaymentMethodId.nil? ? nil : kbPaymentMethodId.to_s
 
@@ -199,8 +212,8 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = Killbill::Plugin::Model::CallContext.new.to_ruby(context) unless context.nil?
           begin
-            res = @delegate_plugin.void_payment(kbAccountId, kbPaymentId, kbPaymentMethodId, properties, context)
-            # conversion for res [type = org.killbill.billing.payment.plugin.api.PaymentInfoPlugin]
+            res = @delegate_plugin.void_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, properties, context)
+            # conversion for res [type = org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin]
             res = res.to_java unless res.nil?
             return res
           rescue Exception => e
@@ -215,8 +228,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::org.killbill.billing.payment.plugin.api.PaymentInfoPlugin getPaymentInfo(Java::java.util.UUID, Java::java.util.UUID, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
-        def get_payment_info(kbAccountId, kbPaymentId, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin creditPayment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def credit_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, amount, currency, properties, context)
 
           # conversion for kbAccountId [type = java.util.UUID]
           kbAccountId = kbAccountId.nil? ? nil : kbAccountId.to_s
@@ -224,42 +237,17 @@ module Killbill
           # conversion for kbPaymentId [type = java.util.UUID]
           kbPaymentId = kbPaymentId.nil? ? nil : kbPaymentId.to_s
 
-          # conversion for properties [type = java.lang.Iterable]
-          tmp = []
-          (properties.nil? ? [] : properties.iterator).each do |m|
-            # conversion for m [type = org.killbill.billing.payment.api.PluginProperty]
-            m = Killbill::Plugin::Model::PluginProperty.new.to_ruby(m) unless m.nil?
-            tmp << m
-          end
-          properties = tmp
-
-          # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
-          context = Killbill::Plugin::Model::TenantContext.new.to_ruby(context) unless context.nil?
-          begin
-            res = @delegate_plugin.get_payment_info(kbAccountId, kbPaymentId, properties, context)
-            # conversion for res [type = org.killbill.billing.payment.plugin.api.PaymentInfoPlugin]
-            res = res.to_java unless res.nil?
-            return res
-          rescue Exception => e
-            message = "Failure in get_payment_info: #{e}"
-            unless e.backtrace.nil?
-              message = "#{message}\n#{e.backtrace.join("\n")}"
-            end
-            logger.warn message
-            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_payment_info failure", e.message)
-          ensure
-            @delegate_plugin.after_request
-          end
-        end
-
-        java_signature 'Java::org.killbill.billing.util.entity.Pagination searchPayments(Java::java.lang.String, Java::java.lang.Long, Java::java.lang.Long, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
-        def search_payments(searchKey, offset, limit, properties, context)
+          # conversion for kbTransactionId [type = java.util.UUID]
+          kbTransactionId = kbTransactionId.nil? ? nil : kbTransactionId.to_s
 
-          # conversion for searchKey [type = java.lang.String]
+          # conversion for kbPaymentMethodId [type = java.util.UUID]
+          kbPaymentMethodId = kbPaymentMethodId.nil? ? nil : kbPaymentMethodId.to_s
 
-          # conversion for offset [type = java.lang.Long]
+          # conversion for amount [type = java.math.BigDecimal]
+          amount = amount.nil? ? 0 : BigDecimal.new(amount.to_s)
 
-          # conversion for limit [type = java.lang.Long]
+          # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
+          currency = currency.to_s.to_sym unless currency.nil?
 
           # conversion for properties [type = java.lang.Iterable]
           tmp = []
@@ -270,27 +258,27 @@ module Killbill
           end
           properties = tmp
 
-          # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
-          context = Killbill::Plugin::Model::TenantContext.new.to_ruby(context) unless context.nil?
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = Killbill::Plugin::Model::CallContext.new.to_ruby(context) unless context.nil?
           begin
-            res = @delegate_plugin.search_payments(searchKey, offset, limit, properties, context)
-            # conversion for res [type = org.killbill.billing.util.entity.Pagination]
+            res = @delegate_plugin.credit_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, amount, currency, properties, context)
+            # conversion for res [type = org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin]
             res = res.to_java unless res.nil?
             return res
           rescue Exception => e
-            message = "Failure in search_payments: #{e}"
+            message = "Failure in credit_payment: #{e}"
             unless e.backtrace.nil?
               message = "#{message}\n#{e.backtrace.join("\n")}"
             end
             logger.warn message
-            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("search_payments failure", e.message)
+            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("credit_payment failure", e.message)
           ensure
             @delegate_plugin.after_request
           end
         end
 
-        java_signature 'Java::org.killbill.billing.payment.plugin.api.RefundInfoPlugin processRefund(Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def process_refund(kbAccountId, kbPaymentId, refundAmount, currency, properties, context)
+        java_signature 'Java::org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin refundPayment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def refund_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, amount, currency, properties, context)
 
           # conversion for kbAccountId [type = java.util.UUID]
           kbAccountId = kbAccountId.nil? ? nil : kbAccountId.to_s
@@ -298,8 +286,14 @@ module Killbill
           # conversion for kbPaymentId [type = java.util.UUID]
           kbPaymentId = kbPaymentId.nil? ? nil : kbPaymentId.to_s
 
-          # conversion for refundAmount [type = java.math.BigDecimal]
-          refundAmount = refundAmount.nil? ? 0 : BigDecimal.new(refundAmount.to_s)
+          # conversion for kbTransactionId [type = java.util.UUID]
+          kbTransactionId = kbTransactionId.nil? ? nil : kbTransactionId.to_s
+
+          # conversion for kbPaymentMethodId [type = java.util.UUID]
+          kbPaymentMethodId = kbPaymentMethodId.nil? ? nil : kbPaymentMethodId.to_s
+
+          # conversion for amount [type = java.math.BigDecimal]
+          amount = amount.nil? ? 0 : BigDecimal.new(amount.to_s)
 
           # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
           currency = currency.to_s.to_sym unless currency.nil?
@@ -316,24 +310,24 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = Killbill::Plugin::Model::CallContext.new.to_ruby(context) unless context.nil?
           begin
-            res = @delegate_plugin.process_refund(kbAccountId, kbPaymentId, refundAmount, currency, properties, context)
-            # conversion for res [type = org.killbill.billing.payment.plugin.api.RefundInfoPlugin]
+            res = @delegate_plugin.refund_payment(kbAccountId, kbPaymentId, kbTransactionId, kbPaymentMethodId, amount, currency, properties, context)
+            # conversion for res [type = org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin]
             res = res.to_java unless res.nil?
             return res
           rescue Exception => e
-            message = "Failure in process_refund: #{e}"
+            message = "Failure in refund_payment: #{e}"
             unless e.backtrace.nil?
               message = "#{message}\n#{e.backtrace.join("\n")}"
             end
             logger.warn message
-            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("process_refund failure", e.message)
+            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("refund_payment failure", e.message)
           ensure
             @delegate_plugin.after_request
           end
         end
 
-        java_signature 'Java::java.util.List getRefundInfo(Java::java.util.UUID, Java::java.util.UUID, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
-        def get_refund_info(kbAccountId, kbPaymentId, properties, context)
+        java_signature 'Java::java.util.List getPaymentInfo(Java::java.util.UUID, Java::java.util.UUID, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_payment_info(kbAccountId, kbPaymentId, properties, context)
 
           # conversion for kbAccountId [type = java.util.UUID]
           kbAccountId = kbAccountId.nil? ? nil : kbAccountId.to_s
@@ -353,30 +347,30 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
           context = Killbill::Plugin::Model::TenantContext.new.to_ruby(context) unless context.nil?
           begin
-            res = @delegate_plugin.get_refund_info(kbAccountId, kbPaymentId, properties, context)
+            res = @delegate_plugin.get_payment_info(kbAccountId, kbPaymentId, properties, context)
             # conversion for res [type = java.util.List]
             tmp = java.util.ArrayList.new
             (res || []).each do |m|
-              # conversion for m [type = org.killbill.billing.payment.plugin.api.RefundInfoPlugin]
+              # conversion for m [type = org.killbill.billing.payment.plugin.api.PaymentTransactionInfoPlugin]
               m = m.to_java unless m.nil?
               tmp.add(m)
             end
             res = tmp
             return res
           rescue Exception => e
-            message = "Failure in get_refund_info: #{e}"
+            message = "Failure in get_payment_info: #{e}"
             unless e.backtrace.nil?
               message = "#{message}\n#{e.backtrace.join("\n")}"
             end
             logger.warn message
-            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_refund_info failure", e.message)
+            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("get_payment_info failure", e.message)
           ensure
             @delegate_plugin.after_request
           end
         end
 
-        java_signature 'Java::org.killbill.billing.util.entity.Pagination searchRefunds(Java::java.lang.String, Java::java.lang.Long, Java::java.lang.Long, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
-        def search_refunds(searchKey, offset, limit, properties, context)
+        java_signature 'Java::org.killbill.billing.util.entity.Pagination searchPayments(Java::java.lang.String, Java::java.lang.Long, Java::java.lang.Long, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def search_payments(searchKey, offset, limit, properties, context)
 
           # conversion for searchKey [type = java.lang.String]
 
@@ -396,17 +390,17 @@ module Killbill
           # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
           context = Killbill::Plugin::Model::TenantContext.new.to_ruby(context) unless context.nil?
           begin
-            res = @delegate_plugin.search_refunds(searchKey, offset, limit, properties, context)
+            res = @delegate_plugin.search_payments(searchKey, offset, limit, properties, context)
             # conversion for res [type = org.killbill.billing.util.entity.Pagination]
             res = res.to_java unless res.nil?
             return res
           rescue Exception => e
-            message = "Failure in search_refunds: #{e}"
+            message = "Failure in search_payments: #{e}"
             unless e.backtrace.nil?
               message = "#{message}\n#{e.backtrace.join("\n")}"
             end
             logger.warn message
-            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("search_refunds failure", e.message)
+            raise Java::org.killbill.billing.payment.plugin.api.PaymentPluginApiException.new("search_payments failure", e.message)
           ensure
             @delegate_plugin.after_request
           end