killbill 9.2.0 → 9.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d578e1ef04688003c404427d1164c71a0b26a22
-  data.tar.gz: 5fe18a0b545bb73a4131c2b212bd7eb958733633
+  metadata.gz: 4687364a701565146d3b166c0d52e7409bb78bf5
+  data.tar.gz: 7e188584ee75971ac8624c13b1994df080aa22cc
 SHA512:
-  metadata.gz: b9b47a64148b0c4f2532768871ae6bed3ba721787e438cdfee116c9ea1d82b6e293624bcf77f638f5c794dd4d49450ef27e8533fafd7ba5fdad49a0767f66f03
-  data.tar.gz: 97ca3b6290e95f3a686f5cc59ae7f97b444747dc6aed3e001f62ce740868ff0a3ff57a401343120805a586459d269e496ac6cf2e595791ca0c670a11fd2a74f0
+  metadata.gz: 6fc0e8aa9a7474513e8efdca22f56b6644815538b557961dfbfc2d9c65e83550067aeb002d3235fa191aa73452643e525cb80cc739c2728da8b85a997fbad06e
+  data.tar.gz: 046e127a84ffd444bc4f5734b9fead68ffd855bc65c3b30e3f9f6e46f0b123687585c04fcec85ca8f4b440bfdbb0391721a684a1fa16d0fde1e3602491779f15

data/Gemfile.lock

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

data/Jarfile

@@ -1,4 +1,4 @@
-jar 'org.kill-bill.billing:killbill-api', '0.51.7'
+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'
@@ -6,7 +6,7 @@ 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.0'
-jar 'org.kill-bill.billing:killbill-util', '0.19.0'
+jar 'org.kill-bill.billing:killbill-util:tests', '0.19.5'
+jar 'org.kill-bill.billing:killbill-util', '0.19.5'
 jar 'org.mockito:mockito-all', '1.10.19'
 jar 'javax.servlet:javax.servlet-api', '4.0.0'

data/Jarfile.lock

@@ -1,20 +1,19 @@
 ---
 :runtime:
 - com.zaxxer:HikariCP-java6:jar:2.3.13
-- org.kill-bill.billing:killbill-internal-api:jar:0.19.0
 - net.jcip:jcip-annotations:jar:1.0
 - 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
 - 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-concurrent:jar:0.21.1
+- 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:jar:0.37.2
-- org.kill-bill.billing:killbill-platform-lifecycle:jar:0.37.2
-- org.kill-bill.commons:killbill-embeddeddb-common:jar:0.21.1
 - org.joda:joda-money:jar:0.9
 - org.ehcache.integrations.shiro:shiro-ehcache3:jar:1.0.0
 - com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.6.7
@@ -25,36 +24,36 @@
 - 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.commons:killbill-locker:jar:0.21.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-xmlloader:jar:0.21.1
+- org.kill-bill.commons:killbill-locker:jar:0.21.8
+- org.kill-bill.commons:killbill-xmlloader:jar:0.21.8
 - javax.cache:cache-api:jar:1.0.0
-- org.kill-bill.billing:killbill-util:jar:tests:0.19.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
 - 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.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.billing:killbill-platform-api:jar:0.37.2
 - com.google.code.findbugs:annotations:jar:3.0.1u2
-- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.37.2
+- org.kill-bill.billing:killbill-platform-osgi-api:jar:0.37.9
 - org.antlr:ST4:jar:4.0.8
-- org.kill-bill.commons:killbill-queue:jar:0.21.1
 - 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-jdbi:jar:0.21.1
+- 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-api:jar:0.51.7
-- org.kill-bill.commons:killbill-clock:jar:0.21.1
 - 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
@@ -64,7 +63,8 @@
 - cglib:cglib:jar:3.1
 - io.dropwizard.metrics:metrics-core:jar:3.2.2
 - org.slf4j:slf4j-api:jar:1.7.25
-- org.kill-bill.billing:killbill-util:jar:0.19.0
+- org.kill-bill.billing:killbill-util:jar:tests:0.19.5
+- org.kill-bill.billing:killbill-platform-base:jar:0.37.9
 - org.mockito:mockito-all:jar:1.10.19
-- org.kill-bill.billing:killbill-platform-base:jar:0.37.2
+- org.kill-bill.billing:killbill-api:jar:0.51.12
 - org.osgi:org.osgi.compendium:jar:5.0.0

data/NEWS

@@ -1,3 +1,6 @@
+9.2.1
+    Release for Kill Bill 0.19.6
+
 9.2.0
     Initial release for Kill Bill 0.19.x
 

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.invoice.api.InvoiceItem
 
-        attr_accessor :id, :created_date, :updated_date, :invoice_item_type, :invoice_id, :account_id, :child_account_id, :start_date, :end_date, :amount, :currency, :description, :bundle_id, :subscription_id, :plan_name, :pretty_plan_name, :phase_name, :pretty_phase_name, :usage_name, :pretty_usage_name, :rate, :linked_item_id
+        attr_accessor :id, :created_date, :updated_date, :invoice_item_type, :invoice_id, :account_id, :child_account_id, :start_date, :end_date, :amount, :currency, :description, :bundle_id, :subscription_id, :plan_name, :pretty_plan_name, :phase_name, :pretty_phase_name, :usage_name, :pretty_usage_name, :rate, :linked_item_id, :quantity, :item_details
 
         def initialize()
         end
@@ -123,6 +123,12 @@ module Killbill
 
           # conversion for linked_item_id [type = java.util.UUID]
           @linked_item_id = java.util.UUID.fromString(@linked_item_id.to_s) unless @linked_item_id.nil?
+
+          # conversion for quantity [type = java.lang.Integer]
+          @quantity = @quantity
+
+          # conversion for item_details [type = java.lang.String]
+          @item_details = @item_details.to_s unless @item_details.nil?
           self
         end
 
@@ -219,6 +225,12 @@ module Killbill
           # conversion for linked_item_id [type = java.util.UUID]
           @linked_item_id = j_obj.linked_item_id
           @linked_item_id = @linked_item_id.nil? ? nil : @linked_item_id.to_s
+
+          # conversion for quantity [type = java.lang.Integer]
+          @quantity = j_obj.quantity
+
+          # conversion for item_details [type = java.lang.String]
+          @item_details = j_obj.item_details
           self
         end
 

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

@@ -34,7 +34,7 @@ module Killbill
 
         include org.killbill.billing.invoice.api.formatters.InvoiceItemFormatter
 
-        attr_accessor :invoice_item_type, :invoice_id, :account_id, :child_account_id, :start_date, :end_date, :amount, :currency, :description, :bundle_id, :subscription_id, :plan_name, :pretty_plan_name, :phase_name, :pretty_phase_name, :usage_name, :pretty_usage_name, :rate, :linked_item_id, :id, :created_date, :updated_date, :formatted_start_date, :formatted_end_date, :formatted_amount
+        attr_accessor :invoice_item_type, :invoice_id, :account_id, :child_account_id, :start_date, :end_date, :amount, :currency, :description, :bundle_id, :subscription_id, :plan_name, :pretty_plan_name, :phase_name, :pretty_phase_name, :usage_name, :pretty_usage_name, :rate, :linked_item_id, :quantity, :item_details, :id, :created_date, :updated_date, :formatted_start_date, :formatted_end_date, :formatted_amount
 
         def initialize()
         end
@@ -109,6 +109,12 @@ module Killbill
           # conversion for linked_item_id [type = java.util.UUID]
           @linked_item_id = java.util.UUID.fromString(@linked_item_id.to_s) unless @linked_item_id.nil?
 
+          # conversion for quantity [type = java.lang.Integer]
+          @quantity = @quantity
+
+          # conversion for item_details [type = java.lang.String]
+          @item_details = @item_details.to_s unless @item_details.nil?
+
           # conversion for id [type = java.util.UUID]
           @id = java.util.UUID.fromString(@id.to_s) unless @id.nil?
 
@@ -209,6 +215,12 @@ module Killbill
           @linked_item_id = j_obj.linked_item_id
           @linked_item_id = @linked_item_id.nil? ? nil : @linked_item_id.to_s
 
+          # conversion for quantity [type = java.lang.Integer]
+          @quantity = j_obj.quantity
+
+          # conversion for item_details [type = java.lang.String]
+          @item_details = j_obj.item_details
+
           # conversion for id [type = java.util.UUID]
           @id = j_obj.id
           @id = @id.nil? ? nil : @id.to_s

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

@@ -39,8 +39,8 @@ module Killbill
         end
 
 
-        java_signature 'Java::java.util.List getInvoicesByAccount(Java::java.util.UUID, Java::boolean, Java::org.killbill.billing.util.callcontext.TenantContext)'
-        def get_invoices_by_account(accountId, includesMigrated, context)
+        java_signature 'Java::java.util.List getInvoicesByAccount(Java::java.util.UUID, Java::boolean, Java::boolean, Java::org.killbill.billing.util.callcontext.TenantContext)'
+        def get_invoices_by_account(accountId, includesMigrated, includeVoidedInvoices, context)
 
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
@@ -48,9 +48,12 @@ module Killbill
           # conversion for includesMigrated [type = boolean]
           includesMigrated = includesMigrated.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(includesMigrated)
 
+          # conversion for includeVoidedInvoices [type = boolean]
+          includeVoidedInvoices = includeVoidedInvoices.nil? ? java.lang.Boolean.new(false) : java.lang.Boolean.new(includeVoidedInvoices)
+
           # conversion for context [type = org.killbill.billing.util.callcontext.TenantContext]
           context = context.to_java unless context.nil?
-          res = @real_java_api.get_invoices_by_account(accountId, includesMigrated, context)
+          res = @real_java_api.get_invoices_by_account(accountId, includesMigrated, includeVoidedInvoices, context)
           # conversion for res [type = java.util.List]
           tmp = []
           (res || []).each do |m|
@@ -331,8 +334,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::org.killbill.billing.invoice.api.InvoiceItem insertCredit(Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.joda.time.LocalDate, Java::org.killbill.billing.catalog.api.Currency, Java::boolean, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def insert_credit(accountId, amount, effectiveDate, currency, autoCommit, description, context)
+        java_signature 'Java::org.killbill.billing.invoice.api.InvoiceItem insertCredit(Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.joda.time.LocalDate, Java::org.killbill.billing.catalog.api.Currency, Java::boolean, Java::java.lang.String, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def insert_credit(accountId, amount, effectiveDate, currency, autoCommit, description, itemDetails, context)
 
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
@@ -358,10 +361,13 @@ module Killbill
           # conversion for description [type = java.lang.String]
           description = description.to_s unless description.nil?
 
+          # conversion for itemDetails [type = java.lang.String]
+          itemDetails = itemDetails.to_s unless itemDetails.nil?
+
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.insert_credit(accountId, amount, effectiveDate, currency, autoCommit, description, context)
+            res = @real_java_api.insert_credit(accountId, amount, effectiveDate, currency, autoCommit, description, itemDetails, context)
             # conversion for res [type = org.killbill.billing.invoice.api.InvoiceItem]
             res = Killbill::Plugin::Model::InvoiceItem.new.to_ruby(res) unless res.nil?
             return res
@@ -370,8 +376,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::org.killbill.billing.invoice.api.InvoiceItem insertCreditForInvoice(Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.joda.time.LocalDate, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def insert_credit_for_invoice(accountId, invoiceId, amount, effectiveDate, currency, description, context)
+        java_signature 'Java::org.killbill.billing.invoice.api.InvoiceItem insertCreditForInvoice(Java::java.util.UUID, Java::java.util.UUID, Java::java.math.BigDecimal, Java::org.joda.time.LocalDate, Java::org.killbill.billing.catalog.api.Currency, Java::java.lang.String, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def insert_credit_for_invoice(accountId, invoiceId, amount, effectiveDate, currency, description, itemDetails, context)
 
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
@@ -397,10 +403,13 @@ module Killbill
           # conversion for description [type = java.lang.String]
           description = description.to_s unless description.nil?
 
+          # conversion for itemDetails [type = java.lang.String]
+          itemDetails = itemDetails.to_s unless itemDetails.nil?
+
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.insert_credit_for_invoice(accountId, invoiceId, amount, effectiveDate, currency, description, context)
+            res = @real_java_api.insert_credit_for_invoice(accountId, invoiceId, amount, effectiveDate, currency, description, itemDetails, context)
             # conversion for res [type = org.killbill.billing.invoice.api.InvoiceItem]
             res = Killbill::Plugin::Model::InvoiceItem.new.to_ruby(res) unless res.nil?
             return res
@@ -409,8 +418,8 @@ module Killbill
           end
         end
 
-        java_signature 'Java::org.killbill.billing.invoice.api.InvoiceItem insertInvoiceItemAdjustment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
-        def insert_invoice_item_adjustment(accountId, invoiceId, invoiceItemId, effectiveDate, description, context)
+        java_signature 'Java::org.killbill.billing.invoice.api.InvoiceItem insertInvoiceItemAdjustment(Java::java.util.UUID, Java::java.util.UUID, Java::java.util.UUID, Java::org.joda.time.LocalDate, Java::java.lang.String, Java::java.lang.String, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def insert_invoice_item_adjustment(accountId, invoiceId, invoiceItemId, effectiveDate, description, itemDetails, context)
 
           # conversion for accountId [type = java.util.UUID]
           accountId = java.util.UUID.fromString(accountId.to_s) unless accountId.nil?
@@ -429,10 +438,13 @@ module Killbill
           # conversion for description [type = java.lang.String]
           description = description.to_s unless description.nil?
 
+          # conversion for itemDetails [type = java.lang.String]
+          itemDetails = itemDetails.to_s unless itemDetails.nil?
+
           # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
           context = context.to_java unless context.nil?
           begin
-            res = @real_java_api.insert_invoice_item_adjustment(accountId, invoiceId, invoiceItemId, effectiveDate, description, context)
+            res = @real_java_api.insert_invoice_item_adjustment(accountId, invoiceId, invoiceItemId, effectiveDate, description, itemDetails, context)
             # conversion for res [type = org.killbill.billing.invoice.api.InvoiceItem]
             res = Killbill::Plugin::Model::InvoiceItem.new.to_ruby(res) unless res.nil?
             return res
@@ -563,6 +575,17 @@ module Killbill
             raise Killbill::Plugin::Model::InvoiceApiException.new.to_ruby(e)
           end
         end
+
+        java_signature 'Java::void voidInvoice(Java::java.util.UUID, Java::org.killbill.billing.util.callcontext.CallContext)'
+        def void_invoice(invoiceId, context)
+
+          # conversion for invoiceId [type = java.util.UUID]
+          invoiceId = java.util.UUID.fromString(invoiceId.to_s) unless invoiceId.nil?
+
+          # conversion for context [type = org.killbill.billing.util.callcontext.CallContext]
+          context = context.to_java unless context.nil?
+          @real_java_api.void_invoice(invoiceId, context)
+        end
       end
     end
   end

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

@@ -41,7 +41,7 @@ module Killbill
           cc_last_name = (overrides.delete(:cc_last_name) || (set_defaults ? 'Doe' : nil))
           cc_type = (overrides.delete(:cc_type) || (set_defaults ? 'Visa' : nil))
           cc_exp_month = (overrides.delete(:cc_exp_month) || (set_defaults ? 12 : nil))
-          cc_exp_year = (overrides.delete(:cc_exp_year) || (set_defaults ? 2017 : nil))
+          cc_exp_year = (overrides.delete(:cc_exp_year) || (set_defaults ? 2020 : nil))
           cc_last_4 = (overrides.delete(:cc_last_4) || (set_defaults ? 4242 : nil))
           address1 = (overrides.delete(:address1) || (set_defaults ? '5, oakriu road' : nil))
           address2 = (overrides.delete(:address2) || (set_defaults ? 'apt. 298' : nil))

data/lib/killbill/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.2.1
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement