killbill 9.2.1 → 9.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4687364a701565146d3b166c0d52e7409bb78bf5
-  data.tar.gz: 7e188584ee75971ac8624c13b1994df080aa22cc
+  metadata.gz: d4b3c904551bc86f9e98e4bd696435490a1878e0
+  data.tar.gz: 09bd877095df109669dab84a793ea954adc8c307
 SHA512:
-  metadata.gz: 6fc0e8aa9a7474513e8efdca22f56b6644815538b557961dfbfc2d9c65e83550067aeb002d3235fa191aa73452643e525cb80cc739c2728da8b85a997fbad06e
-  data.tar.gz: 046e127a84ffd444bc4f5734b9fead68ffd855bc65c3b30e3f9f6e46f0b123687585c04fcec85ca8f4b440bfdbb0391721a684a1fa16d0fde1e3602491779f15
+  metadata.gz: f007e62b8b2882b5ef31deb39567397230f66473ec32f1638862e1120d171350f4fb2411fdf762aeaaf46b1940161f019f0780dec6ca2e7833e02f049cb96257
+  data.tar.gz: c2e30a6996f08f71861a9f0482ea37a63a9cc24801ebabd4d54fd9fafd3953fa22837202cb9d22f9a241c028053abf833839e3273ba04dcf6f1b31c885ec7f66

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill (9.2.1)
+    killbill (9.2.2)
       rack (>= 1.5.2)
       sinatra (~> 1.3.4)
       typhoeus (~> 0.6.9)

data/Jarfile

@@ -1,12 +1,12 @@
-jar 'org.kill-bill.billing:killbill-api', '0.51.12'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.24.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.24.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.24.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.24.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.24.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.24.4'
-jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.24.4'
-jar 'org.kill-bill.billing:killbill-util:tests', '0.19.5'
-jar 'org.kill-bill.billing:killbill-util', '0.19.5'
+jar 'org.kill-bill.billing:killbill-api', '0.51.13'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-currency', '0.24.6'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-invoice', '0.24.6'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-notification', '0.24.6'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-payment', '0.24.6'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-control', '0.24.6'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-catalog', '0.24.6'
+jar 'org.kill-bill.billing.plugin:killbill-plugin-api-entitlement', '0.24.6'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.19.6'
+jar 'org.kill-bill.billing:killbill-util', '0.19.6'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '4.0.0'

data/Jarfile.lock

@@ -5,17 +5,19 @@
 - com.fasterxml.jackson.dataformat:jackson-dataformat-csv:jar:2.6.7
 - org.skife.config:config-magic:jar:0.17
 - org.weakref:jmxutils:jar:1.19
+- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.24.6
 - aopalliance:aopalliance:jar:1.0
-- org.kill-bill.commons:killbill-concurrent:jar:0.21.8
-- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.24.4
 - org.osgi:org.osgi.core:jar:5.0.0
 - com.ning:async-http-client:jar:1.9.40
-- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.21.8
-- org.kill-bill.billing:killbill-platform-osgi:jar:0.37.9
-- org.kill-bill.billing:killbill-platform-lifecycle:jar:0.37.9
-- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.24.4
+- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.37.10
+- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.24.6
+- org.kill-bill.billing:killbill-api:jar:0.51.13
+- org.kill-bill.billing:killbill-util:jar:0.19.6
+- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.24.6
+- org.kill-bill.billing:killbill-util:jar:tests:0.19.6
 - org.joda:joda-money:jar:0.9
 - org.ehcache.integrations.shiro:shiro-ehcache3:jar:1.0.0
+- org.kill-bill.billing:killbill-platform-base:jar:0.37.10
 - com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.6.7
 - com.fasterxml:classmate:jar:1.1.0
 - org.slf4j:jcl-over-slf4j:jar:1.7.25
@@ -24,47 +26,45 @@
 - org.apache.felix:org.apache.felix.framework:jar:4.4.1
 - org.ehcache:ehcache-clustered:jar:3.3.1
 - com.google.code.findbugs:jsr305:jar:3.0.1
-- org.kill-bill.billing.plugin:killbill-plugin-api-invoice:jar:0.24.4
 - com.google.guava:guava:jar:20.0
 - com.samskivert:jmustache:jar:1.5
-- org.kill-bill.commons:killbill-locker:jar:0.21.8
-- org.kill-bill.commons:killbill-xmlloader:jar:0.21.8
+- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.24.6
+- org.kill-bill.commons:killbill-clock:jar:0.21.9
 - javax.cache:cache-api:jar:1.0.0
-- org.kill-bill.billing:killbill-util:jar:0.19.5
-- org.kill-bill.billing:killbill-internal-api:jar:0.19.5
 - org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:jar:1.16
-- org.kill-bill.billing.plugin:killbill-plugin-api-notification:jar:0.24.4
 - javax.servlet:javax.servlet-api:jar:4.0.0
+- org.kill-bill.billing:killbill-platform-osgi:jar:0.37.10
+- org.kill-bill.billing.plugin:killbill-plugin-api-currency:jar:0.24.6
 - com.fasterxml.jackson.core:jackson-annotations:jar:2.6.7
-- org.kill-bill.billing:killbill-platform-api:jar:0.37.9
-- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.24.4
 - org.apache.shiro:shiro-core:jar:1.3.2
+- org.kill-bill.billing.plugin:killbill-plugin-api-catalog:jar:0.24.6
 - org.ow2.asm:asm:jar:5.0.3
 - com.fasterxml.jackson.core:jackson-databind:jar:2.6.7
-- org.kill-bill.billing.plugin:killbill-plugin-api-payment:jar:0.24.4
+- org.kill-bill.commons:killbill-xmlloader:jar:0.21.9
 - com.google.code.findbugs:annotations:jar:3.0.1u2
-- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.37.9
+- org.kill-bill.commons:killbill-locker:jar:0.21.9
 - org.antlr:ST4:jar:4.0.8
 - org.apache.shiro:shiro-guice:jar:1.3.2
-- org.kill-bill.commons:killbill-jdbi:jar:0.21.8
 - org.antlr:antlr-runtime:jar:3.5.2
-- org.kill-bill.commons:killbill-queue:jar:0.21.8
 - org.ehcache:ehcache:jar:3.3.1
 - io.dropwizard.metrics:metrics-jcache:jar:3.2.2
+- org.kill-bill.billing:killbill-internal-api:jar:0.19.6
 - com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.6.7
 - com.google.inject.extensions:guice-multibindings:jar:3.0
-- org.kill-bill.commons:killbill-clock:jar:0.21.8
 - joda-time:joda-time:jar:2.9.9
 - javax.inject:javax.inject:jar:1
-- org.kill-bill.billing.plugin:killbill-plugin-api-control:jar:0.24.4
+- org.kill-bill.commons:killbill-concurrent:jar:0.21.9
 - com.h2database:h2:jar:1.4.194
 - commons-beanutils:commons-beanutils:jar:1.8.3
 - com.fasterxml.jackson.core:jackson-core:jar:2.6.7
 - cglib:cglib:jar:3.1
 - io.dropwizard.metrics:metrics-core:jar:3.2.2
+- org.kill-bill.billing:killbill-platform-api:jar:0.37.10
 - org.slf4j:slf4j-api:jar:1.7.25
-- org.kill-bill.billing:killbill-util:jar:tests:0.19.5
-- org.kill-bill.billing:killbill-platform-base:jar:0.37.9
+- org.kill-bill.commons:killbill-queue:jar:0.21.9
+- org.kill-bill.billing.plugin:killbill-plugin-api-entitlement:jar:0.24.6
+- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.21.9
+- org.kill-bill.commons:killbill-jdbi:jar:0.21.9
 - org.mockito:mockito-all:jar:1.10.19
-- org.kill-bill.billing:killbill-api:jar:0.51.12
 - org.osgi:org.osgi.compendium:jar:5.0.0
+- org.kill-bill.billing:killbill-platform-lifecycle:jar:0.37.10

data/NEWS

@@ -1,9 +1,19 @@
+9.2.2
+    Release for Kill Bill 0.19.7
+    ActiveMerchant: pass in extra_params to gateway api calls
+
 9.2.1
     Release for Kill Bill 0.19.6
 
 9.2.0
     Initial release for Kill Bill 0.19.x
 
+8.3.4
+    ActiveMerchant: pass in extra_params to gateway api calls
+
+8.3.3
+    active_merchant: update default CC year in tests
+
 8.3.2
     Merge global configuration into each account specific configuration
 

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

@@ -0,0 +1,193 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 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.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module Killbill
+  module Plugin
+    module Model
+
+      java_package 'org.killbill.billing.invoice.plugin.api'
+      class InvoiceContext
+
+        include org.killbill.billing.invoice.plugin.api.InvoiceContext
+
+        attr_accessor :user_token, :user_name, :call_origin, :user_type, :reason_code, :comments, :created_date, :updated_date, :account_id, :tenant_id, :target_date, :invoice, :existing_invoices, :is_dry_run, :is_rescheduled
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for user_token [type = java.util.UUID]
+          @user_token = java.util.UUID.fromString(@user_token.to_s) unless @user_token.nil?
+
+          # conversion for user_name [type = java.lang.String]
+          @user_name = @user_name.to_s unless @user_name.nil?
+
+          # conversion for call_origin [type = org.killbill.billing.util.callcontext.CallOrigin]
+          @call_origin = Java::org.killbill.billing.util.callcontext.CallOrigin.value_of( @call_origin.to_s ) unless @call_origin.nil?
+
+          # conversion for user_type [type = org.killbill.billing.util.callcontext.UserType]
+          @user_type = Java::org.killbill.billing.util.callcontext.UserType.value_of( @user_type.to_s ) unless @user_type.nil?
+
+          # conversion for reason_code [type = java.lang.String]
+          @reason_code = @reason_code.to_s unless @reason_code.nil?
+
+          # conversion for comments [type = java.lang.String]
+          @comments = @comments.to_s unless @comments.nil?
+
+          # conversion for created_date [type = org.joda.time.DateTime]
+          if !@created_date.nil?
+            @created_date =  (@created_date.kind_of? Time) ? DateTime.parse(@created_date.to_s) : @created_date
+            @created_date = Java::org.joda.time.DateTime.new(@created_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+
+          # conversion for updated_date [type = org.joda.time.DateTime]
+          if !@updated_date.nil?
+            @updated_date =  (@updated_date.kind_of? Time) ? DateTime.parse(@updated_date.to_s) : @updated_date
+            @updated_date = Java::org.joda.time.DateTime.new(@updated_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+
+          # conversion for account_id [type = java.util.UUID]
+          @account_id = java.util.UUID.fromString(@account_id.to_s) unless @account_id.nil?
+
+          # conversion for tenant_id [type = java.util.UUID]
+          @tenant_id = java.util.UUID.fromString(@tenant_id.to_s) unless @tenant_id.nil?
+
+          # conversion for target_date [type = org.joda.time.LocalDate]
+          if !@target_date.nil?
+            @target_date = Java::org.joda.time.LocalDate.parse(@target_date.to_s)
+          end
+
+          # conversion for invoice [type = org.killbill.billing.invoice.api.Invoice]
+          @invoice = @invoice.to_java unless @invoice.nil?
+
+          # conversion for existing_invoices [type = java.util.List]
+          tmp = java.util.ArrayList.new
+          (@existing_invoices || []).each do |m|
+            # conversion for m [type = org.killbill.billing.invoice.api.Invoice]
+            m = m.to_java unless m.nil?
+            tmp.add(m)
+          end
+          @existing_invoices = tmp
+
+          # conversion for is_dry_run [type = boolean]
+          @is_dry_run = @is_dry_run.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_dry_run)
+
+          # conversion for is_rescheduled [type = boolean]
+          @is_rescheduled = @is_rescheduled.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_rescheduled)
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for user_token [type = java.util.UUID]
+          @user_token = j_obj.user_token
+          @user_token = @user_token.nil? ? nil : @user_token.to_s
+
+          # conversion for user_name [type = java.lang.String]
+          @user_name = j_obj.user_name
+
+          # conversion for call_origin [type = org.killbill.billing.util.callcontext.CallOrigin]
+          @call_origin = j_obj.call_origin
+          @call_origin = @call_origin.to_s.to_sym unless @call_origin.nil?
+
+          # conversion for user_type [type = org.killbill.billing.util.callcontext.UserType]
+          @user_type = j_obj.user_type
+          @user_type = @user_type.to_s.to_sym unless @user_type.nil?
+
+          # conversion for reason_code [type = java.lang.String]
+          @reason_code = j_obj.reason_code
+
+          # conversion for comments [type = java.lang.String]
+          @comments = j_obj.comments
+
+          # conversion for created_date [type = org.joda.time.DateTime]
+          @created_date = j_obj.created_date
+          if !@created_date.nil?
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
+            str = fmt.print(@created_date)
+            @created_date = DateTime.iso8601(str)
+          end
+
+          # conversion for updated_date [type = org.joda.time.DateTime]
+          @updated_date = j_obj.updated_date
+          if !@updated_date.nil?
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
+            str = fmt.print(@updated_date)
+            @updated_date = DateTime.iso8601(str)
+          end
+
+          # conversion for account_id [type = java.util.UUID]
+          @account_id = j_obj.account_id
+          @account_id = @account_id.nil? ? nil : @account_id.to_s
+
+          # conversion for tenant_id [type = java.util.UUID]
+          @tenant_id = j_obj.tenant_id
+          @tenant_id = @tenant_id.nil? ? nil : @tenant_id.to_s
+
+          # conversion for target_date [type = org.joda.time.LocalDate]
+          @target_date = j_obj.target_date
+          if !@target_date.nil?
+            @target_date = @target_date.to_s
+          end
+
+          # conversion for invoice [type = org.killbill.billing.invoice.api.Invoice]
+          @invoice = j_obj.invoice
+          @invoice = Killbill::Plugin::Model::Invoice.new.to_ruby(@invoice) unless @invoice.nil?
+
+          # conversion for existing_invoices [type = java.util.List]
+          @existing_invoices = j_obj.existing_invoices
+          tmp = []
+          (@existing_invoices || []).each do |m|
+            # conversion for m [type = org.killbill.billing.invoice.api.Invoice]
+            m = Killbill::Plugin::Model::Invoice.new.to_ruby(m) unless m.nil?
+            tmp << m
+          end
+          @existing_invoices = tmp
+
+          # conversion for is_dry_run [type = boolean]
+          @is_dry_run = j_obj.is_dry_run
+          if @is_dry_run.nil?
+            @is_dry_run = false
+          else
+            tmp_bool = (@is_dry_run.java_kind_of? java.lang.Boolean) ? @is_dry_run.boolean_value : @is_dry_run
+            @is_dry_run = tmp_bool ? true : false
+          end
+
+          # conversion for is_rescheduled [type = boolean]
+          @is_rescheduled = j_obj.is_rescheduled
+          if @is_rescheduled.nil?
+            @is_rescheduled = false
+          else
+            tmp_bool = (@is_rescheduled.java_kind_of? java.lang.Boolean) ? @is_rescheduled.boolean_value : @is_rescheduled
+            @is_rescheduled = tmp_bool ? true : false
+          end
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -40,6 +40,37 @@ module Killbill
         end
 
 
+        java_signature 'Java::org.killbill.billing.invoice.plugin.api.PriorInvoiceResult priorCall(Java::org.killbill.billing.invoice.plugin.api.InvoiceContext, Java::java.lang.Iterable)'
+        def prior_call(context, properties)
+
+          # conversion for context [type = org.killbill.billing.invoice.plugin.api.InvoiceContext]
+          context = Killbill::Plugin::Model::InvoiceContext.new.to_ruby(context) unless context.nil?
+
+          # 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
+          begin
+            res = @delegate_plugin.prior_call(context, properties)
+            # conversion for res [type = org.killbill.billing.invoice.plugin.api.PriorInvoiceResult]
+            res = res.to_java unless res.nil?
+            return res
+          rescue Exception => e
+            message = "Failure in prior_call: #{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("prior_call failure", e.message)
+          ensure
+            @delegate_plugin.after_request
+          end
+        end
+
         java_signature 'Java::java.util.List getAdditionalInvoiceItems(Java::org.killbill.billing.invoice.api.Invoice, Java::boolean, Java::java.lang.Iterable, Java::org.killbill.billing.util.callcontext.CallContext)'
         def get_additional_invoice_items(invoice, dryRun, properties, context)
 
@@ -87,6 +118,68 @@ module Killbill
             @delegate_plugin.after_request
           end
         end
+
+        java_signature 'Java::org.killbill.billing.invoice.plugin.api.OnSuccessInvoiceResult onSuccessCall(Java::org.killbill.billing.invoice.plugin.api.InvoiceContext, Java::java.lang.Iterable)'
+        def on_success_call(context, properties)
+
+          # conversion for context [type = org.killbill.billing.invoice.plugin.api.InvoiceContext]
+          context = Killbill::Plugin::Model::InvoiceContext.new.to_ruby(context) unless context.nil?
+
+          # 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
+          begin
+            res = @delegate_plugin.on_success_call(context, properties)
+            # conversion for res [type = org.killbill.billing.invoice.plugin.api.OnSuccessInvoiceResult]
+            res = res.to_java unless res.nil?
+            return res
+          rescue Exception => e
+            message = "Failure in on_success_call: #{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("on_success_call failure", e.message)
+          ensure
+            @delegate_plugin.after_request
+          end
+        end
+
+        java_signature 'Java::org.killbill.billing.invoice.plugin.api.OnFailureInvoiceResult onFailureCall(Java::org.killbill.billing.invoice.plugin.api.InvoiceContext, Java::java.lang.Iterable)'
+        def on_failure_call(context, properties)
+
+          # conversion for context [type = org.killbill.billing.invoice.plugin.api.InvoiceContext]
+          context = Killbill::Plugin::Model::InvoiceContext.new.to_ruby(context) unless context.nil?
+
+          # 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
+          begin
+            res = @delegate_plugin.on_failure_call(context, properties)
+            # conversion for res [type = org.killbill.billing.invoice.plugin.api.OnFailureInvoiceResult]
+            res = res.to_java unless res.nil?
+            return res
+          rescue Exception => e
+            message = "Failure in on_failure_call: #{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("on_failure_call failure", e.message)
+          ensure
+            @delegate_plugin.after_request
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,53 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 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.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module Killbill
+  module Plugin
+    module Model
+
+      java_package 'org.killbill.billing.invoice.plugin.api'
+      class OnFailureInvoiceResult
+
+        include org.killbill.billing.invoice.plugin.api.OnFailureInvoiceResult
+
+        attr_accessor 
+
+        def initialize()
+        end
+
+        def to_java()
+        self
+      end
+
+      def to_ruby(j_obj)
+      self
+    end
+
+  end
+end
+end
+end

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

@@ -0,0 +1,53 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 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.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module Killbill
+  module Plugin
+    module Model
+
+      java_package 'org.killbill.billing.invoice.plugin.api'
+      class OnSuccessInvoiceResult
+
+        include org.killbill.billing.invoice.plugin.api.OnSuccessInvoiceResult
+
+        attr_accessor 
+
+        def initialize()
+        end
+
+        def to_java()
+        self
+      end
+
+      def to_ruby(j_obj)
+      self
+    end
+
+  end
+end
+end
+end

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

@@ -0,0 +1,77 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 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.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module Killbill
+  module Plugin
+    module Model
+
+      java_package 'org.killbill.billing.invoice.plugin.api'
+      class PriorInvoiceResult
+
+        include org.killbill.billing.invoice.plugin.api.PriorInvoiceResult
+
+        attr_accessor :is_aborted, :reschedule_date
+
+        def initialize()
+        end
+
+        def to_java()
+          # conversion for is_aborted [type = boolean]
+          @is_aborted = @is_aborted.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(@is_aborted)
+
+          # conversion for reschedule_date [type = org.joda.time.DateTime]
+          if !@reschedule_date.nil?
+            @reschedule_date =  (@reschedule_date.kind_of? Time) ? DateTime.parse(@reschedule_date.to_s) : @reschedule_date
+            @reschedule_date = Java::org.joda.time.DateTime.new(@reschedule_date.to_s, Java::org.joda.time.DateTimeZone::UTC)
+          end
+          self
+        end
+
+        def to_ruby(j_obj)
+          # conversion for is_aborted [type = boolean]
+          @is_aborted = j_obj.is_aborted
+          if @is_aborted.nil?
+            @is_aborted = false
+          else
+            tmp_bool = (@is_aborted.java_kind_of? java.lang.Boolean) ? @is_aborted.boolean_value : @is_aborted
+            @is_aborted = tmp_bool ? true : false
+          end
+
+          # conversion for reschedule_date [type = org.joda.time.DateTime]
+          @reschedule_date = j_obj.reschedule_date
+          if !@reschedule_date.nil?
+            fmt = Java::org.joda.time.format.ISODateTimeFormat.date_time_no_millis # See https://github.com/killbill/killbill-java-parser/issues/3
+            str = fmt.print(@reschedule_date)
+            @reschedule_date = DateTime.iso8601(str)
+          end
+          self
+        end
+
+      end
+    end
+  end
+end

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

@@ -58,3 +58,7 @@ require 'killbill/gen/plugin-api/entitlement_plugin_api_exception'
 require 'killbill/gen/plugin-api/payment_transaction_info_plugin'
 require 'killbill/gen/plugin-api/hosted_payment_page_form_descriptor'
 require 'killbill/gen/plugin-api/gateway_notification'
+require 'killbill/gen/plugin-api/invoice_context'
+require 'killbill/gen/plugin-api/on_failure_invoice_result'
+require 'killbill/gen/plugin-api/on_success_invoice_result'
+require 'killbill/gen/plugin-api/prior_invoice_result'

data/lib/killbill/helpers/active_merchant/payment_plugin.rb

@@ -49,15 +49,15 @@ module Killbill
           end
         end
 
-        def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        def authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             gateway.authorize(amount_in_cents, payment_source, options)
           end
 
-          dispatch_to_gateways(:authorize, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
+          dispatch_to_gateways(:authorize, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, nil, extra_params)
         end
 
-        def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             gateway.capture(amount_in_cents, linked_transaction.txn_id, options)
           end
@@ -69,18 +69,18 @@ module Killbill
             last_authorization
           end
 
-          dispatch_to_gateways(:capture, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc)
+          dispatch_to_gateways(:capture, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc, extra_params)
         end
 
-        def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        def purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             gateway.purchase(amount_in_cents, payment_source, options)
           end
 
-          dispatch_to_gateways(:purchase, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
+          dispatch_to_gateways(:purchase, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, nil, extra_params)
         end
 
-        def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
+        def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context, extra_params = {})
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             authorization = linked_transaction.txn_id
 
@@ -99,18 +99,18 @@ module Killbill
             @transaction_model.find_candidate_transaction_for_void(kb_payment_id, context.tenant_id, linked_transaction_type)
           end
 
-          dispatch_to_gateways(:void, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, nil, nil, properties, context, gateway_call_proc, linked_transaction_proc)
+          dispatch_to_gateways(:void, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, nil, nil, properties, context, gateway_call_proc, linked_transaction_proc, extra_params)
         end
 
-        def credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        def credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             gateway.credit(amount_in_cents, payment_source, options)
           end
 
-          dispatch_to_gateways(:credit, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc)
+          dispatch_to_gateways(:credit, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, nil, extra_params)
         end
 
-        def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, extra_params = {})
           gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
             gateway.refund(amount_in_cents, linked_transaction.txn_id, options)
           end
@@ -123,7 +123,7 @@ module Killbill
             transaction
           end
 
-          dispatch_to_gateways(:refund, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc)
+          dispatch_to_gateways(:refund, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, linked_transaction_proc, extra_params)
         end
 
         def get_payment_info(kb_account_id, kb_payment_id, properties, context)

data/lib/killbill/version.rb

@@ -1,3 +1,3 @@
 module Killbill
-  VERSION = '9.2.1'
+  VERSION = '9.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 9.2.1
+  version: 9.2.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -532,14 +532,17 @@ files:
 - lib/killbill/gen/plugin-api/ext_bus_event.rb
 - lib/killbill/gen/plugin-api/gateway_notification.rb
 - lib/killbill/gen/plugin-api/hosted_payment_page_form_descriptor.rb
+- lib/killbill/gen/plugin-api/invoice_context.rb
 - lib/killbill/gen/plugin-api/invoice_payment_metadata.rb
 - lib/killbill/gen/plugin-api/invoice_plugin_api.rb
 - lib/killbill/gen/plugin-api/invoice_plugin_api_retry_exception.rb
 - lib/killbill/gen/plugin-api/notification_plugin_api.rb
 - lib/killbill/gen/plugin-api/notification_plugin_api_retry_exception.rb
 - lib/killbill/gen/plugin-api/on_failure_entitlement_result.rb
+- lib/killbill/gen/plugin-api/on_failure_invoice_result.rb
 - lib/killbill/gen/plugin-api/on_failure_payment_control_result.rb
 - lib/killbill/gen/plugin-api/on_success_entitlement_result.rb
+- lib/killbill/gen/plugin-api/on_success_invoice_result.rb
 - lib/killbill/gen/plugin-api/on_success_payment_control_result.rb
 - lib/killbill/gen/plugin-api/payment_control_api_exception.rb
 - lib/killbill/gen/plugin-api/payment_control_context.rb
@@ -550,6 +553,7 @@ files:
 - lib/killbill/gen/plugin-api/payment_plugin_api_exception.rb
 - lib/killbill/gen/plugin-api/payment_transaction_info_plugin.rb
 - lib/killbill/gen/plugin-api/prior_entitlement_result.rb
+- lib/killbill/gen/plugin-api/prior_invoice_result.rb
 - lib/killbill/gen/plugin-api/prior_payment_control_result.rb
 - lib/killbill/gen/plugin-api/require_gen.rb
 - lib/killbill/gen/plugin-api/standalone_plugin_catalog.rb